From 84933c123493a72ab95c6bf99c12748df675fa44 Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Fri, 21 Dec 2012 12:22:39 +0100
Subject: [PATCH 001/122] Allow allow-core-timeout=off conf of
 PinnedDispatcher, see #2856

---
 .../src/main/scala/akka/dispatch/PinnedDispatcher.scala  | 2 +-
 akka-docs/rst/java/dispatchers.rst                       | 9 +++++++++
 akka-docs/rst/scala/dispatchers.rst                      | 5 +++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/akka-actor/src/main/scala/akka/dispatch/PinnedDispatcher.scala b/akka-actor/src/main/scala/akka/dispatch/PinnedDispatcher.scala
index eb5b2686c3..9cdff4b521 100644
--- a/akka-actor/src/main/scala/akka/dispatch/PinnedDispatcher.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/PinnedDispatcher.scala
@@ -26,7 +26,7 @@ class PinnedDispatcher(
     Int.MaxValue,
     Duration.Zero,
     _mailboxType,
-    _threadPoolConfig.copy(allowCorePoolTimeout = true, corePoolSize = 1, maxPoolSize = 1),
+    _threadPoolConfig.copy(corePoolSize = 1, maxPoolSize = 1),
     _shutdownTimeout) {
 
   @volatile
diff --git a/akka-docs/rst/java/dispatchers.rst b/akka-docs/rst/java/dispatchers.rst
index b25a1c33b0..0be567ea7f 100644
--- a/akka-docs/rst/java/dispatchers.rst
+++ b/akka-docs/rst/java/dispatchers.rst
@@ -123,6 +123,15 @@ And then using it:
 
 .. includecode:: ../java/code/docs/dispatcher/DispatcherDocTestBase.java#defining-pinned-dispatcher
 
+Note that ``thread-pool-executor`` configuration as per the above ``my-thread-pool-dispatcher`` example is
+NOT applicable. This is because every actor will have its own thread pool when using ``PinnedDispatcher``,
+and that pool will have only one thread.
+
+Note that it's not guaranteed that the *same* thread is used over time, since the core pool timeout
+is used for ``PinnedDispatcher`` to keep resource usage down in case of idle actors. To use the same
+thread all the time you need to add ``thread-pool-executor.allow-core-timeout=off`` to the
+configuration of the ``PinnedDispatcher``.
+
 Mailboxes
 ---------
 
diff --git a/akka-docs/rst/scala/dispatchers.rst b/akka-docs/rst/scala/dispatchers.rst
index 68182af86e..3ca629b54c 100644
--- a/akka-docs/rst/scala/dispatchers.rst
+++ b/akka-docs/rst/scala/dispatchers.rst
@@ -129,6 +129,11 @@ Note that ``thread-pool-executor`` configuration as per the above ``my-thread-po
 NOT applicable. This is because every actor will have its own thread pool when using ``PinnedDispatcher``,
 and that pool will have only one thread.
 
+Note that it's not guaranteed that the *same* thread is used over time, since the core pool timeout
+is used for ``PinnedDispatcher`` to keep resource usage down in case of idle actors. To use the same
+thread all the time you need to add ``thread-pool-executor.allow-core-timeout=off`` to the
+configuration of the ``PinnedDispatcher``.
+
 Mailboxes
 ---------
 

From 0d185e297d3cf198937142d644801159504abfd9 Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Fri, 21 Dec 2012 15:03:29 +0100
Subject: [PATCH 002/122] Check routees in a better way in
 ClusterRoundRobinRoutedActorSpec, see #2801

---
 .../ClusterRoundRobinRoutedActorSpec.scala    | 29 ++++++++++++++++---
 .../transport/ThrottlerTransportAdapter.scala |  2 +-
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/ClusterRoundRobinRoutedActorSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/ClusterRoundRobinRoutedActorSpec.scala
index 0098da695b..8a6ac1935f 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/ClusterRoundRobinRoutedActorSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/ClusterRoundRobinRoutedActorSpec.scala
@@ -110,6 +110,9 @@ abstract class ClusterRoundRobinRoutedActorSpec extends MultiNodeSpec(ClusterRou
     case a                         ⇒ a
   }
 
+  def currentRoutees(router: ActorRef) =
+    Await.result(router ? CurrentRoutees, remaining).asInstanceOf[RouterRoutees].routees
+
   "A cluster router with a RoundRobin router" must {
     "start cluster with 2 nodes" taggedAs LongRunningTest in {
       awaitClusterUp(first, second)
@@ -121,6 +124,9 @@ abstract class ClusterRoundRobinRoutedActorSpec extends MultiNodeSpec(ClusterRou
       runOn(first) {
         router1.isInstanceOf[RoutedActorRef] must be(true)
 
+        // max-nr-of-instances-per-node=2 times 2 nodes
+        awaitCond(currentRoutees(router1).size == 4)
+
         val iterationCount = 10
         for (i ← 0 until iterationCount) {
           router1 ! "hit"
@@ -146,6 +152,9 @@ abstract class ClusterRoundRobinRoutedActorSpec extends MultiNodeSpec(ClusterRou
       enterBarrier("myservice-started")
 
       runOn(first) {
+        // 2 nodes, 1 routee on each node
+        awaitCond(currentRoutees(router4).size == 2)
+
         val iterationCount = 10
         for (i ← 0 until iterationCount) {
           router4 ! "hit"
@@ -169,6 +178,9 @@ abstract class ClusterRoundRobinRoutedActorSpec extends MultiNodeSpec(ClusterRou
       awaitClusterUp(first, second, third, fourth)
 
       runOn(first) {
+        // max-nr-of-instances-per-node=2 times 4 nodes
+        awaitCond(currentRoutees(router1).size == 8)
+
         val iterationCount = 10
         for (i ← 0 until iterationCount) {
           router1 ! "hit"
@@ -188,6 +200,9 @@ abstract class ClusterRoundRobinRoutedActorSpec extends MultiNodeSpec(ClusterRou
       // cluster consists of first, second, third and fourth
 
       runOn(first) {
+        // 4 nodes, 1 routee on each node
+        awaitCond(currentRoutees(router4).size == 4)
+
         val iterationCount = 10
         for (i ← 0 until iterationCount) {
           router4 ! "hit"
@@ -205,6 +220,9 @@ abstract class ClusterRoundRobinRoutedActorSpec extends MultiNodeSpec(ClusterRou
     "deploy routees to only remote nodes when allow-local-routees = off" taggedAs LongRunningTest in {
 
       runOn(first) {
+        // max-nr-of-instances-per-node=1 times 3 nodes
+        awaitCond(currentRoutees(router3).size == 3)
+
         val iterationCount = 10
         for (i ← 0 until iterationCount) {
           router3 ! "hit"
@@ -227,6 +245,9 @@ abstract class ClusterRoundRobinRoutedActorSpec extends MultiNodeSpec(ClusterRou
       runOn(first) {
         router2.isInstanceOf[RoutedActorRef] must be(true)
 
+        // totalInstances = 3, maxInstancesPerNode = 1
+        awaitCond(currentRoutees(router2).size == 3)
+
         val iterationCount = 10
         for (i ← 0 until iterationCount) {
           router2 ! "hit"
@@ -235,8 +256,8 @@ abstract class ClusterRoundRobinRoutedActorSpec extends MultiNodeSpec(ClusterRou
         val replies = receiveReplies(DeployRoutee, iterationCount)
 
         // note that router2 has totalInstances = 3, maxInstancesPerNode = 1
-        val currentRoutees = Await.result(router2 ? CurrentRoutees, 5 seconds).asInstanceOf[RouterRoutees].routees
-        val routeeAddresses = currentRoutees map fullAddress
+        val routees = currentRoutees(router2)
+        val routeeAddresses = routees map fullAddress
 
         routeeAddresses.size must be(3)
         replies.values.sum must be(iterationCount)
@@ -249,8 +270,8 @@ abstract class ClusterRoundRobinRoutedActorSpec extends MultiNodeSpec(ClusterRou
       muteMarkingAsUnreachable()
 
       runOn(first) {
-        def currentRoutees = Await.result(router2 ? CurrentRoutees, 5 seconds).asInstanceOf[RouterRoutees].routees
-        def routeeAddresses = (currentRoutees map fullAddress).toSet
+        def routees = currentRoutees(router2)
+        def routeeAddresses = (routees map fullAddress).toSet
 
         val notUsedAddress = ((roles map address).toSet -- routeeAddresses).head
 
diff --git a/akka-remote/src/main/scala/akka/remote/transport/ThrottlerTransportAdapter.scala b/akka-remote/src/main/scala/akka/remote/transport/ThrottlerTransportAdapter.scala
index c007b3d7d2..d76bbbf071 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/ThrottlerTransportAdapter.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/ThrottlerTransportAdapter.scala
@@ -154,7 +154,7 @@ private[transport] class ThrottlerManager(wrappedTransport: Transport) extends A
       wrappedTransport.associate(remoteAddress) onComplete {
         // Slight modification of pipe, only success is sent, failure is propagated to a separate future
         case Success(handle) ⇒ self ! (handle, statusPromise)
-        case Failure(e) ⇒ statusPromise.failure(e)
+        case Failure(e)      ⇒ statusPromise.failure(e)
       }
     // Finished outbound association and got back the handle
     case (handle: AssociationHandle, statusPromise: Promise[AssociationHandle]) ⇒

From 5fff91f482a2d83ba5f1a7167f0fbb16826a2e91 Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Wed, 26 Dec 2012 16:24:30 +0100
Subject: [PATCH 003/122] Turning off stacktraces for ConnectException, to cut
 down the noise in the logs

---
 .../scala/akka/remote/transport/netty/NettyTransport.scala    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala b/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
index 2f10dfb4f7..76236a9627 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
@@ -339,8 +339,8 @@ class NettyTransport(private val settings: NettyTransportSettings, private val s
         case NonFatal(e) ⇒
           Future.failed(e)
       }) onFailure {
-        case t: ConnectException ⇒ statusPromise failure new NettyTransportException(t.getMessage, t.getCause)
-        case t ⇒ statusPromise failure t
+        case t: ConnectException ⇒ statusPromise failure new NettyTransportException(t.getMessage, t.getCause) with NoStackTrace
+        case t                   ⇒ statusPromise failure t
       }
 
       statusPromise.future

From d7f7076a94c50a6cf3203d2c6ccbc3de0e3ac205 Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Wed, 26 Dec 2012 16:50:12 +0100
Subject: [PATCH 004/122]  #2848 - Removing the UUID from AkkaException

---
 akka-actor/src/main/scala/akka/AkkaException.scala | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/akka-actor/src/main/scala/akka/AkkaException.scala b/akka-actor/src/main/scala/akka/AkkaException.scala
index ae245e3591..f290c7e565 100644
--- a/akka-actor/src/main/scala/akka/AkkaException.scala
+++ b/akka-actor/src/main/scala/akka/AkkaException.scala
@@ -14,10 +14,6 @@ package akka
 @SerialVersionUID(1L)
 class AkkaException(message: String, cause: Throwable) extends RuntimeException(message, cause) with Serializable {
   def this(msg: String) = this(msg, null)
-
-  lazy val uuid: String = java.util.UUID.randomUUID().toString
-
-  override def toString(): String = uuid + super.toString()
 }
 
 /**

From 51ed8b06b5fe0334c64705588fb83dd036937017 Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Wed, 26 Dec 2012 17:00:58 +0100
Subject: [PATCH 005/122] Switching to ByteString in FSMDocSpec to get rid of
 warnings in pattern matching

---
 akka-docs/rst/scala/code/docs/actor/FSMDocSpec.scala | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/akka-docs/rst/scala/code/docs/actor/FSMDocSpec.scala b/akka-docs/rst/scala/code/docs/actor/FSMDocSpec.scala
index 15821419d4..49d51a19a4 100644
--- a/akka-docs/rst/scala/code/docs/actor/FSMDocSpec.scala
+++ b/akka-docs/rst/scala/code/docs/actor/FSMDocSpec.scala
@@ -6,6 +6,8 @@ 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

From 76f22ea42ab6dea8892b9b6ce62d70f8ee733e90 Mon Sep 17 00:00:00 2001
From: Christophe Pache <christophe.pache@crossing-tech.com>
Date: Fri, 28 Dec 2012 16:01:35 +0100
Subject: [PATCH 006/122] Let the ActorSystem find its configuration outside of
 the bundle, in the OSGi etc directory, following this order:    
 etc/bundle-BUNDLE_SYMBOLIC_NAME.conf     etc/bundle-BUNDLE_ID.conf    
 etc/akka.conf     akka-actor classpath config (using the original 
 OsgiActorSystemFactory.actorSystemConfig method.)

Configurations fallback from the most to the less specific one.

For the moment, as I haven't found test on ActorSystem Configuration in OSGi, I did not add test for this feature.
    	modified:   akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala
---
 .../scala/akka/osgi/OsgiActorSystemFactory.scala | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala b/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala
index 447719ef39..86c2f11c72 100644
--- a/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala
+++ b/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala
@@ -7,6 +7,7 @@ import impl.BundleDelegatingClassLoader
 import akka.actor.ActorSystem
 import com.typesafe.config.{ ConfigFactory, Config }
 import org.osgi.framework.BundleContext
+import java.io.File
 
 /**
  * Factory class to create ActorSystem implementations in an OSGi environment.  This mainly involves dealing with
@@ -32,6 +33,21 @@ class OsgiActorSystemFactory(val context: BundleContext, val fallbackClassLoader
   def createActorSystem(name: Option[String]): ActorSystem =
     ActorSystem(actorSystemName(name), actorSystemConfig(context), classloader)
 
+  /**
+   * Strategy method to create the Config for the ActorSystem, based on configuration files found in etc directory,
+   * ensuring that the default/reference configuration is loaded from the akka-actor bundle.
+   * The configuration is based on
+   * File(etc/bundle-SYMBOLICNAME.conf)
+   * File(etc/bundle-ID.conf)
+   * File(etc/akka.conf)
+   * Configuration files found in akka-actor bundle
+   */
+  def extendedActorSystemConfig(context: BundleContext): Config = {
+    val bunleNameAkkaConfig = ConfigFactory.parseFile(new File("etc/bundle-%s.conf" format context.getBundle.getSymbolicName))
+    val bunleIDAkkaConfig = ConfigFactory.parseFile(new File("etc/bundle-%s.conf" format context.getBundle.getBundleId))
+    val defaultAkkaConfig = ConfigFactory.parseFile(new File("etc/akka.conf"))
+    bunleNameAkkaConfig.withFallback(bunleIDAkkaConfig.withFallback(defaultAkkaConfig).withFallback(actorSystemConfig(context)))
+  }
   /**
    * Strategy method to create the Config for the ActorSystem, ensuring that the default/reference configuration is
    * loaded from the akka-actor bundle.

From f492e643453732de95425808bc6a925a2a9fde3b Mon Sep 17 00:00:00 2001
From: Christophe Pache <christophe.pache@crossing-tech.com>
Date: Fri, 28 Dec 2012 17:20:41 +0100
Subject: [PATCH 007/122] Concerning akka in osgi: ActorRefProvider contains in
 akka-cluster or akka-remote bundle are not found by the akka-actor bundle,
 thus exposing those if required

---
 project/AkkaBuild.scala | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index 6bca2ff7c0..2674e1c111 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -641,7 +641,8 @@ object AkkaBuild extends Build {
 
   object OSGi {
 
-    val actor = exports(Seq("akka*"))
+    val actor = exports(Seq("akka*"), imports = Seq("akka.remote.*;resolution:=optional", "akka.cluster.*;resolution:=optional"))
+
 
     val agent = exports(Seq("akka.agent.*"))
 

From dad40d456a859beebc3ad7af9fe4474092013ffe Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Wed, 2 Jan 2013 17:03:19 +0100
Subject: [PATCH 008/122] Fix race in CircuitBreakerMTSpec, see #2823

---
 .../akka/pattern/CircuitBreakerMTSpec.scala   | 67 +++++++++----------
 1 file changed, 33 insertions(+), 34 deletions(-)

diff --git a/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerMTSpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerMTSpec.scala
index 34cb3d4ef8..a21dd6f22a 100644
--- a/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerMTSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerMTSpec.scala
@@ -4,8 +4,9 @@
 package akka.pattern
 
 import akka.testkit._
+import scala.collection.immutable
 import scala.concurrent.duration._
-import scala.concurrent.{ Promise, Future, Await }
+import scala.concurrent.{ Future, Await }
 import scala.annotation.tailrec
 
 class CircuitBreakerMTSpec extends AkkaSpec {
@@ -14,6 +15,7 @@ class CircuitBreakerMTSpec extends AkkaSpec {
     val callTimeout = 1.second.dilated
     val resetTimeout = 2.seconds.dilated
     val breaker = new CircuitBreaker(system.scheduler, 5, callTimeout, resetTimeout)
+    val numberOfTestCalls = 100
 
     def openBreaker(): Unit = {
       @tailrec def call(attemptsLeft: Int): Unit = {
@@ -26,29 +28,31 @@ class CircuitBreakerMTSpec extends AkkaSpec {
       call(10)
     }
 
+    def testCallsWithBreaker(): immutable.IndexedSeq[Future[String]] = {
+      val aFewActive = new TestLatch(5)
+      for (_ ← 1 to numberOfTestCalls) yield breaker.withCircuitBreaker(Future {
+        aFewActive.countDown()
+        Await.ready(aFewActive, 5.seconds.dilated)
+        "succeed"
+      }) recoverWith {
+        case _: CircuitBreakerOpenException ⇒
+          aFewActive.countDown()
+          Future.successful("CBO")
+      }
+    }
+
     "allow many calls while in closed state with no errors" in {
-
-      val futures = for (i ← 1 to 100) yield breaker.withCircuitBreaker(Future { Thread.sleep(10); "succeed" })
-
+      val futures = testCallsWithBreaker()
       val result = Await.result(Future.sequence(futures), 5.second.dilated)
-
-      result.size must be(100)
+      result.size must be(numberOfTestCalls)
       result.toSet must be === Set("succeed")
-
     }
 
     "transition to open state upon reaching failure limit and fail-fast" in {
       openBreaker()
-
-      val futures = for (i ← 1 to 100) yield breaker.withCircuitBreaker(Future {
-        Thread.sleep(10); "success"
-      }) recoverWith {
-        case _: CircuitBreakerOpenException ⇒ Promise.successful("CBO").future
-      }
-
+      val futures = testCallsWithBreaker()
       val result = Await.result(Future.sequence(futures), 5.second.dilated)
-
-      result.size must be(100)
+      result.size must be(numberOfTestCalls)
       result.toSet must be === Set("CBO")
     }
 
@@ -58,17 +62,12 @@ class CircuitBreakerMTSpec extends AkkaSpec {
 
       openBreaker()
 
+      // breaker should become half-open after a while
       Await.ready(halfOpenLatch, resetTimeout + 1.seconds.dilated)
 
-      val futures = for (i ← 1 to 100) yield breaker.withCircuitBreaker(Future {
-        Thread.sleep(10); "succeed"
-      }) recoverWith {
-        case _: CircuitBreakerOpenException ⇒ Promise.successful("CBO").future
-      }
-
+      val futures = testCallsWithBreaker()
       val result = Await.result(Future.sequence(futures), 5.second.dilated)
-
-      result.size must be(100)
+      result.size must be(numberOfTestCalls)
       result.toSet must be === Set("succeed", "CBO")
     }
 
@@ -76,19 +75,19 @@ class CircuitBreakerMTSpec extends AkkaSpec {
       val halfOpenLatch = new TestLatch(1)
       breaker.onHalfOpen(halfOpenLatch.countDown())
       openBreaker()
-      Await.ready(halfOpenLatch, 5.seconds.dilated)
-      Await.ready(breaker.withCircuitBreaker(Future("succeed")), resetTimeout)
 
-      val futures = (1 to 100) map {
-        i ⇒
-          breaker.withCircuitBreaker(Future { Thread.sleep(10); "succeed" }) recoverWith {
-            case _: CircuitBreakerOpenException ⇒ Promise.successful("CBO").future
-          }
-      }
+      // breaker should become half-open after a while
+      Await.ready(halfOpenLatch, resetTimeout + 1.seconds.dilated)
 
+      // one successful call should close the latch
+      val closedLatch = new TestLatch(1)
+      breaker.onClose(closedLatch.countDown())
+      breaker.withCircuitBreaker(Future("succeed"))
+      Await.ready(closedLatch, 5.seconds.dilated)
+
+      val futures = testCallsWithBreaker()
       val result = Await.result(Future.sequence(futures), 5.second.dilated)
-
-      result.size must be(100)
+      result.size must be(numberOfTestCalls)
       result.toSet must be === Set("succeed")
     }
   }

From da6c2f3b545e59da941f8b7302249fc14ec7c1f5 Mon Sep 17 00:00:00 2001
From: Roland <rk@rkuhn.info>
Date: Wed, 2 Jan 2013 23:13:44 +0100
Subject: [PATCH 009/122] remove fixed ports from RemoteCommunicationSpec, see
 #2843

---
 .../akka/remote/RemoteCommunicationSpec.scala | 35 ++++++++++++-------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/akka-remote/src/test/scala/akka/remote/RemoteCommunicationSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteCommunicationSpec.scala
index 61443879c0..8e619d8bb3 100644
--- a/akka-remote/src/test/scala/akka/remote/RemoteCommunicationSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/RemoteCommunicationSpec.scala
@@ -41,20 +41,31 @@ akka {
   remote.transport = "akka.remote.netty.NettyRemoteTransport"
   remote.netty {
     hostname = localhost
-    port = 12345
-  }
-  actor.deployment {
-    /blub.remote = "akka://remote-sys@localhost:12346"
-    /looker/child.remote = "akka://remote-sys@localhost:12346"
-    /looker/child/grandchild.remote = "akka://RemoteCommunicationSpec@localhost:12345"
+    port = 0
   }
 }
                                                """) with ImplicitSender with DefaultTimeout {
 
   import RemoteCommunicationSpec._
 
-  val conf = ConfigFactory.parseString("akka.remote.netty.port=12346").withFallback(system.settings.config)
-  val other = ActorSystem("remote-sys", conf)
+  val other = ActorSystem("remote-sys", system.settings.config)
+
+  val localAddr = system.asInstanceOf[ExtendedActorSystem].provider.getDefaultAddress
+  val remoteAddr = other.asInstanceOf[ExtendedActorSystem].provider.getDefaultAddress
+
+  val deploys = Seq(
+    Deploy("/blub", scope = RemoteScope(remoteAddr)),
+    Deploy("/looker/child", scope = RemoteScope(remoteAddr)),
+    Deploy("/looker/child/grandchild", scope = RemoteScope(localAddr)))
+
+  def deploy(sys: ActorSystem, d: Deploy) {
+    sys.asInstanceOf[ExtendedActorSystem].provider.asInstanceOf[RemoteActorRefProvider].deployer.deploy(d)
+  }
+
+  for (d ← deploys) {
+    deploy(system, d)
+    deploy(other, d)
+  }
 
   val remote = other.actorOf(Props(new Actor {
     def receive = {
@@ -62,7 +73,7 @@ akka {
     }
   }), "echo")
 
-  val here = system.actorFor("akka://remote-sys@localhost:12346/user/echo")
+  val here = system.actorFor(RootActorPath(remoteAddr) / "user" / "echo")
 
   override def atTermination() {
     other.shutdown()
@@ -81,7 +92,7 @@ akka {
       val old = other.eventStream.logLevel
       other.eventStream.setLogLevel(Logging.DebugLevel)
       EventFilter.debug(start = "dropping", occurrences = 1).intercept {
-        system.actorFor("akka://remotesys@localhost:12346/user/echo") ! "ping"
+        system.actorFor(RootActorPath(remoteAddr.copy(system = "remotesys")) / "user" / "echo") ! "ping"
       }(other)
       other.eventStream.setLogLevel(old)
     }
@@ -95,13 +106,13 @@ akka {
 
     "send dead letters on remote if actor does not exist" in {
       EventFilter.warning(pattern = "dead.*buh", occurrences = 1).intercept {
-        system.actorFor("akka://remote-sys@localhost:12346/does/not/exist") ! "buh"
+        system.actorFor(RootActorPath(remoteAddr) / "does" / "not" / "exist") ! "buh"
       }(other)
     }
 
     "create and supervise children on remote node" in {
       val r = system.actorOf(Props[Echo], "blub")
-      r.path.toString must be === "akka://remote-sys@localhost:12346/remote/akka/RemoteCommunicationSpec@localhost:12345/user/blub"
+      r.path.toString must be === s"akka://remote-sys@localhost:${remoteAddr.port.get}/remote/akka/RemoteCommunicationSpec@localhost:${localAddr.port.get}/user/blub"
       r ! 42
       expectMsg(42)
       EventFilter[Exception]("crash", occurrences = 1).intercept {

From 5297db2950503606013529e96ebc41cb09183213 Mon Sep 17 00:00:00 2001
From: Roland <rk@rkuhn.info>
Date: Wed, 2 Jan 2013 23:37:01 +0100
Subject: [PATCH 010/122] remove fixed ports from AkkaProtocolStressTest, see
 #2843

---
 .../transport/AkkaProtocolStressTest.scala    | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala b/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala
index da9bbc9ac8..b16b8040d4 100644
--- a/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala
+++ b/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala
@@ -5,6 +5,9 @@ import com.typesafe.config.{ Config, ConfigFactory }
 import AkkaProtocolStressTest._
 import akka.actor._
 import scala.concurrent.duration._
+import akka.testkit.TestEvent
+import akka.testkit.EventFilter
+import akka.remote.EndpointException
 
 object AkkaProtocolStressTest {
   val configA: Config = ConfigFactory parseString ("""
@@ -26,7 +29,7 @@ object AkkaProtocolStressTest {
 
       remoting.transports.tcp {
         applied-adapters = ["gremlin"]
-        port = 12345
+        port = 0
       }
 
     }
@@ -62,17 +65,15 @@ object AkkaProtocolStressTest {
 
 class AkkaProtocolStressTest extends AkkaSpec(configA) with ImplicitSender with DefaultTimeout {
 
-  val configB = ConfigFactory.parseString("akka.remoting.transports.tcp.port = 12346")
-    .withFallback(system.settings.config).resolve()
-
-  val systemB = ActorSystem("systemB", configB)
+  val systemB = ActorSystem("systemB", system.settings.config)
   val remote = systemB.actorOf(Props(new Actor {
     def receive = {
       case seq: Int ⇒ sender ! seq
     }
   }), "echo")
 
-  val here = system.actorFor("tcp.gremlin.akka://systemB@localhost:12346/user/echo")
+  val rootB = RootActorPath(systemB.asInstanceOf[ExtendedActorSystem].provider.getDefaultAddress)
+  val here = system.actorFor(rootB / "user" / "echo")
 
   "AkkaProtocolTransport" must {
     "guarantee at-most-once delivery and message ordering despite packet loss" taggedAs TimingTest in {
@@ -82,6 +83,13 @@ class AkkaProtocolStressTest extends AkkaSpec(configA) with ImplicitSender with
         case (received: Int, lost: Int) ⇒
           log.debug(s" ######## Received ${received - lost} messages from ${received} ########")
       }
+      system.eventStream.publish(TestEvent.Mute(
+        EventFilter.warning(source = "akka://AkkaProtocolStressTest/user/$a", start = "received dead letter"),
+        EventFilter.warning(pattern = "received dead letter.*(InboundPayload|Disassociate)")))
+      systemB.eventStream.publish(TestEvent.Mute(
+        EventFilter[EndpointException](),
+        EventFilter.error(start = "AssociationError"),
+        EventFilter.warning(pattern = "received dead letter.*(InboundPayload|Disassociate)")))
     }
   }
 

From 040e4c86019b857aefeb7bfc2afcfa3c86d02c2c Mon Sep 17 00:00:00 2001
From: Roland <rk@rkuhn.info>
Date: Wed, 2 Jan 2013 23:45:46 +0100
Subject: [PATCH 011/122] remove fixed ports from
 ThrottlerTransportAdapterSpec, see #2843

---
 .../ThrottlerTransportAdapterSpec.scala       | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/akka-remote/src/test/scala/akka/remote/transport/ThrottlerTransportAdapterSpec.scala b/akka-remote/src/test/scala/akka/remote/transport/ThrottlerTransportAdapterSpec.scala
index d05dc073cb..4d997c88cc 100644
--- a/akka-remote/src/test/scala/akka/remote/transport/ThrottlerTransportAdapterSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/transport/ThrottlerTransportAdapterSpec.scala
@@ -8,6 +8,9 @@ import scala.concurrent.duration._
 import scala.concurrent.Await
 import akka.remote.transport.ThrottlerTransportAdapter.{ Direction, TokenBucket, SetThrottle }
 import akka.remote.RemoteActorRefProvider
+import akka.testkit.TestEvent
+import akka.testkit.EventFilter
+import akka.remote.EndpointException
 
 object ThrottlerTransportAdapterSpec {
   val configA: Config = ConfigFactory parseString ("""
@@ -19,7 +22,7 @@ object ThrottlerTransportAdapterSpec {
       remoting.log-remote-lifecycle-events = on
 
       remoting.transports.tcp.applied-adapters = ["trttl"]
-      remoting.transports.tcp.port = 12345
+      remoting.transports.tcp.port = 0
     }
                                                    """)
 
@@ -56,24 +59,30 @@ object ThrottlerTransportAdapterSpec {
 }
 
 class ThrottlerTransportAdapterSpec extends AkkaSpec(configA) with ImplicitSender with DefaultTimeout {
-  val configB = ConfigFactory.parseString("akka.remoting.transports.tcp.port = 12346")
-    .withFallback(system.settings.config).resolve()
 
-  val systemB = ActorSystem("systemB", configB)
+  val systemB = ActorSystem("systemB", system.settings.config)
   val remote = systemB.actorOf(Props[Echo], "echo")
 
-  val here = system.actorFor("tcp.trttl.akka://systemB@localhost:12346/user/echo")
+  val rootB = RootActorPath(systemB.asInstanceOf[ExtendedActorSystem].provider.getDefaultAddress)
+  val here = system.actorFor(rootB / "user" / "echo")
 
   "ThrottlerTransportAdapter" must {
     "maintain average message rate" taggedAs TimingTest in {
       Await.result(
         system.asInstanceOf[ExtendedActorSystem].provider.asInstanceOf[RemoteActorRefProvider].transport
-          .managementCommand(SetThrottle(Address("akka", "systemB", "localhost", 12346), Direction.Send, TokenBucket(200, 500, 0, 0))), 3 seconds)
+          .managementCommand(SetThrottle(Address("akka", "systemB", "localhost", rootB.address.port.get), Direction.Send, TokenBucket(200, 500, 0, 0))), 3 seconds)
       val tester = system.actorOf(Props(new ThrottlingTester(here, self))) ! "start"
 
       expectMsgPF((TotalTime + 3) seconds) {
         case time: Long ⇒ log.warning("Total time of transmission: " + NANOSECONDS.toSeconds(time))
       }
+      system.eventStream.publish(TestEvent.Mute(
+        EventFilter.warning(source = "akka://AkkaProtocolStressTest/user/$a", start = "received dead letter"),
+        EventFilter.warning(pattern = "received dead letter.*(InboundPayload|Disassociate)")))
+      systemB.eventStream.publish(TestEvent.Mute(
+        EventFilter[EndpointException](),
+        EventFilter.error(start = "AssociationError"),
+        EventFilter.warning(pattern = "received dead letter.*(InboundPayload|Disassociate)")))
     }
   }
 

From fa494863a0e4c69f0f5e2a5d3effe85d1142cb19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Endre=20S=C3=A1ndor=20Varga?= <vendre@hit.bme.hu>
Date: Thu, 3 Jan 2013 10:53:30 +0100
Subject: [PATCH 012/122] Hardened flushing by sending a final "null" message

---
 .../transport/netty/NettyTransport.scala      | 19 ++++++++++++++-----
 .../remote/transport/netty/TcpSupport.scala   |  3 ++-
 .../remote/transport/netty/UdpSupport.scala   |  3 ++-
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala b/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
index 76236a9627..f913fa0cbc 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
@@ -11,7 +11,7 @@ import com.typesafe.config.Config
 import java.net.{ UnknownHostException, SocketAddress, InetAddress, InetSocketAddress, ConnectException }
 import java.util.concurrent.{ ConcurrentHashMap, Executor, Executors, CancellationException }
 import org.jboss.netty.bootstrap.{ ConnectionlessBootstrap, Bootstrap, ClientBootstrap, ServerBootstrap }
-import org.jboss.netty.buffer.ChannelBuffer
+import org.jboss.netty.buffer.{ChannelBuffers, ChannelBuffer}
 import org.jboss.netty.channel._
 import org.jboss.netty.channel.group.{ ChannelGroupFuture, ChannelGroupFutureListener }
 import org.jboss.netty.channel.socket.nio.{ NioDatagramChannelFactory, NioServerSocketChannelFactory, NioClientSocketChannelFactory }
@@ -348,13 +348,22 @@ class NettyTransport(private val settings: NettyTransportSettings, private val s
   }
 
   override def shutdown(): Unit = {
-    channelGroup.unbind()
-    channelGroup.disconnect().addListener(new ChannelGroupFutureListener {
+    // Force flush by trying to write an empty buffer and wait for success
+    channelGroup.write(ChannelBuffers.buffer(0)).addListener(new ChannelGroupFutureListener {
       def operationComplete(future: ChannelGroupFuture) {
-        channelGroup.close()
-        inboundBootstrap.releaseExternalResources()
+        channelGroup.unbind()
+        channelGroup.disconnect().addListener(new ChannelGroupFutureListener {
+          def operationComplete(future: ChannelGroupFuture) {
+            channelGroup.close().addListener(new ChannelGroupFutureListener {
+              def operationComplete(future: ChannelGroupFuture) {
+                inboundBootstrap.releaseExternalResources()
+              }
+            })
+          }
+        })
       }
     })
+
   }
 
 }
diff --git a/akka-remote/src/main/scala/akka/remote/transport/netty/TcpSupport.scala b/akka-remote/src/main/scala/akka/remote/transport/netty/TcpSupport.scala
index 6e8b714fb0..515637dad0 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/netty/TcpSupport.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/netty/TcpSupport.scala
@@ -32,7 +32,8 @@ private[remote] trait TcpHandlers extends CommonHandlers {
   }
 
   override def onMessage(ctx: ChannelHandlerContext, e: MessageEvent) {
-    notifyListener(e.getChannel, InboundPayload(ByteString(e.getMessage.asInstanceOf[ChannelBuffer].array())))
+    val bytes: Array[Byte] = e.getMessage.asInstanceOf[ChannelBuffer].array()
+    if (bytes.length > 0) notifyListener(e.getChannel, InboundPayload(ByteString(bytes)))
   }
 
   override def onException(ctx: ChannelHandlerContext, e: ExceptionEvent) {
diff --git a/akka-remote/src/main/scala/akka/remote/transport/netty/UdpSupport.scala b/akka-remote/src/main/scala/akka/remote/transport/netty/UdpSupport.scala
index 080b03c152..cb4251bf92 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/netty/UdpSupport.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/netty/UdpSupport.scala
@@ -34,7 +34,8 @@ private[remote] trait UdpHandlers extends CommonHandlers {
         initUdp(e.getChannel, e.getRemoteAddress, e.getMessage.asInstanceOf[ChannelBuffer])
       } else {
         val listener = transport.udpConnectionTable.get(inetSocketAddress)
-        listener notify InboundPayload(ByteString(e.getMessage.asInstanceOf[ChannelBuffer].array()))
+        val bytes: Array[Byte] = e.getMessage.asInstanceOf[ChannelBuffer].array()
+        if (bytes.length > 0)listener notify InboundPayload(ByteString(bytes))
       }
     case _ ⇒
   }

From 94b145fc9545127f29886d7ace5da868bf92bfa1 Mon Sep 17 00:00:00 2001
From: Crossing-Tech <guillaume.yziquel@crossing-tech.com>
Date: Thu, 3 Jan 2013 11:46:09 +0100
Subject: [PATCH 013/122]  patriknw comments commited

        * .conf, .properties, .json configuration files
        * string interpolation
        * take place of the legacy actorSystemConfig
---
 .../akka/osgi/OsgiActorSystemFactory.scala    | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala b/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala
index 86c2f11c72..9069e5d06d 100644
--- a/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala
+++ b/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala
@@ -37,23 +37,19 @@ class OsgiActorSystemFactory(val context: BundleContext, val fallbackClassLoader
    * Strategy method to create the Config for the ActorSystem, based on configuration files found in etc directory,
    * ensuring that the default/reference configuration is loaded from the akka-actor bundle.
    * The configuration is based on
-   * File(etc/bundle-SYMBOLICNAME.conf)
-   * File(etc/bundle-ID.conf)
-   * File(etc/akka.conf)
+   * etc/bundle-SYMBOLICNAME, etc/bundle-ID, etc/akka.conf
+   * in either ".conf", ".properties", ".json" formats
    * Configuration files found in akka-actor bundle
    */
-  def extendedActorSystemConfig(context: BundleContext): Config = {
-    val bunleNameAkkaConfig = ConfigFactory.parseFile(new File("etc/bundle-%s.conf" format context.getBundle.getSymbolicName))
-    val bunleIDAkkaConfig = ConfigFactory.parseFile(new File("etc/bundle-%s.conf" format context.getBundle.getBundleId))
-    val defaultAkkaConfig = ConfigFactory.parseFile(new File("etc/akka.conf"))
-    bunleNameAkkaConfig.withFallback(bunleIDAkkaConfig.withFallback(defaultAkkaConfig).withFallback(actorSystemConfig(context)))
+  def actorSystemConfig(context: BundleContext): Config = {
+    val bundleSymbolicName = context.getBundle.getSymbolicName
+    val bundleId = context.getBundle.getBundleId
+    val acceptedFileExtension = List("conf", "properties", "json")
+    val acceptedFileName = List(s"bundle-$bundleSymbolicName", s"bundle-$bundleId", "akka")
+    val configurationFiles = acceptedFileName.flatMap(x => acceptedFileExtension.map(y => s"etc/$x.$y"))
+    val applicationConfiguration = configurationFiles.foldLeft(ConfigFactory.empty())((x, y) => x.withFallback(ConfigFactory.parseFileAnySyntax(new File(y))))
+    applicationConfiguration.withFallback(ConfigFactory.load(classloader).withFallback(ConfigFactory.defaultReference(OsgiActorSystemFactory.akkaActorClassLoader)))
   }
-  /**
-   * Strategy method to create the Config for the ActorSystem, ensuring that the default/reference configuration is
-   * loaded from the akka-actor bundle.
-   */
-  def actorSystemConfig(context: BundleContext): Config =
-    ConfigFactory.load(classloader).withFallback(ConfigFactory.defaultReference(OsgiActorSystemFactory.akkaActorClassLoader))
 
   /**
    * Determine the name for the [[akka.actor.ActorSystem]]

From b2a050bbe909180faa7c5199a6b185738d20b81c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Endre=20S=C3=A1ndor=20Varga?= <vendre@hit.bme.hu>
Date: Thu, 3 Jan 2013 12:06:53 +0100
Subject: [PATCH 014/122] Cleaned up chaining of ChannelGroupFutures

---
 .../transport/netty/NettyTransport.scala      | 40 +++++++++++--------
 .../remote/transport/netty/UdpSupport.scala   |  2 +-
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala b/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
index f913fa0cbc..4bddb57795 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
@@ -11,9 +11,9 @@ import com.typesafe.config.Config
 import java.net.{ UnknownHostException, SocketAddress, InetAddress, InetSocketAddress, ConnectException }
 import java.util.concurrent.{ ConcurrentHashMap, Executor, Executors, CancellationException }
 import org.jboss.netty.bootstrap.{ ConnectionlessBootstrap, Bootstrap, ClientBootstrap, ServerBootstrap }
-import org.jboss.netty.buffer.{ChannelBuffers, ChannelBuffer}
+import org.jboss.netty.buffer.{ ChannelBuffers, ChannelBuffer }
 import org.jboss.netty.channel._
-import org.jboss.netty.channel.group.{ ChannelGroupFuture, ChannelGroupFutureListener }
+import org.jboss.netty.channel.group.{ ChannelGroup, ChannelGroupFuture, ChannelGroupFutureListener }
 import org.jboss.netty.channel.socket.nio.{ NioDatagramChannelFactory, NioServerSocketChannelFactory, NioClientSocketChannelFactory }
 import org.jboss.netty.handler.codec.frame.{ LengthFieldBasedFrameDecoder, LengthFieldPrepender }
 import scala.concurrent.duration.{ Duration, FiniteDuration, MILLISECONDS }
@@ -41,6 +41,20 @@ object NettyFutureBridge {
     })
     p.future
   }
+
+  def apply(nettyFuture: ChannelGroupFuture): Future[ChannelGroup] = {
+    import scala.collection.JavaConverters._
+    val p = Promise[ChannelGroup]
+    nettyFuture.addListener(new ChannelGroupFutureListener {
+      def operationComplete(future: ChannelGroupFuture): Unit = p complete Try(
+        if (future.isCompleteSuccess) future.getGroup
+        else throw future.iterator.asScala.collectFirst {
+          case f if f.isCancelled ⇒ new CancellationException
+          case f if !f.isSuccess  ⇒ f.getCause
+        } getOrElse new IllegalStateException("Error reported in ChannelGroupFuture, but no error found in individual futures."))
+    })
+    p.future
+  }
 }
 
 class NettyTransportException(msg: String, cause: Throwable) extends RuntimeException(msg, cause) with OnlyCauseStackTrace {
@@ -348,21 +362,13 @@ class NettyTransport(private val settings: NettyTransportSettings, private val s
   }
 
   override def shutdown(): Unit = {
-    // Force flush by trying to write an empty buffer and wait for success
-    channelGroup.write(ChannelBuffers.buffer(0)).addListener(new ChannelGroupFutureListener {
-      def operationComplete(future: ChannelGroupFuture) {
-        channelGroup.unbind()
-        channelGroup.disconnect().addListener(new ChannelGroupFutureListener {
-          def operationComplete(future: ChannelGroupFuture) {
-            channelGroup.close().addListener(new ChannelGroupFutureListener {
-              def operationComplete(future: ChannelGroupFuture) {
-                inboundBootstrap.releaseExternalResources()
-              }
-            })
-          }
-        })
-      }
-    })
+    def always(c: ChannelGroupFuture) = NettyFutureBridge(c) recover { case _ ⇒ c.getGroup }
+    for {
+      // Force flush by trying to write an empty buffer and wait for success
+      _ ← always(channelGroup.write(ChannelBuffers.buffer(0)))
+      _ ← always({ channelGroup.unbind(); channelGroup.disconnect() })
+      _ ← always(channelGroup.close())
+    } inboundBootstrap.releaseExternalResources()
 
   }
 
diff --git a/akka-remote/src/main/scala/akka/remote/transport/netty/UdpSupport.scala b/akka-remote/src/main/scala/akka/remote/transport/netty/UdpSupport.scala
index cb4251bf92..c52e8d9bc9 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/netty/UdpSupport.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/netty/UdpSupport.scala
@@ -35,7 +35,7 @@ private[remote] trait UdpHandlers extends CommonHandlers {
       } else {
         val listener = transport.udpConnectionTable.get(inetSocketAddress)
         val bytes: Array[Byte] = e.getMessage.asInstanceOf[ChannelBuffer].array()
-        if (bytes.length > 0)listener notify InboundPayload(ByteString(bytes))
+        if (bytes.length > 0) listener notify InboundPayload(ByteString(bytes))
       }
     case _ ⇒
   }

From a367ad03dabd28c7629a61583130597e61be34c0 Mon Sep 17 00:00:00 2001
From: Roland <rk@rkuhn.info>
Date: Thu, 3 Jan 2013 12:29:30 +0100
Subject: [PATCH 015/122] remove fixed ports from RemotingSpec, see #2843

---
 .../test/scala/akka/remote/RemotingSpec.scala | 46 +++++++++++++------
 1 file changed, 33 insertions(+), 13 deletions(-)

diff --git a/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala b/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala
index efed787649..76930f1a9f 100644
--- a/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala
@@ -53,9 +53,9 @@ object RemotingSpec {
       remoting.log-remote-lifecycle-events = on
       remoting.enabled-transports = [test, tcp, udp, ssl]
 
-      remoting.transports.tcp.port = 12345
-      remoting.transports.udp.port = 12345
-      remoting.transports.ssl.port = 23456
+      remoting.transports.tcp.port = 0
+      remoting.transports.udp.port = 0
+      remoting.transports.ssl.port = 0
       remoting.transports.ssl.ssl = ${common-ssl-settings}
 
       remoting.transports.test {
@@ -69,9 +69,6 @@ object RemotingSpec {
 
       actor.deployment {
         /blub.remote = "test.akka://remote-sys@localhost:12346"
-        /gonk.remote = "tcp.akka://remote-sys@localhost:12346"
-        /zagzag.remote = "udp.akka://remote-sys@localhost:12346"
-        /roghtaar.remote = "tcp.ssl.akka://remote-sys@localhost:23457"
         /looker/child.remote = "test.akka://remote-sys@localhost:12346"
         /looker/child/grandchild.remote = "test.akka://RemotingSpec@localhost:12345"
       }
@@ -90,14 +87,25 @@ class RemotingSpec extends AkkaSpec(RemotingSpec.cfg) with ImplicitSender with D
   val conf = ConfigFactory.parseString(
     """
       akka.remoting.transports {
-        tcp.port = 12346
-        udp.port = 12346
-        ssl.port = 23457
         test.local-address = "test://remote-sys@localhost:12346"
       }
     """).withFallback(system.settings.config).resolve()
   val other = ActorSystem("remote-sys", conf)
 
+  for (
+    (name, proto) ← Seq(
+      "/gonk" -> "tcp",
+      "/zagzag" -> "udp",
+      "/roghtaar" -> "tcp.ssl")
+  ) deploy(system, Deploy(name, scope = RemoteScope(addr(other, proto))))
+
+  def addr(sys: ActorSystem, proto: String) =
+    sys.asInstanceOf[ExtendedActorSystem].provider.getExternalAddressFor(Address(s"$proto.akka", "", "", 0)).get
+  def port(sys: ActorSystem, proto: String) = addr(sys, proto).port.get
+  def deploy(sys: ActorSystem, d: Deploy) {
+    sys.asInstanceOf[ExtendedActorSystem].provider.asInstanceOf[RemoteActorRefProvider].deployer.deploy(d)
+  }
+
   val remote = other.actorOf(Props(new Actor {
     def receive = {
       case "ping" ⇒ sender ! (("pong", sender))
@@ -119,7 +127,7 @@ class RemotingSpec extends AkkaSpec(RemotingSpec.cfg) with ImplicitSender with D
     }
 
     "send error message for wrong address" in {
-      EventFilter.error(start = "AssociationError").intercept {
+      filterEvents(EventFilter[EndpointException](occurrences = 6), EventFilter.error(start = "Association", occurrences = 6)) {
         system.actorFor("test.akka://nonexistingsystem@localhost:12346/user/echo") ! "ping"
       }
     }
@@ -183,7 +191,8 @@ class RemotingSpec extends AkkaSpec(RemotingSpec.cfg) with ImplicitSender with D
 
     "be able to use multiple transports and use the appropriate one (TCP)" in {
       val r = system.actorOf(Props[Echo], "gonk")
-      r.path.toString must be === "tcp.akka://remote-sys@localhost:12346/remote/tcp.akka/RemotingSpec@localhost:12345/user/gonk"
+      r.path.toString must be ===
+        s"tcp.akka://remote-sys@localhost:${port(other, "tcp")}/remote/tcp.akka/RemotingSpec@localhost:${port(system, "tcp")}/user/gonk"
       r ! 42
       expectMsg(42)
       EventFilter[Exception]("crash", occurrences = 1).intercept {
@@ -198,7 +207,8 @@ class RemotingSpec extends AkkaSpec(RemotingSpec.cfg) with ImplicitSender with D
 
     "be able to use multiple transports and use the appropriate one (UDP)" in {
       val r = system.actorOf(Props[Echo], "zagzag")
-      r.path.toString must be === "udp.akka://remote-sys@localhost:12346/remote/udp.akka/RemotingSpec@localhost:12345/user/zagzag"
+      r.path.toString must be ===
+        s"udp.akka://remote-sys@localhost:${port(other, "udp")}/remote/udp.akka/RemotingSpec@localhost:${port(system, "udp")}/user/zagzag"
       r ! 42
       expectMsg(10 seconds, 42)
       EventFilter[Exception]("crash", occurrences = 1).intercept {
@@ -213,7 +223,8 @@ class RemotingSpec extends AkkaSpec(RemotingSpec.cfg) with ImplicitSender with D
 
     "be able to use multiple transports and use the appropriate one (SSL)" in {
       val r = system.actorOf(Props[Echo], "roghtaar")
-      r.path.toString must be === "tcp.ssl.akka://remote-sys@localhost:23457/remote/tcp.ssl.akka/RemotingSpec@localhost:23456/user/roghtaar"
+      r.path.toString must be ===
+        s"tcp.ssl.akka://remote-sys@localhost:${port(other, "tcp.ssl")}/remote/tcp.ssl.akka/RemotingSpec@localhost:${port(system, "tcp.ssl")}/user/roghtaar"
       r ! 42
       expectMsg(10 seconds, 42)
       EventFilter[Exception]("crash", occurrences = 1).intercept {
@@ -226,6 +237,15 @@ class RemotingSpec extends AkkaSpec(RemotingSpec.cfg) with ImplicitSender with D
       expectMsg("postStop")
     }
 
+    "shut down more logging" in {
+      system.eventStream.publish(TestEvent.Mute(
+        EventFilter.warning(pattern = "received dead letter.*(InboundPayload|Disassociate)")))
+      other.eventStream.publish(TestEvent.Mute(
+        EventFilter[EndpointException](),
+        EventFilter.error(start = "AssociationError"),
+        EventFilter.warning(pattern = "received dead letter.*(InboundPayload|Disassociate|HandleListener)")))
+    }
+
   }
 
 }

From 8c537fbc37442cea945ae98dc21794391ada1b74 Mon Sep 17 00:00:00 2001
From: Roland <rk@rkuhn.info>
Date: Thu, 3 Jan 2013 12:33:09 +0100
Subject: [PATCH 016/122] remove postfixOps warnings in remote tests

---
 .../src/test/scala/akka/remote/RemotingSpec.scala  |  4 ++--
 .../akka/remote/transport/AkkaProtocolSpec.scala   | 14 +++++++-------
 .../remote/transport/AkkaProtocolStressTest.scala  |  2 +-
 .../transport/ThrottlerTransportAdapterSpec.scala  |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala b/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala
index 76930f1a9f..7e0bcd440d 100644
--- a/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala
@@ -210,7 +210,7 @@ class RemotingSpec extends AkkaSpec(RemotingSpec.cfg) with ImplicitSender with D
       r.path.toString must be ===
         s"udp.akka://remote-sys@localhost:${port(other, "udp")}/remote/udp.akka/RemotingSpec@localhost:${port(system, "udp")}/user/zagzag"
       r ! 42
-      expectMsg(10 seconds, 42)
+      expectMsg(10.seconds, 42)
       EventFilter[Exception]("crash", occurrences = 1).intercept {
         r ! new Exception("crash")
       }(other)
@@ -226,7 +226,7 @@ class RemotingSpec extends AkkaSpec(RemotingSpec.cfg) with ImplicitSender with D
       r.path.toString must be ===
         s"tcp.ssl.akka://remote-sys@localhost:${port(other, "tcp.ssl")}/remote/tcp.ssl.akka/RemotingSpec@localhost:${port(system, "tcp.ssl")}/user/roghtaar"
       r ! 42
-      expectMsg(10 seconds, 42)
+      expectMsg(10.seconds, 42)
       EventFilter[Exception]("crash", occurrences = 1).intercept {
         r ! new Exception("crash")
       }(other)
diff --git a/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolSpec.scala b/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolSpec.scala
index d3a3125c3b..592a491693 100644
--- a/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolSpec.scala
@@ -202,7 +202,7 @@ class AkkaProtocolSpec extends AkkaSpec("""akka.actor.provider = "akka.remote.Re
         codec,
         failureDetector)))
 
-      Await.result(statusPromise.future, 3 seconds) match {
+      Await.result(statusPromise.future, 3.seconds) match {
         case h: AssociationHandle ⇒
           h.remoteAddress must be === remoteAkkaAddress
           h.localAddress must be === localAkkaAddress
@@ -241,7 +241,7 @@ class AkkaProtocolSpec extends AkkaSpec("""akka.actor.provider = "akka.remote.Re
       // finish connection by sending back a payload
       reader ! testPayload
 
-      Await.result(statusPromise.future, 3 seconds) match {
+      Await.result(statusPromise.future, 3.seconds) match {
         case h: AssociationHandle ⇒
           h.remoteAddress must be === remoteAkkaAddress
           h.localAddress must be === localAkkaAddress
@@ -315,7 +315,7 @@ class AkkaProtocolSpec extends AkkaSpec("""akka.actor.provider = "akka.remote.Re
         codec,
         failureDetector)))
 
-      Await.result(statusPromise.future, 3 seconds) match {
+      Await.result(statusPromise.future, 3.seconds) match {
         case h: AssociationHandle ⇒
           h.remoteAddress must be === remoteAkkaAddress
           h.localAddress must be === localAkkaAddress
@@ -341,7 +341,7 @@ class AkkaProtocolSpec extends AkkaSpec("""akka.actor.provider = "akka.remote.Re
         codec,
         failureDetector)))
 
-      val wrappedHandle = Await.result(statusPromise.future, 3 seconds) match {
+      val wrappedHandle = Await.result(statusPromise.future, 3.seconds) match {
         case h: AssociationHandle ⇒
           h.remoteAddress must be === remoteAkkaAddress
           h.localAddress must be === localAkkaAddress
@@ -379,7 +379,7 @@ class AkkaProtocolSpec extends AkkaSpec("""akka.actor.provider = "akka.remote.Re
       // Finish association with a heartbeat -- pushes state out of WaitActivity
       reader ! testHeartbeat
 
-      val wrappedHandle = Await.result(statusPromise.future, 3 seconds) match {
+      val wrappedHandle = Await.result(statusPromise.future, 3.seconds) match {
         case h: AssociationHandle ⇒
           h.remoteAddress must be === remoteAkkaAddress
           h.localAddress must be === localAkkaAddress
@@ -412,7 +412,7 @@ class AkkaProtocolSpec extends AkkaSpec("""akka.actor.provider = "akka.remote.Re
         codec,
         failureDetector)))
 
-      val wrappedHandle = Await.result(statusPromise.future, 3 seconds) match {
+      val wrappedHandle = Await.result(statusPromise.future, 3.seconds) match {
         case h: AssociationHandle ⇒
           h.remoteAddress must be === remoteAkkaAddress
           h.localAddress must be === localAkkaAddress
@@ -448,7 +448,7 @@ class AkkaProtocolSpec extends AkkaSpec("""akka.actor.provider = "akka.remote.Re
         codec,
         failureDetector)))
 
-      val wrappedHandle = Await.result(statusPromise.future, 3 seconds) match {
+      val wrappedHandle = Await.result(statusPromise.future, 3.seconds) match {
         case h: AssociationHandle ⇒
           h.remoteAddress must be === remoteAkkaAddress
           h.localAddress must be === localAkkaAddress
diff --git a/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala b/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala
index b16b8040d4..595ec02e60 100644
--- a/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala
+++ b/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala
@@ -79,7 +79,7 @@ class AkkaProtocolStressTest extends AkkaSpec(configA) with ImplicitSender with
     "guarantee at-most-once delivery and message ordering despite packet loss" taggedAs TimingTest in {
       val tester = system.actorOf(Props(new SequenceVerifier(here, self))) ! "start"
 
-      expectMsgPF(30 seconds) {
+      expectMsgPF(30.seconds) {
         case (received: Int, lost: Int) ⇒
           log.debug(s" ######## Received ${received - lost} messages from ${received} ########")
       }
diff --git a/akka-remote/src/test/scala/akka/remote/transport/ThrottlerTransportAdapterSpec.scala b/akka-remote/src/test/scala/akka/remote/transport/ThrottlerTransportAdapterSpec.scala
index 4d997c88cc..7559996e7b 100644
--- a/akka-remote/src/test/scala/akka/remote/transport/ThrottlerTransportAdapterSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/transport/ThrottlerTransportAdapterSpec.scala
@@ -70,10 +70,10 @@ class ThrottlerTransportAdapterSpec extends AkkaSpec(configA) with ImplicitSende
     "maintain average message rate" taggedAs TimingTest in {
       Await.result(
         system.asInstanceOf[ExtendedActorSystem].provider.asInstanceOf[RemoteActorRefProvider].transport
-          .managementCommand(SetThrottle(Address("akka", "systemB", "localhost", rootB.address.port.get), Direction.Send, TokenBucket(200, 500, 0, 0))), 3 seconds)
+          .managementCommand(SetThrottle(Address("akka", "systemB", "localhost", rootB.address.port.get), Direction.Send, TokenBucket(200, 500, 0, 0))), 3.seconds)
       val tester = system.actorOf(Props(new ThrottlingTester(here, self))) ! "start"
 
-      expectMsgPF((TotalTime + 3) seconds) {
+      expectMsgPF((TotalTime + 3).seconds) {
         case time: Long ⇒ log.warning("Total time of transmission: " + NANOSECONDS.toSeconds(time))
       }
       system.eventStream.publish(TestEvent.Mute(

From 01e3c5fce720cf4fe9f396b4893e7bfacf135cff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Endre=20S=C3=A1ndor=20Varga?= <vendre@hit.bme.hu>
Date: Thu, 3 Jan 2013 14:54:17 +0100
Subject: [PATCH 017/122] Added setIssueHandshake() to enable auto-handshake

---
 .../akka/remote/transport/netty/NettyTransport.scala | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala b/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
index f913fa0cbc..6b912e54ec 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
@@ -23,6 +23,7 @@ import util.control.{ NoStackTrace, NonFatal }
 import akka.dispatch.ThreadPoolConfig
 import akka.remote.transport.AssociationHandle.HandleEventListener
 import java.util.concurrent.atomic.AtomicInteger
+import org.jboss.netty.handler.ssl.SslHandler
 
 object NettyTransportSettings {
   sealed trait Mode
@@ -230,10 +231,17 @@ class NettyTransport(private val settings: NettyTransportSettings, private val s
   }
 
   private val associationListenerPromise: Promise[AssociationEventListener] = Promise()
+
+  private def sslHandler(isClient: Boolean): SslHandler = {
+    val handler = NettySSLSupport(settings.SslSettings.get, log, isClient)
+    handler.setIssueHandshake(true)
+    handler
+  }
+
   private val serverPipelineFactory: ChannelPipelineFactory = new ChannelPipelineFactory {
     override def getPipeline: ChannelPipeline = {
       val pipeline = newPipeline
-      if (EnableSsl) pipeline.addFirst("SslHandler", NettySSLSupport(settings.SslSettings.get, log, false))
+      if (EnableSsl) pipeline.addFirst("SslHandler", sslHandler(false))
       val handler = if (isDatagram) new UdpServerHandler(NettyTransport.this, associationListenerPromise.future)
       else new TcpServerHandler(NettyTransport.this, associationListenerPromise.future)
       pipeline.addLast("ServerHandler", handler)
@@ -244,7 +252,7 @@ class NettyTransport(private val settings: NettyTransportSettings, private val s
   private def clientPipelineFactory(statusPromise: Promise[AssociationHandle]): ChannelPipelineFactory = new ChannelPipelineFactory {
     override def getPipeline: ChannelPipeline = {
       val pipeline = newPipeline
-      if (EnableSsl) pipeline.addFirst("SslHandler", NettySSLSupport(settings.SslSettings.get, log, true))
+      if (EnableSsl) pipeline.addFirst("SslHandler", sslHandler(true))
       val handler = if (isDatagram) new UdpClientHandler(NettyTransport.this, statusPromise)
       else new TcpClientHandler(NettyTransport.this, statusPromise)
       pipeline.addLast("clienthandler", handler)

From e399aefe3dac000ab9ba73947ec439e4cec9f210 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Endre=20S=C3=A1ndor=20Varga?= <vendre@hit.bme.hu>
Date: Thu, 3 Jan 2013 16:18:25 +0100
Subject: [PATCH 018/122] Using named parameters for booleans

---
 .../scala/akka/remote/transport/netty/NettyTransport.scala  | 6 +++---
 .../main/scala/akka/remote/transport/netty/UdpSupport.scala | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala b/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
index 6b912e54ec..7381a62297 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
@@ -11,7 +11,7 @@ import com.typesafe.config.Config
 import java.net.{ UnknownHostException, SocketAddress, InetAddress, InetSocketAddress, ConnectException }
 import java.util.concurrent.{ ConcurrentHashMap, Executor, Executors, CancellationException }
 import org.jboss.netty.bootstrap.{ ConnectionlessBootstrap, Bootstrap, ClientBootstrap, ServerBootstrap }
-import org.jboss.netty.buffer.{ChannelBuffers, ChannelBuffer}
+import org.jboss.netty.buffer.{ ChannelBuffers, ChannelBuffer }
 import org.jboss.netty.channel._
 import org.jboss.netty.channel.group.{ ChannelGroupFuture, ChannelGroupFutureListener }
 import org.jboss.netty.channel.socket.nio.{ NioDatagramChannelFactory, NioServerSocketChannelFactory, NioClientSocketChannelFactory }
@@ -241,7 +241,7 @@ class NettyTransport(private val settings: NettyTransportSettings, private val s
   private val serverPipelineFactory: ChannelPipelineFactory = new ChannelPipelineFactory {
     override def getPipeline: ChannelPipeline = {
       val pipeline = newPipeline
-      if (EnableSsl) pipeline.addFirst("SslHandler", sslHandler(false))
+      if (EnableSsl) pipeline.addFirst("SslHandler", sslHandler(isClient = false))
       val handler = if (isDatagram) new UdpServerHandler(NettyTransport.this, associationListenerPromise.future)
       else new TcpServerHandler(NettyTransport.this, associationListenerPromise.future)
       pipeline.addLast("ServerHandler", handler)
@@ -252,7 +252,7 @@ class NettyTransport(private val settings: NettyTransportSettings, private val s
   private def clientPipelineFactory(statusPromise: Promise[AssociationHandle]): ChannelPipelineFactory = new ChannelPipelineFactory {
     override def getPipeline: ChannelPipeline = {
       val pipeline = newPipeline
-      if (EnableSsl) pipeline.addFirst("SslHandler", sslHandler(true))
+      if (EnableSsl) pipeline.addFirst("SslHandler", sslHandler(isClient = true))
       val handler = if (isDatagram) new UdpClientHandler(NettyTransport.this, statusPromise)
       else new TcpClientHandler(NettyTransport.this, statusPromise)
       pipeline.addLast("clienthandler", handler)
diff --git a/akka-remote/src/main/scala/akka/remote/transport/netty/UdpSupport.scala b/akka-remote/src/main/scala/akka/remote/transport/netty/UdpSupport.scala
index cb4251bf92..c52e8d9bc9 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/netty/UdpSupport.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/netty/UdpSupport.scala
@@ -35,7 +35,7 @@ private[remote] trait UdpHandlers extends CommonHandlers {
       } else {
         val listener = transport.udpConnectionTable.get(inetSocketAddress)
         val bytes: Array[Byte] = e.getMessage.asInstanceOf[ChannelBuffer].array()
-        if (bytes.length > 0)listener notify InboundPayload(ByteString(bytes))
+        if (bytes.length > 0) listener notify InboundPayload(ByteString(bytes))
       }
     case _ ⇒
   }

From ff24be7650518022235fa74c3fcf77e4352332ba Mon Sep 17 00:00:00 2001
From: Roland <rk@rkuhn.info>
Date: Thu, 3 Jan 2013 16:38:18 +0100
Subject: [PATCH 019/122] introduce AkkaSpec.beforeTermination hook, e.g. to
 silence shutdown logs

- apply it in RemoteRouterSpec, RemoteDeathWatchSpec, RemotingSpec,
  AkkaProtocolStressTest and ThrottlerTransportAdapterSpec
---
 .../akka/remote/RemoteDeathWatchSpec.scala      |  5 +++++
 .../scala/akka/remote/RemoteRouterSpec.scala    |  5 +++++
 .../test/scala/akka/remote/RemotingSpec.scala   | 16 ++++++++--------
 .../transport/AkkaProtocolStressTest.scala      | 17 ++++++++++-------
 .../ThrottlerTransportAdapterSpec.scala         | 17 ++++++++++-------
 .../src/test/scala/akka/testkit/AkkaSpec.scala  |  3 +++
 6 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/akka-remote/src/test/scala/akka/remote/RemoteDeathWatchSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteDeathWatchSpec.scala
index 636910aa64..1b21a5c4bd 100644
--- a/akka-remote/src/test/scala/akka/remote/RemoteDeathWatchSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/RemoteDeathWatchSpec.scala
@@ -26,6 +26,11 @@ akka {
   val other = ActorSystem("other", ConfigFactory.parseString("akka.remoting.transports.tcp.port=2666")
     .withFallback(system.settings.config))
 
+  override def beforeTermination() {
+    system.eventStream.publish(TestEvent.Mute(
+      EventFilter.warning(pattern = "received dead letter.*Disassociate")))
+  }
+
   override def atTermination() {
     other.shutdown()
   }
diff --git a/akka-remote/src/test/scala/akka/remote/RemoteRouterSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteRouterSpec.scala
index e4611d0ba1..e3031a7cc2 100644
--- a/akka-remote/src/test/scala/akka/remote/RemoteRouterSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/RemoteRouterSpec.scala
@@ -219,4 +219,9 @@ akka.actor.deployment {
 
   }
 
+  override def beforeTermination() {
+    system.eventStream.publish(TestEvent.Mute(
+      EventFilter.warning(pattern = "received dead letter.*Disassociate")))
+  }
+
 }
diff --git a/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala b/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala
index 7e0bcd440d..4a8e691b7d 100644
--- a/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala
@@ -237,15 +237,15 @@ class RemotingSpec extends AkkaSpec(RemotingSpec.cfg) with ImplicitSender with D
       expectMsg("postStop")
     }
 
-    "shut down more logging" in {
-      system.eventStream.publish(TestEvent.Mute(
-        EventFilter.warning(pattern = "received dead letter.*(InboundPayload|Disassociate)")))
-      other.eventStream.publish(TestEvent.Mute(
-        EventFilter[EndpointException](),
-        EventFilter.error(start = "AssociationError"),
-        EventFilter.warning(pattern = "received dead letter.*(InboundPayload|Disassociate|HandleListener)")))
-    }
+  }
 
+  override def beforeTermination() {
+    system.eventStream.publish(TestEvent.Mute(
+      EventFilter.warning(pattern = "received dead letter.*(InboundPayload|Disassociate)")))
+    other.eventStream.publish(TestEvent.Mute(
+      EventFilter[EndpointException](),
+      EventFilter.error(start = "AssociationError"),
+      EventFilter.warning(pattern = "received dead letter.*(InboundPayload|Disassociate|HandleListener)")))
   }
 
 }
diff --git a/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala b/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala
index 595ec02e60..eba8670d79 100644
--- a/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala
+++ b/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala
@@ -83,16 +83,19 @@ class AkkaProtocolStressTest extends AkkaSpec(configA) with ImplicitSender with
         case (received: Int, lost: Int) ⇒
           log.debug(s" ######## Received ${received - lost} messages from ${received} ########")
       }
-      system.eventStream.publish(TestEvent.Mute(
-        EventFilter.warning(source = "akka://AkkaProtocolStressTest/user/$a", start = "received dead letter"),
-        EventFilter.warning(pattern = "received dead letter.*(InboundPayload|Disassociate)")))
-      systemB.eventStream.publish(TestEvent.Mute(
-        EventFilter[EndpointException](),
-        EventFilter.error(start = "AssociationError"),
-        EventFilter.warning(pattern = "received dead letter.*(InboundPayload|Disassociate)")))
     }
   }
 
+  override def beforeTermination() {
+    system.eventStream.publish(TestEvent.Mute(
+      EventFilter.warning(source = "akka://AkkaProtocolStressTest/user/$a", start = "received dead letter"),
+      EventFilter.warning(pattern = "received dead letter.*(InboundPayload|Disassociate)")))
+    systemB.eventStream.publish(TestEvent.Mute(
+      EventFilter[EndpointException](),
+      EventFilter.error(start = "AssociationError"),
+      EventFilter.warning(pattern = "received dead letter.*(InboundPayload|Disassociate)")))
+  }
+
   override def atTermination(): Unit = systemB.shutdown()
 
 }
diff --git a/akka-remote/src/test/scala/akka/remote/transport/ThrottlerTransportAdapterSpec.scala b/akka-remote/src/test/scala/akka/remote/transport/ThrottlerTransportAdapterSpec.scala
index 7559996e7b..8795c62412 100644
--- a/akka-remote/src/test/scala/akka/remote/transport/ThrottlerTransportAdapterSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/transport/ThrottlerTransportAdapterSpec.scala
@@ -76,16 +76,19 @@ class ThrottlerTransportAdapterSpec extends AkkaSpec(configA) with ImplicitSende
       expectMsgPF((TotalTime + 3).seconds) {
         case time: Long ⇒ log.warning("Total time of transmission: " + NANOSECONDS.toSeconds(time))
       }
-      system.eventStream.publish(TestEvent.Mute(
-        EventFilter.warning(source = "akka://AkkaProtocolStressTest/user/$a", start = "received dead letter"),
-        EventFilter.warning(pattern = "received dead letter.*(InboundPayload|Disassociate)")))
-      systemB.eventStream.publish(TestEvent.Mute(
-        EventFilter[EndpointException](),
-        EventFilter.error(start = "AssociationError"),
-        EventFilter.warning(pattern = "received dead letter.*(InboundPayload|Disassociate)")))
     }
   }
 
+  override def beforeTermination() {
+    system.eventStream.publish(TestEvent.Mute(
+      EventFilter.warning(source = "akka://AkkaProtocolStressTest/user/$a", start = "received dead letter"),
+      EventFilter.warning(pattern = "received dead letter.*(InboundPayload|Disassociate)")))
+    systemB.eventStream.publish(TestEvent.Mute(
+      EventFilter[EndpointException](),
+      EventFilter.error(start = "AssociationError"),
+      EventFilter.warning(pattern = "received dead letter.*(InboundPayload|Disassociate)")))
+  }
+
   override def atTermination(): Unit = systemB.shutdown()
 }
 
diff --git a/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala b/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala
index d4844087b7..1ed8e22384 100644
--- a/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala
+++ b/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala
@@ -70,6 +70,7 @@ abstract class AkkaSpec(_system: ActorSystem)
   }
 
   final override def afterAll {
+    beforeTermination()
     system.shutdown()
     try system.awaitTermination(5 seconds) catch {
       case _: TimeoutException ⇒
@@ -81,6 +82,8 @@ abstract class AkkaSpec(_system: ActorSystem)
 
   protected def atStartup() {}
 
+  protected def beforeTermination() {}
+
   protected def atTermination() {}
 
   def spawn(dispatcherId: String = Dispatchers.DefaultDispatcherId)(body: ⇒ Unit): Unit =

From 6c31d5313e437c50c8ae3aa450953851e87d5a4d Mon Sep 17 00:00:00 2001
From: Roland <rk@rkuhn.info>
Date: Thu, 3 Jan 2013 17:17:12 +0100
Subject: [PATCH 020/122] rename AkkaSpec.{atTermination => afterTermination}

---
 .../src/multi-jvm/scala/akka/cluster/LargeClusterSpec.scala   | 2 +-
 .../code/docs/actor/mailbox/DurableMailboxDocSpec.scala       | 2 +-
 .../scala/code/docs/remoting/RemoteDeploymentDocSpec.scala    | 2 +-
 .../akka/actor/mailbox/filebased/FileBasedMailboxSpec.scala   | 4 ++--
 .../test/scala/akka/actor/mailbox/DurableMailboxSpec.scala    | 4 ++--
 .../src/main/scala/akka/remote/testkit/MultiNodeSpec.scala    | 4 ++--
 .../src/test/scala/akka/remote/RemoteCommunicationSpec.scala  | 2 +-
 .../src/test/scala/akka/remote/RemoteDeathWatchSpec.scala     | 2 +-
 akka-remote/src/test/scala/akka/remote/RemoteRouterSpec.scala | 2 +-
 akka-remote/src/test/scala/akka/remote/RemotingSpec.scala     | 2 +-
 .../test/scala/akka/remote/Ticket1978CommunicationSpec.scala  | 2 +-
 akka-remote/src/test/scala/akka/remote/UntrustedSpec.scala    | 2 +-
 .../scala/akka/remote/transport/AkkaProtocolStressTest.scala  | 2 +-
 .../akka/remote/transport/ThrottlerTransportAdapterSpec.scala | 2 +-
 akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala       | 4 ++--
 15 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/LargeClusterSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/LargeClusterSpec.scala
index 97711b30de..dd6a421819 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/LargeClusterSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/LargeClusterSpec.scala
@@ -100,7 +100,7 @@ abstract class LargeClusterSpec
    */
   override def cluster: Cluster = Cluster(system)
 
-  override def atTermination(): Unit = {
+  override def afterTermination(): Unit = {
     systems foreach { _.shutdown }
     val shutdownTimeout = 20.seconds
     val deadline = Deadline.now + shutdownTimeout
diff --git a/akka-docs/rst/modules/code/docs/actor/mailbox/DurableMailboxDocSpec.scala b/akka-docs/rst/modules/code/docs/actor/mailbox/DurableMailboxDocSpec.scala
index 4c2880f53d..018a14fcc0 100644
--- a/akka-docs/rst/modules/code/docs/actor/mailbox/DurableMailboxDocSpec.scala
+++ b/akka-docs/rst/modules/code/docs/actor/mailbox/DurableMailboxDocSpec.scala
@@ -127,7 +127,7 @@ class MyMailboxSpec extends DurableMailboxSpec("MyStorage", MyMailboxSpec.config
   override def atStartup() {
   }
 
-  override def atTermination() {
+  override def afterTermination() {
   }
 
   "MyMailbox" must {
diff --git a/akka-docs/rst/scala/code/docs/remoting/RemoteDeploymentDocSpec.scala b/akka-docs/rst/scala/code/docs/remoting/RemoteDeploymentDocSpec.scala
index 0816d262a6..ddea525a13 100644
--- a/akka-docs/rst/scala/code/docs/remoting/RemoteDeploymentDocSpec.scala
+++ b/akka-docs/rst/scala/code/docs/remoting/RemoteDeploymentDocSpec.scala
@@ -28,7 +28,7 @@ class RemoteDeploymentDocSpec extends AkkaSpec("""
   val other = ActorSystem("remote", system.settings.config)
   val address = other.asInstanceOf[ExtendedActorSystem].provider.getExternalAddressFor(Address("tcp.akka", "s", "host", 1)).get
 
-  override def atTermination() { other.shutdown() }
+  override def afterTermination() { other.shutdown() }
 
   "demonstrate programmatic deployment" in {
     //#deploy
diff --git a/akka-durable-mailboxes/akka-file-mailbox/src/test/scala/akka/actor/mailbox/filebased/FileBasedMailboxSpec.scala b/akka-durable-mailboxes/akka-file-mailbox/src/test/scala/akka/actor/mailbox/filebased/FileBasedMailboxSpec.scala
index e0271461e8..1ba5f23f1c 100644
--- a/akka-durable-mailboxes/akka-file-mailbox/src/test/scala/akka/actor/mailbox/filebased/FileBasedMailboxSpec.scala
+++ b/akka-durable-mailboxes/akka-file-mailbox/src/test/scala/akka/actor/mailbox/filebased/FileBasedMailboxSpec.scala
@@ -45,8 +45,8 @@ class FileBasedMailboxSpec extends DurableMailboxSpec("File", FileBasedMailboxSp
     super.atStartup()
   }
 
-  override def atTermination() {
+  override def afterTermination() {
     clean()
-    super.atTermination()
+    super.afterTermination()
   }
 }
diff --git a/akka-durable-mailboxes/akka-mailboxes-common/src/test/scala/akka/actor/mailbox/DurableMailboxSpec.scala b/akka-durable-mailboxes/akka-mailboxes-common/src/test/scala/akka/actor/mailbox/DurableMailboxSpec.scala
index 2c6706f693..decfec6014 100644
--- a/akka-durable-mailboxes/akka-mailboxes-common/src/test/scala/akka/actor/mailbox/DurableMailboxSpec.scala
+++ b/akka-durable-mailboxes/akka-mailboxes-common/src/test/scala/akka/actor/mailbox/DurableMailboxSpec.scala
@@ -84,14 +84,14 @@ abstract class DurableMailboxSpec(system: ActorSystem, val backendName: String)
     try system.awaitTermination(5 seconds) catch {
       case _: TimeoutException ⇒ system.log.warning("Failed to stop [{}] within 5 seconds", system.name)
     }
-    atTermination()
+    afterTermination()
   }
 
   /**
    * May be implemented in concrete subclass to do additional things once after all
    * test cases have been run.
    */
-  def atTermination() {}
+  def afterTermination() {}
 
   protected def streamMustContain(in: InputStream, words: String): Unit = {
     val output = new Array[Byte](8192)
diff --git a/akka-remote-tests/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala b/akka-remote-tests/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala
index d2d7ad50d5..ec926dd3af 100644
--- a/akka-remote-tests/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala
+++ b/akka-remote-tests/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala
@@ -272,7 +272,7 @@ abstract class MultiNodeSpec(val myself: RoleName, _system: ActorSystem, _roles:
         if (verifySystemShutdown) throw new RuntimeException(msg)
         else system.log.warning(msg)
     }
-    atTermination()
+    afterTermination()
   }
 
   /**
@@ -293,7 +293,7 @@ abstract class MultiNodeSpec(val myself: RoleName, _system: ActorSystem, _roles:
   /**
    * Override this method to do something when the whole test is terminating.
    */
-  protected def atTermination(): Unit = {}
+  protected def afterTermination(): Unit = {}
 
   /**
    * All registered roles
diff --git a/akka-remote/src/test/scala/akka/remote/RemoteCommunicationSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteCommunicationSpec.scala
index 8e619d8bb3..7e27c1ffc1 100644
--- a/akka-remote/src/test/scala/akka/remote/RemoteCommunicationSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/RemoteCommunicationSpec.scala
@@ -75,7 +75,7 @@ akka {
 
   val here = system.actorFor(RootActorPath(remoteAddr) / "user" / "echo")
 
-  override def atTermination() {
+  override def afterTermination() {
     other.shutdown()
   }
 
diff --git a/akka-remote/src/test/scala/akka/remote/RemoteDeathWatchSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteDeathWatchSpec.scala
index 1b21a5c4bd..95eb10f3af 100644
--- a/akka-remote/src/test/scala/akka/remote/RemoteDeathWatchSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/RemoteDeathWatchSpec.scala
@@ -31,7 +31,7 @@ akka {
       EventFilter.warning(pattern = "received dead letter.*Disassociate")))
   }
 
-  override def atTermination() {
+  override def afterTermination() {
     other.shutdown()
   }
 
diff --git a/akka-remote/src/test/scala/akka/remote/RemoteRouterSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteRouterSpec.scala
index e3031a7cc2..869a45445f 100644
--- a/akka-remote/src/test/scala/akka/remote/RemoteRouterSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/RemoteRouterSpec.scala
@@ -70,7 +70,7 @@ akka.actor.deployment {
 }""").withFallback(system.settings.config)
   val otherSystem = ActorSystem("remote-sys", conf)
 
-  override def atTermination() {
+  override def afterTermination() {
     otherSystem.shutdown()
   }
 
diff --git a/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala b/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala
index 4a8e691b7d..177fb49a9a 100644
--- a/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala
@@ -114,7 +114,7 @@ class RemotingSpec extends AkkaSpec(RemotingSpec.cfg) with ImplicitSender with D
 
   val here = system.actorFor("test.akka://remote-sys@localhost:12346/user/echo")
 
-  override def atTermination() {
+  override def afterTermination() {
     other.shutdown()
     AssociationRegistry.clear()
   }
diff --git a/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala b/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala
index 7498cf269c..73d857aefc 100644
--- a/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala
@@ -125,7 +125,7 @@ abstract class Ticket1978CommunicationSpec(val cipherConfig: CipherConfig) exten
     "remote-sys",
     ConfigFactory.parseString("akka.remote.netty.port=" + cipherConfig.remotePort).withFallback(system.settings.config))
 
-  override def atTermination() {
+  override def afterTermination() {
     if (cipherConfig.runTest) {
       other.shutdown()
       other.awaitTermination()
diff --git a/akka-remote/src/test/scala/akka/remote/UntrustedSpec.scala b/akka-remote/src/test/scala/akka/remote/UntrustedSpec.scala
index 03b8b5a921..8e555ee9f6 100644
--- a/akka-remote/src/test/scala/akka/remote/UntrustedSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/UntrustedSpec.scala
@@ -37,7 +37,7 @@ akka.loglevel = DEBUG
   val target1 = other.actorFor(RootActorPath(addr) / "remote")
   val target2 = other.actorFor(RootActorPath(addr) / testActor.path.elements)
 
-  override def atTermination() {
+  override def afterTermination() {
     other.shutdown()
   }
 
diff --git a/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala b/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala
index eba8670d79..0d2dcb002e 100644
--- a/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala
+++ b/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala
@@ -96,6 +96,6 @@ class AkkaProtocolStressTest extends AkkaSpec(configA) with ImplicitSender with
       EventFilter.warning(pattern = "received dead letter.*(InboundPayload|Disassociate)")))
   }
 
-  override def atTermination(): Unit = systemB.shutdown()
+  override def afterTermination(): Unit = systemB.shutdown()
 
 }
diff --git a/akka-remote/src/test/scala/akka/remote/transport/ThrottlerTransportAdapterSpec.scala b/akka-remote/src/test/scala/akka/remote/transport/ThrottlerTransportAdapterSpec.scala
index 8795c62412..134f58ee09 100644
--- a/akka-remote/src/test/scala/akka/remote/transport/ThrottlerTransportAdapterSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/transport/ThrottlerTransportAdapterSpec.scala
@@ -89,7 +89,7 @@ class ThrottlerTransportAdapterSpec extends AkkaSpec(configA) with ImplicitSende
       EventFilter.warning(pattern = "received dead letter.*(InboundPayload|Disassociate)")))
   }
 
-  override def atTermination(): Unit = systemB.shutdown()
+  override def afterTermination(): Unit = systemB.shutdown()
 }
 
 class ThrottlerTransportAdapterGenericSpec extends GenericTransportSpec(withAkkaProtocol = true) {
diff --git a/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala b/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala
index 1ed8e22384..d1fc341447 100644
--- a/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala
+++ b/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala
@@ -77,14 +77,14 @@ abstract class AkkaSpec(_system: ActorSystem)
         system.log.warning("Failed to stop [{}] within 5 seconds", system.name)
         println(system.asInstanceOf[ActorSystemImpl].printTree)
     }
-    atTermination()
+    afterTermination()
   }
 
   protected def atStartup() {}
 
   protected def beforeTermination() {}
 
-  protected def atTermination() {}
+  protected def afterTermination() {}
 
   def spawn(dispatcherId: String = Dispatchers.DefaultDispatcherId)(body: ⇒ Unit): Unit =
     Future(body)(system.dispatchers.lookup(dispatcherId))

From abb8366eb4be934035634b3ca6ca12f3d1da89f4 Mon Sep 17 00:00:00 2001
From: Crossing-Tech <guillaume.yziquel@crossing-tech.com>
Date: Fri, 4 Jan 2013 10:48:38 +0100
Subject: [PATCH 021/122] rkuhn comments applied: no more extension

---
 .../src/main/scala/akka/osgi/OsgiActorSystemFactory.scala   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala b/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala
index 9069e5d06d..620e4bfc5a 100644
--- a/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala
+++ b/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala
@@ -44,10 +44,8 @@ class OsgiActorSystemFactory(val context: BundleContext, val fallbackClassLoader
   def actorSystemConfig(context: BundleContext): Config = {
     val bundleSymbolicName = context.getBundle.getSymbolicName
     val bundleId = context.getBundle.getBundleId
-    val acceptedFileExtension = List("conf", "properties", "json")
-    val acceptedFileName = List(s"bundle-$bundleSymbolicName", s"bundle-$bundleId", "akka")
-    val configurationFiles = acceptedFileName.flatMap(x => acceptedFileExtension.map(y => s"etc/$x.$y"))
-    val applicationConfiguration = configurationFiles.foldLeft(ConfigFactory.empty())((x, y) => x.withFallback(ConfigFactory.parseFileAnySyntax(new File(y))))
+    val acceptedFilePath = List(s"bundle-$bundleSymbolicName", s"bundle-$bundleId", "akka").map(x =>  s"etc/$x")
+    val applicationConfiguration = acceptedFilePath.foldLeft(ConfigFactory.empty())((x, y) => x.withFallback(ConfigFactory.parseFileAnySyntax(new File(y))))
     applicationConfiguration.withFallback(ConfigFactory.load(classloader).withFallback(ConfigFactory.defaultReference(OsgiActorSystemFactory.akkaActorClassLoader)))
   }
 

From 48c6374721f485d70a7c3eb8b5d302d0c85c2523 Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Thu, 3 Jan 2013 14:51:41 +0100
Subject: [PATCH 022/122] Clean shutdown of ReliableProxySpec, see #2846

* Solved by adding missing Dequeue in throttler
* Changed to FSM timers in throttler
* Some boy scouting
---
 .../contrib/pattern/ReliableProxySpec.scala   | 45 +++++-----
 akka-docs/rst/dev/multi-node-testing.rst      |  4 +-
 .../akka/remote/testconductor/Conductor.scala | 26 +++---
 .../akka/remote/testconductor/Extension.scala |  4 +-
 .../akka/remote/testkit/MultiNodeSpec.scala   |  4 +-
 .../transport/ThrottlerTransportAdapter.scala | 85 ++++++++++---------
 .../remote/transport/ThrottleModeSpec.scala   | 40 ++++-----
 7 files changed, 105 insertions(+), 103 deletions(-)

diff --git a/akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ReliableProxySpec.scala b/akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ReliableProxySpec.scala
index deef1871c2..56d795c83b 100644
--- a/akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ReliableProxySpec.scala
+++ b/akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ReliableProxySpec.scala
@@ -37,8 +37,9 @@ class ReliableProxySpec extends MultiNodeSpec(ReliableProxySpec) with STMultiNod
 
   override def afterEach {
     runOn(local) {
-      testConductor.throttle(local, remote, Direction.Both, -1).await
+      testConductor.passThrough(local, remote, Direction.Both).await
     }
+    enterBarrier("after-each")
   }
 
   @volatile var target: ActorRef = system.deadLetters
@@ -46,8 +47,8 @@ class ReliableProxySpec extends MultiNodeSpec(ReliableProxySpec) with STMultiNod
 
   def expectState(s: State) = expectMsg(FSM.CurrentState(proxy, s))
   def expectTransition(s1: State, s2: State) = expectMsg(FSM.Transition(proxy, s1, s2))
-  
-  def sendN(n: Int) =  (1 to n) foreach (proxy ! _)
+
+  def sendN(n: Int) = (1 to n) foreach (proxy ! _)
   def expectN(n: Int) = (1 to n) foreach { n ⇒ expectMsg(n); lastSender must be === target }
 
   "A ReliableProxy" must {
@@ -82,6 +83,8 @@ class ReliableProxySpec extends MultiNodeSpec(ReliableProxySpec) with STMultiNod
       runOn(remote) {
         expectMsg("hello")
       }
+
+      enterBarrier("initialize-done")
     }
 
     "forward messages in sequence" in {
@@ -95,9 +98,9 @@ class ReliableProxySpec extends MultiNodeSpec(ReliableProxySpec) with STMultiNod
           expectN(100)
         }
       }
-      
+
       enterBarrier("test1a")
-      
+
       runOn(local) {
         sendN(100)
         expectTransition(Idle, Active)
@@ -108,7 +111,7 @@ class ReliableProxySpec extends MultiNodeSpec(ReliableProxySpec) with STMultiNod
           expectN(100)
         }
       }
-      
+
       enterBarrier("test1b")
     }
 
@@ -121,17 +124,17 @@ class ReliableProxySpec extends MultiNodeSpec(ReliableProxySpec) with STMultiNod
           expectNoMsg
         }
       }
-      
+
       enterBarrier("test2a")
-      
+
       runOn(remote) {
         expectNoMsg(0 seconds)
       }
-      
+
       enterBarrier("test2b")
-      
+
       runOn(local) {
-        testConductor.throttle(local, remote, Direction.Send, -1).await
+        testConductor.passThrough(local, remote, Direction.Send).await
         within(5 seconds) { expectTransition(Active, Idle) }
       }
       runOn(remote) {
@@ -139,7 +142,7 @@ class ReliableProxySpec extends MultiNodeSpec(ReliableProxySpec) with STMultiNod
           expectN(100)
         }
       }
-      
+
       enterBarrier("test2c")
     }
 
@@ -157,14 +160,14 @@ class ReliableProxySpec extends MultiNodeSpec(ReliableProxySpec) with STMultiNod
           expectN(100)
         }
       }
-      
+
       enterBarrier("test3a")
-      
+
       runOn(local) {
-        testConductor.throttle(local, remote, Direction.Receive, -1).await
+        testConductor.passThrough(local, remote, Direction.Receive).await
         within(5 seconds) { expectTransition(Active, Idle) }
       }
-      
+
       enterBarrier("test3b")
     }
 
@@ -182,11 +185,11 @@ class ReliableProxySpec extends MultiNodeSpec(ReliableProxySpec) with STMultiNod
           expectN(50)
         }
       }
-      
+
       enterBarrier("test4a")
-      
+
       runOn(local) {
-        testConductor.throttle(local, remote, Direction.Send, rateMBit = -1).await
+        testConductor.passThrough(local, remote, Direction.Send).await
         testConductor.throttle(local, remote, Direction.Receive, rateMBit = 0.1).await
         sendN(50)
         within(5 seconds) {
@@ -199,8 +202,8 @@ class ReliableProxySpec extends MultiNodeSpec(ReliableProxySpec) with STMultiNod
           expectN(50)
         }
       }
-      
-      enterBarrier("test4a")
+
+      enterBarrier("test4b")
     }
 
   }
diff --git a/akka-docs/rst/dev/multi-node-testing.rst b/akka-docs/rst/dev/multi-node-testing.rst
index b098317054..eb293eaeb8 100644
--- a/akka-docs/rst/dev/multi-node-testing.rst
+++ b/akka-docs/rst/dev/multi-node-testing.rst
@@ -207,8 +207,8 @@ surprising ways.
 
   * Don't issue a shutdown of the first node. The first node is the controller and if it shuts down your test will break.
 
-  * To be able to use ``blackhole``, ``passThrough``, and ``throttle`` you must activate the ``TestConductorTranport`` 
-    by specifying ``testTransport(on = true)`` in your MultiNodeConfig.
+  * To be able to use ``blackhole``, ``passThrough``, and ``throttle`` you must activate the failure injector and 
+    throttler transport adapters by specifying ``testTransport(on = true)`` in your MultiNodeConfig.
 
   * Throttling, shutdown and other failure injections can only be done from the first node, which again is the controller.
 
diff --git a/akka-remote-tests/src/main/scala/akka/remote/testconductor/Conductor.scala b/akka-remote-tests/src/main/scala/akka/remote/testconductor/Conductor.scala
index 31d05b8a71..ea14dccc57 100644
--- a/akka-remote-tests/src/main/scala/akka/remote/testconductor/Conductor.scala
+++ b/akka-remote-tests/src/main/scala/akka/remote/testconductor/Conductor.scala
@@ -94,8 +94,8 @@ trait Conductor { this: TestConductorExt ⇒
    * increased latency.
    *
    * ====Note====
-   * To use this feature you must activate the `TestConductorTranport`
-   * by specifying `testTransport(on = true)` in your MultiNodeConfig.
+   * To use this feature you must activate the failure injector and throttler
+   * transport adapters by specifying `testTransport(on = true)` in your MultiNodeConfig.
    *
    * @param node is the symbolic name of the node which is to be affected
    * @param target is the symbolic name of the other node to which connectivity shall be throttled
@@ -115,18 +115,15 @@ trait Conductor { this: TestConductorExt ⇒
    * Socket.
    *
    * ====Note====
-   * To use this feature you must activate the `TestConductorTranport`
-   * by specifying `testTransport(on = true)` in your MultiNodeConfig.
+   * To use this feature you must activate the failure injector and throttler
+   * transport adapters by specifying `testTransport(on = true)` in your MultiNodeConfig.
    *
    * @param node is the symbolic name of the node which is to be affected
    * @param target is the symbolic name of the other node to which connectivity shall be impeded
    * @param direction can be either `Direction.Send`, `Direction.Receive` or `Direction.Both`
    */
-  def blackhole(node: RoleName, target: RoleName, direction: Direction): Future[Done] = {
-    import Settings.QueryTimeout
-    requireTestConductorTranport()
-    controller ? Throttle(node, target, direction, 0f) mapTo classTag[Done]
-  }
+  def blackhole(node: RoleName, target: RoleName, direction: Direction): Future[Done] =
+    throttle(node, target, direction, 0f)
 
   private def requireTestConductorTranport(): Unit = if (!transport.defaultAddress.protocol.contains(".gremlin.trttl."))
     throw new ConfigurationException("To use this feature you must activate the failure injector adapters " +
@@ -137,18 +134,15 @@ trait Conductor { this: TestConductorExt ⇒
    * sending and/or receiving.
    *
    * ====Note====
-   * To use this feature you must activate the `TestConductorTranport`
-   * by specifying `testTransport(on = true)` in your MultiNodeConfig.
+   * To use this feature you must activate the failure injector and throttler
+   * transport adapters by specifying `testTransport(on = true)` in your MultiNodeConfig.
    *
    * @param node is the symbolic name of the node which is to be affected
    * @param target is the symbolic name of the other node to which connectivity shall be impeded
    * @param direction can be either `Direction.Send`, `Direction.Receive` or `Direction.Both`
    */
-  def passThrough(node: RoleName, target: RoleName, direction: Direction): Future[Done] = {
-    import Settings.QueryTimeout
-    requireTestConductorTranport()
-    controller ? Throttle(node, target, direction, -1f) mapTo classTag[Done]
-  }
+  def passThrough(node: RoleName, target: RoleName, direction: Direction): Future[Done] =
+    throttle(node, target, direction, -1f)
 
   /**
    * Tell the remote support to shutdown the connection to the given remote
diff --git a/akka-remote-tests/src/main/scala/akka/remote/testconductor/Extension.scala b/akka-remote-tests/src/main/scala/akka/remote/testconductor/Extension.scala
index 4a054fdff4..3ad3027331 100644
--- a/akka-remote-tests/src/main/scala/akka/remote/testconductor/Extension.scala
+++ b/akka-remote-tests/src/main/scala/akka/remote/testconductor/Extension.scala
@@ -36,8 +36,8 @@ object TestConductor extends ExtensionKey[TestConductorExt] {
  * to be a [[akka.remote.RemoteActorRefProvider]].
  *
  * To use ``blackhole``, ``passThrough``, and ``throttle`` you must activate the
- * `TestConductorTranport` by specifying `testTransport(on = true)` in your
- * MultiNodeConfig.
+ * failure injector and throttler transport adapters by specifying `testTransport(on = true)`
+ * in your MultiNodeConfig.
  *
  */
 class TestConductorExt(val system: ExtendedActorSystem) extends Extension with Conductor with Player {
diff --git a/akka-remote-tests/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala b/akka-remote-tests/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala
index ec926dd3af..f390c1b32f 100644
--- a/akka-remote-tests/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala
+++ b/akka-remote-tests/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala
@@ -87,8 +87,8 @@ abstract class MultiNodeConfig {
 
   /**
    * To be able to use `blackhole`, `passThrough`, and `throttle` you must
-   * activate the TestConductorTranport by specifying
-   * `testTransport(on = true)` in your MultiNodeConfig.
+   * activate the failure injector and throttler transport adapters by
+   * specifying `testTransport(on = true)` in your MultiNodeConfig.
    */
   def testTransport(on: Boolean): Unit = _testTransport = on
 
diff --git a/akka-remote/src/main/scala/akka/remote/transport/ThrottlerTransportAdapter.scala b/akka-remote/src/main/scala/akka/remote/transport/ThrottlerTransportAdapter.scala
index d76bbbf071..82143f483a 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/ThrottlerTransportAdapter.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/ThrottlerTransportAdapter.scala
@@ -59,43 +59,42 @@ object ThrottlerTransportAdapter {
   case class SetThrottle(address: Address, direction: Direction, mode: ThrottleMode)
 
   sealed trait ThrottleMode {
-    def tryConsumeTokens(timeOfSend: Long, tokens: Int): (ThrottleMode, Boolean)
-    def timeToAvailable(currentTime: Long, tokens: Int): Long
+    def tryConsumeTokens(nanoTimeOfSend: Long, tokens: Int): (ThrottleMode, Boolean)
+    def timeToAvailable(currentNanoTime: Long, tokens: Int): FiniteDuration
   }
 
-  case class TokenBucket(capacity: Int, tokensPerSecond: Double, lastSend: Long, availableTokens: Int)
+  case class TokenBucket(capacity: Int, tokensPerSecond: Double, nanoTimeOfLastSend: Long, availableTokens: Int)
     extends ThrottleMode {
 
-    private def isAvailable(timeOfSend: Long, tokens: Int): Boolean = if ((tokens > capacity && availableTokens > 0)) {
+    private def isAvailable(nanoTimeOfSend: Long, tokens: Int): Boolean = if ((tokens > capacity && availableTokens > 0)) {
       true // Allow messages larger than capacity through, it will be recorded as negative tokens
-    } else min((availableTokens + tokensGenerated(timeOfSend)), capacity) >= tokens
+    } else min((availableTokens + tokensGenerated(nanoTimeOfSend)), capacity) >= tokens
 
-    override def tryConsumeTokens(timeOfSend: Long, tokens: Int): (ThrottleMode, Boolean) = {
-      if (isAvailable(timeOfSend, tokens))
+    override def tryConsumeTokens(nanoTimeOfSend: Long, tokens: Int): (ThrottleMode, Boolean) = {
+      if (isAvailable(nanoTimeOfSend, tokens))
         (this.copy(
-          lastSend = timeOfSend,
-          availableTokens = min(availableTokens - tokens + tokensGenerated(timeOfSend), capacity)), true)
+          nanoTimeOfLastSend = nanoTimeOfSend,
+          availableTokens = min(availableTokens - tokens + tokensGenerated(nanoTimeOfSend), capacity)), true)
       else (this, false)
     }
 
-    override def timeToAvailable(currentTime: Long, tokens: Int): Long = {
-      val needed = (if (tokens > capacity) 1 else tokens) - tokensGenerated(currentTime)
-      TimeUnit.SECONDS.toNanos((needed / tokensPerSecond).toLong)
+    override def timeToAvailable(currentNanoTime: Long, tokens: Int): FiniteDuration = {
+      val needed = (if (tokens > capacity) 1 else tokens) - tokensGenerated(currentNanoTime)
+      (needed / tokensPerSecond).seconds
     }
 
-    private def tokensGenerated(timeOfSend: Long): Int =
-      (TimeUnit.NANOSECONDS.toMillis(timeOfSend - lastSend) * tokensPerSecond / 1000.0).toInt
+    private def tokensGenerated(nanoTimeOfSend: Long): Int =
+      (TimeUnit.NANOSECONDS.toMillis(nanoTimeOfSend - nanoTimeOfLastSend) * tokensPerSecond / 1000.0).toInt
   }
 
   case object Unthrottled extends ThrottleMode {
-
-    override def tryConsumeTokens(timeOfSend: Long, tokens: Int): (ThrottleMode, Boolean) = (this, true)
-    override def timeToAvailable(currentTime: Long, tokens: Int): Long = 1L
+    override def tryConsumeTokens(nanoTimeOfSend: Long, tokens: Int): (ThrottleMode, Boolean) = (this, true)
+    override def timeToAvailable(currentNanoTime: Long, tokens: Int): FiniteDuration = Duration.Zero
   }
 
   case object Blackhole extends ThrottleMode {
-    override def tryConsumeTokens(timeOfSend: Long, tokens: Int): (ThrottleMode, Boolean) = (this, false)
-    override def timeToAvailable(currentTime: Long, tokens: Int): Long = 0L
+    override def tryConsumeTokens(nanoTimeOfSend: Long, tokens: Int): (ThrottleMode, Boolean) = (this, false)
+    override def timeToAvailable(currentNanoTime: Long, tokens: Int): FiniteDuration = Duration.Zero
   }
 }
 
@@ -215,6 +214,8 @@ private[transport] class ThrottlerManager(wrappedTransport: Transport) extends A
 }
 
 object ThrottledAssociation {
+  private final val DequeueTimerName = "dequeue"
+
   case object Dequeue
 
   sealed trait ThrottlerState
@@ -253,7 +254,7 @@ private[transport] class ThrottledAssociation(
   import context.dispatcher
 
   var inboundThrottleMode: ThrottleMode = _
-  var queue = Queue.empty[ByteString]
+  var throttledMessages = Queue.empty[ByteString]
   var upstreamListener: HandleEventListener = _
 
   override def postStop(): Unit = originalHandle.disassociate()
@@ -272,7 +273,7 @@ private[transport] class ThrottledAssociation(
 
   when(WaitOrigin) {
     case Event(InboundPayload(p), ExposedHandle(exposedHandle)) ⇒
-      queue = queue enqueue p
+      throttledMessages = throttledMessages enqueue p
       peekOrigin(p) match {
         case Some(origin) ⇒
           manager ! Checkin(origin, exposedHandle)
@@ -283,12 +284,12 @@ private[transport] class ThrottledAssociation(
 
   when(WaitMode) {
     case Event(InboundPayload(p), _) ⇒
-      queue = queue enqueue p
+      throttledMessages = throttledMessages enqueue p
       stay()
     case Event(mode: ThrottleMode, ExposedHandle(exposedHandle)) ⇒
       inboundThrottleMode = mode
       if (inboundThrottleMode == Blackhole) {
-        queue = Queue.empty[ByteString]
+        throttledMessages = Queue.empty[ByteString]
         exposedHandle.disassociate()
         stop()
       } else {
@@ -300,7 +301,7 @@ private[transport] class ThrottledAssociation(
 
   when(WaitUpstreamListener) {
     case Event(InboundPayload(p), _) ⇒
-      queue = queue enqueue p
+      throttledMessages = throttledMessages enqueue p
       stay()
     case Event(listener: HandleEventListener, _) ⇒
       upstreamListener = listener
@@ -315,30 +316,30 @@ private[transport] class ThrottledAssociation(
       self ! Dequeue
       goto(Throttling)
     case Event(InboundPayload(p), _) ⇒
-      queue = queue enqueue p
+      throttledMessages = throttledMessages enqueue p
       stay()
   }
 
   when(Throttling) {
     case Event(mode: ThrottleMode, _) ⇒
       inboundThrottleMode = mode
-      if (inboundThrottleMode == Blackhole) queue = Queue.empty[ByteString]
+      if (inboundThrottleMode == Blackhole) throttledMessages = Queue.empty[ByteString]
+      cancelTimer(DequeueTimerName)
+      if (throttledMessages.nonEmpty)
+        scheduleDequeue(inboundThrottleMode.timeToAvailable(System.nanoTime(), throttledMessages.head.length))
       stay()
     case Event(InboundPayload(p), _) ⇒
       forwardOrDelay(p)
       stay()
 
     case Event(Dequeue, _) ⇒
-      if (!queue.isEmpty) {
-        val (payload, newqueue) = queue.dequeue
+      if (throttledMessages.nonEmpty) {
+        val (payload, newqueue) = throttledMessages.dequeue
         upstreamListener notify InboundPayload(payload)
-        queue = newqueue
+        throttledMessages = newqueue
         inboundThrottleMode = inboundThrottleMode.tryConsumeTokens(System.nanoTime(), payload.length)._1
-        if (inboundThrottleMode == Unthrottled && !queue.isEmpty) self ! Dequeue
-        else if (!queue.isEmpty) {
-          context.system.scheduler.scheduleOnce(
-            inboundThrottleMode.timeToAvailable(System.nanoTime(), queue.head.length).nanos, self, Dequeue)
-        }
+        if (throttledMessages.nonEmpty)
+          scheduleDequeue(inboundThrottleMode.timeToAvailable(System.nanoTime(), throttledMessages.head.length))
       }
       stay()
 
@@ -370,24 +371,28 @@ private[transport] class ThrottledAssociation(
     if (inboundThrottleMode == Blackhole) {
       // Do nothing
     } else {
-      if (queue.isEmpty) {
+      if (throttledMessages.isEmpty) {
         val tokens = payload.length
         val (newbucket, success) = inboundThrottleMode.tryConsumeTokens(System.nanoTime(), tokens)
         if (success) {
           inboundThrottleMode = newbucket
           upstreamListener notify InboundPayload(payload)
         } else {
-          queue = queue.enqueue(payload)
-
-          context.system.scheduler.scheduleOnce(
-            inboundThrottleMode.timeToAvailable(System.nanoTime(), tokens).nanos, self, Dequeue)
+          throttledMessages = throttledMessages.enqueue(payload)
+          scheduleDequeue(inboundThrottleMode.timeToAvailable(System.nanoTime(), tokens))
         }
       } else {
-        queue = queue.enqueue(payload)
+        throttledMessages = throttledMessages.enqueue(payload)
       }
     }
   }
 
+  def scheduleDequeue(delay: FiniteDuration): Unit = inboundThrottleMode match {
+    case Blackhole                   ⇒ // Do nothing
+    case _ if delay <= Duration.Zero ⇒ self ! Dequeue
+    case _                           ⇒ setTimer(DequeueTimerName, Dequeue, delay, repeat = false)
+  }
+
 }
 
 private[transport] case class ThrottlerHandle(_wrappedHandle: AssociationHandle, throttlerActor: ActorRef)
diff --git a/akka-remote/src/test/scala/akka/remote/transport/ThrottleModeSpec.scala b/akka-remote/src/test/scala/akka/remote/transport/ThrottleModeSpec.scala
index c91007b479..bda2e0a517 100644
--- a/akka-remote/src/test/scala/akka/remote/transport/ThrottleModeSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/transport/ThrottleModeSpec.scala
@@ -18,77 +18,77 @@ class ThrottleModeSpec extends AkkaSpec {
     }
 
     "in tokenbucket mode allow consuming tokens up to capacity" in {
-      val bucket = TokenBucket(capacity = 100, tokensPerSecond = 100, lastSend = 0L, availableTokens = 100)
-      val (bucket1, success1) = bucket.tryConsumeTokens(timeOfSend = 0L, 10)
+      val bucket = TokenBucket(capacity = 100, tokensPerSecond = 100, nanoTimeOfLastSend = 0L, availableTokens = 100)
+      val (bucket1, success1) = bucket.tryConsumeTokens(nanoTimeOfSend = 0L, 10)
       bucket1 must be(TokenBucket(100, 100, 0, 90))
       success1 must be(true)
 
-      val (bucket2, success2) = bucket1.tryConsumeTokens(timeOfSend = 0L, 40)
+      val (bucket2, success2) = bucket1.tryConsumeTokens(nanoTimeOfSend = 0L, 40)
       bucket2 must be(TokenBucket(100, 100, 0, 50))
       success2 must be(true)
 
-      val (bucket3, success3) = bucket2.tryConsumeTokens(timeOfSend = 0L, 50)
+      val (bucket3, success3) = bucket2.tryConsumeTokens(nanoTimeOfSend = 0L, 50)
       bucket3 must be(TokenBucket(100, 100, 0, 0))
       success3 must be(true)
 
-      val (bucket4, success4) = bucket3.tryConsumeTokens(timeOfSend = 0, 1)
+      val (bucket4, success4) = bucket3.tryConsumeTokens(nanoTimeOfSend = 0, 1)
       bucket4 must be(TokenBucket(100, 100, 0, 0))
       success4 must be(false)
     }
 
     "accurately replenish tokens" in {
-      val bucket = TokenBucket(capacity = 100, tokensPerSecond = 100, lastSend = 0L, availableTokens = 0)
-      val (bucket1, success1) = bucket.tryConsumeTokens(timeOfSend = 0L, 0)
+      val bucket = TokenBucket(capacity = 100, tokensPerSecond = 100, nanoTimeOfLastSend = 0L, availableTokens = 0)
+      val (bucket1, success1) = bucket.tryConsumeTokens(nanoTimeOfSend = 0L, 0)
       bucket1 must be(TokenBucket(100, 100, 0, 0))
       success1 must be(true)
 
-      val (bucket2, success2) = bucket1.tryConsumeTokens(timeOfSend = halfSecond, 0)
+      val (bucket2, success2) = bucket1.tryConsumeTokens(nanoTimeOfSend = halfSecond, 0)
       bucket2 must be(TokenBucket(100, 100, halfSecond, 50))
       success2 must be(true)
 
-      val (bucket3, success3) = bucket2.tryConsumeTokens(timeOfSend = 2 * halfSecond, 0)
+      val (bucket3, success3) = bucket2.tryConsumeTokens(nanoTimeOfSend = 2 * halfSecond, 0)
       bucket3 must be(TokenBucket(100, 100, 2 * halfSecond, 100))
       success3 must be(true)
 
-      val (bucket4, success4) = bucket3.tryConsumeTokens(timeOfSend = 3 * halfSecond, 0)
+      val (bucket4, success4) = bucket3.tryConsumeTokens(nanoTimeOfSend = 3 * halfSecond, 0)
       bucket4 must be(TokenBucket(100, 100, 3 * halfSecond, 100))
       success4 must be(true)
     }
 
     "accurately interleave replenish and consume" in {
-      val bucket = TokenBucket(capacity = 100, tokensPerSecond = 100, lastSend = 0L, availableTokens = 20)
-      val (bucket1, success1) = bucket.tryConsumeTokens(timeOfSend = 0L, 10)
+      val bucket = TokenBucket(capacity = 100, tokensPerSecond = 100, nanoTimeOfLastSend = 0L, availableTokens = 20)
+      val (bucket1, success1) = bucket.tryConsumeTokens(nanoTimeOfSend = 0L, 10)
       bucket1 must be(TokenBucket(100, 100, 0, 10))
       success1 must be(true)
 
-      val (bucket2, success2) = bucket1.tryConsumeTokens(timeOfSend = halfSecond, 60)
+      val (bucket2, success2) = bucket1.tryConsumeTokens(nanoTimeOfSend = halfSecond, 60)
       bucket2 must be(TokenBucket(100, 100, halfSecond, 0))
       success2 must be(true)
 
-      val (bucket3, success3) = bucket2.tryConsumeTokens(timeOfSend = 2 * halfSecond, 40)
+      val (bucket3, success3) = bucket2.tryConsumeTokens(nanoTimeOfSend = 2 * halfSecond, 40)
       bucket3 must be(TokenBucket(100, 100, 2 * halfSecond, 10))
       success3 must be(true)
 
-      val (bucket4, success4) = bucket3.tryConsumeTokens(timeOfSend = 3 * halfSecond, 70)
+      val (bucket4, success4) = bucket3.tryConsumeTokens(nanoTimeOfSend = 3 * halfSecond, 70)
       bucket4 must be(TokenBucket(100, 100, 2 * halfSecond, 10))
       success4 must be(false)
     }
 
     "allow oversized packets through by loaning" in {
-      val bucket = TokenBucket(capacity = 100, tokensPerSecond = 100, lastSend = 0L, availableTokens = 20)
-      val (bucket1, success1) = bucket.tryConsumeTokens(timeOfSend = 0L, 30)
+      val bucket = TokenBucket(capacity = 100, tokensPerSecond = 100, nanoTimeOfLastSend = 0L, availableTokens = 20)
+      val (bucket1, success1) = bucket.tryConsumeTokens(nanoTimeOfSend = 0L, 30)
       bucket1 must be(TokenBucket(100, 100, 0, 20))
       success1 must be(false)
 
-      val (bucket2, success2) = bucket1.tryConsumeTokens(timeOfSend = halfSecond, 110)
+      val (bucket2, success2) = bucket1.tryConsumeTokens(nanoTimeOfSend = halfSecond, 110)
       bucket2 must be(TokenBucket(100, 100, halfSecond, -40))
       success2 must be(true)
 
-      val (bucket3, success3) = bucket2.tryConsumeTokens(timeOfSend = 2 * halfSecond, 20)
+      val (bucket3, success3) = bucket2.tryConsumeTokens(nanoTimeOfSend = 2 * halfSecond, 20)
       bucket3 must be(TokenBucket(100, 100, halfSecond, -40))
       success3 must be(false)
 
-      val (bucket4, success4) = bucket3.tryConsumeTokens(timeOfSend = 3 * halfSecond, 20)
+      val (bucket4, success4) = bucket3.tryConsumeTokens(nanoTimeOfSend = 3 * halfSecond, 20)
       bucket4 must be(TokenBucket(100, 100, 3 * halfSecond, 40))
       success4 must be(true)
     }

From f876d921ffccc04eb45daccfc23b7582299733d4 Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Fri, 4 Jan 2013 13:07:56 +0100
Subject: [PATCH 023/122] fix broken rename of nanoTimeOfLastSend

---
 .../scala/akka/remote/testconductor/Player.scala | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/akka-remote-tests/src/main/scala/akka/remote/testconductor/Player.scala b/akka-remote-tests/src/main/scala/akka/remote/testconductor/Player.scala
index f6bf469b36..f3b7a89c08 100644
--- a/akka-remote-tests/src/main/scala/akka/remote/testconductor/Player.scala
+++ b/akka-remote-tests/src/main/scala/akka/remote/testconductor/Player.scala
@@ -52,12 +52,16 @@ trait Player { this: TestConductorExt ⇒
     val a = system.actorOf(Props(new Actor {
       var waiting: ActorRef = _
       def receive = {
-        case fsm: ActorRef                        ⇒ waiting = sender; fsm ! SubscribeTransitionCallBack(self)
+        case fsm: ActorRef ⇒
+          waiting = sender; fsm ! SubscribeTransitionCallBack(self)
         case Transition(_, Connecting, AwaitDone) ⇒ // step 1, not there yet
-        case Transition(_, AwaitDone, Connected)  ⇒ waiting ! Done; context stop self
-        case t: Transition[_]                     ⇒ waiting ! Status.Failure(new RuntimeException("unexpected transition: " + t)); context stop self
-        case CurrentState(_, Connected)           ⇒ waiting ! Done; context stop self
-        case _: CurrentState[_]                   ⇒
+        case Transition(_, AwaitDone, Connected) ⇒
+          waiting ! Done; context stop self
+        case t: Transition[_] ⇒
+          waiting ! Status.Failure(new RuntimeException("unexpected transition: " + t)); context stop self
+        case CurrentState(_, Connected) ⇒
+          waiting ! Done; context stop self
+        case _: CurrentState[_] ⇒
       }
     }))
 
@@ -218,7 +222,7 @@ private[akka] class ClientFSM(name: RoleName, controllerAddr: InetSocketAddress)
           else if (t.rateMBit == 0.0f) Blackhole
           // Conversion needed as the TokenBucket measures in octets: 125000 Octets/s = 1Mbit/s
           // FIXME: Initial capacity should be carefully chosen
-          else TokenBucket(capacity = 1000, tokensPerSecond = t.rateMBit * 125000.0, lastSend = 0, availableTokens = 0)
+          else TokenBucket(capacity = 1000, tokensPerSecond = t.rateMBit * 125000.0, nanoTimeOfLastSend = 0, availableTokens = 0)
 
           val cmdFuture = TestConductor().transport.managementCommand(SetThrottle(t.target, t.direction, mode))
 

From 6fae695b3cdece228cf5c6e210f1104af8b4d0b8 Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Fri, 4 Jan 2013 11:44:12 +0100
Subject: [PATCH 024/122] Enable blackhole tests again, see #2832

---
 .../src/multi-jvm/scala/akka/cluster/SplitBrainSpec.scala       | 2 +-
 .../scala/akka/cluster/UnreachableNodeRejoinsClusterSpec.scala  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/SplitBrainSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/SplitBrainSpec.scala
index 4fe1f551aa..95b362e6b3 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/SplitBrainSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/SplitBrainSpec.scala
@@ -59,7 +59,7 @@ abstract class SplitBrainSpec(multiNodeConfig: SplitBrainMultiNodeConfig)
   val side1 = Vector(first, second)
   val side2 = Vector(third, fourth, fifth)
 
-  "A cluster of 5 members" ignore {
+  "A cluster of 5 members" must {
 
     "reach initial convergence" taggedAs LongRunningTest in {
       awaitClusterUp(first, second, third, fourth, fifth)
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/UnreachableNodeRejoinsClusterSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/UnreachableNodeRejoinsClusterSpec.scala
index 45760a3bcd..99b076b8d6 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/UnreachableNodeRejoinsClusterSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/UnreachableNodeRejoinsClusterSpec.scala
@@ -67,7 +67,7 @@ abstract class UnreachableNodeRejoinsClusterSpec(multiNodeConfig: UnreachableNod
     enterBarrier("after_" + endBarrierNumber)
   }
 
-  "A cluster of " + roles.size + " members" ignore {
+  "A cluster of " + roles.size + " members" must {
 
     "reach initial convergence" taggedAs LongRunningTest in {
       awaitClusterUp(roles: _*)

From 58324eb2632e39e2d59f8d78f8f29ee75c08447f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Endre=20S=C3=A1ndor=20Varga?= <vendre@hit.bme.hu>
Date: Fri, 4 Jan 2013 11:25:54 +0100
Subject: [PATCH 025/122] Enforcing ordering of Terminated wrt remote/local
 #2835

---
 .../src/main/scala/akka/actor/Address.scala   |  1 +
 .../scala/akka/actor/dungeon/DeathWatch.scala | 26 ++++++++++++++-----
 .../akka/actor/dungeon/FaultHandling.scala    |  6 ++++-
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/akka-actor/src/main/scala/akka/actor/Address.scala b/akka-actor/src/main/scala/akka/actor/Address.scala
index d98bbcb208..33c147de7a 100644
--- a/akka-actor/src/main/scala/akka/actor/Address.scala
+++ b/akka-actor/src/main/scala/akka/actor/Address.scala
@@ -19,6 +19,7 @@ import scala.collection.immutable
  */
 @SerialVersionUID(1L)
 final case class Address private (protocol: String, system: String, host: Option[String], port: Option[Int]) {
+  // Please note that local/non-local distinction must be preserved: host.isDefined == !isLocal
 
   def this(protocol: String, system: String) = this(protocol, system, None, None)
   def this(protocol: String, system: String, host: String, port: Int) = this(protocol, system, Option(host), Some(port))
diff --git a/akka-actor/src/main/scala/akka/actor/dungeon/DeathWatch.scala b/akka-actor/src/main/scala/akka/actor/dungeon/DeathWatch.scala
index 70f79f1d48..313796ad68 100644
--- a/akka-actor/src/main/scala/akka/actor/dungeon/DeathWatch.scala
+++ b/akka-actor/src/main/scala/akka/actor/dungeon/DeathWatch.scala
@@ -4,7 +4,7 @@
 
 package akka.actor.dungeon
 
-import akka.actor.{ Terminated, InternalActorRef, ActorRef, ActorCell, Actor, Address, AddressTerminated }
+import akka.actor.{ Terminated, InternalActorRef, ActorRef, ActorRefScope, ActorCell, Actor, Address, AddressTerminated }
 import akka.dispatch.{ Watch, Unwatch }
 import akka.event.Logging.{ Warning, Error, Debug }
 import scala.util.control.NonFatal
@@ -51,12 +51,24 @@ private[akka] trait DeathWatch { this: ActorCell ⇒
     if (!watchedBy.isEmpty) {
       val terminated = Terminated(self)(existenceConfirmed = true, addressTerminated = false)
       try {
-        watchedBy foreach {
-          watcher ⇒
-            try watcher.tell(terminated, self) catch {
-              case NonFatal(t) ⇒ publish(Error(t, self.path.toString, clazz(actor), "deathwatch"))
-            }
-        }
+        def sendTerminated(ifLocal: Boolean)(watcher: ActorRef): Unit =
+          if (watcher.asInstanceOf[ActorRefScope].isLocal == ifLocal) watcher.tell(terminated, self)
+
+        /*
+         * It is important to notify the remote watchers first, otherwise RemoteDaemon might shut down, causing
+         * the remoting to shut down as well. At this point Terminated messages to remote watchers are no longer
+         * deliverable.
+         *
+         * The problematic case is:
+         *  1. Terminated is sent to RemoteDaemon
+         *   1a. RemoteDaemon is fast enough to notify the terminator actor in RemoteActorRefProvider
+         *   1b. The terminator is fast enough to enqueue the shutdown command in the remoting
+         *  2. Only at this point is the Terminated (to be sent remotely) enqueued in the mailbox of remoting
+         *
+         * If the remote watchers are notified first, then the mailbox of the Remoting will guarantee the correct order.
+         */
+        watchedBy foreach sendTerminated(ifLocal = false)
+        watchedBy foreach sendTerminated(ifLocal = true)
       } finally watchedBy = ActorCell.emptyActorRefSet
     }
   }
diff --git a/akka-actor/src/main/scala/akka/actor/dungeon/FaultHandling.scala b/akka-actor/src/main/scala/akka/actor/dungeon/FaultHandling.scala
index ac4f5b5c36..c2ff511809 100644
--- a/akka-actor/src/main/scala/akka/actor/dungeon/FaultHandling.scala
+++ b/akka-actor/src/main/scala/akka/actor/dungeon/FaultHandling.scala
@@ -190,7 +190,11 @@ private[akka] trait FaultHandling { this: ActorCell ⇒
 
   private def finishTerminate() {
     val a = actor
-    // The following order is crucial for things to work properly. Only chnage this if you're very confident and lucky.
+    /* The following order is crucial for things to work properly. Only change this if you're very confident and lucky.
+     *
+     * Please note that if a parent is also a watcher then ChildTerminated and Terminated must be processed in this
+     * specific order.
+     */
     try if (a ne null) a.postStop()
     finally try dispatcher.detach(this)
     finally try parent.sendSystemMessage(ChildTerminated(self))

From dc5f835f1f72cf3cd2a31317864cf891904669ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Endre=20S=C3=A1ndor=20Varga?= <vendre@hit.bme.hu>
Date: Fri, 4 Jan 2013 14:24:39 +0100
Subject: [PATCH 026/122] Added scope query methods to Address.

---
 .../src/main/scala/akka/actor/Address.scala    | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/akka-actor/src/main/scala/akka/actor/Address.scala b/akka-actor/src/main/scala/akka/actor/Address.scala
index 33c147de7a..f02dcfb567 100644
--- a/akka-actor/src/main/scala/akka/actor/Address.scala
+++ b/akka-actor/src/main/scala/akka/actor/Address.scala
@@ -19,11 +19,27 @@ import scala.collection.immutable
  */
 @SerialVersionUID(1L)
 final case class Address private (protocol: String, system: String, host: Option[String], port: Option[Int]) {
-  // Please note that local/non-local distinction must be preserved: host.isDefined == !isLocal
+  // Please note that local/non-local distinction must be preserved:
+  // host.isDefined == hasGlobalScope
+  // host.isEmpty == hasLocalScope
+  // hasLocalScope == !hasGlobalScope
 
   def this(protocol: String, system: String) = this(protocol, system, None, None)
   def this(protocol: String, system: String, host: String, port: Int) = this(protocol, system, Option(host), Some(port))
 
+  /**
+   * Returns true if this Address is only defined locally. It is not safe to send locally scoped addresses to remote
+   * hosts. See also [[akka.actor.Address#hasGlobalScope]].
+   */
+  def hasLocalScope: Boolean = host.isEmpty
+
+  /**
+   * Returns true if this Address is usable globally. Unlike locally defined addresses ([[akka.actor.Address#hasLocalScope]])
+   * addresses of global scope are safe to sent to other hosts, as they globally and uniquely identify an addressable
+   * entity.
+   */
+  def hasGlobalScope: Boolean = host.isDefined
+
   /**
    * Returns the canonical String representation of this Address formatted as:
    *

From 06f1945561f737d211dc0bde91391dc54ef76d2d Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Fri, 4 Jan 2013 12:59:45 +0100
Subject: [PATCH 027/122] Improve ReliableProxy resend across a slow link, see
 #2849

* The within margin was too small. On my machine the transition to Idle is done
  when 400 ms is remaining, which is too timing sensitive.
* Improved the "resend across a slow link" test to actually trigger resending,
  which it didn't do before.
---
 .../contrib/pattern/ReliableProxySpec.scala   | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ReliableProxySpec.scala b/akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ReliableProxySpec.scala
index 56d795c83b..cd2d2b6157 100644
--- a/akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ReliableProxySpec.scala
+++ b/akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ReliableProxySpec.scala
@@ -171,12 +171,18 @@ class ReliableProxySpec extends MultiNodeSpec(ReliableProxySpec) with STMultiNod
       enterBarrier("test3b")
     }
 
-    "resend across a slow link" in {
+    "resend across a slow outbound link" in {
       runOn(local) {
-        testConductor.throttle(local, remote, Direction.Send, rateMBit = 0.1).await
+        // the rateMBit value is derived from empirical studies so that it will trigger resends,
+        // the exact value is not important, but it must not be too large
+        testConductor.throttle(local, remote, Direction.Send, rateMBit = 0.02).await
         sendN(50)
         within(5 seconds) {
           expectTransition(Idle, Active)
+          // use the slow link for a while, which will trigger resends
+          Thread.sleep(2000)
+          // full speed, and it will catch up outstanding messages
+          testConductor.passThrough(local, remote, Direction.Send).await
           expectTransition(Active, Idle)
         }
       }
@@ -184,16 +190,25 @@ class ReliableProxySpec extends MultiNodeSpec(ReliableProxySpec) with STMultiNod
         within(5 seconds) {
           expectN(50)
         }
+        expectNoMsg(1 second)
       }
 
-      enterBarrier("test4a")
+      enterBarrier("test4")
+    }
 
+    "resend across a slow inbound link" in {
       runOn(local) {
         testConductor.passThrough(local, remote, Direction.Send).await
-        testConductor.throttle(local, remote, Direction.Receive, rateMBit = 0.1).await
+        // the rateMBit value is derived from empirical studies so that it will trigger resends,
+        // the exact value is not important, but it must not be too large
+        testConductor.throttle(local, remote, Direction.Receive, rateMBit = 0.02).await
         sendN(50)
         within(5 seconds) {
           expectTransition(Idle, Active)
+          // use the slow link for a while, which will trigger resends
+          Thread.sleep(2000)
+          // full speed, and it will catch up outstanding messages
+          testConductor.passThrough(local, remote, Direction.Receive).await
           expectTransition(Active, Idle)
         }
       }
@@ -201,9 +216,10 @@ class ReliableProxySpec extends MultiNodeSpec(ReliableProxySpec) with STMultiNod
         within(1 second) {
           expectN(50)
         }
+        expectNoMsg(2 seconds)
       }
 
-      enterBarrier("test4b")
+      enterBarrier("test5")
     }
 
   }

From f147f4d3d27ce626cec21d879666212ec5a1ed79 Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Wed, 12 Dec 2012 11:49:20 +0100
Subject: [PATCH 028/122] Stress / long running test of cluster, see #2786

* akka.cluster.StressSpec
* Configurable number of nodes and duration for each step
* Report metrics and phi periodically to see progress
* Configurable payload size
* Test of various join and remove scenarios
* Test of watch
* Exercise supervision
* Report cluster stats
* Test with many actors in tree structure

Apart from the test this commit also solves some issues:

* Avoid adding back members when downed in ClusterHeartbeatSender
* Avoid duplicate close of ClusterReadView
* Add back the publish of AddressTerminated when MemberDowned/Removed
  it was lost in merge of "publish on convergence", see #2779
---
 .../scala/akka/cluster/ClusterEvent.scala     |   18 +-
 .../scala/akka/cluster/ClusterHeartbeat.scala |    1 +
 .../main/scala/akka/cluster/ClusterJmx.scala  |    1 -
 ...ientDowningNodeThatIsUnreachableSpec.scala |    4 +-
 .../ClientDowningNodeThatIsUpSpec.scala       |    4 +-
 ...aderDowningNodeThatIsUnreachableSpec.scala |    8 +-
 .../scala/akka/cluster/MBeanSpec.scala        |    2 +-
 .../akka/cluster/MultiNodeClusterSpec.scala   |    8 +-
 .../akka/cluster/SingletonClusterSpec.scala   |    2 +-
 .../scala/akka/cluster/SplitBrainSpec.scala   |    4 +-
 .../scala/akka/cluster/StressSpec.scala       | 1082 +++++++++++++++++
 .../UnreachableNodeRejoinsClusterSpec.scala   |    2 +-
 12 files changed, 1112 insertions(+), 24 deletions(-)
 create mode 100644 akka-cluster/src/multi-jvm/scala/akka/cluster/StressSpec.scala

diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterEvent.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterEvent.scala
index c896e721cc..7d1997649d 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterEvent.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/ClusterEvent.scala
@@ -284,18 +284,24 @@ private[cluster] final class ClusterDomainEventPublisher extends Actor with Acto
     // keep the latestGossip to be sent to new subscribers
     latestGossip = newGossip
     // first publish the diffUnreachable between the last two gossips
-    diffUnreachable(oldGossip, newGossip) foreach { event ⇒
-      publish(event)
-      // notify DeathWatch about unreachable node
-      publish(AddressTerminated(event.member.address))
-    }
+    diffUnreachable(oldGossip, newGossip) foreach publish
     // buffer up the MemberEvents waiting for convergence
     memberEvents ++= diffMemberEvents(oldGossip, newGossip)
     // if we have convergence then publish the MemberEvents and possibly a LeaderChanged
     if (newGossip.convergence) {
       val previousConvergedGossip = latestConvergedGossip
       latestConvergedGossip = newGossip
-      memberEvents foreach publish
+      memberEvents foreach { event ⇒
+        event match {
+          case m @ (MemberDowned(_) | MemberRemoved(_)) ⇒
+            // TODO MemberDowned match should probably be covered by MemberRemoved, see ticket #2788
+            //   but right now we don't change Downed to Removed
+            publish(event)
+            // notify DeathWatch about downed node
+            publish(AddressTerminated(m.member.address))
+          case _ ⇒ publish(event)
+        }
+      }
       memberEvents = immutable.Seq.empty
       diffLeader(previousConvergedGossip, latestConvergedGossip) foreach publish
     }
diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterHeartbeat.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterHeartbeat.scala
index 3ada580bb2..94e4e9b9f9 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterHeartbeat.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/ClusterHeartbeat.scala
@@ -116,6 +116,7 @@ private[cluster] final class ClusterHeartbeatSender extends Actor with ActorLogg
     case HeartbeatTick          ⇒ heartbeat()
     case s: CurrentClusterState ⇒ reset(s)
     case UnreachableMember(m)   ⇒ removeMember(m)
+    case MemberDowned(m)        ⇒ removeMember(m)
     case MemberRemoved(m)       ⇒ removeMember(m)
     case e: MemberEvent         ⇒ addMember(e.member)
     case JoinInProgress(a, d)   ⇒ addJoinInProgress(a, d)
diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterJmx.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterJmx.scala
index ae023263c8..ec0c38a944 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterJmx.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/ClusterJmx.scala
@@ -140,7 +140,6 @@ private[akka] class ClusterJmx(cluster: Cluster, log: LoggingAdapter) {
    * Unregisters the cluster JMX MBean from MBean server.
    */
   def unregisterMBean(): Unit = {
-    clusterView.close()
     try {
       mBeanServer.unregisterMBean(clusterMBeanName)
     } catch {
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUnreachableSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUnreachableSpec.scala
index bf1009b472..a10e941c3f 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUnreachableSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUnreachableSpec.scala
@@ -52,7 +52,7 @@ abstract class ClientDowningNodeThatIsUnreachableSpec(multiNodeConfig: ClientDow
         cluster.down(thirdAddress)
         enterBarrier("down-third-node")
 
-        awaitUpConvergence(numberOfMembers = 3, canNotBePartOfMemberRing = List(thirdAddress))
+        awaitUpConvergence(numberOfMembers = 3, canNotBePartOfMemberRing = Set(thirdAddress))
         clusterView.members.exists(_.address == thirdAddress) must be(false)
       }
 
@@ -63,7 +63,7 @@ abstract class ClientDowningNodeThatIsUnreachableSpec(multiNodeConfig: ClientDow
       runOn(second, fourth) {
         enterBarrier("down-third-node")
 
-        awaitUpConvergence(numberOfMembers = 3, canNotBePartOfMemberRing = List(thirdAddress))
+        awaitUpConvergence(numberOfMembers = 3, canNotBePartOfMemberRing = Set(thirdAddress))
       }
 
       enterBarrier("await-completion")
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUpSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUpSpec.scala
index 2a0af15997..a8c8bdb736 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUpSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUpSpec.scala
@@ -50,7 +50,7 @@ abstract class ClientDowningNodeThatIsUpSpec(multiNodeConfig: ClientDowningNodeT
 
         markNodeAsUnavailable(thirdAddress)
 
-        awaitUpConvergence(numberOfMembers = 3, canNotBePartOfMemberRing = List(thirdAddress))
+        awaitUpConvergence(numberOfMembers = 3, canNotBePartOfMemberRing = Set(thirdAddress))
         clusterView.members.exists(_.address == thirdAddress) must be(false)
       }
 
@@ -61,7 +61,7 @@ abstract class ClientDowningNodeThatIsUpSpec(multiNodeConfig: ClientDowningNodeT
       runOn(second, fourth) {
         enterBarrier("down-third-node")
 
-        awaitUpConvergence(numberOfMembers = 3, canNotBePartOfMemberRing = List(thirdAddress))
+        awaitUpConvergence(numberOfMembers = 3, canNotBePartOfMemberRing = Set(thirdAddress))
       }
 
       enterBarrier("await-completion")
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderDowningNodeThatIsUnreachableSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderDowningNodeThatIsUnreachableSpec.scala
index 279e32ab66..6a917be56e 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderDowningNodeThatIsUnreachableSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderDowningNodeThatIsUnreachableSpec.scala
@@ -60,7 +60,7 @@ abstract class LeaderDowningNodeThatIsUnreachableSpec(multiNodeConfig: LeaderDow
 
         // --- HERE THE LEADER SHOULD DETECT FAILURE AND AUTO-DOWN THE UNREACHABLE NODE ---
 
-        awaitUpConvergence(numberOfMembers = 3, canNotBePartOfMemberRing = List(fourthAddress), 30.seconds)
+        awaitUpConvergence(numberOfMembers = 3, canNotBePartOfMemberRing = Set(fourthAddress), 30.seconds)
       }
 
       runOn(fourth) {
@@ -70,7 +70,7 @@ abstract class LeaderDowningNodeThatIsUnreachableSpec(multiNodeConfig: LeaderDow
       runOn(second, third) {
         enterBarrier("down-fourth-node")
 
-        awaitUpConvergence(numberOfMembers = 3, canNotBePartOfMemberRing = List(fourthAddress), 30.seconds)
+        awaitUpConvergence(numberOfMembers = 3, canNotBePartOfMemberRing = Set(fourthAddress), 30.seconds)
       }
 
       enterBarrier("await-completion-1")
@@ -90,7 +90,7 @@ abstract class LeaderDowningNodeThatIsUnreachableSpec(multiNodeConfig: LeaderDow
 
         // --- HERE THE LEADER SHOULD DETECT FAILURE AND AUTO-DOWN THE UNREACHABLE NODE ---
 
-        awaitUpConvergence(numberOfMembers = 2, canNotBePartOfMemberRing = List(secondAddress), 30.seconds)
+        awaitUpConvergence(numberOfMembers = 2, canNotBePartOfMemberRing = Set(secondAddress), 30.seconds)
       }
 
       runOn(second) {
@@ -100,7 +100,7 @@ abstract class LeaderDowningNodeThatIsUnreachableSpec(multiNodeConfig: LeaderDow
       runOn(third) {
         enterBarrier("down-second-node")
 
-        awaitUpConvergence(numberOfMembers = 2, canNotBePartOfMemberRing = List(secondAddress), 30 seconds)
+        awaitUpConvergence(numberOfMembers = 2, canNotBePartOfMemberRing = Set(secondAddress), 30 seconds)
       }
 
       enterBarrier("await-completion-2")
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MBeanSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/MBeanSpec.scala
index e6d83f881e..5d55afb00f 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MBeanSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/MBeanSpec.scala
@@ -115,7 +115,7 @@ abstract class MBeanSpec
       enterBarrier("fourth-down")
 
       runOn(first, second, third) {
-        awaitUpConvergence(3, canNotBePartOfMemberRing = List(fourthAddress))
+        awaitUpConvergence(3, canNotBePartOfMemberRing = Set(fourthAddress))
         assertMembers(clusterView.members, first, second, third)
       }
 
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiNodeClusterSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiNodeClusterSpec.scala
index fd2714005b..9d7447e6c9 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiNodeClusterSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiNodeClusterSpec.scala
@@ -218,17 +218,17 @@ trait MultiNodeClusterSpec extends Suite with STMultiNodeSpec { self: MultiNodeS
    */
   def awaitUpConvergence(
     numberOfMembers: Int,
-    canNotBePartOfMemberRing: immutable.Seq[Address] = Nil,
+    canNotBePartOfMemberRing: Set[Address] = Set.empty,
     timeout: FiniteDuration = 20.seconds): Unit = {
     within(timeout) {
+      if (!canNotBePartOfMemberRing.isEmpty) // don't run this on an empty set
+        awaitCond(
+          canNotBePartOfMemberRing forall (address ⇒ !(clusterView.members exists (_.address == address))))
       awaitCond(clusterView.members.size == numberOfMembers)
       awaitCond(clusterView.members.forall(_.status == MemberStatus.Up))
       // clusterView.leader is updated by LeaderChanged, await that to be updated also
       val expectedLeader = clusterView.members.headOption.map(_.address)
       awaitCond(clusterView.leader == expectedLeader)
-      if (!canNotBePartOfMemberRing.isEmpty) // don't run this on an empty set
-        awaitCond(
-          canNotBePartOfMemberRing forall (address ⇒ !(clusterView.members exists (_.address == address))))
     }
   }
 
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/SingletonClusterSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/SingletonClusterSpec.scala
index 33ce67ecb5..d1e7098f9b 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/SingletonClusterSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/SingletonClusterSpec.scala
@@ -66,7 +66,7 @@ abstract class SingletonClusterSpec(multiNodeConfig: SingletonClusterMultiNodeCo
 
         markNodeAsUnavailable(secondAddress)
 
-        awaitUpConvergence(numberOfMembers = 1, canNotBePartOfMemberRing = List(secondAddress), 30.seconds)
+        awaitUpConvergence(numberOfMembers = 1, canNotBePartOfMemberRing = Set(secondAddress), 30.seconds)
         clusterView.isSingletonCluster must be(true)
         awaitCond(clusterView.isLeader)
       }
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/SplitBrainSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/SplitBrainSpec.scala
index 95b362e6b3..0633969319 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/SplitBrainSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/SplitBrainSpec.scala
@@ -102,7 +102,7 @@ abstract class SplitBrainSpec(multiNodeConfig: SplitBrainMultiNodeConfig)
         // auto-down = on
         awaitCond(clusterView.unreachableMembers.forall(m ⇒ m.status == MemberStatus.Down), 15 seconds)
         clusterView.unreachableMembers.map(_.address) must be(side2.toSet map address)
-        awaitUpConvergence(side1.size, side2 map address)
+        awaitUpConvergence(side1.size, side2.toSet map address)
         assertLeader(side1: _*)
       }
 
@@ -110,7 +110,7 @@ abstract class SplitBrainSpec(multiNodeConfig: SplitBrainMultiNodeConfig)
         // auto-down = on
         awaitCond(clusterView.unreachableMembers.forall(m ⇒ m.status == MemberStatus.Down), 15 seconds)
         clusterView.unreachableMembers.map(_.address) must be(side1.toSet map address)
-        awaitUpConvergence(side2.size, side1 map address)
+        awaitUpConvergence(side2.size, side1.toSet map address)
         assertLeader(side2: _*)
       }
 
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/StressSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/StressSpec.scala
new file mode 100644
index 0000000000..707e96610f
--- /dev/null
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/StressSpec.scala
@@ -0,0 +1,1082 @@
+/**
+ *  Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ */
+package akka.cluster
+
+import language.postfixOps
+import scala.annotation.tailrec
+import scala.collection.immutable
+import scala.concurrent.duration._
+import scala.concurrent.forkjoin.ThreadLocalRandom
+import org.scalatest.BeforeAndAfterEach
+import com.typesafe.config.Config
+import com.typesafe.config.ConfigFactory
+import akka.actor.Actor
+import akka.actor.ActorLogging
+import akka.actor.ActorRef
+import akka.actor.ActorSystem
+import akka.actor.Address
+import akka.actor.Deploy
+import akka.actor.OneForOneStrategy
+import akka.actor.Props
+import akka.actor.RootActorPath
+import akka.actor.SupervisorStrategy._
+import akka.actor.Terminated
+import akka.cluster.ClusterEvent.ClusterMetricsChanged
+import akka.cluster.ClusterEvent.CurrentClusterState
+import akka.cluster.ClusterEvent.MemberEvent
+import akka.cluster.StandardMetrics.Cpu
+import akka.cluster.StandardMetrics.HeapMemory
+import akka.remote.RemoteScope
+import akka.remote.testkit.MultiNodeConfig
+import akka.remote.testkit.MultiNodeSpec
+import akka.routing.FromConfig
+import akka.testkit._
+import akka.testkit.TestEvent._
+
+/**
+ * This test is intended to be used as long running stress test
+ * of cluster related features. Number of nodes and duration of
+ * the test steps can be configured. The test scenario is organized as
+ * follows:
+ * 1. join nodes in various ways up to the configured total number of nodes
+ * 2  while nodes are joining a few cluster aware routers are also working
+ * 3. exercise concurrent joining and shutdown of nodes repeatedly
+ * 4. exercise cluster aware routers, including high throughput
+ * 5. exercise many actors in a tree structure
+ * 6. exercise remote supervision
+ * 7. leave and shutdown nodes in various ways
+ * 8. while nodes are removed remote death watch is also exercised
+ * 9. while nodes are removed a few cluster aware routers are also working
+ */
+object StressMultiJvmSpec extends MultiNodeConfig {
+
+  // Note that this test uses default configuration,
+  // not MultiNodeClusterSpec.clusterConfig
+  commonConfig(ConfigFactory.parseString("""
+    akka.test.cluster-stress-spec {
+      # scale the nr-of-nodes* settings with this factor
+      nr-of-nodes-factor = 1
+      nr-of-nodes = 13
+      # not scaled
+      nr-of-seed-nodes = 3
+      nr-of-nodes-joining-to-seed-initally = 2
+      nr-of-nodes-joining-one-by-one-small = 2
+      nr-of-nodes-joining-one-by-one-large = 2
+      nr-of-nodes-joining-to-one = 2
+      nr-of-nodes-joining-to-seed = 2
+      nr-of-nodes-leaving-one-by-one-small = 1
+      nr-of-nodes-leaving-one-by-one-large = 2
+      nr-of-nodes-leaving = 2
+      nr-of-nodes-shutdown-one-by-one-small = 1
+      nr-of-nodes-shutdown-one-by-one-large = 2
+      nr-of-nodes-shutdown = 2
+      nr-of-nodes-join-remove = 2
+      # not scaled
+      join-remove-duration = 90s
+      work-batch-size = 100
+      work-batch-interval = 2s
+      payload-size = 1000
+      # scale the *-duration settings with this factor
+      duration-factor = 1
+      normal-throughput-duration = 30s
+      high-throughput-duration = 10s
+      supervision-duration = 10s
+      # actors are created in a tree structure defined
+      # by tree-width (number of children for each actor) and
+      # tree-levels, total number of actors can be calculated by
+      # (width * math.pow(width, levels) - 1) / (width - 1)
+      tree-width = 5
+      tree-levels = 4
+      report-metrics-interval = 10s
+      # scale convergence within timeouts with this factor
+      convergence-within-factor = 1.0
+    }
+
+    akka.actor.provider = akka.cluster.ClusterActorRefProvider
+    akka.cluster {
+      auto-join = off
+      auto-down = on
+      publish-stats-interval = 0 s # always, when it happens
+    }
+    akka.event-handlers = ["akka.testkit.TestEventListener"]
+    akka.loglevel = INFO
+    akka.remote.log-remote-lifecycle-events = off
+
+    akka.actor.deployment {
+      /master-node-1/workers {
+        router = round-robin
+        nr-of-instances = 100
+        cluster {
+          enabled = on
+          max-nr-of-instances-per-node = 1
+          allow-local-routees = off
+        }
+      }
+      /master-node-2/workers {
+        router = round-robin
+        nr-of-instances = 100
+        cluster {
+          enabled = on
+          routees-path = "/user/worker"
+          allow-local-routees = off
+        }
+      }
+      /master-node-3/workers = {
+        router = adaptive
+        nr-of-instances = 100
+        cluster {
+          enabled = on
+          max-nr-of-instances-per-node = 1
+          allow-local-routees = off
+        }
+      }
+    }
+    """))
+
+  class Settings(conf: Config) {
+    private val testConfig = conf.getConfig("akka.test.cluster-stress-spec")
+    import testConfig._
+
+    private def getDuration(name: String): FiniteDuration = Duration(getMilliseconds(name), MILLISECONDS)
+
+    val nFactor = getInt("nr-of-nodes-factor")
+    val totalNumberOfNodes = getInt("nr-of-nodes") * nFactor ensuring (
+      _ >= 10, "nr-of-nodes must be >= 10")
+    val numberOfSeedNodes = getInt("nr-of-seed-nodes") // not scaled by nodes factor
+    val numberOfNodesJoiningToSeedNodesInitially = getInt("nr-of-nodes-joining-to-seed-initally") * nFactor
+    val numberOfNodesJoiningOneByOneSmall = getInt("nr-of-nodes-joining-one-by-one-small") * nFactor
+    val numberOfNodesJoiningOneByOneLarge = getInt("nr-of-nodes-joining-one-by-one-large") * nFactor
+    val numberOfNodesJoiningToOneNode = getInt("nr-of-nodes-joining-to-one") * nFactor
+    val numberOfNodesJoiningToSeedNodes = getInt("nr-of-nodes-joining-to-seed") * nFactor
+    val numberOfNodesLeavingOneByOneSmall = getInt("nr-of-nodes-leaving-one-by-one-small") * nFactor
+    val numberOfNodesLeavingOneByOneLarge = getInt("nr-of-nodes-leaving-one-by-one-large") * nFactor
+    val numberOfNodesLeaving = getInt("nr-of-nodes-leaving") * nFactor
+    val numberOfNodesShutdownOneByOneSmall = getInt("nr-of-nodes-shutdown-one-by-one-small") * nFactor
+    val numberOfNodesShutdownOneByOneLarge = getInt("nr-of-nodes-shutdown-one-by-one-large") * nFactor
+    val numberOfNodesShutdown = getInt("nr-of-nodes-shutdown") * nFactor
+    val numberOfNodesJoinRemove = getInt("nr-of-nodes-join-remove") // not scaled by nodes factor
+
+    val workBatchSize = getInt("work-batch-size")
+    val workBatchInterval = Duration(getMilliseconds("work-batch-interval"), MILLISECONDS)
+    val payloadSize = getInt("payload-size")
+    val dFactor = getInt("duration-factor")
+    val joinRemoveDuration = getDuration("join-remove-duration") * dFactor
+    val normalThroughputDuration = getDuration("normal-throughput-duration") * dFactor
+    val highThroughputDuration = getDuration("high-throughput-duration") * dFactor
+    val supervisionDuration = getDuration("supervision-duration") * dFactor
+    val treeWidth = getInt("tree-width")
+    val treeLevels = getInt("tree-levels")
+    val reportMetricsInterval = getDuration("report-metrics-interval")
+    val convergenceWithinFactor = getDouble("convergence-within-factor")
+
+    require(numberOfSeedNodes + numberOfNodesJoiningToSeedNodesInitially + numberOfNodesJoiningOneByOneSmall +
+      numberOfNodesJoiningOneByOneLarge + numberOfNodesJoiningToOneNode + numberOfNodesJoiningToSeedNodes <= totalNumberOfNodes,
+      s"specified number of joining nodes <= ${totalNumberOfNodes}")
+
+    // don't shutdown the 3 nodes hosting the master actors
+    require(numberOfNodesLeavingOneByOneSmall + numberOfNodesLeavingOneByOneLarge + numberOfNodesLeaving +
+      numberOfNodesShutdownOneByOneSmall + numberOfNodesShutdownOneByOneLarge + numberOfNodesShutdown <= totalNumberOfNodes - 3,
+      s"specified number of leaving/shutdown nodes <= ${totalNumberOfNodes - 3}")
+
+    require(numberOfNodesJoinRemove <= totalNumberOfNodes, s"nr-of-nodes-join-remove must be <= ${totalNumberOfNodes}")
+  }
+
+  // FIXME configurable number of nodes
+  for (n ← 1 to 13) role("node-" + n)
+
+  implicit class FormattedDouble(val d: Double) extends AnyVal {
+    def form: String = d.formatted("%.2f")
+  }
+
+  case class ClusterResult(
+    address: Address,
+    duration: Duration,
+    clusterStats: ClusterStats)
+
+  case class AggregatedClusterResult(title: String, duration: Duration, clusterStats: ClusterStats)
+
+  /**
+   * Central aggregator of cluster statistics and metrics.
+   * Reports the result via log periodically and when all
+   * expected results has been collected. It shuts down
+   * itself when expected results has been collected.
+   */
+  class ClusterResultAggregator(title: String, expectedResults: Int, reportMetricsInterval: FiniteDuration) extends Actor with ActorLogging {
+    val cluster = Cluster(context.system)
+    var reportTo: Option[ActorRef] = None
+    var results = Vector.empty[ClusterResult]
+    var nodeMetrics = Set.empty[NodeMetrics]
+    var phiValuesObservedByNode = {
+      import akka.cluster.Member.addressOrdering
+      immutable.SortedMap.empty[Address, Set[PhiValue]]
+    }
+
+    import context.dispatcher
+    val reportMetricsTask = context.system.scheduler.schedule(
+      reportMetricsInterval, reportMetricsInterval, self, ReportTick)
+
+    // subscribe to ClusterMetricsChanged, re-subscribe when restart
+    override def preStart(): Unit = cluster.subscribe(self, classOf[ClusterMetricsChanged])
+    override def postStop(): Unit = {
+      cluster.unsubscribe(self)
+      reportMetricsTask.cancel()
+      super.postStop()
+    }
+
+    def receive = {
+      case ClusterMetricsChanged(clusterMetrics) ⇒ nodeMetrics = clusterMetrics
+      case PhiResult(from, phiValues)            ⇒ phiValuesObservedByNode += from -> phiValues
+      case ReportTick ⇒
+        log.info(s"[${title}] in progress\n${formatMetrics}\n\n${formatPhi}")
+      case r: ClusterResult ⇒
+        results :+= r
+        if (results.size == expectedResults) {
+          val aggregated = AggregatedClusterResult(title, maxDuration, totalClusterStats)
+          log.info(s"[${title}] completed in [${aggregated.duration.toMillis}] ms\n${aggregated.clusterStats}\n${formatMetrics}\n\n${formatPhi}")
+          reportTo foreach { _ ! aggregated }
+          context stop self
+        }
+      case _: CurrentClusterState ⇒
+      case ReportTo(ref)          ⇒ reportTo = ref
+    }
+
+    def maxDuration = results.map(_.duration).max
+
+    def totalClusterStats = results.map(_.clusterStats).foldLeft(ClusterStats()) { (acc, s) ⇒
+      ClusterStats(
+        receivedGossipCount = acc.receivedGossipCount + s.receivedGossipCount,
+        mergeConflictCount = acc.mergeConflictCount + s.mergeConflictCount,
+        mergeCount = acc.mergeCount + s.mergeCount,
+        mergeDetectedCount = acc.mergeDetectedCount + s.mergeDetectedCount)
+    }
+
+    def formatMetrics: String = {
+      import akka.cluster.Member.addressOrdering
+      (formatMetricsHeader +: (nodeMetrics.toSeq.sortBy(_.address) map formatMetricsLine)).mkString("\n")
+    }
+
+    def formatMetricsHeader: String = "Node\tHeap (MB)\tCPU (%)\tLoad"
+
+    def formatMetricsLine(nodeMetrics: NodeMetrics): String = {
+      val heap = nodeMetrics match {
+        case HeapMemory(address, timestamp, used, committed, max) ⇒
+          (used.doubleValue / 1024 / 1024).form
+        case _ ⇒ ""
+      }
+      val cpuAndLoad = nodeMetrics match {
+        case Cpu(address, timestamp, loadOption, cpuOption, processors) ⇒
+          format(cpuOption) + "\t" + format(loadOption)
+        case _ ⇒ "N/A\tN/A"
+      }
+      s"${nodeMetrics.address}\t${heap}\t${cpuAndLoad}"
+    }
+
+    def format(opt: Option[Double]) = opt match {
+      case None    ⇒ "N/A"
+      case Some(x) ⇒ x.form
+    }
+
+    def formatPhi: String = {
+      if (phiValuesObservedByNode.isEmpty) ""
+      else {
+        import akka.cluster.Member.addressOrdering
+        val lines =
+          for {
+            (monitor, phiValues) ← phiValuesObservedByNode.toSeq
+            phi ← phiValues.toSeq.sortBy(_.address)
+          } yield formatPhiLine(monitor, phi.address, phi)
+
+        (formatPhiHeader +: lines).mkString("\n")
+      }
+    }
+
+    def formatPhiHeader: String = "Monitor\tSubject\tcount\tcount phi > 1.0\tmax phi"
+
+    def formatPhiLine(monitor: Address, subject: Address, phi: PhiValue): String =
+      s"${monitor}\t${subject}\t${phi.count}\t${phi.countAboveOne}\t${phi.max.form}"
+
+  }
+
+  /**
+   * Keeps cluster statistics and metrics reported by
+   * ClusterResultAggregator. Logs the list of historical
+   * results when a new AggregatedClusterResult is received.
+   */
+  class ClusterResultHistory extends Actor with ActorLogging {
+    var history = Vector.empty[AggregatedClusterResult]
+
+    def receive = {
+      case result: AggregatedClusterResult ⇒
+        history :+= result
+        log.info("Cluster result history\n" + formatHistory)
+    }
+
+    def formatHistory: String =
+      (formatHistoryHeader +: (history map formatHistoryLine)).mkString("\n")
+
+    def formatHistoryHeader: String = "title\tduration (ms)\tgossip count\tmerge count"
+
+    def formatHistoryLine(result: AggregatedClusterResult): String =
+      s"${result.title}\t${result.duration.toMillis}\t${result.clusterStats.receivedGossipCount}\t${result.clusterStats.mergeCount}"
+
+  }
+
+  /**
+   * Collect phi values of the failure detector and report to the
+   * central ClusterResultAggregator.
+   */
+  class PhiObserver extends Actor with ActorLogging {
+    val cluster = Cluster(context.system)
+    val fd = cluster.failureDetector.asInstanceOf[AccrualFailureDetector]
+    var reportTo: Option[ActorRef] = None
+    val emptyPhiByNode = Map.empty[Address, PhiValue].withDefault(address ⇒ PhiValue(address, 0, 0, 0.0))
+    var phiByNode = emptyPhiByNode
+    var nodes = Set.empty[Address]
+
+    import context.dispatcher
+    val checkPhiTask = context.system.scheduler.schedule(
+      1.second, 1.second, self, PhiTick)
+
+    // subscribe to MemberEvent, re-subscribe when restart
+    override def preStart(): Unit = cluster.subscribe(self, classOf[MemberEvent])
+    override def postStop(): Unit = {
+      cluster.unsubscribe(self)
+      checkPhiTask.cancel()
+      super.postStop()
+    }
+
+    def receive = {
+      case PhiTick ⇒
+        nodes foreach { node ⇒
+          val previous = phiByNode(node)
+          val φ = fd.phi(node)
+          if (φ > 0) {
+            val aboveOne = if (!φ.isInfinite && φ > 1.0) 1 else 0
+            phiByNode += node -> PhiValue(node, previous.countAboveOne + aboveOne, previous.count + 1,
+              math.max(previous.max, φ))
+          }
+        }
+        reportTo foreach { _ ! PhiResult(cluster.selfAddress, phiByNode.values.toSet) }
+      case state: CurrentClusterState ⇒ nodes = state.members.map(_.address)
+      case memberEvent: MemberEvent   ⇒ nodes += memberEvent.member.address
+      case ReportTo(ref)              ⇒ reportTo = ref
+      case Reset ⇒
+        phiByNode = emptyPhiByNode
+        nodes = Set.empty[Address]
+        cluster.unsubscribe(self)
+        cluster.subscribe(self, classOf[MemberEvent])
+
+    }
+  }
+
+  /**
+   * Master of routers
+   *
+   * Flow control, to not flood the consumers, is handled by scheduling a
+   * batch of messages to be sent to the router when half of the number
+   * of outstanding messages remains.
+   *
+   * It uses a simple message retry mechanism. If an ack of a sent message
+   * is not received within a timeout, that message will be resent to the router,
+   * infinite number of times.
+   *
+   * When it receives the `End` command it will stop sending messages to the router,
+   * resends continuous, until all outstanding acks have been received, and then
+   * finally it replies with `WorkResult` to the sender of the `End` command, and stops
+   * itself.
+   */
+  class Master(settings: StressMultiJvmSpec.Settings, batchInterval: FiniteDuration, tree: Boolean) extends Actor {
+    val workers = context.actorOf(Props[Worker].withRouter(FromConfig), "workers")
+    val payload = Array.fill(settings.payloadSize)(ThreadLocalRandom.current.nextInt(127).toByte)
+    val retryTimeout = 5.seconds.dilated(context.system)
+    val idCounter = Iterator from 0
+    var sendCounter = 0L
+    var ackCounter = 0L
+    var outstanding = Map.empty[JobId, JobState]
+    var startTime = 0L
+
+    import context.dispatcher
+    val resendTask = context.system.scheduler.schedule(3.seconds, 3.seconds, self, RetryTick)
+
+    override def postStop(): Unit = {
+      resendTask.cancel()
+      super.postStop()
+    }
+
+    def receive = {
+      case Begin ⇒
+        startTime = System.nanoTime
+        self ! SendBatch
+        context.become(working)
+      case RetryTick ⇒
+    }
+
+    def working: Receive = {
+      case Ack(id) ⇒
+        outstanding -= id
+        ackCounter += 1
+        if (outstanding.size == settings.workBatchSize / 2)
+          if (batchInterval == Duration.Zero) self ! SendBatch
+          else context.system.scheduler.scheduleOnce(batchInterval, self, SendBatch)
+      case SendBatch ⇒ sendJobs()
+      case RetryTick ⇒ resend()
+      case End ⇒
+        done(sender)
+        context.become(ending(sender))
+    }
+
+    def ending(replyTo: ActorRef): Receive = {
+      case Ack(id) ⇒
+        outstanding -= id
+        ackCounter += 1
+        done(replyTo)
+      case SendBatch ⇒
+      case RetryTick ⇒ resend()
+    }
+
+    def done(replyTo: ActorRef): Unit = if (outstanding.isEmpty) {
+      val duration = (System.nanoTime - startTime).nanos
+      replyTo ! WorkResult(duration, sendCounter, ackCounter)
+      context stop self
+    }
+
+    def sendJobs(): Unit = {
+      0 until settings.workBatchSize foreach { _ ⇒
+        send(createJob())
+      }
+    }
+
+    def createJob(): Job = {
+      if (tree) TreeJob(idCounter.next(), payload, ThreadLocalRandom.current.nextInt(settings.treeWidth),
+        settings.treeLevels, settings.treeWidth)
+      else SimpleJob(idCounter.next(), payload)
+    }
+
+    def resend(): Unit = {
+      outstanding.values foreach { jobState ⇒
+        if (jobState.deadline.isOverdue)
+          send(jobState.job)
+      }
+    }
+
+    def send(job: Job): Unit = {
+      outstanding += job.id -> JobState(Deadline.now + retryTimeout, job)
+      sendCounter += 1
+      workers ! job
+    }
+  }
+
+  /**
+   * Used by Master as routee
+   */
+  class Worker extends Actor with ActorLogging {
+    def receive = {
+      case SimpleJob(id, payload) ⇒ sender ! Ack(id)
+      case TreeJob(id, payload, idx, levels, width) ⇒
+        // create the actors when first TreeJob message is received
+        val totalActors = ((width * math.pow(width, levels) - 1) / (width - 1)).toInt
+        log.info("Creating [{}] actors in a tree structure of [{}] levels and each actor has [{}] children",
+          totalActors, levels, width)
+        val tree = context.actorOf(Props(new TreeNode(levels, width)), "tree")
+        tree forward (idx, SimpleJob(id, payload))
+        context.become(treeWorker(tree))
+    }
+
+    def treeWorker(tree: ActorRef): Receive = {
+      case SimpleJob(id, payload) ⇒ sender ! Ack(id)
+      case TreeJob(id, payload, idx, _, _) ⇒
+        tree forward (idx, SimpleJob(id, payload))
+    }
+  }
+
+  class TreeNode(level: Int, width: Int) extends Actor {
+    require(level >= 1)
+    def createChild(): Actor = if (level == 1) new Leaf else new TreeNode(level - 1, width)
+    val indexedChildren =
+      0 until width map { i ⇒ context.actorOf(Props(createChild()), name = i.toString) } toVector
+
+    def receive = {
+      case (idx: Int, job: SimpleJob) if idx < width ⇒ indexedChildren(idx) forward (idx, job)
+    }
+  }
+
+  class Leaf extends Actor {
+    def receive = {
+      case (_: Int, job: SimpleJob) ⇒ sender ! Ack(job.id)
+    }
+  }
+
+  /**
+   * Used for remote death watch testing
+   */
+  class Watchee extends Actor {
+    def receive = Actor.emptyBehavior
+  }
+
+  /**
+   * Used for remote supervision testing
+   */
+  class Supervisor extends Actor {
+
+    var restartCount = 0
+
+    override val supervisorStrategy =
+      OneForOneStrategy(maxNrOfRetries = 5, withinTimeRange = 1 minute) {
+        case _: Exception ⇒
+          restartCount += 1
+          Restart
+      }
+
+    def receive = {
+      case props: Props     ⇒ context.actorOf(props)
+      case e: Exception     ⇒ context.children foreach { _ ! e }
+      case GetChildrenCount ⇒ sender ! ChildrenCount(context.children.size, restartCount)
+      case Reset ⇒
+        require(context.children.isEmpty,
+          s"ResetChildrenCount not allowed when children exists, [${context.children.size}]")
+        restartCount = 0
+    }
+  }
+
+  /**
+   * Child of Supervisor for remote supervision testing
+   */
+  class RemoteChild extends Actor {
+    def receive = {
+      case e: Exception ⇒ throw e
+    }
+  }
+
+  case object Begin
+  case object End
+  case object RetryTick
+  case object ReportTick
+  case object PhiTick
+  case class PhiResult(from: Address, phiValues: Set[PhiValue])
+  case class PhiValue(address: Address, countAboveOne: Int, count: Int, max: Double)
+  case class ReportTo(ref: Option[ActorRef])
+
+  type JobId = Int
+  trait Job { def id: JobId }
+  case class SimpleJob(id: JobId, payload: Any) extends Job
+  case class TreeJob(id: JobId, payload: Any, idx: Int, levels: Int, width: Int) extends Job
+  case class Ack(id: JobId)
+  case class JobState(deadline: Deadline, job: Job)
+  case class WorkResult(duration: Duration, sendCount: Long, ackCount: Long) {
+    def retryCount: Long = sendCount - ackCount
+    def jobsPerSecond: Double = ackCount * 1000.0 / duration.toMillis
+  }
+  case object SendBatch
+  case class CreateTree(levels: Int, width: Int)
+
+  case object GetChildrenCount
+  case class ChildrenCount(numberOfChildren: Int, numberOfChildRestarts: Int)
+  case object Reset
+
+}
+
+class StressMultiJvmNode1 extends StressSpec
+class StressMultiJvmNode2 extends StressSpec
+class StressMultiJvmNode3 extends StressSpec
+class StressMultiJvmNode4 extends StressSpec
+class StressMultiJvmNode5 extends StressSpec
+class StressMultiJvmNode6 extends StressSpec
+class StressMultiJvmNode7 extends StressSpec
+class StressMultiJvmNode8 extends StressSpec
+class StressMultiJvmNode9 extends StressSpec
+class StressMultiJvmNode10 extends StressSpec
+class StressMultiJvmNode11 extends StressSpec
+class StressMultiJvmNode12 extends StressSpec
+class StressMultiJvmNode13 extends StressSpec
+
+abstract class StressSpec
+  extends MultiNodeSpec(StressMultiJvmSpec)
+  with MultiNodeClusterSpec with BeforeAndAfterEach with ImplicitSender {
+
+  import StressMultiJvmSpec._
+  import ClusterEvent._
+
+  val settings = new Settings(system.settings.config)
+  import settings._
+
+  var step = 0
+  var nbrUsedRoles = 0
+
+  override def beforeEach(): Unit = { step += 1 }
+
+  override def muteLog(sys: ActorSystem = system): Unit = {
+    super.muteLog(sys)
+    sys.eventStream.publish(Mute(EventFilter[RuntimeException](pattern = ".*Simulated exception.*")))
+    sys.eventStream.publish(Mute(EventFilter.warning(pattern = ".*PhiResult.*")))
+    sys.eventStream.publish(Mute(EventFilter.warning(pattern = ".*SendBatch.*")))
+  }
+
+  val seedNodes = roles.take(numberOfSeedNodes)
+
+  override def cluster: Cluster = {
+    createWorker
+    super.cluster
+  }
+
+  // always create one worker when the cluster is started
+  lazy val createWorker: Unit =
+    system.actorOf(Props[Worker], "worker")
+
+  def createResultAggregator(title: String, expectedResults: Int, includeInHistory: Boolean): Unit = {
+    runOn(roles.head) {
+      val aggregator = system.actorOf(Props(new ClusterResultAggregator(title, expectedResults, reportMetricsInterval)),
+        name = "result" + step)
+      if (includeInHistory) aggregator ! ReportTo(Some(clusterResultHistory))
+      else aggregator ! ReportTo(None)
+    }
+    enterBarrier("result-aggregator-created-" + step)
+    runOn(roles.take(nbrUsedRoles): _*) {
+      phiObserver ! ReportTo(Some(clusterResultAggregator))
+    }
+  }
+
+  def clusterResultAggregator: ActorRef = system.actorFor(node(roles.head) / "user" / ("result" + step))
+
+  lazy val clusterResultHistory = system.actorOf(Props[ClusterResultHistory], "resultHistory")
+
+  lazy val phiObserver = system.actorOf(Props[PhiObserver], "phiObserver")
+
+  def awaitClusterResult: Unit = {
+    runOn(roles.head) {
+      val r = clusterResultAggregator
+      watch(r)
+      expectMsgPF(remaining) { case Terminated(`r`) ⇒ true }
+    }
+    enterBarrier("cluster-result-done-" + step)
+  }
+
+  def joinOneByOne(numberOfNodes: Int): Unit = {
+    0 until numberOfNodes foreach { _ ⇒
+      joinOne()
+      nbrUsedRoles += 1
+      step += 1
+    }
+  }
+
+  def convergenceWithin(base: FiniteDuration, nodes: Int): FiniteDuration =
+    (base.toMillis * convergenceWithinFactor * nodes).millis
+
+  def joinOne(): Unit = within(5.seconds + convergenceWithin(2.seconds, nbrUsedRoles + 1)) {
+    val currentRoles = roles.take(nbrUsedRoles + 1)
+    val title = s"join one to ${nbrUsedRoles} nodes cluster"
+    createResultAggregator(title, expectedResults = currentRoles.size, includeInHistory = true)
+    runOn(currentRoles: _*) {
+      reportResult {
+        runOn(currentRoles.last) {
+          cluster.join(roles.head)
+        }
+        awaitUpConvergence(currentRoles.size, timeout = remaining)
+      }
+
+    }
+    awaitClusterResult
+    enterBarrier("join-one-" + step)
+  }
+
+  def joinSeveral(numberOfNodes: Int, toSeedNodes: Boolean): Unit =
+    within(10.seconds + convergenceWithin(3.seconds, nbrUsedRoles + numberOfNodes)) {
+      val currentRoles = roles.take(nbrUsedRoles + numberOfNodes)
+      val joiningRoles = currentRoles.takeRight(numberOfNodes)
+      val title = s"join ${numberOfNodes} to ${if (toSeedNodes) "seed nodes" else "one node"}, in ${nbrUsedRoles} nodes cluster"
+      createResultAggregator(title, expectedResults = currentRoles.size, includeInHistory = true)
+      runOn(currentRoles: _*) {
+        reportResult {
+          runOn(joiningRoles: _*) {
+            if (toSeedNodes) cluster.joinSeedNodes(seedNodes.toIndexedSeq map address)
+            else cluster.join(roles.head)
+          }
+          awaitUpConvergence(currentRoles.size, timeout = remaining)
+        }
+
+      }
+      awaitClusterResult
+      enterBarrier("join-several-" + step)
+    }
+
+  def removeOneByOne(numberOfNodes: Int, shutdown: Boolean): Unit = {
+    0 until numberOfNodes foreach { _ ⇒
+      removeOne(shutdown)
+      nbrUsedRoles -= 1
+      step += 1
+    }
+  }
+
+  def removeOne(shutdown: Boolean): Unit = within(10.seconds + convergenceWithin(3.seconds, nbrUsedRoles - 1)) {
+    val currentRoles = roles.take(nbrUsedRoles - 1)
+    val title = s"${if (shutdown) "shutdown" else "remove"} one from ${nbrUsedRoles} nodes cluster"
+    createResultAggregator(title, expectedResults = currentRoles.size, includeInHistory = true)
+    val removeRole = roles(nbrUsedRoles - 1)
+    val removeAddress = address(removeRole)
+    runOn(removeRole) {
+      system.actorOf(Props[Watchee], "watchee")
+      if (!shutdown) cluster.leave(myself)
+    }
+    enterBarrier("watchee-created-" + step)
+    runOn(roles.head) {
+      watch(system.actorFor(node(removeRole) / "user" / "watchee"))
+    }
+    enterBarrier("watch-estabilished-" + step)
+
+    runOn(currentRoles: _*) {
+      reportResult {
+        runOn(roles.head) {
+          if (shutdown) {
+            log.info("Shutting down [{}]", removeAddress)
+            testConductor.shutdown(removeRole, 0).await
+          }
+        }
+        awaitUpConvergence(currentRoles.size, timeout = remaining)
+      }
+    }
+
+    runOn(roles.head) {
+      val expectedRef = system.actorFor(RootActorPath(removeAddress) / "user" / "watchee")
+      expectMsgPF(remaining) {
+        case Terminated(`expectedRef`) ⇒ true
+      }
+    }
+    enterBarrier("watch-verified-" + step)
+
+    awaitClusterResult
+    enterBarrier("remove-one-" + step)
+  }
+
+  def removeSeveral(numberOfNodes: Int, shutdown: Boolean): Unit =
+    within(10.seconds + convergenceWithin(5.seconds, nbrUsedRoles - numberOfNodes)) {
+      val currentRoles = roles.take(nbrUsedRoles - numberOfNodes)
+      val removeRoles = roles.slice(currentRoles.size, nbrUsedRoles)
+      val title = s"${if (shutdown) "shutdown" else "leave"} ${numberOfNodes} in ${nbrUsedRoles} nodes cluster"
+      createResultAggregator(title, expectedResults = currentRoles.size, includeInHistory = true)
+      runOn(removeRoles: _*) {
+        if (!shutdown) cluster.leave(myself)
+      }
+      runOn(currentRoles: _*) {
+        reportResult {
+          runOn(roles.head) {
+            if (shutdown) removeRoles.foreach { r ⇒
+              log.info("Shutting down [{}]", address(r))
+              testConductor.shutdown(r, 0).await
+            }
+          }
+          awaitUpConvergence(currentRoles.size, timeout = remaining)
+        }
+      }
+      awaitClusterResult
+      enterBarrier("remove-several-" + step)
+    }
+
+  def reportResult[T](thunk: ⇒ T): T = {
+    val startTime = System.nanoTime
+    val startStats = clusterView.latestStats
+
+    val returnValue = thunk
+
+    val duration = (System.nanoTime - startTime).nanos
+    val latestStats = clusterView.latestStats
+    val clusterStats = ClusterStats(
+      receivedGossipCount = latestStats.receivedGossipCount - startStats.receivedGossipCount,
+      mergeConflictCount = latestStats.mergeConflictCount - startStats.mergeConflictCount,
+      mergeCount = latestStats.mergeCount - startStats.mergeCount,
+      mergeDetectedCount = latestStats.mergeDetectedCount - startStats.mergeDetectedCount)
+    clusterResultAggregator ! ClusterResult(cluster.selfAddress, duration, clusterStats)
+    returnValue
+  }
+
+  def exerciseJoinRemove(title: String, duration: FiniteDuration): Unit = {
+    val activeRoles = roles.take(numberOfNodesJoinRemove)
+    val loopDuration = 10.seconds + convergenceWithin(4.seconds, nbrUsedRoles + activeRoles.size)
+    val deadline = Deadline.now + duration - loopDuration
+    val usedRoles = roles.take(nbrUsedRoles)
+    val usedAddresses = usedRoles.map(address(_)).toSet
+
+    @tailrec def loop(counter: Int, previousAS: Option[ActorSystem], allPreviousAddresses: Set[Address]): Option[ActorSystem] = {
+      if (deadline.isOverdue) previousAS
+      else {
+        val t = title + " round " + counter
+        runOn(usedRoles: _*) {
+          phiObserver ! Reset
+        }
+        createResultAggregator(t, expectedResults = nbrUsedRoles, includeInHistory = true)
+        val (nextAS, nextAddresses) = within(loopDuration) {
+          reportResult {
+            val nextAS =
+              if (activeRoles contains myself) {
+                previousAS foreach { _.shutdown() }
+                val sys = ActorSystem(system.name, system.settings.config)
+                muteLog(sys)
+                Cluster(sys).joinSeedNodes(seedNodes.toIndexedSeq map address)
+                Some(sys)
+              } else previousAS
+            runOn(usedRoles: _*) {
+              awaitUpConvergence(
+                nbrUsedRoles + activeRoles.size,
+                canNotBePartOfMemberRing = allPreviousAddresses,
+                timeout = remaining)
+            }
+            val nextAddresses = clusterView.members.map(_.address) -- usedAddresses
+            runOn(usedRoles: _*) {
+              nextAddresses.size must be(numberOfNodesJoinRemove)
+            }
+
+            enterBarrier("join-remove-" + step)
+            (nextAS, nextAddresses)
+          }
+        }
+        awaitClusterResult
+
+        step += 1
+        loop(counter + 1, nextAS, nextAddresses)
+
+      }
+    }
+
+    loop(1, None, Set.empty) foreach { _.shutdown }
+    within(loopDuration) {
+      runOn(usedRoles: _*) {
+        awaitUpConvergence(nbrUsedRoles, timeout = remaining)
+        phiObserver ! Reset
+      }
+    }
+    enterBarrier("join-remove-shutdown-" + step)
+
+  }
+
+  def master: ActorRef = system.actorFor("/user/master-" + myself.name)
+
+  def exerciseRouters(title: String, duration: FiniteDuration, batchInterval: FiniteDuration,
+                      expectDroppedMessages: Boolean, tree: Boolean): Unit =
+    within(duration + 10.seconds) {
+      createResultAggregator(title, expectedResults = nbrUsedRoles, includeInHistory = false)
+
+      val (masterRoles, otherRoles) = roles.take(nbrUsedRoles).splitAt(3)
+      runOn(masterRoles: _*) {
+        reportResult {
+          val m = system.actorOf(Props(new Master(settings, batchInterval, tree)),
+            name = "master-" + myself.name)
+          m ! Begin
+          import system.dispatcher
+          system.scheduler.scheduleOnce(highThroughputDuration) {
+            m.tell(End, testActor)
+          }
+          val workResult = awaitWorkResult
+          workResult.sendCount must be > (0L)
+          workResult.ackCount must be > (0L)
+          if (!expectDroppedMessages)
+            workResult.retryCount must be(0)
+
+          enterBarrier("routers-done-" + step)
+        }
+      }
+      runOn(otherRoles: _*) {
+        reportResult {
+          enterBarrier("routers-done-" + step)
+        }
+      }
+
+      awaitClusterResult
+    }
+
+  def awaitWorkResult: WorkResult = {
+    val m = master
+    val workResult = expectMsgType[WorkResult]
+    log.info("{} result, [{}] jobs/s, retried [{}] of [{}] msg", m.path.name,
+      workResult.jobsPerSecond.form,
+      workResult.retryCount, workResult.sendCount)
+    watch(m)
+    expectMsgPF(remaining) { case Terminated(`m`) ⇒ true }
+    workResult
+  }
+
+  def exerciseSupervision(title: String, duration: FiniteDuration): Unit =
+    within(duration + 10.seconds) {
+      val supervisor = system.actorOf(Props[Supervisor], "supervisor")
+      while (remaining > 10.seconds) {
+        createResultAggregator(title, expectedResults = nbrUsedRoles, includeInHistory = false)
+
+        reportResult {
+          roles.take(nbrUsedRoles) foreach { r ⇒
+            supervisor ! Props[RemoteChild].withDeploy(Deploy(scope = RemoteScope(address(r))))
+          }
+          supervisor ! GetChildrenCount
+          expectMsgType[ChildrenCount] must be(ChildrenCount(nbrUsedRoles, 0))
+
+          1 to 5 foreach { _ ⇒ supervisor ! new RuntimeException("Simulated exception") }
+          awaitCond {
+            supervisor ! GetChildrenCount
+            val c = expectMsgType[ChildrenCount]
+            c == ChildrenCount(nbrUsedRoles, 5 * nbrUsedRoles)
+          }
+
+          // after 5 restart attempts the children should be stopped
+          supervisor ! new RuntimeException("Simulated exception")
+          awaitCond {
+            supervisor ! GetChildrenCount
+            val c = expectMsgType[ChildrenCount]
+            // zero children
+            c == ChildrenCount(0, 6 * nbrUsedRoles)
+          }
+          supervisor ! Reset
+
+        }
+
+        awaitClusterResult
+      }
+    }
+
+  "A cluster under stress" must {
+
+    "join seed nodes" taggedAs LongRunningTest in {
+
+      val otherNodesJoiningSeedNodes = roles.slice(numberOfSeedNodes, numberOfSeedNodes + numberOfNodesJoiningToSeedNodesInitially)
+      val size = seedNodes.size + otherNodesJoiningSeedNodes.size
+
+      createResultAggregator("join seed nodes", expectedResults = size, includeInHistory = true)
+
+      runOn((seedNodes ++ otherNodesJoiningSeedNodes): _*) {
+        reportResult {
+          cluster.joinSeedNodes(seedNodes.toIndexedSeq map address)
+          awaitUpConvergence(size)
+        }
+      }
+
+      awaitClusterResult
+
+      nbrUsedRoles += size
+      enterBarrier("after-" + step)
+    }
+
+    "start routers that are running while nodes are joining" taggedAs LongRunningTest in {
+      runOn(roles.take(3): _*) {
+        system.actorOf(Props(new Master(settings, settings.workBatchInterval, tree = false)),
+          name = "master-" + myself.name) ! Begin
+      }
+      enterBarrier("after-" + step)
+    }
+
+    "join nodes one-by-one to small cluster" taggedAs LongRunningTest in {
+      joinOneByOne(numberOfNodesJoiningOneByOneSmall)
+      enterBarrier("after-" + step)
+    }
+
+    "join several nodes to one node" taggedAs LongRunningTest in {
+      joinSeveral(numberOfNodesJoiningToOneNode, toSeedNodes = false)
+      nbrUsedRoles += numberOfNodesJoiningToOneNode
+      enterBarrier("after-" + step)
+    }
+
+    "join several nodes to seed nodes" taggedAs LongRunningTest in {
+      joinSeveral(numberOfNodesJoiningToOneNode, toSeedNodes = true)
+      nbrUsedRoles += numberOfNodesJoiningToSeedNodes
+      enterBarrier("after-" + step)
+    }
+
+    "join nodes one-by-one to large cluster" taggedAs LongRunningTest in {
+      joinOneByOne(numberOfNodesJoiningOneByOneLarge)
+      enterBarrier("after-" + step)
+    }
+
+    "end routers that are running while nodes are joining" taggedAs LongRunningTest in within(30.seconds) {
+      runOn(roles.take(3): _*) {
+        val m = master
+        m.tell(End, testActor)
+        val workResult = awaitWorkResult
+        workResult.retryCount must be(0)
+        workResult.sendCount must be > (0L)
+        workResult.ackCount must be > (0L)
+      }
+      enterBarrier("after-" + step)
+    }
+
+    "use routers with normal throughput" taggedAs LongRunningTest in {
+      exerciseRouters("use routers with normal throughput", normalThroughputDuration,
+        batchInterval = workBatchInterval, expectDroppedMessages = false, tree = false)
+      enterBarrier("after-" + step)
+    }
+
+    "use routers with high throughput" taggedAs LongRunningTest in {
+      exerciseRouters("use routers with high throughput", highThroughputDuration,
+        batchInterval = Duration.Zero, expectDroppedMessages = false, tree = false)
+      enterBarrier("after-" + step)
+    }
+
+    "use many actors with normal throughput" taggedAs LongRunningTest in {
+      exerciseRouters("use many actors with normal throughput", normalThroughputDuration,
+        batchInterval = workBatchInterval, expectDroppedMessages = false, tree = true)
+      enterBarrier("after-" + step)
+    }
+
+    "use many actors with high throughput" taggedAs LongRunningTest in {
+      exerciseRouters("use many actors with high throughput", highThroughputDuration,
+        batchInterval = Duration.Zero, expectDroppedMessages = false, tree = true)
+      enterBarrier("after-" + step)
+    }
+
+    "excercise join/remove/join/remove" taggedAs LongRunningTest in {
+      exerciseJoinRemove("excercise join/remove", joinRemoveDuration)
+      enterBarrier("after-" + step)
+    }
+
+    "excercise supervision" taggedAs LongRunningTest in {
+      exerciseSupervision("excercise supervision", supervisionDuration)
+      enterBarrier("after-" + step)
+    }
+
+    "start routers that are running while nodes are removed" taggedAs LongRunningTest in {
+      runOn(roles.take(3): _*) {
+        system.actorOf(Props(new Master(settings, settings.workBatchInterval, tree = false)),
+          name = "master-" + myself.name) ! Begin
+      }
+      enterBarrier("after-" + step)
+    }
+
+    "leave nodes one-by-one from large cluster" taggedAs LongRunningTest in {
+      removeOneByOne(numberOfNodesLeavingOneByOneLarge, shutdown = false)
+      enterBarrier("after-" + step)
+    }
+
+    "shutdown nodes one-by-one from large cluster" taggedAs LongRunningTest in {
+      removeOneByOne(numberOfNodesShutdownOneByOneLarge, shutdown = true)
+      enterBarrier("after-" + step)
+    }
+
+    "leave several nodes" taggedAs LongRunningTest in {
+      removeSeveral(numberOfNodesLeaving, shutdown = false)
+      nbrUsedRoles -= numberOfNodesLeaving
+      enterBarrier("after-" + step)
+    }
+
+    "shutdown several nodes" taggedAs LongRunningTest in {
+      removeSeveral(numberOfNodesShutdown, shutdown = true)
+      nbrUsedRoles -= numberOfNodesShutdown
+      enterBarrier("after-" + step)
+    }
+
+    "leave nodes one-by-one from small cluster" taggedAs LongRunningTest in {
+      removeOneByOne(numberOfNodesLeavingOneByOneSmall, shutdown = false)
+      enterBarrier("after-" + step)
+    }
+
+    "shutdown nodes one-by-one from small cluster" taggedAs LongRunningTest in {
+      removeOneByOne(numberOfNodesShutdownOneByOneSmall, shutdown = true)
+      enterBarrier("after-" + step)
+    }
+
+    "end routers that are running while nodes are removed" taggedAs LongRunningTest in within(30.seconds) {
+      runOn(roles.take(3): _*) {
+        val m = master
+        m.tell(End, testActor)
+        val workResult = awaitWorkResult
+        workResult.sendCount must be > (0L)
+        workResult.ackCount must be > (0L)
+      }
+      enterBarrier("after-" + step)
+    }
+
+  }
+}
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/UnreachableNodeRejoinsClusterSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/UnreachableNodeRejoinsClusterSpec.scala
index 99b076b8d6..a33ca8146e 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/UnreachableNodeRejoinsClusterSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/UnreachableNodeRejoinsClusterSpec.scala
@@ -130,7 +130,7 @@ abstract class UnreachableNodeRejoinsClusterSpec(multiNodeConfig: UnreachableNod
       }
 
       runOn(allBut(victim): _*) {
-        awaitUpConvergence(roles.size - 1, List(victim))
+        awaitUpConvergence(roles.size - 1, Set(victim))
       }
 
       endBarrier

From 48216980fcb08a99233f26fcc32f42733a105f2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Endre=20S=C3=A1ndor=20Varga?= <vendre@hit.bme.hu>
Date: Fri, 4 Jan 2013 14:17:28 +0100
Subject: [PATCH 029/122] Fixed startup race in transport adapters #2867

---
 .../transport/AbstractTransportAdapter.scala  | 50 ++++++++++++++++---
 .../transport/AkkaProtocolTransport.scala     | 29 ++---------
 .../transport/ThrottlerTransportAdapter.scala | 28 +++--------
 3 files changed, 55 insertions(+), 52 deletions(-)

diff --git a/akka-remote/src/main/scala/akka/remote/transport/AbstractTransportAdapter.scala b/akka-remote/src/main/scala/akka/remote/transport/AbstractTransportAdapter.scala
index b46f89262b..3dae6d479b 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/AbstractTransportAdapter.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/AbstractTransportAdapter.scala
@@ -2,16 +2,17 @@ package akka.remote.transport
 
 import scala.language.postfixOps
 import akka.actor._
-import akka.pattern.ask
+import akka.pattern.{ ask, pipe }
+import akka.remote.Remoting.RegisterTransportActor
+import akka.remote.transport.ActorTransportAdapter.ListenUnderlying
+import akka.remote.transport.ActorTransportAdapter.ListenerRegistered
 import akka.remote.transport.Transport._
-import akka.remote.{ RARP, RemotingSettings, RemoteActorRefProvider }
+import akka.remote.{ RARP, RemotingSettings }
+import akka.util.Timeout
 import scala.collection.immutable
+import scala.concurrent.duration._
 import scala.concurrent.{ ExecutionContext, Promise, Future }
 import scala.util.Success
-import scala.util.Failure
-import akka.remote.Remoting.RegisterTransportActor
-import akka.util.Timeout
-import scala.concurrent.duration._
 
 trait TransportAdapterProvider extends ((Transport, ExtendedActorSystem) ⇒ Transport)
 
@@ -121,7 +122,9 @@ object ActorTransportAdapter {
 
 abstract class ActorTransportAdapter(wrappedTransport: Transport, system: ActorSystem)
   extends AbstractTransportAdapter(wrappedTransport)(system.dispatcher) {
+
   import ActorTransportAdapter._
+
   private implicit val timeout = new Timeout(3 seconds)
 
   protected def managerName: String
@@ -150,3 +153,38 @@ abstract class ActorTransportAdapter(wrappedTransport: Transport, system: ActorS
   override def shutdown(): Unit = manager ! PoisonPill
 }
 
+abstract class ActorTransportAdapterManager extends Actor {
+  private var delayedEvents = immutable.Queue.empty[Any]
+
+  protected var associationListener: AssociationEventListener = _
+  protected var localAddress: Address = _
+  private var uniqueId = 0L
+
+  protected def nextId(): Long = {
+    uniqueId += 1
+    uniqueId
+  }
+
+  import context.dispatcher
+
+  def receive: Receive = {
+    case ListenUnderlying(listenAddress, upstreamListenerFuture) ⇒
+      localAddress = listenAddress
+      upstreamListenerFuture.future.map { ListenerRegistered(_) } pipeTo self
+
+    case ListenerRegistered(listener) ⇒
+      associationListener = listener
+      delayedEvents foreach { self.tell(_, Actor.noSender) }
+      delayedEvents = immutable.Queue.empty[Any]
+      context.become(ready)
+
+    /* Simple imitation of Stash. It is more lightweight as it does not need any specific dispatchers or additional
+     * queue. The difference is that these messages will not survive a restart -- which is not needed here.
+     * These messages will be processed in the ready state.
+     */
+    case otherEvent ⇒ delayedEvents = delayedEvents enqueue otherEvent
+
+  }
+
+  protected def ready: Receive
+}
diff --git a/akka-remote/src/main/scala/akka/remote/transport/AkkaProtocolTransport.scala b/akka-remote/src/main/scala/akka/remote/transport/AkkaProtocolTransport.scala
index 09ac87b9fa..c99cbcb398 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/AkkaProtocolTransport.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/AkkaProtocolTransport.scala
@@ -101,9 +101,7 @@ private[remote] class AkkaProtocolTransport(
 private[transport] class AkkaProtocolManager(
   private val wrappedTransport: Transport,
   private val settings: AkkaProtocolSettings)
-  extends Actor {
-
-  import context.dispatcher
+  extends ActorTransportAdapterManager {
 
   // The AkkaProtocolTransport does not handle the recovery of associations, this task is implemented in the
   // remoting itself. Hence the strategy Stop.
@@ -111,32 +109,13 @@ private[transport] class AkkaProtocolManager(
     case NonFatal(_) ⇒ Stop
   }
 
-  private val nextId = Iterator from 0
-
-  var localAddress: Address = _
-
-  private var associationHandler: AssociationEventListener = _
-
-  def receive: Receive = {
-    case ListenUnderlying(listenAddress, upstreamListenerFuture) ⇒
-      localAddress = listenAddress
-      upstreamListenerFuture.future.map { ListenerRegistered(_) } pipeTo self
-
-    case ListenerRegistered(listener) ⇒
-      associationHandler = listener
-      context.become(ready)
-
-    // Block inbound associations until handler is registered
-    case InboundAssociation(handle) ⇒ handle.disassociate()
-  }
-
   private def actorNameFor(remoteAddress: Address): String =
-    "akkaProtocol-" + AddressUrlEncoder(remoteAddress) + "-" + nextId.next()
+    "akkaProtocol-" + AddressUrlEncoder(remoteAddress) + "-" + nextId()
 
-  private def ready: Receive = {
+  override def ready: Receive = {
     case InboundAssociation(handle) ⇒
       val stateActorLocalAddress = localAddress
-      val stateActorAssociationHandler = associationHandler
+      val stateActorAssociationHandler = associationListener
       val stateActorSettings = settings
       val failureDetector = createFailureDetector()
       context.actorOf(Props(new ProtocolStateActor(
diff --git a/akka-remote/src/main/scala/akka/remote/transport/ThrottlerTransportAdapter.scala b/akka-remote/src/main/scala/akka/remote/transport/ThrottlerTransportAdapter.scala
index 82143f483a..bb74937563 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/ThrottlerTransportAdapter.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/ThrottlerTransportAdapter.scala
@@ -4,8 +4,6 @@ import ThrottlerTransportAdapter._
 import akka.actor._
 import akka.pattern.pipe
 import akka.remote.transport.ActorTransportAdapter.AssociateUnderlying
-import akka.remote.transport.ActorTransportAdapter.ListenUnderlying
-import akka.remote.transport.ActorTransportAdapter.ListenerRegistered
 import akka.remote.transport.AkkaPduCodec.Associate
 import akka.remote.transport.AssociationHandle.{ ActorHandleEventListener, Disassociated, InboundPayload, HandleEventListener }
 import akka.remote.transport.ThrottledAssociation._
@@ -104,7 +102,10 @@ class ThrottlerTransportAdapter(_wrappedTransport: Transport, _system: ExtendedA
   override protected def addedSchemeIdentifier = SchemeIdentifier
   override protected def maximumOverhead = 0
   protected def managerName = s"throttlermanager.${wrappedTransport.schemeIdentifier}${UniqueId.getAndIncrement}"
-  protected def managerProps = Props(new ThrottlerManager(wrappedTransport))
+  protected def managerProps = {
+    val wt = wrappedTransport
+    Props(new ThrottlerManager(wt))
+  }
 
   override def managementCommand(cmd: Any, statusPromise: Promise[Boolean]): Unit = cmd match {
     case s @ SetThrottle(_, _, _) ⇒
@@ -119,12 +120,10 @@ private[transport] object ThrottlerManager {
   case class Checkin(origin: Address, handle: ThrottlerHandle)
 }
 
-private[transport] class ThrottlerManager(wrappedTransport: Transport) extends Actor {
+private[transport] class ThrottlerManager(wrappedTransport: Transport) extends ActorTransportAdapterManager {
 
   import context.dispatcher
 
-  private val ids = Iterator from 0
-  private var associationListener: AssociationEventListener = _
   private var throttlingModes = Map[Address, (ThrottleMode, Direction)]()
   private var handleTable = List[(Address, ThrottlerHandle)]()
 
@@ -132,20 +131,7 @@ private[transport] class ThrottlerManager(wrappedTransport: Transport) extends A
 
   override def postStop(): Unit = wrappedTransport.shutdown()
 
-  def receive: Receive = {
-    case ListenUnderlying(listenAddress, upstreamListenerFuture) ⇒
-      upstreamListenerFuture.future.map { ListenerRegistered(_) } pipeTo self
-
-    case ListenerRegistered(listener) ⇒
-      associationListener = listener
-      context.become(ready)
-
-    // Block inbound associations until handler is registered
-    case InboundAssociation(handle) ⇒
-      handle.disassociate()
-  }
-
-  private def ready: Receive = {
+  override def ready: Receive = {
     case InboundAssociation(handle) ⇒
       val wrappedHandle = wrapHandle(handle, associationListener, inbound = true)
       wrappedHandle.throttlerActor ! wrappedHandle
@@ -207,7 +193,7 @@ private[transport] class ThrottlerManager(wrappedTransport: Transport) extends A
   private def wrapHandle(originalHandle: AssociationHandle, listener: AssociationEventListener, inbound: Boolean): ThrottlerHandle = {
     val managerRef = self
     val throttlerActor = context.actorOf(Props(new ThrottledAssociation(managerRef, listener, originalHandle, inbound)),
-      "throttler" + ids.next())
+      "throttler" + nextId())
     ThrottlerHandle(originalHandle, throttlerActor)
   }
 

From 9c1a00d02017a1786820d27a62496afb7e8285ce Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Tue, 8 Jan 2013 11:48:50 +0100
Subject: [PATCH 030/122] Propagate statusPromise down to the actual change in
 throttler, see #2877

* added some missing copyright headers
---
 .../src/main/scala/akka/remote/Endpoint.scala |  3 ++
 .../scala/akka/remote/FailureDetector.scala   |  3 ++
 .../remote/PhiAccrualFailureDetector.scala    |  3 ++
 .../src/main/scala/akka/remote/Remoting.scala | 10 +++-
 .../scala/akka/remote/RemotingLifecycle.scala |  3 ++
 .../transport/AbstractTransportAdapter.scala  |  3 ++
 .../akka/remote/transport/AkkaPduCodec.scala  |  3 ++
 .../transport/AkkaProtocolTransport.scala     |  6 ++-
 .../FailureInjectorTransportAdapter.scala     |  3 ++
 .../akka/remote/transport/TestTransport.scala |  3 ++
 .../transport/ThrottlerTransportAdapter.scala | 52 ++++++++++++-------
 .../akka/remote/transport/Transport.scala     |  3 ++
 .../remote/transport/netty/NettyHelpers.scala |  3 ++
 .../transport/netty/NettyTransport.scala      |  3 ++
 .../remote/transport/netty/TcpSupport.scala   |  3 ++
 .../remote/transport/netty/UdpSupport.scala   |  3 ++
 16 files changed, 85 insertions(+), 22 deletions(-)

diff --git a/akka-remote/src/main/scala/akka/remote/Endpoint.scala b/akka-remote/src/main/scala/akka/remote/Endpoint.scala
index 639084e812..2b90447517 100644
--- a/akka-remote/src/main/scala/akka/remote/Endpoint.scala
+++ b/akka-remote/src/main/scala/akka/remote/Endpoint.scala
@@ -1,3 +1,6 @@
+/**
+ * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ */
 package akka.remote
 
 import akka.{ OnlyCauseStackTrace, AkkaException }
diff --git a/akka-remote/src/main/scala/akka/remote/FailureDetector.scala b/akka-remote/src/main/scala/akka/remote/FailureDetector.scala
index d3562b2afd..d4ac7b896f 100644
--- a/akka-remote/src/main/scala/akka/remote/FailureDetector.scala
+++ b/akka-remote/src/main/scala/akka/remote/FailureDetector.scala
@@ -1,3 +1,6 @@
+/**
+ * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ */
 package akka.remote
 
 import java.util.concurrent.TimeUnit._
diff --git a/akka-remote/src/main/scala/akka/remote/PhiAccrualFailureDetector.scala b/akka-remote/src/main/scala/akka/remote/PhiAccrualFailureDetector.scala
index b0525b48d8..caff3fe387 100644
--- a/akka-remote/src/main/scala/akka/remote/PhiAccrualFailureDetector.scala
+++ b/akka-remote/src/main/scala/akka/remote/PhiAccrualFailureDetector.scala
@@ -1,3 +1,6 @@
+/**
+ * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ */
 package akka.remote
 
 import akka.remote.FailureDetector.Clock
diff --git a/akka-remote/src/main/scala/akka/remote/Remoting.scala b/akka-remote/src/main/scala/akka/remote/Remoting.scala
index be9ff83684..1653293269 100644
--- a/akka-remote/src/main/scala/akka/remote/Remoting.scala
+++ b/akka-remote/src/main/scala/akka/remote/Remoting.scala
@@ -1,3 +1,6 @@
+/**
+ * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ */
 package akka.remote
 
 import scala.language.postfixOps
@@ -400,7 +403,12 @@ private[remote] class EndpointManager(conf: Config, log: LoggingAdapter) extends
 
   val accepting: Receive = {
     case ManagementCommand(cmd, statusPromise) ⇒
-      transportMapping.values foreach { _.managementCommand(cmd, statusPromise) }
+      val allStatuses = transportMapping.values map { transport ⇒
+        val p = Promise[Boolean]()
+        transport.managementCommand(cmd, p)
+        p.future
+      }
+      statusPromise completeWith Future.fold(allStatuses)(true)(_ && _)
 
     case s @ Send(message, senderOption, recipientRef) ⇒
       val recipientAddress = recipientRef.path.address
diff --git a/akka-remote/src/main/scala/akka/remote/RemotingLifecycle.scala b/akka-remote/src/main/scala/akka/remote/RemotingLifecycle.scala
index bd44ff3982..1c454f8101 100644
--- a/akka-remote/src/main/scala/akka/remote/RemotingLifecycle.scala
+++ b/akka-remote/src/main/scala/akka/remote/RemotingLifecycle.scala
@@ -1,3 +1,6 @@
+/**
+ * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ */
 package akka.remote
 
 import akka.event.{ LoggingAdapter, Logging }
diff --git a/akka-remote/src/main/scala/akka/remote/transport/AbstractTransportAdapter.scala b/akka-remote/src/main/scala/akka/remote/transport/AbstractTransportAdapter.scala
index b46f89262b..1163e8cea0 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/AbstractTransportAdapter.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/AbstractTransportAdapter.scala
@@ -1,3 +1,6 @@
+/**
+ * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ */
 package akka.remote.transport
 
 import scala.language.postfixOps
diff --git a/akka-remote/src/main/scala/akka/remote/transport/AkkaPduCodec.scala b/akka-remote/src/main/scala/akka/remote/transport/AkkaPduCodec.scala
index b6b17c68c7..3d1d68c437 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/AkkaPduCodec.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/AkkaPduCodec.scala
@@ -1,3 +1,6 @@
+/**
+ * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ */
 package akka.remote.transport
 
 import akka.AkkaException
diff --git a/akka-remote/src/main/scala/akka/remote/transport/AkkaProtocolTransport.scala b/akka-remote/src/main/scala/akka/remote/transport/AkkaProtocolTransport.scala
index 09ac87b9fa..4799bfba76 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/AkkaProtocolTransport.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/AkkaProtocolTransport.scala
@@ -1,3 +1,6 @@
+/**
+ * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ */
 package akka.remote.transport
 
 import akka.{ OnlyCauseStackTrace, AkkaException }
@@ -375,7 +378,8 @@ private[transport] class ProtocolStateActor(initialData: InitialProtocolStateDat
         case Disassociate ⇒
           stop()
 
-        case Heartbeat ⇒ failureDetector.heartbeat(); stay()
+        case Heartbeat ⇒
+          failureDetector.heartbeat(); stay()
 
         case Payload(payload) ⇒ stateData match {
           case AssociatedWaitHandler(handlerFuture, wrappedHandle, queue) ⇒
diff --git a/akka-remote/src/main/scala/akka/remote/transport/FailureInjectorTransportAdapter.scala b/akka-remote/src/main/scala/akka/remote/transport/FailureInjectorTransportAdapter.scala
index 59be194dde..2846c72e02 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/FailureInjectorTransportAdapter.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/FailureInjectorTransportAdapter.scala
@@ -1,3 +1,6 @@
+/**
+ * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ */
 package akka.remote.transport
 
 import FailureInjectorTransportAdapter._
diff --git a/akka-remote/src/main/scala/akka/remote/transport/TestTransport.scala b/akka-remote/src/main/scala/akka/remote/transport/TestTransport.scala
index 200e038778..c9fb06e6bc 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/TestTransport.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/TestTransport.scala
@@ -1,3 +1,6 @@
+/**
+ * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ */
 package akka.remote.transport
 
 import TestTransport._
diff --git a/akka-remote/src/main/scala/akka/remote/transport/ThrottlerTransportAdapter.scala b/akka-remote/src/main/scala/akka/remote/transport/ThrottlerTransportAdapter.scala
index 82143f483a..f668953037 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/ThrottlerTransportAdapter.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/ThrottlerTransportAdapter.scala
@@ -1,8 +1,12 @@
+/**
+ * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ */
 package akka.remote.transport
 
 import ThrottlerTransportAdapter._
 import akka.actor._
 import akka.pattern.pipe
+import akka.remote.EndpointManager.ManagementCommand
 import akka.remote.transport.ActorTransportAdapter.AssociateUnderlying
 import akka.remote.transport.ActorTransportAdapter.ListenUnderlying
 import akka.remote.transport.ActorTransportAdapter.ListenerRegistered
@@ -17,6 +21,7 @@ import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicReference
 import scala.annotation.tailrec
 import scala.collection.immutable.Queue
+import scala.concurrent.Future
 import scala.concurrent.Promise
 import scala.math.min
 import scala.util.{ Success, Failure }
@@ -107,10 +112,8 @@ class ThrottlerTransportAdapter(_wrappedTransport: Transport, _system: ExtendedA
   protected def managerProps = Props(new ThrottlerManager(wrappedTransport))
 
   override def managementCommand(cmd: Any, statusPromise: Promise[Boolean]): Unit = cmd match {
-    case s @ SetThrottle(_, _, _) ⇒
-      manager ! s
-      statusPromise.success(true)
-    case _ ⇒ wrappedTransport.managementCommand(cmd, statusPromise)
+    case s: SetThrottle ⇒ manager ! ManagementCommand(s, statusPromise)
+    case _              ⇒ wrappedTransport.managementCommand(cmd, statusPromise)
   }
 }
 
@@ -164,17 +167,22 @@ private[transport] class ThrottlerManager(wrappedTransport: Transport) extends A
       wrappedHandle.readHandlerPromise.future.map { (_, inMode) } pipeTo wrappedHandle.throttlerActor
       handleTable ::= nakedAddress(naked) -> wrappedHandle
       statusPromise.success(wrappedHandle)
-    case s @ SetThrottle(address, direction, mode) ⇒
+    case ManagementCommand(SetThrottle(address, direction, mode), statusPromise) ⇒
       val naked = nakedAddress(address)
       throttlingModes += naked -> (mode, direction)
-      handleTable.foreach {
-        case (addr, handle) ⇒
-          if (addr == naked) setMode(handle, mode, direction)
+      val allStatuses = handleTable.map {
+        case (`naked`, handle) ⇒
+          val p = Promise[Boolean]()
+          setMode(handle, mode, direction, p)
+          p.future
+        case _ ⇒ Future.successful(true)
       }
+      statusPromise completeWith Future.fold(allStatuses)(true)(_ && _)
+
     case Checkin(origin, handle) ⇒
       val naked: Address = nakedAddress(origin)
       handleTable ::= naked -> handle
-      setMode(naked, handle)
+      setMode(naked, handle, Promise[Boolean]())
 
   }
 
@@ -192,16 +200,19 @@ private[transport] class ThrottlerManager(wrappedTransport: Transport) extends A
     }
   }
 
-  private def setMode(nakedAddress: Address, handle: ThrottlerHandle): Unit = {
+  private def setMode(nakedAddress: Address, handle: ThrottlerHandle, statusPromise: Promise[Boolean]): Unit = {
     throttlingModes.get(nakedAddress) match {
-      case Some((mode, direction)) ⇒ setMode(handle, mode, direction)
-      case None                    ⇒ setMode(handle, Unthrottled, Direction.Both)
+      case Some((mode, direction)) ⇒ setMode(handle, mode, direction, statusPromise)
+      case None                    ⇒ setMode(handle, Unthrottled, Direction.Both, statusPromise)
     }
   }
 
-  private def setMode(handle: ThrottlerHandle, mode: ThrottleMode, direction: Direction): Unit = {
-    if (direction.includes(Direction.Receive)) handle.throttlerActor ! mode
-    if (direction.includes(Direction.Send)) handle.outboundThrottleMode.set(mode)
+  private def setMode(handle: ThrottlerHandle, mode: ThrottleMode, direction: Direction,
+                      statusPromise: Promise[Boolean]): Unit = {
+    if (direction.includes(Direction.Send))
+      handle.outboundThrottleMode.set(mode)
+    if (direction.includes(Direction.Receive))
+      handle.throttlerActor ! ManagementCommand(mode, statusPromise)
   }
 
   private def wrapHandle(originalHandle: AssociationHandle, listener: AssociationEventListener, inbound: Boolean): ThrottlerHandle = {
@@ -286,9 +297,9 @@ private[transport] class ThrottledAssociation(
     case Event(InboundPayload(p), _) ⇒
       throttledMessages = throttledMessages enqueue p
       stay()
-    case Event(mode: ThrottleMode, ExposedHandle(exposedHandle)) ⇒
+    case Event(ManagementCommand(mode: ThrottleMode, statusPromise), ExposedHandle(exposedHandle)) ⇒
       inboundThrottleMode = mode
-      if (inboundThrottleMode == Blackhole) {
+      try if (mode == Blackhole) {
         throttledMessages = Queue.empty[ByteString]
         exposedHandle.disassociate()
         stop()
@@ -296,7 +307,7 @@ private[transport] class ThrottledAssociation(
         associationHandler notify InboundAssociation(exposedHandle)
         exposedHandle.readHandlerPromise.future pipeTo self
         goto(WaitUpstreamListener)
-      }
+      } finally statusPromise.success(true)
   }
 
   when(WaitUpstreamListener) {
@@ -321,12 +332,13 @@ private[transport] class ThrottledAssociation(
   }
 
   when(Throttling) {
-    case Event(mode: ThrottleMode, _) ⇒
+    case Event(ManagementCommand(mode: ThrottleMode, statusPromise), _) ⇒
       inboundThrottleMode = mode
-      if (inboundThrottleMode == Blackhole) throttledMessages = Queue.empty[ByteString]
+      if (mode == Blackhole) throttledMessages = Queue.empty[ByteString]
       cancelTimer(DequeueTimerName)
       if (throttledMessages.nonEmpty)
         scheduleDequeue(inboundThrottleMode.timeToAvailable(System.nanoTime(), throttledMessages.head.length))
+      statusPromise.success(true)
       stay()
     case Event(InboundPayload(p), _) ⇒
       forwardOrDelay(p)
diff --git a/akka-remote/src/main/scala/akka/remote/transport/Transport.scala b/akka-remote/src/main/scala/akka/remote/transport/Transport.scala
index b2cdbcc54e..649597f4c7 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/Transport.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/Transport.scala
@@ -1,3 +1,6 @@
+/**
+ * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ */
 package akka.remote.transport
 
 import scala.concurrent.{ Promise, Future }
diff --git a/akka-remote/src/main/scala/akka/remote/transport/netty/NettyHelpers.scala b/akka-remote/src/main/scala/akka/remote/transport/netty/NettyHelpers.scala
index dec126cd6a..f4c4cd05f3 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/netty/NettyHelpers.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/netty/NettyHelpers.scala
@@ -1,3 +1,6 @@
+/**
+ * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ */
 package akka.remote.transport.netty
 
 import akka.AkkaException
diff --git a/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala b/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
index abc475ab4b..e285f40e19 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
@@ -1,3 +1,6 @@
+/**
+ * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ */
 package akka.remote.transport.netty
 
 import akka.{ OnlyCauseStackTrace, ConfigurationException }
diff --git a/akka-remote/src/main/scala/akka/remote/transport/netty/TcpSupport.scala b/akka-remote/src/main/scala/akka/remote/transport/netty/TcpSupport.scala
index 515637dad0..32e4025432 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/netty/TcpSupport.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/netty/TcpSupport.scala
@@ -1,3 +1,6 @@
+/**
+ * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ */
 package akka.remote.transport.netty
 
 import akka.actor.Address
diff --git a/akka-remote/src/main/scala/akka/remote/transport/netty/UdpSupport.scala b/akka-remote/src/main/scala/akka/remote/transport/netty/UdpSupport.scala
index c52e8d9bc9..d46c738b44 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/netty/UdpSupport.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/netty/UdpSupport.scala
@@ -1,3 +1,6 @@
+/**
+ * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ */
 package akka.remote.transport.netty
 
 import akka.actor.Address

From 695fe02e5855c10f032e50e83cfb26364b0eab7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Endre=20S=C3=A1ndor=20Varga?= <vendre@hit.bme.hu>
Date: Tue, 8 Jan 2013 14:05:55 +0100
Subject: [PATCH 031/122] Only client should issue an SSL handshake #2833

---
 .../main/scala/akka/remote/transport/netty/NettyTransport.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala b/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
index abc475ab4b..361337242a 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
@@ -248,7 +248,7 @@ class NettyTransport(private val settings: NettyTransportSettings, private val s
 
   private def sslHandler(isClient: Boolean): SslHandler = {
     val handler = NettySSLSupport(settings.SslSettings.get, log, isClient)
-    handler.setIssueHandshake(true)
+    if (isClient) handler.setIssueHandshake(true)
     handler
   }
 

From 46d376b3e598c9440e18b2f8948970f8f48d9829 Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Tue, 8 Jan 2013 15:09:51 +0100
Subject: [PATCH 032/122] Remove LargeClusterSpec, superseded by StressSpec,
 see #2786

---
 .../scala/akka/cluster/LargeClusterSpec.scala | 330 ------------------
 1 file changed, 330 deletions(-)
 delete mode 100644 akka-cluster/src/multi-jvm/scala/akka/cluster/LargeClusterSpec.scala

diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/LargeClusterSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/LargeClusterSpec.scala
deleted file mode 100644
index dd6a421819..0000000000
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/LargeClusterSpec.scala
+++ /dev/null
@@ -1,330 +0,0 @@
-/**
- *  Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
- */
-package akka.cluster
-
-import com.typesafe.config.ConfigFactory
-import akka.remote.testkit.MultiNodeConfig
-import akka.remote.testkit.MultiNodeSpec
-import akka.testkit._
-import akka.testkit.TestEvent._
-import scala.concurrent.duration._
-import akka.actor.ActorSystem
-import java.util.concurrent.TimeoutException
-import scala.collection.immutable.SortedSet
-import scala.concurrent.Await
-import java.util.concurrent.TimeUnit
-import akka.remote.testconductor.RoleName
-import akka.actor.Props
-import akka.actor.Actor
-import akka.cluster.MemberStatus._
-
-object LargeClusterMultiJvmSpec extends MultiNodeConfig {
-  // each jvm simulates a datacenter with many nodes
-  val firstDatacenter = role("first-datacenter")
-  val secondDatacenter = role("second-datacenter")
-  val thirdDatacenter = role("third-datacenter")
-  val fourthDatacenter = role("fourth-datacenter")
-  val fifthDatacenter = role("fifth-datacenter")
-
-  // Note that this test uses default configuration,
-  // not MultiNodeClusterSpec.clusterConfig
-  commonConfig(ConfigFactory.parseString("""
-    # Number of ActorSystems in each jvm, can be specified as
-    # system property when running real tests. Many nodes
-    # will take long time and consume many threads.
-    # 10 => 50 nodes is possible to run on one machine.
-    akka.test.large-cluster-spec.nodes-per-datacenter = 2
-    akka.cluster {
-      gossip-interval = 500 ms
-      auto-join = off
-      auto-down = on
-      failure-detector.acceptable-heartbeat-pause = 5s
-      publish-stats-interval = 0 s # always, when it happens
-    }
-    akka.event-handlers = ["akka.testkit.TestEventListener"]
-    akka.loglevel = INFO
-    akka.actor.provider = akka.cluster.ClusterActorRefProvider
-    akka.actor.default-dispatcher.fork-join-executor {
-      # when using nodes-per-datacenter=10 we need some extra
-      # threads to keep up with netty connect blocking
-      parallelism-min = 13
-      parallelism-max = 13
-    }
-    akka.scheduler.tick-duration = 33 ms
-    akka.remote.log-remote-lifecycle-events = off
-    akka.remote.netty.execution-pool-size = 4
-    #akka.remote.netty.reconnection-time-window = 10s
-    akka.remote.netty.write-timeout = 5s
-    akka.remote.netty.backoff-timeout = 500ms
-    akka.remote.netty.connection-timeout = 500ms
-
-    # Using a separate dispatcher for netty io doesn't reduce number
-    # of needed threads
-    # akka.remote.netty.use-dispatcher-for-io=akka.test.io-dispatcher
-    # akka.test.io-dispatcher.fork-join-executor {
-    #   parallelism-min = 100
-    #   parallelism-max = 100
-    # }
-    """))
-}
-
-class LargeClusterMultiJvmNode1 extends LargeClusterSpec
-class LargeClusterMultiJvmNode2 extends LargeClusterSpec
-class LargeClusterMultiJvmNode3 extends LargeClusterSpec
-class LargeClusterMultiJvmNode4 extends LargeClusterSpec
-class LargeClusterMultiJvmNode5 extends LargeClusterSpec
-
-abstract class LargeClusterSpec
-  extends MultiNodeSpec(LargeClusterMultiJvmSpec)
-  with MultiNodeClusterSpec {
-
-  import LargeClusterMultiJvmSpec._
-  import ClusterEvent._
-
-  override def muteLog(sys: ActorSystem = system): Unit = {
-    super.muteLog(sys)
-    muteMarkingAsUnreachable(sys)
-    muteDeadLetters(sys)
-  }
-
-  var systems: IndexedSeq[ActorSystem] = IndexedSeq(system)
-  val nodesPerDatacenter = system.settings.config.getInt(
-    "akka.test.large-cluster-spec.nodes-per-datacenter")
-
-  /**
-   * Since we start some ActorSystems/Clusters outside of the
-   * MultiNodeClusterSpec control we can't use use the mechanism
-   * defined in MultiNodeClusterSpec to inject failure detector etc.
-   * Use ordinary Cluster extension with default AccrualFailureDetector.
-   */
-  override def cluster: Cluster = Cluster(system)
-
-  override def afterTermination(): Unit = {
-    systems foreach { _.shutdown }
-    val shutdownTimeout = 20.seconds
-    val deadline = Deadline.now + shutdownTimeout
-    systems.foreach { sys ⇒
-      if (sys.isTerminated)
-        () // already done
-      else if (deadline.isOverdue)
-        sys.log.warning("Failed to shutdown [{}] within [{}]", sys.name, shutdownTimeout)
-      else {
-        try sys.awaitTermination(deadline.timeLeft) catch {
-          case _: TimeoutException ⇒ sys.log.warning("Failed to shutdown [{}] within [{}]", sys.name, shutdownTimeout)
-        }
-      }
-    }
-  }
-
-  def startupSystems(): Unit = {
-    // one system is already started by the multi-node test
-    for (n ← 2 to nodesPerDatacenter) {
-      val sys = ActorSystem(myself.name + "-" + n, system.settings.config)
-      muteLog(sys)
-      systems :+= sys
-    }
-
-    // Initialize the Cluster extensions, i.e. startup the clusters
-    systems foreach { Cluster(_) }
-  }
-
-  def expectedMaxDuration(totalNodes: Int): FiniteDuration = 5.seconds + 2.seconds * totalNodes
-
-  def joinAll(from: RoleName, to: RoleName, totalNodes: Int, runOnRoles: RoleName*): Unit = {
-    val joiningClusters = systems.map(Cluster(_)).toSet
-    join(joiningClusters, from, to, totalNodes, runOnRoles: _*)
-  }
-
-  def join(joiningClusterNodes: Set[Cluster], from: RoleName, to: RoleName, totalNodes: Int, runOnRoles: RoleName*): Unit = {
-    runOnRoles must contain(from)
-    runOnRoles must contain(to)
-
-    runOn(runOnRoles: _*) {
-      systems.size must be(nodesPerDatacenter) // make sure it is initialized
-
-      val clusterNodes = if(isNode(from)) joiningClusterNodes else systems.map(Cluster(_)).toSet
-      val startGossipCounts = Map.empty[Cluster, Long] ++
-        clusterNodes.map(c ⇒ (c -> c.readView.latestStats.receivedGossipCount))
-      def gossipCount(c: Cluster): Long = {
-        c.readView.latestStats.receivedGossipCount - startGossipCounts(c)
-      }
-      val startTime = System.nanoTime
-      def tookMillis: String = TimeUnit.NANOSECONDS.toMillis(System.nanoTime - startTime) + " ms"
-
-      val latch = TestLatch(clusterNodes.size)
-      clusterNodes foreach { c ⇒
-        c.subscribe(system.actorOf(Props(new Actor {
-          var upCount = 0
-          def receive = {
-            case state: CurrentClusterState ⇒
-              upCount = state.members.count(_.status == Up)
-            case MemberUp(_) if !latch.isOpen ⇒
-              upCount += 1
-              if (upCount == totalNodes) {
-                log.debug("All [{}] nodes Up in [{}], it took [{}], received [{}] gossip messages",
-                  totalNodes, c.selfAddress, tookMillis, gossipCount(c))
-                latch.countDown()
-              }
-            case _ ⇒ // ignore
-          }
-        })), classOf[MemberEvent])
-      }
-
-      runOn(from) {
-        clusterNodes foreach { _ join to }
-      }
-
-      Await.ready(latch, remaining)
-
-      val counts = clusterNodes.map(gossipCount(_))
-      val formattedStats = "mean=%s min=%s max=%s".format(counts.sum / clusterNodes.size, counts.min, counts.max)
-      log.info("Convergence of [{}] nodes reached, it took [{}], received [{}] gossip messages per node",
-        totalNodes, tookMillis, formattedStats)
-
-    }
-  }
-
-  "A large cluster" must {
-
-    "join all nodes in first-datacenter to first-datacenter" taggedAs LongRunningTest in {
-      runOn(firstDatacenter) {
-        startupSystems()
-        startClusterNode()
-      }
-      enterBarrier("first-datacenter-started")
-
-      val totalNodes = nodesPerDatacenter
-      within(expectedMaxDuration(totalNodes)) {
-        joinAll(from = firstDatacenter, to = firstDatacenter, totalNodes, runOnRoles = firstDatacenter)
-        enterBarrier("first-datacenter-joined")
-      }
-    }
-
-    "join all nodes in second-datacenter to first-datacenter" taggedAs LongRunningTest in {
-      runOn(secondDatacenter) {
-        startupSystems()
-      }
-      enterBarrier("second-datacenter-started")
-
-      val totalNodes = nodesPerDatacenter * 2
-      within(expectedMaxDuration(totalNodes)) {
-        joinAll(from = secondDatacenter, to = firstDatacenter, totalNodes, runOnRoles = firstDatacenter, secondDatacenter)
-        enterBarrier("second-datacenter-joined")
-      }
-    }
-
-    "join all nodes in third-datacenter to first-datacenter" taggedAs LongRunningTest in {
-      runOn(thirdDatacenter) {
-        startupSystems()
-      }
-      enterBarrier("third-datacenter-started")
-
-      val totalNodes = nodesPerDatacenter * 3
-      within(expectedMaxDuration(totalNodes)) {
-        joinAll(from = thirdDatacenter, to = firstDatacenter, totalNodes,
-          runOnRoles = firstDatacenter, secondDatacenter, thirdDatacenter)
-        enterBarrier("third-datacenter-joined")
-      }
-    }
-
-    "join all nodes in fourth-datacenter to first-datacenter" taggedAs LongRunningTest in {
-      runOn(fourthDatacenter) {
-        startupSystems()
-      }
-      enterBarrier("fourth-datacenter-started")
-
-      val totalNodes = nodesPerDatacenter * 4
-      within(expectedMaxDuration(totalNodes)) {
-        joinAll(from = fourthDatacenter, to = firstDatacenter, totalNodes,
-          runOnRoles = firstDatacenter, secondDatacenter, thirdDatacenter, fourthDatacenter)
-        enterBarrier("fourth-datacenter-joined")
-      }
-    }
-
-    "join nodes one by one from fifth-datacenter to first-datacenter" taggedAs LongRunningTest in {
-      runOn(fifthDatacenter) {
-        startupSystems()
-      }
-      enterBarrier("fifth-datacenter-started")
-
-      // enough to join a few one-by-one (takes too long time otherwise)
-      val (bulk, oneByOne) = systems.splitAt(systems.size - 3)
-
-      if (bulk.nonEmpty) {
-        val totalNodes = nodesPerDatacenter * 4 + bulk.size
-        within(expectedMaxDuration(totalNodes)) {
-          val joiningClusters = if(isNode(fifthDatacenter)) bulk.map(Cluster(_)).toSet else Set.empty[Cluster]
-          join(joiningClusters, from = fifthDatacenter, to = firstDatacenter, totalNodes,
-            runOnRoles = firstDatacenter, secondDatacenter, thirdDatacenter, fourthDatacenter, fifthDatacenter)
-          enterBarrier("fifth-datacenter-joined-" + bulk.size)
-        }
-      }
-
-      for (i ← 0 until oneByOne.size) {
-        val totalNodes = nodesPerDatacenter * 4 + bulk.size + i + 1
-        within(expectedMaxDuration(totalNodes)) {
-          val joiningClusters = if(isNode(fifthDatacenter)) Set(Cluster(oneByOne(i))) else Set.empty[Cluster]
-          join(joiningClusters, from = fifthDatacenter, to = firstDatacenter, totalNodes,
-            runOnRoles = firstDatacenter, secondDatacenter, thirdDatacenter, fourthDatacenter, fifthDatacenter)
-          enterBarrier("fifth-datacenter-joined-" + (bulk.size + i))
-        }
-      }
-    }
-
-    "detect failure and auto-down crashed nodes in second-datacenter" taggedAs LongRunningTest in {
-      val downedNodes = nodesPerDatacenter
-      val liveNodes = nodesPerDatacenter * 4
-
-      within(30.seconds + 3.seconds * liveNodes) {
-        val startGossipCounts = Map.empty[Cluster, Long] ++
-          systems.map(sys ⇒ (Cluster(sys) -> Cluster(sys).readView.latestStats.receivedGossipCount))
-        def gossipCount(c: Cluster): Long = {
-          c.readView.latestStats.receivedGossipCount - startGossipCounts(c)
-        }
-        val startTime = System.nanoTime
-        def tookMillis: String = TimeUnit.NANOSECONDS.toMillis(System.nanoTime - startTime) + " ms"
-
-        val latch = TestLatch(nodesPerDatacenter)
-        systems foreach { sys ⇒
-          Cluster(sys).subscribe(sys.actorOf(Props(new Actor {
-            var gotDowned = Set.empty[Member]
-            def receive = {
-              case state: CurrentClusterState ⇒
-                gotDowned = gotDowned ++ state.unreachable.filter(_.status == Down)
-                checkDone()
-              case MemberDowned(m) if !latch.isOpen ⇒
-                gotDowned = gotDowned + m
-                checkDone()
-              case _ ⇒ // not interesting
-            }
-            def checkDone(): Unit = if (gotDowned.size == downedNodes) {
-              log.info("Detected [{}] downed nodes in [{}], it took [{}], received [{}] gossip messages",
-                downedNodes, Cluster(sys).selfAddress, tookMillis, gossipCount(Cluster(sys)))
-              latch.countDown()
-            }
-          })), classOf[ClusterDomainEvent])
-        }
-
-        runOn(firstDatacenter) {
-          testConductor.shutdown(secondDatacenter, 0).await
-        }
-
-        enterBarrier("second-datacenter-shutdown")
-
-        runOn(firstDatacenter, thirdDatacenter, fourthDatacenter, fifthDatacenter) {
-          Await.ready(latch, remaining)
-          val mergeCount = systems.map(sys ⇒ Cluster(sys).readView.latestStats.mergeCount).sum
-          val counts = systems.map(sys ⇒ gossipCount(Cluster(sys)))
-          val formattedStats = "mean=%s min=%s max=%s".format(counts.sum / nodesPerDatacenter, counts.min, counts.max)
-          log.info("Convergence of [{}] nodes reached after failure, it took [{}], received [{}] gossip messages per node, merged [{}] times",
-            liveNodes, tookMillis, formattedStats, mergeCount)
-        }
-
-        enterBarrier("after-6")
-      }
-
-    }
-
-  }
-}

From 554e3396cafa2c45ad42d5cf5f3f6d0a6785539a Mon Sep 17 00:00:00 2001
From: Roland Kuhn <rk@rkuhn.info>
Date: Tue, 8 Jan 2013 18:08:22 +0100
Subject: [PATCH 033/122] remove extra "the" in docs

---
 akka-docs/rst/general/message-delivery-guarantees.rst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/akka-docs/rst/general/message-delivery-guarantees.rst b/akka-docs/rst/general/message-delivery-guarantees.rst
index 86b0716c90..d9544d7016 100644
--- a/akka-docs/rst/general/message-delivery-guarantees.rst
+++ b/akka-docs/rst/general/message-delivery-guarantees.rst
@@ -1,4 +1,3 @@
-
 .. _message-delivery-guarantees:
 
 ###########################
@@ -171,7 +170,7 @@ Reliability of Local Message Sends
 ----------------------------------
 
 The Akka test suite relies on not losing messages in the local context (and for
-non-error condition tests also for remote deployment), meaning that the we
+non-error condition tests also for remote deployment), meaning that we
 actually do apply the best effort to keep our tests stable. A local ``tell``
 operation can however fail for the same reasons as a normal method call can on
 the JVM:

From 943c438d5ea860790dd448e6cd725f4201137f13 Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Fri, 4 Jan 2013 16:39:48 +0100
Subject: [PATCH 034/122] Publish clean state when joining (PublishStart), see
 #2871

* The failure in JoinTwoClustersSpec was due to missing publishing
  of cluster events when clearing current state when joining
* This fix is in the right direction, but joining clusters like this
  will need some design thought, creating ticket 2873 for that
---
 .../main/scala/akka/cluster/ClusterDaemon.scala    |  6 +++---
 .../src/main/scala/akka/cluster/ClusterEvent.scala | 14 +++++++++-----
 .../src/main/scala/akka/cluster/Gossip.scala       |  8 ++++++--
 .../cluster/ClusterDomainEventPublisherSpec.scala  | 12 ++++++++++++
 .../src/test/scala/akka/cluster/GossipSpec.scala   |  2 +-
 5 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterDaemon.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterDaemon.scala
index 50644e431c..6db32a7316 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterDaemon.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/ClusterDaemon.scala
@@ -191,7 +191,7 @@ private[cluster] final class ClusterCoreDaemon(publisher: ActorRef) extends Acto
 
   // note that self is not initially member,
   // and the Gossip is not versioned for this 'Node' yet
-  var latestGossip: Gossip = Gossip()
+  var latestGossip: Gossip = Gossip.empty
 
   var stats = ClusterStats()
 
@@ -283,7 +283,7 @@ private[cluster] final class ClusterCoreDaemon(publisher: ActorRef) extends Acto
   def join(address: Address): Unit = {
     if (!latestGossip.members.exists(_.address == address)) {
       // wipe our state since a node that joins a cluster must be empty
-      latestGossip = Gossip()
+      latestGossip = Gossip.empty
       // wipe the failure detector since we are starting fresh and shouldn't care about the past
       failureDetector.reset()
       // wipe the publisher since we are starting fresh
@@ -377,7 +377,7 @@ private[cluster] final class ClusterCoreDaemon(publisher: ActorRef) extends Acto
   def removing(address: Address): Unit = {
     log.info("Cluster Node [{}] - Node has been REMOVED by the leader - shutting down...", selfAddress)
     // just cleaning up the gossip state
-    latestGossip = Gossip()
+    latestGossip = Gossip.empty
     publish(latestGossip)
     context.become(removed)
     // make sure the final (removed) state is published
diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterEvent.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterEvent.scala
index 7d1997649d..7e7befeb4e 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterEvent.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/ClusterEvent.scala
@@ -238,8 +238,8 @@ object ClusterEvent {
 private[cluster] final class ClusterDomainEventPublisher extends Actor with ActorLogging {
   import InternalClusterAction._
 
-  var latestGossip: Gossip = Gossip()
-  var latestConvergedGossip: Gossip = Gossip()
+  var latestGossip: Gossip = Gossip.empty
+  var latestConvergedGossip: Gossip = Gossip.empty
   var memberEvents: immutable.Seq[MemberEvent] = immutable.Seq.empty
 
   def receive = {
@@ -313,7 +313,11 @@ private[cluster] final class ClusterDomainEventPublisher extends Actor with Acto
 
   def publish(event: AnyRef): Unit = eventStream publish event
 
-  def publishStart(): Unit = clearState()
+  def publishStart(): Unit =
+    if ((latestGossip ne Gossip.empty) || (latestConvergedGossip ne Gossip.empty)) {
+      clearState()
+      publishCurrentClusterState(None)
+    }
 
   def publishDone(receiver: ActorRef): Unit = {
     clearState()
@@ -321,7 +325,7 @@ private[cluster] final class ClusterDomainEventPublisher extends Actor with Acto
   }
 
   def clearState(): Unit = {
-    latestGossip = Gossip()
-    latestConvergedGossip = Gossip()
+    latestGossip = Gossip.empty
+    latestConvergedGossip = Gossip.empty
   }
 }
diff --git a/akka-cluster/src/main/scala/akka/cluster/Gossip.scala b/akka-cluster/src/main/scala/akka/cluster/Gossip.scala
index 1f96434995..9173e977a5 100644
--- a/akka-cluster/src/main/scala/akka/cluster/Gossip.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/Gossip.scala
@@ -13,6 +13,10 @@ import MemberStatus._
  */
 private[cluster] object Gossip {
   val emptyMembers: immutable.SortedSet[Member] = immutable.SortedSet.empty
+  val empty: Gossip = new Gossip(Gossip.emptyMembers)
+
+  def apply(members: immutable.SortedSet[Member]) =
+    if (members.isEmpty) empty else empty.copy(members = members)
 }
 
 /**
@@ -49,8 +53,8 @@ private[cluster] object Gossip {
  * removed node telling it to shut itself down.
  */
 private[cluster] case class Gossip(
+  members: immutable.SortedSet[Member], // sorted set of members with their status, sorted by address
   overview: GossipOverview = GossipOverview(),
-  members: immutable.SortedSet[Member] = Gossip.emptyMembers, // sorted set of members with their status, sorted by address
   version: VectorClock = VectorClock()) // vector clock version
   extends ClusterMessage // is a serializable cluster message
   with Versioned[Gossip] {
@@ -128,7 +132,7 @@ private[cluster] case class Gossip(
     // 4. fresh seen table
     val mergedSeen = Map.empty[Address, VectorClock]
 
-    Gossip(GossipOverview(mergedSeen, mergedUnreachable), mergedMembers, mergedVClock)
+    Gossip(mergedMembers, GossipOverview(mergedSeen, mergedUnreachable), mergedVClock)
   }
 
   /**
diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterDomainEventPublisherSpec.scala b/akka-cluster/src/test/scala/akka/cluster/ClusterDomainEventPublisherSpec.scala
index 6c13c79f23..37412db930 100644
--- a/akka-cluster/src/test/scala/akka/cluster/ClusterDomainEventPublisherSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/ClusterDomainEventPublisherSpec.scala
@@ -134,5 +134,17 @@ class ClusterDomainEventPublisherSpec extends AkkaSpec
       expectMsg(MemberUp(c2))
       expectMsgType[SeenChanged]
     }
+
+    "publish clean state when PublishStart" in {
+      publisher ! PublishChanges(g3)
+      expectMsg(MemberUp(b1))
+      expectMsg(MemberUp(c2))
+      expectMsgType[SeenChanged]
+
+      publisher ! PublishStart
+      expectMsgType[CurrentClusterState] must be(CurrentClusterState())
+
+    }
+
   }
 }
diff --git a/akka-cluster/src/test/scala/akka/cluster/GossipSpec.scala b/akka-cluster/src/test/scala/akka/cluster/GossipSpec.scala
index 704b12dac0..63707558ce 100644
--- a/akka-cluster/src/test/scala/akka/cluster/GossipSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/GossipSpec.scala
@@ -29,7 +29,7 @@ class GossipSpec extends WordSpec with MustMatchers {
   "A Gossip" must {
 
     "reach convergence when it's empty" in {
-      Gossip().convergence must be(true)
+      Gossip.empty.convergence must be(true)
     }
 
     "merge members by status priority" in {

From dec4542f11a1d7d73d073594f41fb6c3e93c8126 Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Tue, 8 Jan 2013 20:58:13 +0100
Subject: [PATCH 035/122] Revert "Propagate statusPromise down to the actual
 change in throttler, see #2877"

This reverts commit 9c1a00d02017a1786820d27a62496afb7e8285ce.
---
 .../src/main/scala/akka/remote/Endpoint.scala |  3 --
 .../scala/akka/remote/FailureDetector.scala   |  3 --
 .../remote/PhiAccrualFailureDetector.scala    |  3 --
 .../src/main/scala/akka/remote/Remoting.scala | 10 +---
 .../scala/akka/remote/RemotingLifecycle.scala |  3 --
 .../transport/AbstractTransportAdapter.scala  |  3 --
 .../akka/remote/transport/AkkaPduCodec.scala  |  3 --
 .../transport/AkkaProtocolTransport.scala     |  6 +--
 .../FailureInjectorTransportAdapter.scala     |  3 --
 .../akka/remote/transport/TestTransport.scala |  3 --
 .../transport/ThrottlerTransportAdapter.scala | 52 +++++++------------
 .../akka/remote/transport/Transport.scala     |  3 --
 .../remote/transport/netty/NettyHelpers.scala |  3 --
 .../transport/netty/NettyTransport.scala      |  3 --
 .../remote/transport/netty/TcpSupport.scala   |  3 --
 .../remote/transport/netty/UdpSupport.scala   |  3 --
 16 files changed, 22 insertions(+), 85 deletions(-)

diff --git a/akka-remote/src/main/scala/akka/remote/Endpoint.scala b/akka-remote/src/main/scala/akka/remote/Endpoint.scala
index 2b90447517..639084e812 100644
--- a/akka-remote/src/main/scala/akka/remote/Endpoint.scala
+++ b/akka-remote/src/main/scala/akka/remote/Endpoint.scala
@@ -1,6 +1,3 @@
-/**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
- */
 package akka.remote
 
 import akka.{ OnlyCauseStackTrace, AkkaException }
diff --git a/akka-remote/src/main/scala/akka/remote/FailureDetector.scala b/akka-remote/src/main/scala/akka/remote/FailureDetector.scala
index d4ac7b896f..d3562b2afd 100644
--- a/akka-remote/src/main/scala/akka/remote/FailureDetector.scala
+++ b/akka-remote/src/main/scala/akka/remote/FailureDetector.scala
@@ -1,6 +1,3 @@
-/**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
- */
 package akka.remote
 
 import java.util.concurrent.TimeUnit._
diff --git a/akka-remote/src/main/scala/akka/remote/PhiAccrualFailureDetector.scala b/akka-remote/src/main/scala/akka/remote/PhiAccrualFailureDetector.scala
index caff3fe387..b0525b48d8 100644
--- a/akka-remote/src/main/scala/akka/remote/PhiAccrualFailureDetector.scala
+++ b/akka-remote/src/main/scala/akka/remote/PhiAccrualFailureDetector.scala
@@ -1,6 +1,3 @@
-/**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
- */
 package akka.remote
 
 import akka.remote.FailureDetector.Clock
diff --git a/akka-remote/src/main/scala/akka/remote/Remoting.scala b/akka-remote/src/main/scala/akka/remote/Remoting.scala
index 1653293269..be9ff83684 100644
--- a/akka-remote/src/main/scala/akka/remote/Remoting.scala
+++ b/akka-remote/src/main/scala/akka/remote/Remoting.scala
@@ -1,6 +1,3 @@
-/**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
- */
 package akka.remote
 
 import scala.language.postfixOps
@@ -403,12 +400,7 @@ private[remote] class EndpointManager(conf: Config, log: LoggingAdapter) extends
 
   val accepting: Receive = {
     case ManagementCommand(cmd, statusPromise) ⇒
-      val allStatuses = transportMapping.values map { transport ⇒
-        val p = Promise[Boolean]()
-        transport.managementCommand(cmd, p)
-        p.future
-      }
-      statusPromise completeWith Future.fold(allStatuses)(true)(_ && _)
+      transportMapping.values foreach { _.managementCommand(cmd, statusPromise) }
 
     case s @ Send(message, senderOption, recipientRef) ⇒
       val recipientAddress = recipientRef.path.address
diff --git a/akka-remote/src/main/scala/akka/remote/RemotingLifecycle.scala b/akka-remote/src/main/scala/akka/remote/RemotingLifecycle.scala
index 1c454f8101..bd44ff3982 100644
--- a/akka-remote/src/main/scala/akka/remote/RemotingLifecycle.scala
+++ b/akka-remote/src/main/scala/akka/remote/RemotingLifecycle.scala
@@ -1,6 +1,3 @@
-/**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
- */
 package akka.remote
 
 import akka.event.{ LoggingAdapter, Logging }
diff --git a/akka-remote/src/main/scala/akka/remote/transport/AbstractTransportAdapter.scala b/akka-remote/src/main/scala/akka/remote/transport/AbstractTransportAdapter.scala
index 1163e8cea0..b46f89262b 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/AbstractTransportAdapter.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/AbstractTransportAdapter.scala
@@ -1,6 +1,3 @@
-/**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
- */
 package akka.remote.transport
 
 import scala.language.postfixOps
diff --git a/akka-remote/src/main/scala/akka/remote/transport/AkkaPduCodec.scala b/akka-remote/src/main/scala/akka/remote/transport/AkkaPduCodec.scala
index 3d1d68c437..b6b17c68c7 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/AkkaPduCodec.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/AkkaPduCodec.scala
@@ -1,6 +1,3 @@
-/**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
- */
 package akka.remote.transport
 
 import akka.AkkaException
diff --git a/akka-remote/src/main/scala/akka/remote/transport/AkkaProtocolTransport.scala b/akka-remote/src/main/scala/akka/remote/transport/AkkaProtocolTransport.scala
index 4799bfba76..09ac87b9fa 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/AkkaProtocolTransport.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/AkkaProtocolTransport.scala
@@ -1,6 +1,3 @@
-/**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
- */
 package akka.remote.transport
 
 import akka.{ OnlyCauseStackTrace, AkkaException }
@@ -378,8 +375,7 @@ private[transport] class ProtocolStateActor(initialData: InitialProtocolStateDat
         case Disassociate ⇒
           stop()
 
-        case Heartbeat ⇒
-          failureDetector.heartbeat(); stay()
+        case Heartbeat ⇒ failureDetector.heartbeat(); stay()
 
         case Payload(payload) ⇒ stateData match {
           case AssociatedWaitHandler(handlerFuture, wrappedHandle, queue) ⇒
diff --git a/akka-remote/src/main/scala/akka/remote/transport/FailureInjectorTransportAdapter.scala b/akka-remote/src/main/scala/akka/remote/transport/FailureInjectorTransportAdapter.scala
index 2846c72e02..59be194dde 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/FailureInjectorTransportAdapter.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/FailureInjectorTransportAdapter.scala
@@ -1,6 +1,3 @@
-/**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
- */
 package akka.remote.transport
 
 import FailureInjectorTransportAdapter._
diff --git a/akka-remote/src/main/scala/akka/remote/transport/TestTransport.scala b/akka-remote/src/main/scala/akka/remote/transport/TestTransport.scala
index c9fb06e6bc..200e038778 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/TestTransport.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/TestTransport.scala
@@ -1,6 +1,3 @@
-/**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
- */
 package akka.remote.transport
 
 import TestTransport._
diff --git a/akka-remote/src/main/scala/akka/remote/transport/ThrottlerTransportAdapter.scala b/akka-remote/src/main/scala/akka/remote/transport/ThrottlerTransportAdapter.scala
index f668953037..82143f483a 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/ThrottlerTransportAdapter.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/ThrottlerTransportAdapter.scala
@@ -1,12 +1,8 @@
-/**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
- */
 package akka.remote.transport
 
 import ThrottlerTransportAdapter._
 import akka.actor._
 import akka.pattern.pipe
-import akka.remote.EndpointManager.ManagementCommand
 import akka.remote.transport.ActorTransportAdapter.AssociateUnderlying
 import akka.remote.transport.ActorTransportAdapter.ListenUnderlying
 import akka.remote.transport.ActorTransportAdapter.ListenerRegistered
@@ -21,7 +17,6 @@ import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicReference
 import scala.annotation.tailrec
 import scala.collection.immutable.Queue
-import scala.concurrent.Future
 import scala.concurrent.Promise
 import scala.math.min
 import scala.util.{ Success, Failure }
@@ -112,8 +107,10 @@ class ThrottlerTransportAdapter(_wrappedTransport: Transport, _system: ExtendedA
   protected def managerProps = Props(new ThrottlerManager(wrappedTransport))
 
   override def managementCommand(cmd: Any, statusPromise: Promise[Boolean]): Unit = cmd match {
-    case s: SetThrottle ⇒ manager ! ManagementCommand(s, statusPromise)
-    case _              ⇒ wrappedTransport.managementCommand(cmd, statusPromise)
+    case s @ SetThrottle(_, _, _) ⇒
+      manager ! s
+      statusPromise.success(true)
+    case _ ⇒ wrappedTransport.managementCommand(cmd, statusPromise)
   }
 }
 
@@ -167,22 +164,17 @@ private[transport] class ThrottlerManager(wrappedTransport: Transport) extends A
       wrappedHandle.readHandlerPromise.future.map { (_, inMode) } pipeTo wrappedHandle.throttlerActor
       handleTable ::= nakedAddress(naked) -> wrappedHandle
       statusPromise.success(wrappedHandle)
-    case ManagementCommand(SetThrottle(address, direction, mode), statusPromise) ⇒
+    case s @ SetThrottle(address, direction, mode) ⇒
       val naked = nakedAddress(address)
       throttlingModes += naked -> (mode, direction)
-      val allStatuses = handleTable.map {
-        case (`naked`, handle) ⇒
-          val p = Promise[Boolean]()
-          setMode(handle, mode, direction, p)
-          p.future
-        case _ ⇒ Future.successful(true)
+      handleTable.foreach {
+        case (addr, handle) ⇒
+          if (addr == naked) setMode(handle, mode, direction)
       }
-      statusPromise completeWith Future.fold(allStatuses)(true)(_ && _)
-
     case Checkin(origin, handle) ⇒
       val naked: Address = nakedAddress(origin)
       handleTable ::= naked -> handle
-      setMode(naked, handle, Promise[Boolean]())
+      setMode(naked, handle)
 
   }
 
@@ -200,19 +192,16 @@ private[transport] class ThrottlerManager(wrappedTransport: Transport) extends A
     }
   }
 
-  private def setMode(nakedAddress: Address, handle: ThrottlerHandle, statusPromise: Promise[Boolean]): Unit = {
+  private def setMode(nakedAddress: Address, handle: ThrottlerHandle): Unit = {
     throttlingModes.get(nakedAddress) match {
-      case Some((mode, direction)) ⇒ setMode(handle, mode, direction, statusPromise)
-      case None                    ⇒ setMode(handle, Unthrottled, Direction.Both, statusPromise)
+      case Some((mode, direction)) ⇒ setMode(handle, mode, direction)
+      case None                    ⇒ setMode(handle, Unthrottled, Direction.Both)
     }
   }
 
-  private def setMode(handle: ThrottlerHandle, mode: ThrottleMode, direction: Direction,
-                      statusPromise: Promise[Boolean]): Unit = {
-    if (direction.includes(Direction.Send))
-      handle.outboundThrottleMode.set(mode)
-    if (direction.includes(Direction.Receive))
-      handle.throttlerActor ! ManagementCommand(mode, statusPromise)
+  private def setMode(handle: ThrottlerHandle, mode: ThrottleMode, direction: Direction): Unit = {
+    if (direction.includes(Direction.Receive)) handle.throttlerActor ! mode
+    if (direction.includes(Direction.Send)) handle.outboundThrottleMode.set(mode)
   }
 
   private def wrapHandle(originalHandle: AssociationHandle, listener: AssociationEventListener, inbound: Boolean): ThrottlerHandle = {
@@ -297,9 +286,9 @@ private[transport] class ThrottledAssociation(
     case Event(InboundPayload(p), _) ⇒
       throttledMessages = throttledMessages enqueue p
       stay()
-    case Event(ManagementCommand(mode: ThrottleMode, statusPromise), ExposedHandle(exposedHandle)) ⇒
+    case Event(mode: ThrottleMode, ExposedHandle(exposedHandle)) ⇒
       inboundThrottleMode = mode
-      try if (mode == Blackhole) {
+      if (inboundThrottleMode == Blackhole) {
         throttledMessages = Queue.empty[ByteString]
         exposedHandle.disassociate()
         stop()
@@ -307,7 +296,7 @@ private[transport] class ThrottledAssociation(
         associationHandler notify InboundAssociation(exposedHandle)
         exposedHandle.readHandlerPromise.future pipeTo self
         goto(WaitUpstreamListener)
-      } finally statusPromise.success(true)
+      }
   }
 
   when(WaitUpstreamListener) {
@@ -332,13 +321,12 @@ private[transport] class ThrottledAssociation(
   }
 
   when(Throttling) {
-    case Event(ManagementCommand(mode: ThrottleMode, statusPromise), _) ⇒
+    case Event(mode: ThrottleMode, _) ⇒
       inboundThrottleMode = mode
-      if (mode == Blackhole) throttledMessages = Queue.empty[ByteString]
+      if (inboundThrottleMode == Blackhole) throttledMessages = Queue.empty[ByteString]
       cancelTimer(DequeueTimerName)
       if (throttledMessages.nonEmpty)
         scheduleDequeue(inboundThrottleMode.timeToAvailable(System.nanoTime(), throttledMessages.head.length))
-      statusPromise.success(true)
       stay()
     case Event(InboundPayload(p), _) ⇒
       forwardOrDelay(p)
diff --git a/akka-remote/src/main/scala/akka/remote/transport/Transport.scala b/akka-remote/src/main/scala/akka/remote/transport/Transport.scala
index 649597f4c7..b2cdbcc54e 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/Transport.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/Transport.scala
@@ -1,6 +1,3 @@
-/**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
- */
 package akka.remote.transport
 
 import scala.concurrent.{ Promise, Future }
diff --git a/akka-remote/src/main/scala/akka/remote/transport/netty/NettyHelpers.scala b/akka-remote/src/main/scala/akka/remote/transport/netty/NettyHelpers.scala
index f4c4cd05f3..dec126cd6a 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/netty/NettyHelpers.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/netty/NettyHelpers.scala
@@ -1,6 +1,3 @@
-/**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
- */
 package akka.remote.transport.netty
 
 import akka.AkkaException
diff --git a/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala b/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
index 001b7a35f0..361337242a 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
@@ -1,6 +1,3 @@
-/**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
- */
 package akka.remote.transport.netty
 
 import akka.{ OnlyCauseStackTrace, ConfigurationException }
diff --git a/akka-remote/src/main/scala/akka/remote/transport/netty/TcpSupport.scala b/akka-remote/src/main/scala/akka/remote/transport/netty/TcpSupport.scala
index 32e4025432..515637dad0 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/netty/TcpSupport.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/netty/TcpSupport.scala
@@ -1,6 +1,3 @@
-/**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
- */
 package akka.remote.transport.netty
 
 import akka.actor.Address
diff --git a/akka-remote/src/main/scala/akka/remote/transport/netty/UdpSupport.scala b/akka-remote/src/main/scala/akka/remote/transport/netty/UdpSupport.scala
index d46c738b44..c52e8d9bc9 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/netty/UdpSupport.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/netty/UdpSupport.scala
@@ -1,6 +1,3 @@
-/**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
- */
 package akka.remote.transport.netty
 
 import akka.actor.Address

From 9faccf62703c3e483567e0cd0fe2c38444126a05 Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Wed, 9 Jan 2013 11:06:57 +0100
Subject: [PATCH 036/122] Remove todo ReentrantReadWriteLock

---
 akka-actor/src/main/scala/akka/util/BoundedBlockingQueue.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/akka-actor/src/main/scala/akka/util/BoundedBlockingQueue.scala b/akka-actor/src/main/scala/akka/util/BoundedBlockingQueue.scala
index 613599fa8e..9cb35c82c1 100644
--- a/akka-actor/src/main/scala/akka/util/BoundedBlockingQueue.scala
+++ b/akka-actor/src/main/scala/akka/util/BoundedBlockingQueue.scala
@@ -29,7 +29,7 @@ class BoundedBlockingQueue[E <: AnyRef](
       require(maxCapacity > 0)
   }
 
-  protected val lock = new ReentrantLock(false) // TODO might want to switch to ReentrantReadWriteLock
+  protected val lock = new ReentrantLock(false)
 
   private val notEmpty = lock.newCondition()
   private val notFull = lock.newCondition()

From adfeb2c1f07153b7eec11705fda956f62b1bbb04 Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Wed, 9 Jan 2013 01:47:48 +0100
Subject: [PATCH 037/122]  #2879 - updating copyright info

---
 akka-actor-tests/src/test/java/akka/actor/JavaAPI.java        | 2 +-
 akka-actor-tests/src/test/java/akka/actor/JavaExtension.java  | 2 +-
 akka-actor-tests/src/test/java/akka/actor/NonPublicClass.java | 4 ++--
 .../src/test/java/akka/routing/CustomRouteTest.java           | 2 +-
 akka-actor-tests/src/test/java/akka/util/JavaDuration.java    | 2 +-
 akka-actor-tests/src/test/scala/akka/Messages.scala           | 2 +-
 .../scala/akka/actor/ActorConfigurationVerificationSpec.scala | 2 +-
 akka-actor-tests/src/test/scala/akka/actor/ActorDSLSpec.scala | 2 +-
 .../scala/akka/actor/ActorFireForgetRequestReplySpec.scala    | 2 +-
 .../src/test/scala/akka/actor/ActorLifeCycleSpec.scala        | 2 +-
 .../src/test/scala/akka/actor/ActorLookupSpec.scala           | 4 ++--
 akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.scala | 2 +-
 .../src/test/scala/akka/actor/ActorSystemSpec.scala           | 2 +-
 .../src/test/scala/akka/actor/ActorTimeoutSpec.scala          | 2 +-
 .../src/test/scala/akka/actor/ActorWithBoundedStashSpec.scala | 2 +-
 .../src/test/scala/akka/actor/ActorWithStashSpec.scala        | 2 +-
 .../src/test/scala/akka/actor/DeathWatchSpec.scala            | 2 +-
 akka-actor-tests/src/test/scala/akka/actor/DeployerSpec.scala | 2 +-
 akka-actor-tests/src/test/scala/akka/actor/FSMActorSpec.scala | 2 +-
 .../src/test/scala/akka/actor/FSMTimingSpec.scala             | 2 +-
 .../src/test/scala/akka/actor/FSMTransitionSpec.scala         | 2 +-
 .../src/test/scala/akka/actor/ForwardActorSpec.scala          | 2 +-
 akka-actor-tests/src/test/scala/akka/actor/HotSwapSpec.scala  | 2 +-
 akka-actor-tests/src/test/scala/akka/actor/IOActor.scala      | 2 +-
 akka-actor-tests/src/test/scala/akka/actor/JavaAPISpec.scala  | 2 +-
 .../src/test/scala/akka/actor/LocalActorRefProviderSpec.scala | 2 +-
 .../src/test/scala/akka/actor/ReceiveTimeoutSpec.scala        | 2 +-
 .../src/test/scala/akka/actor/RelativeActorPathSpec.scala     | 2 +-
 .../src/test/scala/akka/actor/RestartStrategySpec.scala       | 2 +-
 akka-actor-tests/src/test/scala/akka/actor/Supervisor.scala   | 2 +-
 .../src/test/scala/akka/actor/SupervisorHierarchySpec.scala   | 2 +-
 .../src/test/scala/akka/actor/SupervisorMiscSpec.scala        | 2 +-
 .../src/test/scala/akka/actor/SupervisorSpec.scala            | 2 +-
 .../src/test/scala/akka/actor/SupervisorTreeSpec.scala        | 2 +-
 .../src/test/scala/akka/actor/Ticket669Spec.scala             | 2 +-
 .../src/test/scala/akka/actor/TypedActorSpec.scala            | 2 +-
 .../src/test/scala/akka/actor/dispatch/ActorModelSpec.scala   | 2 +-
 .../src/test/scala/akka/actor/dispatch/DispatchersSpec.scala  | 2 +-
 akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala  | 2 +-
 .../src/test/scala/akka/dataflow/Future2Actor.scala           | 2 +-
 .../src/test/scala/akka/dispatch/MailboxConfigSpec.scala      | 2 +-
 akka-actor-tests/src/test/scala/akka/event/EventBusSpec.scala | 2 +-
 .../src/test/scala/akka/event/EventStreamSpec.scala           | 2 +-
 .../src/test/scala/akka/event/LoggingReceiveSpec.scala        | 2 +-
 akka-actor-tests/src/test/scala/akka/pattern/AskSpec.scala    | 4 ++--
 .../src/test/scala/akka/pattern/CircuitBreakerMTSpec.scala    | 4 ++--
 .../src/test/scala/akka/pattern/CircuitBreakerSpec.scala      | 2 +-
 .../src/test/scala/akka/pattern/PatternSpec.scala             | 2 +-
 .../test/scala/akka/routing/ConfiguredLocalRoutingSpec.scala  | 2 +-
 .../test/scala/akka/routing/ConsistentHashingRouterSpec.scala | 2 +-
 .../src/test/scala/akka/routing/CustomRouteSpec.scala         | 4 ++--
 .../src/test/scala/akka/routing/ResizerSpec.scala             | 2 +-
 .../src/test/scala/akka/routing/RoutingSpec.scala             | 2 +-
 .../src/test/scala/akka/serialization/SerializeSpec.scala     | 2 +-
 .../scala/akka/testkit/CallingThreadDispatcherModelSpec.scala | 2 +-
 akka-actor-tests/src/test/scala/akka/util/DurationSpec.scala  | 2 +-
 akka-actor-tests/src/test/scala/akka/util/IndexSpec.scala     | 4 ++--
 .../src/test/scala/akka/util/JavaDurationSpec.scala           | 2 +-
 akka-actor-tests/src/test/scala/akka/util/SwitchSpec.scala    | 2 +-
 akka-actor/src/main/java/akka/actor/AbstractActorRef.java     | 2 +-
 .../src/main/java/akka/actor/dungeon/AbstractActorCell.java   | 2 +-
 akka-actor/src/main/java/akka/dispatch/AbstractMailbox.java   | 2 +-
 .../main/java/akka/dispatch/AbstractMessageDispatcher.java    | 2 +-
 .../src/main/java/akka/pattern/AbstractCircuitBreaker.java    | 2 +-
 .../src/main/java/akka/pattern/AbstractPromiseActorRef.java   | 4 ++--
 akka-actor/src/main/scala/akka/AkkaException.scala            | 2 +-
 akka-actor/src/main/scala/akka/actor/Actor.scala              | 2 +-
 akka-actor/src/main/scala/akka/actor/ActorCell.scala          | 2 +-
 akka-actor/src/main/scala/akka/actor/ActorDSL.scala           | 2 +-
 akka-actor/src/main/scala/akka/actor/ActorPath.scala          | 2 +-
 akka-actor/src/main/scala/akka/actor/ActorRef.scala           | 2 +-
 akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala   | 2 +-
 akka-actor/src/main/scala/akka/actor/ActorSelection.scala     | 4 ++--
 akka-actor/src/main/scala/akka/actor/ActorSystem.scala        | 2 +-
 akka-actor/src/main/scala/akka/actor/Address.scala            | 4 ++--
 akka-actor/src/main/scala/akka/actor/Deployer.scala           | 2 +-
 akka-actor/src/main/scala/akka/actor/DynamicAccess.scala      | 4 ++--
 akka-actor/src/main/scala/akka/actor/Extension.scala          | 2 +-
 akka-actor/src/main/scala/akka/actor/FSM.scala                | 2 +-
 akka-actor/src/main/scala/akka/actor/FaultHandling.scala      | 2 +-
 akka-actor/src/main/scala/akka/actor/IO.scala                 | 2 +-
 akka-actor/src/main/scala/akka/actor/Props.scala              | 2 +-
 .../src/main/scala/akka/actor/RepointableActorRef.scala       | 2 +-
 akka-actor/src/main/scala/akka/actor/Scheduler.scala          | 2 +-
 akka-actor/src/main/scala/akka/actor/Stash.scala              | 2 +-
 akka-actor/src/main/scala/akka/actor/TypedActor.scala         | 2 +-
 akka-actor/src/main/scala/akka/actor/UntypedActor.scala       | 2 +-
 .../src/main/scala/akka/actor/UntypedActorWithStash.scala     | 2 +-
 akka-actor/src/main/scala/akka/actor/dsl/Creators.scala       | 2 +-
 akka-actor/src/main/scala/akka/actor/dsl/Inbox.scala          | 2 +-
 akka-actor/src/main/scala/akka/actor/dungeon/Children.scala   | 4 ++--
 .../src/main/scala/akka/actor/dungeon/ChildrenContainer.scala | 4 ++--
 akka-actor/src/main/scala/akka/actor/dungeon/DeathWatch.scala | 4 ++--
 akka-actor/src/main/scala/akka/actor/dungeon/Dispatch.scala   | 4 ++--
 .../src/main/scala/akka/actor/dungeon/FaultHandling.scala     | 2 +-
 .../src/main/scala/akka/actor/dungeon/ReceiveTimeout.scala    | 4 ++--
 akka-actor/src/main/scala/akka/actor/package.scala            | 2 +-
 .../src/main/scala/akka/dispatch/AbstractDispatcher.scala     | 2 +-
 .../src/main/scala/akka/dispatch/BalancingDispatcher.scala    | 2 +-
 .../src/main/scala/akka/dispatch/BatchingExecutor.scala       | 2 +-
 akka-actor/src/main/scala/akka/dispatch/Dispatcher.scala      | 2 +-
 akka-actor/src/main/scala/akka/dispatch/Dispatchers.scala     | 2 +-
 akka-actor/src/main/scala/akka/dispatch/Future.scala          | 2 +-
 akka-actor/src/main/scala/akka/dispatch/Mailbox.scala         | 2 +-
 .../src/main/scala/akka/dispatch/PinnedDispatcher.scala       | 2 +-
 .../src/main/scala/akka/dispatch/ThreadPoolBuilder.scala      | 4 ++--
 akka-actor/src/main/scala/akka/event/EventBus.scala           | 2 +-
 akka-actor/src/main/scala/akka/event/EventStream.scala        | 4 ++--
 akka-actor/src/main/scala/akka/event/Logging.scala            | 2 +-
 akka-actor/src/main/scala/akka/event/LoggingReceive.scala     | 4 ++--
 akka-actor/src/main/scala/akka/japi/JavaAPI.scala             | 2 +-
 akka-actor/src/main/scala/akka/pattern/AskSupport.scala       | 4 ++--
 akka-actor/src/main/scala/akka/pattern/CircuitBreaker.scala   | 2 +-
 .../src/main/scala/akka/pattern/FutureTimeoutSupport.scala    | 4 ++--
 .../src/main/scala/akka/pattern/GracefulStopSupport.scala     | 4 ++--
 akka-actor/src/main/scala/akka/pattern/Patterns.scala         | 2 +-
 akka-actor/src/main/scala/akka/pattern/PipeToSupport.scala    | 4 ++--
 akka-actor/src/main/scala/akka/pattern/package.scala          | 4 ++--
 akka-actor/src/main/scala/akka/routing/ConsistentHash.scala   | 2 +-
 .../src/main/scala/akka/routing/ConsistentHashingRouter.scala | 4 ++--
 akka-actor/src/main/scala/akka/routing/Listeners.scala        | 2 +-
 akka-actor/src/main/scala/akka/routing/Routing.scala          | 2 +-
 akka-actor/src/main/scala/akka/routing/package.scala          | 2 +-
 .../src/main/scala/akka/serialization/Serialization.scala     | 2 +-
 .../scala/akka/serialization/SerializationExtension.scala     | 4 ++--
 akka-actor/src/main/scala/akka/serialization/Serializer.scala | 2 +-
 .../src/main/scala/akka/util/BoundedBlockingQueue.scala       | 2 +-
 akka-actor/src/main/scala/akka/util/BoxedType.scala           | 2 +-
 akka-actor/src/main/scala/akka/util/ByteIterator.scala        | 2 +-
 akka-actor/src/main/scala/akka/util/ByteString.scala          | 2 +-
 .../main/scala/akka/util/ClassLoaderObjectInputStream.scala   | 2 +-
 akka-actor/src/main/scala/akka/util/Collections.scala         | 4 ++--
 akka-actor/src/main/scala/akka/util/Crypt.scala               | 2 +-
 akka-actor/src/main/scala/akka/util/HashCode.scala            | 2 +-
 akka-actor/src/main/scala/akka/util/Helpers.scala             | 2 +-
 akka-actor/src/main/scala/akka/util/Index.scala               | 2 +-
 akka-actor/src/main/scala/akka/util/LockUtil.scala            | 2 +-
 akka-actor/src/main/scala/akka/util/Reflect.scala             | 4 ++--
 akka-actor/src/main/scala/akka/util/SubclassifiedIndex.scala  | 2 +-
 akka-actor/src/main/scala/akka/util/Timeout.scala             | 2 +-
 akka-actor/src/main/scala/akka/util/Unsafe.java               | 2 +-
 akka-actor/src/main/scala/akka/util/WildcardTree.scala        | 2 +-
 akka-agent/src/main/scala/akka/agent/Agent.scala              | 2 +-
 akka-camel/src/main/scala/akka/camel/Activation.scala         | 2 +-
 .../src/main/scala/akka/camel/ActorRouteDefinition.scala      | 2 +-
 akka-camel/src/main/scala/akka/camel/Camel.scala              | 2 +-
 akka-camel/src/main/scala/akka/camel/CamelMessage.scala       | 2 +-
 akka-camel/src/main/scala/akka/camel/Consumer.scala           | 2 +-
 akka-camel/src/main/scala/akka/camel/Producer.scala           | 2 +-
 .../main/scala/akka/camel/internal/ActivationMessage.scala    | 4 ++--
 .../main/scala/akka/camel/internal/ActivationTracker.scala    | 2 +-
 .../scala/akka/camel/internal/ConsumerActorRouteBuilder.scala | 2 +-
 .../scala/akka/camel/internal/component/ActorComponent.scala  | 2 +-
 .../main/scala/akka/camel/javaapi/UntypedConsumerActor.scala  | 2 +-
 .../main/scala/akka/camel/javaapi/UntypedProducerActor.scala  | 2 +-
 akka-camel/src/main/scala/akka/package.scala                  | 2 +-
 akka-camel/src/test/java/akka/camel/ConsumerJavaTestBase.java | 2 +-
 akka-camel/src/test/java/akka/camel/MessageJavaTestBase.java  | 2 +-
 .../src/test/java/akka/camel/SampleErrorHandlingConsumer.java | 2 +-
 .../src/test/java/akka/camel/SampleUntypedConsumer.java       | 2 +-
 .../test/java/akka/camel/SampleUntypedForwardingProducer.java | 2 +-
 .../test/java/akka/camel/SampleUntypedReplyingProducer.java   | 2 +-
 .../src/test/scala/akka/camel/ActivationIntegrationTest.scala | 4 ++--
 akka-camel/src/test/scala/akka/camel/CamelConfigSpec.scala    | 2 +-
 .../src/test/scala/akka/camel/CamelExchangeAdapterTest.scala  | 2 +-
 akka-camel/src/test/scala/akka/camel/CamelMessageTest.scala   | 2 +-
 .../src/test/scala/akka/camel/ConcurrentActivationTest.scala  | 2 +-
 .../src/test/scala/akka/camel/ConsumerIntegrationTest.scala   | 2 +-
 akka-camel/src/test/scala/akka/camel/ConsumerJavaTest.scala   | 4 ++--
 akka-camel/src/test/scala/akka/camel/MessageJavaTest.scala    | 2 +-
 akka-camel/src/test/scala/akka/camel/MessageScalaTest.scala   | 2 +-
 .../src/test/scala/akka/camel/ProducerFeatureTest.scala       | 2 +-
 akka-camel/src/test/scala/akka/camel/TestSupport.scala        | 2 +-
 .../src/test/scala/akka/camel/UntypedProducerTest.scala       | 2 +-
 .../internal/component/ActorComponentConfigurationTest.scala  | 4 ++--
 .../akka/camel/internal/component/ActorProducerTest.scala     | 2 +-
 .../akka/camel/internal/component/DurationConverterTest.scala | 2 +-
 .../src/main/scala/akka/cluster/AccrualFailureDetector.scala  | 2 +-
 akka-cluster/src/main/scala/akka/cluster/Cluster.scala        | 2 +-
 .../src/main/scala/akka/cluster/ClusterActorRefProvider.scala | 2 +-
 akka-cluster/src/main/scala/akka/cluster/ClusterDaemon.scala  | 2 +-
 akka-cluster/src/main/scala/akka/cluster/ClusterEvent.scala   | 2 +-
 .../src/main/scala/akka/cluster/ClusterHeartbeat.scala        | 2 +-
 akka-cluster/src/main/scala/akka/cluster/ClusterJmx.scala     | 2 +-
 .../src/main/scala/akka/cluster/ClusterMetricsCollector.scala | 2 +-
 .../src/main/scala/akka/cluster/ClusterReadView.scala         | 2 +-
 .../src/main/scala/akka/cluster/ClusterSettings.scala         | 2 +-
 .../src/main/scala/akka/cluster/FailureDetector.scala         | 2 +-
 akka-cluster/src/main/scala/akka/cluster/Gossip.scala         | 2 +-
 akka-cluster/src/main/scala/akka/cluster/Member.scala         | 4 ++--
 akka-cluster/src/main/scala/akka/cluster/VectorClock.scala    | 2 +-
 .../akka/cluster/routing/AdaptiveLoadBalancingRouter.scala    | 4 ++--
 .../main/scala/akka/cluster/routing/ClusterRouterConfig.scala | 2 +-
 .../akka/cluster/ClientDowningNodeThatIsUnreachableSpec.scala | 2 +-
 .../scala/akka/cluster/ClientDowningNodeThatIsUpSpec.scala    | 2 +-
 .../akka/cluster/ClusterAccrualFailureDetectorSpec.scala      | 2 +-
 .../multi-jvm/scala/akka/cluster/ClusterDeathWatchSpec.scala  | 2 +-
 .../scala/akka/cluster/ClusterMetricsDisabledSpec.scala       | 2 +-
 .../src/multi-jvm/scala/akka/cluster/ClusterMetricsSpec.scala | 4 ++--
 .../src/multi-jvm/scala/akka/cluster/ConvergenceSpec.scala    | 2 +-
 .../src/multi-jvm/scala/akka/cluster/JoinInProgressSpec.scala | 2 +-
 .../src/multi-jvm/scala/akka/cluster/JoinSeedNodeSpec.scala   | 2 +-
 .../multi-jvm/scala/akka/cluster/JoinTwoClustersSpec.scala    | 2 +-
 .../akka/cluster/LeaderDowningNodeThatIsUnreachableSpec.scala | 2 +-
 .../src/multi-jvm/scala/akka/cluster/LeaderElectionSpec.scala | 2 +-
 .../src/multi-jvm/scala/akka/cluster/LeaderLeavingSpec.scala  | 2 +-
 akka-cluster/src/multi-jvm/scala/akka/cluster/MBeanSpec.scala | 2 +-
 .../akka/cluster/MembershipChangeListenerExitingSpec.scala    | 2 +-
 .../scala/akka/cluster/MembershipChangeListenerJoinSpec.scala | 2 +-
 .../akka/cluster/MembershipChangeListenerLeavingSpec.scala    | 2 +-
 .../scala/akka/cluster/MembershipChangeListenerUpSpec.scala   | 2 +-
 .../multi-jvm/scala/akka/cluster/MinMembersBeforeUpSpec.scala | 2 +-
 .../multi-jvm/scala/akka/cluster/MultiNodeClusterSpec.scala   | 2 +-
 .../cluster/NodeLeavingAndExitingAndBeingRemovedSpec.scala    | 2 +-
 .../scala/akka/cluster/NodeLeavingAndExitingSpec.scala        | 2 +-
 .../src/multi-jvm/scala/akka/cluster/NodeMembershipSpec.scala | 2 +-
 .../src/multi-jvm/scala/akka/cluster/NodeUpSpec.scala         | 2 +-
 .../multi-jvm/scala/akka/cluster/SingletonClusterSpec.scala   | 2 +-
 .../src/multi-jvm/scala/akka/cluster/SplitBrainSpec.scala     | 2 +-
 .../src/multi-jvm/scala/akka/cluster/StressSpec.scala         | 2 +-
 .../src/multi-jvm/scala/akka/cluster/SunnyWeatherSpec.scala   | 2 +-
 .../src/multi-jvm/scala/akka/cluster/TransitionSpec.scala     | 2 +-
 .../akka/cluster/UnreachableNodeRejoinsClusterSpec.scala      | 2 +-
 .../cluster/routing/AdaptiveLoadBalancingRouterSpec.scala     | 2 +-
 .../cluster/routing/ClusterConsistentHashingRouterSpec.scala  | 2 +-
 .../cluster/routing/ClusterRoundRobinRoutedActorSpec.scala    | 2 +-
 .../test/scala/akka/cluster/AccrualFailureDetectorSpec.scala  | 2 +-
 .../src/test/scala/akka/cluster/ClusterConfigSpec.scala       | 2 +-
 .../src/test/scala/akka/cluster/ClusterDeployerSpec.scala     | 4 ++--
 .../scala/akka/cluster/ClusterDomainEventPublisherSpec.scala  | 2 +-
 .../src/test/scala/akka/cluster/ClusterDomainEventSpec.scala  | 2 +-
 .../scala/akka/cluster/ClusterHeartbeatSenderStateSpec.scala  | 2 +-
 akka-cluster/src/test/scala/akka/cluster/ClusterSpec.scala    | 2 +-
 akka-cluster/src/test/scala/akka/cluster/EWMASpec.scala       | 2 +-
 .../src/test/scala/akka/cluster/FailureDetectorPuppet.scala   | 2 +-
 akka-cluster/src/test/scala/akka/cluster/GossipSpec.scala     | 2 +-
 .../src/test/scala/akka/cluster/MemberOrderingSpec.scala      | 2 +-
 .../test/scala/akka/cluster/MetricNumericConverterSpec.scala  | 4 ++--
 .../src/test/scala/akka/cluster/MetricValuesSpec.scala        | 4 ++--
 .../src/test/scala/akka/cluster/MetricsCollectorSpec.scala    | 2 +-
 .../src/test/scala/akka/cluster/MetricsGossipSpec.scala       | 2 +-
 .../src/test/scala/akka/cluster/NodeMetricsSpec.scala         | 2 +-
 .../src/test/scala/akka/cluster/VectorClockSpec.scala         | 2 +-
 .../test/scala/akka/cluster/routing/MetricsSelectorSpec.scala | 2 +-
 .../test/scala/akka/cluster/routing/WeightedRouteesSpec.scala | 2 +-
 .../src/main/scala/akka/contrib/pattern/ReliableProxy.scala   | 2 +-
 .../scala/akka/contrib/throttle/TimerBasedThrottler.scala     | 4 ++--
 .../scala/akka/contrib/pattern/ReliableProxySpec.scala        | 2 +-
 .../src/test/java/akka/contrib/pattern/ReliableProxyTest.java | 2 +-
 .../scala/akka/contrib/pattern/ReliableProxyDocSpec.scala     | 2 +-
 .../scala/akka/contrib/throttle/TimerBasedThrottlerSpec.scala | 4 ++--
 akka-dataflow/src/main/scala/akka/dataflow/package.scala      | 4 ++--
 akka-dataflow/src/test/scala/akka/dataflow/DataflowSpec.scala | 2 +-
 akka-docs/_sphinx/themes/akka/layout.html                     | 2 +-
 .../code/docs/circuitbreaker/CircuitBreakerDocSpec.scala      | 2 +-
 .../common/code/docs/circuitbreaker/DangerousJavaActor.java   | 4 ++--
 akka-docs/rst/common/code/docs/duration/Java.java             | 2 +-
 akka-docs/rst/common/code/docs/duration/Sample.scala          | 2 +-
 akka-docs/rst/general/code/docs/config/ConfigDoc.java         | 2 +-
 akka-docs/rst/general/code/docs/config/ConfigDocSpec.scala    | 2 +-
 akka-docs/rst/java/code/docs/actor/FSMDocTest.scala           | 4 ++--
 akka-docs/rst/java/code/docs/actor/FSMDocTestBase.java        | 2 +-
 akka-docs/rst/java/code/docs/actor/FaultHandlingTest.scala    | 2 +-
 akka-docs/rst/java/code/docs/actor/FaultHandlingTestBase.java | 2 +-
 akka-docs/rst/java/code/docs/actor/FirstUntypedActor.java     | 2 +-
 akka-docs/rst/java/code/docs/actor/ImmutableMessage.java      | 2 +-
 .../java/code/docs/actor/MyReceivedTimeoutUntypedActor.java   | 4 ++--
 akka-docs/rst/java/code/docs/actor/MyUntypedActor.java        | 2 +-
 akka-docs/rst/java/code/docs/actor/SchedulerDocTest.scala     | 2 +-
 akka-docs/rst/java/code/docs/actor/SchedulerDocTestBase.java  | 2 +-
 akka-docs/rst/java/code/docs/actor/TypedActorDocTest.scala    | 2 +-
 akka-docs/rst/java/code/docs/actor/TypedActorDocTestBase.java | 2 +-
 akka-docs/rst/java/code/docs/actor/UntypedActorDocTest.scala  | 2 +-
 .../rst/java/code/docs/actor/UntypedActorDocTestBase.java     | 2 +-
 akka-docs/rst/java/code/docs/actor/UntypedActorSwapper.java   | 2 +-
 .../rst/java/code/docs/actor/japi/FaultHandlingDocSample.java | 4 ++--
 akka-docs/rst/java/code/docs/agent/AgentDocJavaSpec.scala     | 4 ++--
 akka-docs/rst/java/code/docs/agent/AgentDocTest.java          | 4 ++--
 .../rst/java/code/docs/dispatcher/DispatcherDocTest.scala     | 2 +-
 .../rst/java/code/docs/dispatcher/DispatcherDocTestBase.java  | 2 +-
 akka-docs/rst/java/code/docs/event/LoggingDocTest.scala       | 2 +-
 akka-docs/rst/java/code/docs/event/LoggingDocTestBase.java    | 2 +-
 akka-docs/rst/java/code/docs/extension/ExtensionDocTest.scala | 2 +-
 .../rst/java/code/docs/extension/ExtensionDocTestBase.java    | 2 +-
 .../java/code/docs/extension/SettingsExtensionDocTest.scala   | 2 +-
 .../code/docs/extension/SettingsExtensionDocTestBase.java     | 2 +-
 akka-docs/rst/java/code/docs/future/FutureDocTest.scala       | 2 +-
 akka-docs/rst/java/code/docs/future/FutureDocTestBase.java    | 2 +-
 .../docs/jrouting/ConsistentHashingRouterDocTestBase.java     | 2 +-
 .../rst/java/code/docs/jrouting/CustomRouterDocTestBase.java  | 2 +-
 akka-docs/rst/java/code/docs/jrouting/FibonacciActor.java     | 2 +-
 akka-docs/rst/java/code/docs/jrouting/ParentActor.java        | 4 ++--
 akka-docs/rst/java/code/docs/jrouting/PrintlnActor.java       | 2 +-
 .../rst/java/code/docs/jrouting/RouterViaConfigExample.java   | 4 ++--
 .../rst/java/code/docs/jrouting/RouterViaProgramExample.java  | 4 ++--
 akka-docs/rst/java/code/docs/pattern/JavaTemplate.java        | 2 +-
 .../rst/java/code/docs/pattern/SchedulerPatternTest.java      | 2 +-
 .../rst/java/code/docs/remoting/RemoteDeploymentDocTest.scala | 4 ++--
 .../java/code/docs/remoting/RemoteDeploymentDocTestBase.java  | 4 ++--
 .../java/code/docs/serialization/SerializationDocTest.scala   | 2 +-
 .../code/docs/serialization/SerializationDocTestBase.java     | 2 +-
 akka-docs/rst/java/code/docs/testkit/TestKitDocTest.java      | 2 +-
 akka-docs/rst/java/code/docs/testkit/TestKitSampleTest.java   | 2 +-
 .../rst/java/code/docs/transactor/CoordinatedCounter.java     | 2 +-
 akka-docs/rst/java/code/docs/transactor/Coordinator.java      | 2 +-
 akka-docs/rst/java/code/docs/transactor/Counter.java          | 2 +-
 akka-docs/rst/java/code/docs/transactor/FriendlyCounter.java  | 2 +-
 akka-docs/rst/java/code/docs/transactor/Increment.java        | 2 +-
 akka-docs/rst/java/code/docs/transactor/Message.java          | 2 +-
 .../rst/java/code/docs/transactor/TransactorDocJavaSpec.scala | 4 ++--
 .../rst/java/code/docs/transactor/TransactorDocTest.java      | 2 +-
 akka-docs/rst/java/code/docs/zeromq/ZeromqDocTest.scala       | 2 +-
 akka-docs/rst/java/code/docs/zeromq/ZeromqDocTestBase.java    | 2 +-
 .../code/docs/actor/mailbox/DurableMailboxDocSpec.scala       | 4 ++--
 .../code/docs/actor/mailbox/DurableMailboxDocTest.scala       | 2 +-
 .../code/docs/actor/mailbox/DurableMailboxDocTestBase.java    | 2 +-
 akka-docs/rst/scala/code/docs/actor/ActorDocSpec.scala        | 2 +-
 akka-docs/rst/scala/code/docs/actor/FSMDocSpec.scala          | 2 +-
 .../rst/scala/code/docs/actor/FaultHandlingDocSample.scala    | 2 +-
 .../rst/scala/code/docs/actor/FaultHandlingDocSpec.scala      | 2 +-
 akka-docs/rst/scala/code/docs/actor/SchedulerDocSpec.scala    | 2 +-
 akka-docs/rst/scala/code/docs/actor/TypedActorDocSpec.scala   | 2 +-
 akka-docs/rst/scala/code/docs/actor/UnnestedReceives.scala    | 2 +-
 akka-docs/rst/scala/code/docs/agent/AgentDocSpec.scala        | 2 +-
 akka-docs/rst/scala/code/docs/camel/Consumers.scala           | 4 ++--
 akka-docs/rst/scala/code/docs/camel/CustomRoute.scala         | 2 +-
 akka-docs/rst/scala/code/docs/dataflow/DataflowDocSpec.scala  | 2 +-
 .../rst/scala/code/docs/dispatcher/DispatcherDocSpec.scala    | 2 +-
 akka-docs/rst/scala/code/docs/event/LoggingDocSpec.scala      | 2 +-
 .../rst/scala/code/docs/extension/ExtensionDocSpec.scala      | 2 +-
 .../scala/code/docs/extension/SettingsExtensionDocSpec.scala  | 2 +-
 akka-docs/rst/scala/code/docs/future/FutureDocSpec.scala      | 2 +-
 akka-docs/rst/scala/code/docs/io/BinaryCoding.scala           | 2 +-
 akka-docs/rst/scala/code/docs/io/HTTPServer.scala             | 2 +-
 akka-docs/rst/scala/code/docs/pattern/ScalaTemplate.scala     | 2 +-
 .../rst/scala/code/docs/pattern/SchedulerPatternSpec.scala    | 2 +-
 .../scala/code/docs/remoting/RemoteDeploymentDocSpec.scala    | 4 ++--
 .../code/docs/routing/ConsistentHashingRouterDocSpec.scala    | 2 +-
 akka-docs/rst/scala/code/docs/routing/RouterDocSpec.scala     | 2 +-
 akka-docs/rst/scala/code/docs/routing/RouterTypeExample.scala | 4 ++--
 .../rst/scala/code/docs/routing/RouterViaConfigDocSpec.scala  | 4 ++--
 .../rst/scala/code/docs/routing/RouterViaConfigExample.scala  | 4 ++--
 .../rst/scala/code/docs/routing/RouterViaProgramExample.scala | 4 ++--
 .../scala/code/docs/serialization/SerializationDocSpec.scala  | 2 +-
 akka-docs/rst/scala/code/docs/testkit/PlainWordSpec.scala     | 4 ++--
 akka-docs/rst/scala/code/docs/testkit/TestKitUsageSpec.scala  | 4 ++--
 akka-docs/rst/scala/code/docs/testkit/TestkitDocSpec.scala    | 2 +-
 .../rst/scala/code/docs/transactor/TransactorDocSpec.scala    | 2 +-
 akka-docs/rst/scala/code/docs/zeromq/ZeromqDocSpec.scala      | 2 +-
 .../scala/akka/actor/mailbox/filebased/FileBasedMailbox.scala | 2 +-
 .../actor/mailbox/filebased/FileBasedMailboxSettings.scala    | 2 +-
 .../src/main/scala/akka/actor/mailbox/DurableMailbox.scala    | 2 +-
 .../test/scala/akka/actor/mailbox/DurableMailboxSpec.scala    | 2 +-
 .../osgi/aries/blueprint/BlueprintActorSystemFactory.scala    | 2 +-
 .../akka/osgi/aries/blueprint/ActorSystemAwareBean.scala      | 2 +-
 .../akka/osgi/aries/blueprint/NamespaceHandlerTest.scala      | 2 +-
 akka-osgi/src/main/scala/akka/osgi/ActorSystemActivator.scala | 2 +-
 .../src/main/scala/akka/osgi/OsgiActorSystemFactory.scala     | 2 +-
 .../scala/akka/osgi/impl/BundleDelegatingClassLoader.scala    | 2 +-
 .../src/test/scala/akka/osgi/ActorSystemActivatorTest.scala   | 4 ++--
 akka-osgi/src/test/scala/akka/osgi/PojoSRTestSupport.scala    | 2 +-
 akka-osgi/src/test/scala/akka/osgi/test/PingPong.scala        | 2 +-
 akka-osgi/src/test/scala/akka/osgi/test/TestActivators.scala  | 4 ++--
 .../src/main/scala/akka/remote/testconductor/Conductor.scala  | 2 +-
 .../src/main/scala/akka/remote/testkit/MultiNodeSpec.scala    | 2 +-
 .../multi-jvm/scala/akka/remote/LookupRemoteActorSpec.scala   | 2 +-
 .../src/multi-jvm/scala/akka/remote/NewRemoteActorSpec.scala  | 2 +-
 .../akka/remote/router/RandomRoutedRemoteActorSpec.scala      | 2 +-
 .../akka/remote/router/RoundRobinRoutedRemoteActorSpec.scala  | 2 +-
 .../remote/router/ScatterGatherRoutedRemoteActorSpec.scala    | 2 +-
 .../scala/akka/remote/testconductor/TestConductorSpec.scala   | 2 +-
 .../scala/akka/remote/testkit/MultiNodeSpecSpec.scala         | 2 +-
 .../src/test/scala/akka/remote/QuietReporter.scala            | 2 +-
 .../test/scala/akka/remote/testconductor/BarrierSpec.scala    | 2 +-
 .../test/scala/akka/remote/testconductor/ControllerSpec.scala | 4 ++--
 .../src/test/scala/akka/remote/testkit/LogRoleReplace.scala   | 4 ++--
 .../src/test/scala/akka/remote/testkit/STMultiNodeSpec.scala  | 2 +-
 akka-remote/src/main/protocol/RemoteProtocol.proto            | 4 ++--
 .../scala/akka/remote/DefaultFailureDetectorRegistry.scala    | 2 +-
 .../src/main/scala/akka/remote/FailureDetectorRegistry.scala  | 2 +-
 .../src/main/scala/akka/remote/MessageSerializer.scala        | 2 +-
 .../src/main/scala/akka/remote/RemoteActorRefProvider.scala   | 2 +-
 akka-remote/src/main/scala/akka/remote/RemoteDaemon.scala     | 2 +-
 akka-remote/src/main/scala/akka/remote/RemoteDeployer.scala   | 4 ++--
 akka-remote/src/main/scala/akka/remote/RemoteSettings.scala   | 2 +-
 akka-remote/src/main/scala/akka/remote/netty/Client.scala     | 2 +-
 .../src/main/scala/akka/remote/netty/NettyRemoteSupport.scala | 2 +-
 .../src/main/scala/akka/remote/netty/NettySSLSupport.scala    | 2 +-
 akka-remote/src/main/scala/akka/remote/netty/Server.scala     | 2 +-
 akka-remote/src/main/scala/akka/remote/netty/Settings.scala   | 2 +-
 .../main/scala/akka/remote/routing/RemoteRouterConfig.scala   | 2 +-
 .../akka/remote/security/provider/AES128CounterInetRNG.scala  | 2 +-
 .../remote/security/provider/AES128CounterSecureRNG.scala     | 2 +-
 .../akka/remote/security/provider/AES256CounterInetRNG.scala  | 2 +-
 .../remote/security/provider/AES256CounterSecureRNG.scala     | 2 +-
 .../scala/akka/remote/security/provider/AkkaProvider.scala    | 2 +-
 .../main/scala/akka/remote/security/provider/SeedSize.scala   | 2 +-
 .../akka/remote/serialization/DaemonMsgCreateSerializer.scala | 4 ++--
 .../scala/akka/remote/serialization/ProtobufSerializer.scala  | 4 ++--
 akka-remote/src/test/protocol/ProtobufProtocol.proto          | 2 +-
 .../test/scala/akka/remote/AccrualFailureDetectorSpec.scala   | 2 +-
 .../src/test/scala/akka/remote/NetworkFailureSpec.scala       | 2 +-
 .../src/test/scala/akka/remote/RemoteCommunicationSpec.scala  | 2 +-
 akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala | 2 +-
 .../src/test/scala/akka/remote/RemoteDeathWatchSpec.scala     | 2 +-
 .../src/test/scala/akka/remote/RemoteDeployerSpec.scala       | 4 ++--
 akka-remote/src/test/scala/akka/remote/RemoteRouterSpec.scala | 2 +-
 akka-remote/src/test/scala/akka/remote/RemotingSpec.scala     | 2 +-
 .../test/scala/akka/remote/Ticket1978CommunicationSpec.scala  | 2 +-
 akka-remote/src/test/scala/akka/remote/UntrustedSpec.scala    | 4 ++--
 .../remote/serialization/DaemonMsgCreateSerializerSpec.scala  | 2 +-
 .../akka/remote/serialization/ProtobufSerializerSpec.scala    | 2 +-
 .../src/main/java/sample/kernel/hello/java/HelloKernel.java   | 2 +-
 .../src/main/scala/sample/kernel/hello/HelloKernel.scala      | 2 +-
 .../akka-sample-hello/src/main/scala/sample/hello/Main.scala  | 2 +-
 .../multi-jvm/scala/sample/multinode/MultiNodeSample.scala    | 2 +-
 .../src/test/scala/sample/multinode/STMultiNodeSpec.scala     | 2 +-
 .../main/java/sample/remote/calculator/java/InternalMsg.java  | 2 +-
 .../remote/calculator/java/JAdvancedCalculatorActor.java      | 2 +-
 .../src/main/java/sample/remote/calculator/java/JCalcApp.java | 2 +-
 .../sample/remote/calculator/java/JCalculatorApplication.java | 4 ++--
 .../java/sample/remote/calculator/java/JCreationActor.java    | 2 +-
 .../main/java/sample/remote/calculator/java/JCreationApp.java | 2 +-
 .../sample/remote/calculator/java/JCreationApplication.java   | 2 +-
 .../main/java/sample/remote/calculator/java/JLookupActor.java | 2 +-
 .../main/java/sample/remote/calculator/java/JLookupApp.java   | 2 +-
 .../sample/remote/calculator/java/JLookupApplication.java     | 2 +-
 .../sample/remote/calculator/java/JSimpleCalculatorActor.java | 2 +-
 .../src/main/java/sample/remote/calculator/java/Op.java       | 2 +-
 .../sample/remote/calculator/CalculatorApplication.scala      | 2 +-
 .../scala/sample/remote/calculator/CreationApplication.scala  | 2 +-
 .../scala/sample/remote/calculator/LookupApplication.scala    | 2 +-
 .../src/main/scala/sample/remote/calculator/MathOp.scala      | 4 ++--
 akka-sbt-plugin/sample/src/main/scala/HelloKernel.scala       | 4 ++--
 .../src/main/scala/akka/event/slf4j/Slf4jEventHandler.scala   | 2 +-
 .../test/scala/akka/event/slf4j/Slf4jEventHandlerSpec.scala   | 2 +-
 akka-testkit/src/main/java/akka/testkit/JavaTestKit.java      | 2 +-
 .../src/main/scala/akka/testkit/CallingThreadDispatcher.scala | 2 +-
 akka-testkit/src/main/scala/akka/testkit/Routing.scala        | 2 +-
 akka-testkit/src/main/scala/akka/testkit/TestActorRef.scala   | 2 +-
 akka-testkit/src/main/scala/akka/testkit/TestBarrier.scala    | 2 +-
 .../src/main/scala/akka/testkit/TestEventListener.scala       | 2 +-
 akka-testkit/src/main/scala/akka/testkit/TestFSMRef.scala     | 2 +-
 akka-testkit/src/main/scala/akka/testkit/TestKit.scala        | 2 +-
 .../src/main/scala/akka/testkit/TestKitExtension.scala        | 4 ++--
 akka-testkit/src/main/scala/akka/testkit/TestLatch.scala      | 2 +-
 .../src/test/java/akka/testkit/TestActorRefJavaCompile.java   | 4 ++--
 akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala       | 2 +-
 akka-testkit/src/test/scala/akka/testkit/AkkaSpecSpec.scala   | 2 +-
 .../src/test/scala/akka/testkit/TestActorRefSpec.scala        | 2 +-
 akka-testkit/src/test/scala/akka/testkit/TestFSMRefSpec.scala | 2 +-
 akka-testkit/src/test/scala/akka/testkit/TestTags.scala       | 2 +-
 .../src/main/scala/akka/transactor/Coordinated.scala          | 2 +-
 .../src/main/scala/akka/transactor/Transactor.scala           | 2 +-
 .../src/main/scala/akka/transactor/TransactorExtension.scala  | 4 ++--
 .../src/main/scala/akka/transactor/UntypedTransactor.scala    | 2 +-
 .../test/java/akka/transactor/ExpectedFailureException.java   | 2 +-
 akka-transactor/src/test/java/akka/transactor/Increment.java  | 2 +-
 .../test/java/akka/transactor/UntypedCoordinatedCounter.java  | 2 +-
 .../java/akka/transactor/UntypedCoordinatedIncrementTest.java | 2 +-
 .../src/test/java/akka/transactor/UntypedCounter.java         | 2 +-
 .../src/test/java/akka/transactor/UntypedFailer.java          | 2 +-
 .../src/test/java/akka/transactor/UntypedTransactorTest.java  | 2 +-
 .../test/scala/akka/transactor/CoordinatedIncrementSpec.scala | 2 +-
 .../src/test/scala/akka/transactor/FickleFriendsSpec.scala    | 2 +-
 .../scala/akka/transactor/JavaUntypedCoordinatedSpec.scala    | 2 +-
 .../scala/akka/transactor/JavaUntypedTransactorSpec.scala     | 2 +-
 .../src/test/scala/akka/transactor/TransactorSpec.scala       | 2 +-
 .../src/main/scala/akka/zeromq/ConcurrentSocketActor.scala    | 2 +-
 akka-zeromq/src/main/scala/akka/zeromq/Response.scala         | 2 +-
 akka-zeromq/src/main/scala/akka/zeromq/SocketOption.scala     | 2 +-
 .../src/main/scala/akka/zeromq/ZMQMessageDeserializer.scala   | 2 +-
 akka-zeromq/src/main/scala/akka/zeromq/ZeroMQ.scala           | 4 ++--
 akka-zeromq/src/main/scala/akka/zeromq/ZeroMQExtension.scala  | 2 +-
 akka-zeromq/src/main/scala/akka/zeromq/package.scala          | 4 ++--
 .../src/test/java/akka/zeromq/ZeroMQFromJavaTests.java        | 2 +-
 .../test/scala/akka/zeromq/ConcurrentSocketActorSpec.scala    | 2 +-
 .../src/test/scala/akka/zeromq/ZeroMQFromJavaSpec.scala       | 2 +-
 project/AkkaBuild.scala                                       | 2 +-
 scripts/generate_config_with_secure_cookie.sh                 | 2 +-
 480 files changed, 559 insertions(+), 559 deletions(-)

diff --git a/akka-actor-tests/src/test/java/akka/actor/JavaAPI.java b/akka-actor-tests/src/test/java/akka/actor/JavaAPI.java
index 80563b679f..16b92e9abc 100644
--- a/akka-actor-tests/src/test/java/akka/actor/JavaAPI.java
+++ b/akka-actor-tests/src/test/java/akka/actor/JavaAPI.java
@@ -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 akka.actor;
diff --git a/akka-actor-tests/src/test/java/akka/actor/JavaExtension.java b/akka-actor-tests/src/test/java/akka/actor/JavaExtension.java
index b87ace5849..5a054a81b8 100644
--- a/akka-actor-tests/src/test/java/akka/actor/JavaExtension.java
+++ b/akka-actor-tests/src/test/java/akka/actor/JavaExtension.java
@@ -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 akka.actor;
 
diff --git a/akka-actor-tests/src/test/java/akka/actor/NonPublicClass.java b/akka-actor-tests/src/test/java/akka/actor/NonPublicClass.java
index 047492e00f..ac21542c46 100644
--- a/akka-actor-tests/src/test/java/akka/actor/NonPublicClass.java
+++ b/akka-actor-tests/src/test/java/akka/actor/NonPublicClass.java
@@ -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 akka.actor;
@@ -14,4 +14,4 @@ class MyNonPublicActorClass extends UntypedActor {
     @Override public void onReceive(Object msg) {
         getSender().tell(msg, getSelf());
     }
-}
\ No newline at end of file
+}
diff --git a/akka-actor-tests/src/test/java/akka/routing/CustomRouteTest.java b/akka-actor-tests/src/test/java/akka/routing/CustomRouteTest.java
index c0ccd4de26..2eca39d70b 100644
--- a/akka-actor-tests/src/test/java/akka/routing/CustomRouteTest.java
+++ b/akka-actor-tests/src/test/java/akka/routing/CustomRouteTest.java
@@ -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 akka.routing;
 
diff --git a/akka-actor-tests/src/test/java/akka/util/JavaDuration.java b/akka-actor-tests/src/test/java/akka/util/JavaDuration.java
index 326afb8543..34e7c61353 100644
--- a/akka-actor-tests/src/test/java/akka/util/JavaDuration.java
+++ b/akka-actor-tests/src/test/java/akka/util/JavaDuration.java
@@ -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 akka.util;
 
diff --git a/akka-actor-tests/src/test/scala/akka/Messages.scala b/akka-actor-tests/src/test/scala/akka/Messages.scala
index 32f80c7b24..1a4867374a 100644
--- a/akka-actor-tests/src/test/scala/akka/Messages.scala
+++ b/akka-actor-tests/src/test/scala/akka/Messages.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 akka
diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorConfigurationVerificationSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorConfigurationVerificationSpec.scala
index c130d23149..1466c9e969 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/ActorConfigurationVerificationSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/ActorConfigurationVerificationSpec.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 akka.actor
 
diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorDSLSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorDSLSpec.scala
index 2aba0e18d4..29ad6775f3 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/ActorDSLSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/ActorDSLSpec.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 akka.actor
diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorFireForgetRequestReplySpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorFireForgetRequestReplySpec.scala
index 93e17d3192..277b844319 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/ActorFireForgetRequestReplySpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/ActorFireForgetRequestReplySpec.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 akka.actor
diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorLifeCycleSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorLifeCycleSpec.scala
index 430a64172a..ec99f97180 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/ActorLifeCycleSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/ActorLifeCycleSpec.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 akka.actor
diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorLookupSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorLookupSpec.scala
index 4d19f5ea9e..02b69f83d8 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/ActorLookupSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/ActorLookupSpec.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 akka.actor
 
@@ -312,4 +312,4 @@ class ActorLookupSpec extends AkkaSpec with DefaultTimeout {
 
   }
 
-}
\ No newline at end of file
+}
diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.scala
index a1da055cf6..e0037a5480 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.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 akka.actor
diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorSystemSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorSystemSpec.scala
index 781b8d4cab..5f295de702 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/ActorSystemSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/ActorSystemSpec.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 akka.actor
 
diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorTimeoutSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorTimeoutSpec.scala
index 965a99319d..bd78f849c8 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/ActorTimeoutSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/ActorTimeoutSpec.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 akka.actor
 
diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorWithBoundedStashSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorWithBoundedStashSpec.scala
index 4d95bf02f6..ae683b648b 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/ActorWithBoundedStashSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/ActorWithBoundedStashSpec.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 akka.actor
 
diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorWithStashSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorWithStashSpec.scala
index c4d9248d88..57f08041a0 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/ActorWithStashSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/ActorWithStashSpec.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 akka.actor
 
diff --git a/akka-actor-tests/src/test/scala/akka/actor/DeathWatchSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/DeathWatchSpec.scala
index d01848943f..54d30d4b65 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/DeathWatchSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/DeathWatchSpec.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 akka.actor
diff --git a/akka-actor-tests/src/test/scala/akka/actor/DeployerSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/DeployerSpec.scala
index 954337431c..f5f916a90d 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/DeployerSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/DeployerSpec.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 akka.actor
diff --git a/akka-actor-tests/src/test/scala/akka/actor/FSMActorSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/FSMActorSpec.scala
index b503ddede4..a89c6a931e 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/FSMActorSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/FSMActorSpec.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 akka.actor
diff --git a/akka-actor-tests/src/test/scala/akka/actor/FSMTimingSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/FSMTimingSpec.scala
index e5436d4e9c..c90dde277d 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/FSMTimingSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/FSMTimingSpec.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 akka.actor
diff --git a/akka-actor-tests/src/test/scala/akka/actor/FSMTransitionSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/FSMTransitionSpec.scala
index 04a0eea352..899fc932a2 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/FSMTransitionSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/FSMTransitionSpec.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 akka.actor
 
diff --git a/akka-actor-tests/src/test/scala/akka/actor/ForwardActorSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ForwardActorSpec.scala
index 40c652c3ec..965e55f897 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/ForwardActorSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/ForwardActorSpec.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 akka.actor
diff --git a/akka-actor-tests/src/test/scala/akka/actor/HotSwapSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/HotSwapSpec.scala
index 120caa3e93..354f23c76f 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/HotSwapSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/HotSwapSpec.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 akka.actor
diff --git a/akka-actor-tests/src/test/scala/akka/actor/IOActor.scala b/akka-actor-tests/src/test/scala/akka/actor/IOActor.scala
index 5cd9075e38..fffc6896d9 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/IOActor.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/IOActor.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 akka.actor
diff --git a/akka-actor-tests/src/test/scala/akka/actor/JavaAPISpec.scala b/akka-actor-tests/src/test/scala/akka/actor/JavaAPISpec.scala
index ca7210beaf..35f852ea77 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/JavaAPISpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/JavaAPISpec.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 akka.actor
 
diff --git a/akka-actor-tests/src/test/scala/akka/actor/LocalActorRefProviderSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/LocalActorRefProviderSpec.scala
index 4cb432aa23..314739e78e 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/LocalActorRefProviderSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/LocalActorRefProviderSpec.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 akka.actor
diff --git a/akka-actor-tests/src/test/scala/akka/actor/ReceiveTimeoutSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ReceiveTimeoutSpec.scala
index f34dbda9e3..0e77d4a7a9 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/ReceiveTimeoutSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/ReceiveTimeoutSpec.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 akka.actor
diff --git a/akka-actor-tests/src/test/scala/akka/actor/RelativeActorPathSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/RelativeActorPathSpec.scala
index 6870a36125..fd076463c7 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/RelativeActorPathSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/RelativeActorPathSpec.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 akka.actor
 
diff --git a/akka-actor-tests/src/test/scala/akka/actor/RestartStrategySpec.scala b/akka-actor-tests/src/test/scala/akka/actor/RestartStrategySpec.scala
index 190c738f83..169c84b8e5 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/RestartStrategySpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/RestartStrategySpec.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 akka.actor
diff --git a/akka-actor-tests/src/test/scala/akka/actor/Supervisor.scala b/akka-actor-tests/src/test/scala/akka/actor/Supervisor.scala
index 80524ea9dc..6b16cdfbb6 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/Supervisor.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/Supervisor.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 akka.actor
 
diff --git a/akka-actor-tests/src/test/scala/akka/actor/SupervisorHierarchySpec.scala b/akka-actor-tests/src/test/scala/akka/actor/SupervisorHierarchySpec.scala
index 722105ebec..095305dce4 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/SupervisorHierarchySpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/SupervisorHierarchySpec.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 akka.actor
diff --git a/akka-actor-tests/src/test/scala/akka/actor/SupervisorMiscSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/SupervisorMiscSpec.scala
index 070a5aba51..52b50491ee 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/SupervisorMiscSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/SupervisorMiscSpec.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 akka.actor
 
diff --git a/akka-actor-tests/src/test/scala/akka/actor/SupervisorSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/SupervisorSpec.scala
index eafb47c47d..7b7c36e0a5 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/SupervisorSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/SupervisorSpec.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 akka.actor
diff --git a/akka-actor-tests/src/test/scala/akka/actor/SupervisorTreeSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/SupervisorTreeSpec.scala
index 96e063a383..f10ae024f3 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/SupervisorTreeSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/SupervisorTreeSpec.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 akka.actor
 
diff --git a/akka-actor-tests/src/test/scala/akka/actor/Ticket669Spec.scala b/akka-actor-tests/src/test/scala/akka/actor/Ticket669Spec.scala
index cca4652de9..f04b01d0ae 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/Ticket669Spec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/Ticket669Spec.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 akka.actor
 
diff --git a/akka-actor-tests/src/test/scala/akka/actor/TypedActorSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/TypedActorSpec.scala
index 5522eb0b67..1270d62aca 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/TypedActorSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/TypedActorSpec.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 akka.actor
 
diff --git a/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala
index a736003421..3fa308ca3e 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.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 akka.actor.dispatch
 
diff --git a/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatchersSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatchersSpec.scala
index 39612fe409..6c39655706 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatchersSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatchersSpec.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 akka.actor.dispatch
 
diff --git a/akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala b/akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala
index 9a43631894..8aee3b5caa 100644
--- a/akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/config/ConfigSpec.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 akka.config
diff --git a/akka-actor-tests/src/test/scala/akka/dataflow/Future2Actor.scala b/akka-actor-tests/src/test/scala/akka/dataflow/Future2Actor.scala
index bc225933fe..572f0b5ef4 100644
--- a/akka-actor-tests/src/test/scala/akka/dataflow/Future2Actor.scala
+++ b/akka-actor-tests/src/test/scala/akka/dataflow/Future2Actor.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 akka.dataflow
 
diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/MailboxConfigSpec.scala b/akka-actor-tests/src/test/scala/akka/dispatch/MailboxConfigSpec.scala
index 94954ab4d8..a79a3c9ab8 100644
--- a/akka-actor-tests/src/test/scala/akka/dispatch/MailboxConfigSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/dispatch/MailboxConfigSpec.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 akka.dispatch
 
diff --git a/akka-actor-tests/src/test/scala/akka/event/EventBusSpec.scala b/akka-actor-tests/src/test/scala/akka/event/EventBusSpec.scala
index 0f7799adc0..d93fdbb4f6 100644
--- a/akka-actor-tests/src/test/scala/akka/event/EventBusSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/event/EventBusSpec.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 akka.event
diff --git a/akka-actor-tests/src/test/scala/akka/event/EventStreamSpec.scala b/akka-actor-tests/src/test/scala/akka/event/EventStreamSpec.scala
index 442d35f194..af70e23ab5 100644
--- a/akka-actor-tests/src/test/scala/akka/event/EventStreamSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/event/EventStreamSpec.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 akka.event
 
diff --git a/akka-actor-tests/src/test/scala/akka/event/LoggingReceiveSpec.scala b/akka-actor-tests/src/test/scala/akka/event/LoggingReceiveSpec.scala
index d7ce93e997..d61fd1496b 100644
--- a/akka-actor-tests/src/test/scala/akka/event/LoggingReceiveSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/event/LoggingReceiveSpec.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 akka.event
 
diff --git a/akka-actor-tests/src/test/scala/akka/pattern/AskSpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/AskSpec.scala
index 8f3f7f0510..73e707e3ac 100644
--- a/akka-actor-tests/src/test/scala/akka/pattern/AskSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/pattern/AskSpec.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 akka.pattern
 
@@ -70,4 +70,4 @@ class AskSpec extends AkkaSpec {
 
   }
 
-}
\ No newline at end of file
+}
diff --git a/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerMTSpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerMTSpec.scala
index a21dd6f22a..c3a5a9cb83 100644
--- a/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerMTSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerMTSpec.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 akka.pattern
 
@@ -91,4 +91,4 @@ class CircuitBreakerMTSpec extends AkkaSpec {
       result.toSet must be === Set("succeed")
     }
   }
-}
\ No newline at end of file
+}
diff --git a/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerSpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerSpec.scala
index 954fefb58d..8cfcb559a9 100644
--- a/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerSpec.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 akka.pattern
diff --git a/akka-actor-tests/src/test/scala/akka/pattern/PatternSpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/PatternSpec.scala
index 0e4333e04e..028463c8bc 100644
--- a/akka-actor-tests/src/test/scala/akka/pattern/PatternSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/pattern/PatternSpec.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 akka.pattern
diff --git a/akka-actor-tests/src/test/scala/akka/routing/ConfiguredLocalRoutingSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/ConfiguredLocalRoutingSpec.scala
index 9f3c121d86..4f45bf9257 100644
--- a/akka-actor-tests/src/test/scala/akka/routing/ConfiguredLocalRoutingSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/routing/ConfiguredLocalRoutingSpec.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 akka.routing
 
diff --git a/akka-actor-tests/src/test/scala/akka/routing/ConsistentHashingRouterSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/ConsistentHashingRouterSpec.scala
index 867da83bd7..a68f08f845 100644
--- a/akka-actor-tests/src/test/scala/akka/routing/ConsistentHashingRouterSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/routing/ConsistentHashingRouterSpec.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 akka.routing
 
diff --git a/akka-actor-tests/src/test/scala/akka/routing/CustomRouteSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/CustomRouteSpec.scala
index 00bd46f430..6363325797 100644
--- a/akka-actor-tests/src/test/scala/akka/routing/CustomRouteSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/routing/CustomRouteSpec.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 akka.routing
 
@@ -49,4 +49,4 @@ class CustomRouteSpec extends AkkaSpec {
     }
 
   }
-}
\ No newline at end of file
+}
diff --git a/akka-actor-tests/src/test/scala/akka/routing/ResizerSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/ResizerSpec.scala
index c9136248e3..398a931ca6 100644
--- a/akka-actor-tests/src/test/scala/akka/routing/ResizerSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/routing/ResizerSpec.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 akka.routing
 
diff --git a/akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala
index 9d7522f950..23445ae1a0 100644
--- a/akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.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 akka.routing
 
diff --git a/akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala b/akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala
index c49dc8037f..d7c7e61b2c 100644
--- a/akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.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 akka.serialization
diff --git a/akka-actor-tests/src/test/scala/akka/testkit/CallingThreadDispatcherModelSpec.scala b/akka-actor-tests/src/test/scala/akka/testkit/CallingThreadDispatcherModelSpec.scala
index 5b023054d4..c23102c35f 100644
--- a/akka-actor-tests/src/test/scala/akka/testkit/CallingThreadDispatcherModelSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/testkit/CallingThreadDispatcherModelSpec.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 akka.testkit
 
diff --git a/akka-actor-tests/src/test/scala/akka/util/DurationSpec.scala b/akka-actor-tests/src/test/scala/akka/util/DurationSpec.scala
index ca285274aa..6a82e09949 100644
--- a/akka-actor-tests/src/test/scala/akka/util/DurationSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/util/DurationSpec.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 akka.util
 
diff --git a/akka-actor-tests/src/test/scala/akka/util/IndexSpec.scala b/akka-actor-tests/src/test/scala/akka/util/IndexSpec.scala
index d2d87b4c14..16374b9c10 100644
--- a/akka-actor-tests/src/test/scala/akka/util/IndexSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/util/IndexSpec.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 akka.util
 
@@ -129,4 +129,4 @@ class IndexSpec extends AkkaSpec with MustMatchers with DefaultTimeout {
       tasks.foreach(Await.result(_, timeout.duration))
     }
   }
-}
\ No newline at end of file
+}
diff --git a/akka-actor-tests/src/test/scala/akka/util/JavaDurationSpec.scala b/akka-actor-tests/src/test/scala/akka/util/JavaDurationSpec.scala
index 2278873b56..f9bd2ace91 100644
--- a/akka-actor-tests/src/test/scala/akka/util/JavaDurationSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/util/JavaDurationSpec.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 akka.util
 
diff --git a/akka-actor-tests/src/test/scala/akka/util/SwitchSpec.scala b/akka-actor-tests/src/test/scala/akka/util/SwitchSpec.scala
index cf272cba88..10fca828a1 100644
--- a/akka-actor-tests/src/test/scala/akka/util/SwitchSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/util/SwitchSpec.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 akka.util
 
diff --git a/akka-actor/src/main/java/akka/actor/AbstractActorRef.java b/akka-actor/src/main/java/akka/actor/AbstractActorRef.java
index 650182a457..65d2834694 100644
--- a/akka-actor/src/main/java/akka/actor/AbstractActorRef.java
+++ b/akka-actor/src/main/java/akka/actor/AbstractActorRef.java
@@ -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 akka.actor;
diff --git a/akka-actor/src/main/java/akka/actor/dungeon/AbstractActorCell.java b/akka-actor/src/main/java/akka/actor/dungeon/AbstractActorCell.java
index 6735b6e2cb..4f9771b256 100644
--- a/akka-actor/src/main/java/akka/actor/dungeon/AbstractActorCell.java
+++ b/akka-actor/src/main/java/akka/actor/dungeon/AbstractActorCell.java
@@ -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 akka.actor.dungeon;
diff --git a/akka-actor/src/main/java/akka/dispatch/AbstractMailbox.java b/akka-actor/src/main/java/akka/dispatch/AbstractMailbox.java
index c4ac378fad..d299a3886a 100644
--- a/akka-actor/src/main/java/akka/dispatch/AbstractMailbox.java
+++ b/akka-actor/src/main/java/akka/dispatch/AbstractMailbox.java
@@ -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 akka.dispatch;
diff --git a/akka-actor/src/main/java/akka/dispatch/AbstractMessageDispatcher.java b/akka-actor/src/main/java/akka/dispatch/AbstractMessageDispatcher.java
index 183812428e..415670968b 100644
--- a/akka-actor/src/main/java/akka/dispatch/AbstractMessageDispatcher.java
+++ b/akka-actor/src/main/java/akka/dispatch/AbstractMessageDispatcher.java
@@ -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 akka.dispatch;
diff --git a/akka-actor/src/main/java/akka/pattern/AbstractCircuitBreaker.java b/akka-actor/src/main/java/akka/pattern/AbstractCircuitBreaker.java
index 44482bb357..6d2f0dbf41 100644
--- a/akka-actor/src/main/java/akka/pattern/AbstractCircuitBreaker.java
+++ b/akka-actor/src/main/java/akka/pattern/AbstractCircuitBreaker.java
@@ -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 akka.pattern;
 
diff --git a/akka-actor/src/main/java/akka/pattern/AbstractPromiseActorRef.java b/akka-actor/src/main/java/akka/pattern/AbstractPromiseActorRef.java
index bb0f03861c..4c55a4c219 100644
--- a/akka-actor/src/main/java/akka/pattern/AbstractPromiseActorRef.java
+++ b/akka-actor/src/main/java/akka/pattern/AbstractPromiseActorRef.java
@@ -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 akka.pattern;
@@ -18,4 +18,4 @@ final class AbstractPromiseActorRef {
             throw new ExceptionInInitializerError(t);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/akka-actor/src/main/scala/akka/AkkaException.scala b/akka-actor/src/main/scala/akka/AkkaException.scala
index f290c7e565..3cec55f1c1 100644
--- a/akka-actor/src/main/scala/akka/AkkaException.scala
+++ b/akka-actor/src/main/scala/akka/AkkaException.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 akka
diff --git a/akka-actor/src/main/scala/akka/actor/Actor.scala b/akka-actor/src/main/scala/akka/actor/Actor.scala
index 3706799f23..a665d1029b 100644
--- a/akka-actor/src/main/scala/akka/actor/Actor.scala
+++ b/akka-actor/src/main/scala/akka/actor/Actor.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 akka.actor
diff --git a/akka-actor/src/main/scala/akka/actor/ActorCell.scala b/akka-actor/src/main/scala/akka/actor/ActorCell.scala
index 51f11c044c..6f48fd235e 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorCell.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorCell.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 akka.actor
diff --git a/akka-actor/src/main/scala/akka/actor/ActorDSL.scala b/akka-actor/src/main/scala/akka/actor/ActorDSL.scala
index bee50ff78e..2b43fb8196 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorDSL.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorDSL.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 akka.actor
diff --git a/akka-actor/src/main/scala/akka/actor/ActorPath.scala b/akka-actor/src/main/scala/akka/actor/ActorPath.scala
index 4cb61d2212..4597d87f9c 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorPath.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorPath.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 akka.actor
 import scala.annotation.tailrec
diff --git a/akka-actor/src/main/scala/akka/actor/ActorRef.scala b/akka-actor/src/main/scala/akka/actor/ActorRef.scala
index a6685ae549..fc88fa4fe8 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorRef.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorRef.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 akka.actor
diff --git a/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala b/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala
index 5a3bb7dac2..f1a8d95fd0 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorRefProvider.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 akka.actor
diff --git a/akka-actor/src/main/scala/akka/actor/ActorSelection.scala b/akka-actor/src/main/scala/akka/actor/ActorSelection.scala
index e329af556b..3aeee6c1d1 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorSelection.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorSelection.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 akka.actor
 
@@ -70,4 +70,4 @@ trait ScalaActorSelection {
   this: ActorSelection ⇒
 
   def !(msg: Any)(implicit sender: ActorRef = Actor.noSender) = tell(msg, sender)
-}
\ No newline at end of file
+}
diff --git a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala
index 45025f1887..ef253884da 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorSystem.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 akka.actor
diff --git a/akka-actor/src/main/scala/akka/actor/Address.scala b/akka-actor/src/main/scala/akka/actor/Address.scala
index f02dcfb567..72f0a0c38a 100644
--- a/akka-actor/src/main/scala/akka/actor/Address.scala
+++ b/akka-actor/src/main/scala/akka/actor/Address.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 akka.actor
 import java.net.URI
@@ -147,4 +147,4 @@ object ActorPathExtractor extends PathUtils {
     } catch {
       case _: URISyntaxException ⇒ None
     }
-}
\ No newline at end of file
+}
diff --git a/akka-actor/src/main/scala/akka/actor/Deployer.scala b/akka-actor/src/main/scala/akka/actor/Deployer.scala
index 8ed7dc754a..310032e06d 100644
--- a/akka-actor/src/main/scala/akka/actor/Deployer.scala
+++ b/akka-actor/src/main/scala/akka/actor/Deployer.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 akka.actor
diff --git a/akka-actor/src/main/scala/akka/actor/DynamicAccess.scala b/akka-actor/src/main/scala/akka/actor/DynamicAccess.scala
index af891bc483..9d865b7da9 100644
--- a/akka-actor/src/main/scala/akka/actor/DynamicAccess.scala
+++ b/akka-actor/src/main/scala/akka/actor/DynamicAccess.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 akka.actor
 
@@ -101,4 +101,4 @@ class ReflectiveDynamicAccess(val classLoader: ClassLoader) extends DynamicAcces
       } recover { case i: InvocationTargetException if i.getTargetException ne null ⇒ throw i.getTargetException }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/akka-actor/src/main/scala/akka/actor/Extension.scala b/akka-actor/src/main/scala/akka/actor/Extension.scala
index 707c07982a..9b6f950d3f 100644
--- a/akka-actor/src/main/scala/akka/actor/Extension.scala
+++ b/akka-actor/src/main/scala/akka/actor/Extension.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 akka.actor
 
diff --git a/akka-actor/src/main/scala/akka/actor/FSM.scala b/akka-actor/src/main/scala/akka/actor/FSM.scala
index 28151a4a47..ad0e0bf7f0 100644
--- a/akka-actor/src/main/scala/akka/actor/FSM.scala
+++ b/akka-actor/src/main/scala/akka/actor/FSM.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 akka.actor
 
diff --git a/akka-actor/src/main/scala/akka/actor/FaultHandling.scala b/akka-actor/src/main/scala/akka/actor/FaultHandling.scala
index 7f65c84d02..b04ee4f06e 100644
--- a/akka-actor/src/main/scala/akka/actor/FaultHandling.scala
+++ b/akka-actor/src/main/scala/akka/actor/FaultHandling.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 akka.actor
 
diff --git a/akka-actor/src/main/scala/akka/actor/IO.scala b/akka-actor/src/main/scala/akka/actor/IO.scala
index e1dedb3ba2..de598210b2 100644
--- a/akka-actor/src/main/scala/akka/actor/IO.scala
+++ b/akka-actor/src/main/scala/akka/actor/IO.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 akka.actor
 
diff --git a/akka-actor/src/main/scala/akka/actor/Props.scala b/akka-actor/src/main/scala/akka/actor/Props.scala
index 30e28834dd..5608e7c8aa 100644
--- a/akka-actor/src/main/scala/akka/actor/Props.scala
+++ b/akka-actor/src/main/scala/akka/actor/Props.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 akka.actor
diff --git a/akka-actor/src/main/scala/akka/actor/RepointableActorRef.scala b/akka-actor/src/main/scala/akka/actor/RepointableActorRef.scala
index 02aef18564..300481ad06 100644
--- a/akka-actor/src/main/scala/akka/actor/RepointableActorRef.scala
+++ b/akka-actor/src/main/scala/akka/actor/RepointableActorRef.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 akka.actor
diff --git a/akka-actor/src/main/scala/akka/actor/Scheduler.scala b/akka-actor/src/main/scala/akka/actor/Scheduler.scala
index bbb830110d..55e4be2065 100644
--- a/akka-actor/src/main/scala/akka/actor/Scheduler.scala
+++ b/akka-actor/src/main/scala/akka/actor/Scheduler.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 akka.actor
diff --git a/akka-actor/src/main/scala/akka/actor/Stash.scala b/akka-actor/src/main/scala/akka/actor/Stash.scala
index cdf4ef6d5b..34c6192016 100644
--- a/akka-actor/src/main/scala/akka/actor/Stash.scala
+++ b/akka-actor/src/main/scala/akka/actor/Stash.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 akka.actor
 
diff --git a/akka-actor/src/main/scala/akka/actor/TypedActor.scala b/akka-actor/src/main/scala/akka/actor/TypedActor.scala
index 7509cd758d..0bc8059ade 100644
--- a/akka-actor/src/main/scala/akka/actor/TypedActor.scala
+++ b/akka-actor/src/main/scala/akka/actor/TypedActor.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 akka.actor
 
diff --git a/akka-actor/src/main/scala/akka/actor/UntypedActor.scala b/akka-actor/src/main/scala/akka/actor/UntypedActor.scala
index 47ddf4fc43..163d9468bc 100644
--- a/akka-actor/src/main/scala/akka/actor/UntypedActor.scala
+++ b/akka-actor/src/main/scala/akka/actor/UntypedActor.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 akka.actor
diff --git a/akka-actor/src/main/scala/akka/actor/UntypedActorWithStash.scala b/akka-actor/src/main/scala/akka/actor/UntypedActorWithStash.scala
index 9b55e9397b..a41e03e8cf 100644
--- a/akka-actor/src/main/scala/akka/actor/UntypedActorWithStash.scala
+++ b/akka-actor/src/main/scala/akka/actor/UntypedActorWithStash.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 akka.actor
diff --git a/akka-actor/src/main/scala/akka/actor/dsl/Creators.scala b/akka-actor/src/main/scala/akka/actor/dsl/Creators.scala
index a9515f3000..bcbcd52cbd 100644
--- a/akka-actor/src/main/scala/akka/actor/dsl/Creators.scala
+++ b/akka-actor/src/main/scala/akka/actor/dsl/Creators.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 akka.actor.dsl
diff --git a/akka-actor/src/main/scala/akka/actor/dsl/Inbox.scala b/akka-actor/src/main/scala/akka/actor/dsl/Inbox.scala
index 418a035e53..46a4f53af5 100644
--- a/akka-actor/src/main/scala/akka/actor/dsl/Inbox.scala
+++ b/akka-actor/src/main/scala/akka/actor/dsl/Inbox.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 akka.actor.dsl
diff --git a/akka-actor/src/main/scala/akka/actor/dungeon/Children.scala b/akka-actor/src/main/scala/akka/actor/dungeon/Children.scala
index ba856206ea..f897535c91 100644
--- a/akka-actor/src/main/scala/akka/actor/dungeon/Children.scala
+++ b/akka-actor/src/main/scala/akka/actor/dungeon/Children.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 akka.actor.dungeon
@@ -197,4 +197,4 @@ private[akka] trait Children { this: ActorCell ⇒
     }
   }
 
-}
\ No newline at end of file
+}
diff --git a/akka-actor/src/main/scala/akka/actor/dungeon/ChildrenContainer.scala b/akka-actor/src/main/scala/akka/actor/dungeon/ChildrenContainer.scala
index 1fccbf8078..13ab3b4c8d 100644
--- a/akka-actor/src/main/scala/akka/actor/dungeon/ChildrenContainer.scala
+++ b/akka-actor/src/main/scala/akka/actor/dungeon/ChildrenContainer.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 akka.actor.dungeon
@@ -210,4 +210,4 @@ private[akka] object ChildrenContainer {
       else c.mkString("children (" + toDie.size + " terminating):\n    ", "\n    ", "\n") + toDie
   }
 
-}
\ No newline at end of file
+}
diff --git a/akka-actor/src/main/scala/akka/actor/dungeon/DeathWatch.scala b/akka-actor/src/main/scala/akka/actor/dungeon/DeathWatch.scala
index 313796ad68..eb191ff415 100644
--- a/akka-actor/src/main/scala/akka/actor/dungeon/DeathWatch.scala
+++ b/akka-actor/src/main/scala/akka/actor/dungeon/DeathWatch.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 akka.actor.dungeon
@@ -164,4 +164,4 @@ private[akka] trait DeathWatch { this: ActorCell ⇒
 
   private def subscribeAddressTerminated(): Unit = system.eventStream.subscribe(self, classOf[AddressTerminated])
 
-}
\ No newline at end of file
+}
diff --git a/akka-actor/src/main/scala/akka/actor/dungeon/Dispatch.scala b/akka-actor/src/main/scala/akka/actor/dungeon/Dispatch.scala
index 469aac78c2..1d3b498c2b 100644
--- a/akka-actor/src/main/scala/akka/actor/dungeon/Dispatch.scala
+++ b/akka-actor/src/main/scala/akka/actor/dungeon/Dispatch.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 akka.actor.dungeon
@@ -116,4 +116,4 @@ private[akka] trait Dispatch { this: ActorCell ⇒
         system.eventStream.publish(Error(e, self.path.toString, clazz(actor), "swallowing exception during message send"))
     }
 
-}
\ No newline at end of file
+}
diff --git a/akka-actor/src/main/scala/akka/actor/dungeon/FaultHandling.scala b/akka-actor/src/main/scala/akka/actor/dungeon/FaultHandling.scala
index c2ff511809..99ddd825b1 100644
--- a/akka-actor/src/main/scala/akka/actor/dungeon/FaultHandling.scala
+++ b/akka-actor/src/main/scala/akka/actor/dungeon/FaultHandling.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 akka.actor.dungeon
diff --git a/akka-actor/src/main/scala/akka/actor/dungeon/ReceiveTimeout.scala b/akka-actor/src/main/scala/akka/actor/dungeon/ReceiveTimeout.scala
index 5e1e4465eb..2f52f312fe 100644
--- a/akka-actor/src/main/scala/akka/actor/dungeon/ReceiveTimeout.scala
+++ b/akka-actor/src/main/scala/akka/actor/dungeon/ReceiveTimeout.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 akka.actor.dungeon
@@ -46,4 +46,4 @@ private[akka] trait ReceiveTimeout { this: ActorCell ⇒
       receiveTimeoutData = (receiveTimeoutData._1, emptyCancellable)
     }
 
-}
\ No newline at end of file
+}
diff --git a/akka-actor/src/main/scala/akka/actor/package.scala b/akka-actor/src/main/scala/akka/actor/package.scala
index deb9f0e7a9..b6e45e74f6 100644
--- a/akka-actor/src/main/scala/akka/actor/package.scala
+++ b/akka-actor/src/main/scala/akka/actor/package.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 akka
diff --git a/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala b/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala
index f8fa5e1046..5d470746f4 100644
--- a/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.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 akka.dispatch
diff --git a/akka-actor/src/main/scala/akka/dispatch/BalancingDispatcher.scala b/akka-actor/src/main/scala/akka/dispatch/BalancingDispatcher.scala
index 6efb5771ef..2190130440 100644
--- a/akka-actor/src/main/scala/akka/dispatch/BalancingDispatcher.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/BalancingDispatcher.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 akka.dispatch
diff --git a/akka-actor/src/main/scala/akka/dispatch/BatchingExecutor.scala b/akka-actor/src/main/scala/akka/dispatch/BatchingExecutor.scala
index cde2034f64..87f7bc6770 100644
--- a/akka-actor/src/main/scala/akka/dispatch/BatchingExecutor.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/BatchingExecutor.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 akka.dispatch
diff --git a/akka-actor/src/main/scala/akka/dispatch/Dispatcher.scala b/akka-actor/src/main/scala/akka/dispatch/Dispatcher.scala
index 6577e217a1..b1f4557815 100644
--- a/akka-actor/src/main/scala/akka/dispatch/Dispatcher.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/Dispatcher.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 akka.dispatch
diff --git a/akka-actor/src/main/scala/akka/dispatch/Dispatchers.scala b/akka-actor/src/main/scala/akka/dispatch/Dispatchers.scala
index 910a5ceed5..3758bd6df0 100644
--- a/akka-actor/src/main/scala/akka/dispatch/Dispatchers.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/Dispatchers.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 akka.dispatch
diff --git a/akka-actor/src/main/scala/akka/dispatch/Future.scala b/akka-actor/src/main/scala/akka/dispatch/Future.scala
index a7c964b750..10b4229ccb 100644
--- a/akka-actor/src/main/scala/akka/dispatch/Future.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/Future.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 akka.dispatch
diff --git a/akka-actor/src/main/scala/akka/dispatch/Mailbox.scala b/akka-actor/src/main/scala/akka/dispatch/Mailbox.scala
index d17ad5b7b6..e47f869a3e 100644
--- a/akka-actor/src/main/scala/akka/dispatch/Mailbox.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/Mailbox.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 akka.dispatch
 
diff --git a/akka-actor/src/main/scala/akka/dispatch/PinnedDispatcher.scala b/akka-actor/src/main/scala/akka/dispatch/PinnedDispatcher.scala
index 9cdff4b521..1b645a64ea 100644
--- a/akka-actor/src/main/scala/akka/dispatch/PinnedDispatcher.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/PinnedDispatcher.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 akka.dispatch
diff --git a/akka-actor/src/main/scala/akka/dispatch/ThreadPoolBuilder.scala b/akka-actor/src/main/scala/akka/dispatch/ThreadPoolBuilder.scala
index 8fb4d6dc4f..cb60867bb1 100644
--- a/akka-actor/src/main/scala/akka/dispatch/ThreadPoolBuilder.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/ThreadPoolBuilder.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 akka.dispatch
@@ -246,4 +246,4 @@ class SaneRejectedExecutionHandler extends RejectedExecutionHandler {
     if (threadPoolExecutor.isShutdown) throw new RejectedExecutionException("Shutdown")
     else runnable.run()
   }
-}
\ No newline at end of file
+}
diff --git a/akka-actor/src/main/scala/akka/event/EventBus.scala b/akka-actor/src/main/scala/akka/event/EventBus.scala
index 6e3e25e42c..2499d0fcd9 100644
--- a/akka-actor/src/main/scala/akka/event/EventBus.scala
+++ b/akka-actor/src/main/scala/akka/event/EventBus.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 akka.event
diff --git a/akka-actor/src/main/scala/akka/event/EventStream.scala b/akka-actor/src/main/scala/akka/event/EventStream.scala
index 7fa6c8a5cf..c37ea4c925 100644
--- a/akka-actor/src/main/scala/akka/event/EventStream.scala
+++ b/akka-actor/src/main/scala/akka/event/EventStream.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 akka.event
 
@@ -59,4 +59,4 @@ class EventStream(private val debug: Boolean = false) extends LoggingBus with Su
     if (debug) publish(Logging.Debug(simpleName(this), this.getClass, "unsubscribing " + subscriber + " from all channels"))
   }
 
-}
\ No newline at end of file
+}
diff --git a/akka-actor/src/main/scala/akka/event/Logging.scala b/akka-actor/src/main/scala/akka/event/Logging.scala
index 14ba99bcaa..f054d787d1 100644
--- a/akka-actor/src/main/scala/akka/event/Logging.scala
+++ b/akka-actor/src/main/scala/akka/event/Logging.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 akka.event
 
diff --git a/akka-actor/src/main/scala/akka/event/LoggingReceive.scala b/akka-actor/src/main/scala/akka/event/LoggingReceive.scala
index 03739de894..07546e30cc 100644
--- a/akka-actor/src/main/scala/akka/event/LoggingReceive.scala
+++ b/akka-actor/src/main/scala/akka/event/LoggingReceive.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 akka.event
 
@@ -44,4 +44,4 @@ class LoggingReceive(source: Option[AnyRef], r: Receive)(implicit context: Actor
     handled
   }
   def apply(o: Any): Unit = r(o)
-}
\ No newline at end of file
+}
diff --git a/akka-actor/src/main/scala/akka/japi/JavaAPI.scala b/akka-actor/src/main/scala/akka/japi/JavaAPI.scala
index 87bb338b0f..b37cee26fe 100644
--- a/akka-actor/src/main/scala/akka/japi/JavaAPI.scala
+++ b/akka-actor/src/main/scala/akka/japi/JavaAPI.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 akka.japi
diff --git a/akka-actor/src/main/scala/akka/pattern/AskSupport.scala b/akka-actor/src/main/scala/akka/pattern/AskSupport.scala
index eef089a85c..18f88ba30e 100644
--- a/akka-actor/src/main/scala/akka/pattern/AskSupport.scala
+++ b/akka-actor/src/main/scala/akka/pattern/AskSupport.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 akka.pattern
 
@@ -255,4 +255,4 @@ private[akka] object PromiseActorRef {
     result.future onComplete { _ ⇒ try a.stop() finally f.cancel() }
     a
   }
-}
\ No newline at end of file
+}
diff --git a/akka-actor/src/main/scala/akka/pattern/CircuitBreaker.scala b/akka-actor/src/main/scala/akka/pattern/CircuitBreaker.scala
index 8a423c12b3..aa578baf38 100644
--- a/akka-actor/src/main/scala/akka/pattern/CircuitBreaker.scala
+++ b/akka-actor/src/main/scala/akka/pattern/CircuitBreaker.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 akka.pattern
 
diff --git a/akka-actor/src/main/scala/akka/pattern/FutureTimeoutSupport.scala b/akka-actor/src/main/scala/akka/pattern/FutureTimeoutSupport.scala
index 6820cf4bfa..7408f18355 100644
--- a/akka-actor/src/main/scala/akka/pattern/FutureTimeoutSupport.scala
+++ b/akka-actor/src/main/scala/akka/pattern/FutureTimeoutSupport.scala
@@ -1,7 +1,7 @@
 package akka.pattern
 
 /**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
  */
 
 import scala.concurrent.duration.Duration
@@ -23,4 +23,4 @@ trait FutureTimeoutSupport {
       using.scheduleOnce(duration) { p completeWith { try value catch { case NonFatal(t) ⇒ Future.failed(t) } } }
       p.future
     }
-}
\ No newline at end of file
+}
diff --git a/akka-actor/src/main/scala/akka/pattern/GracefulStopSupport.scala b/akka-actor/src/main/scala/akka/pattern/GracefulStopSupport.scala
index 9279707238..521175fe60 100644
--- a/akka-actor/src/main/scala/akka/pattern/GracefulStopSupport.scala
+++ b/akka-actor/src/main/scala/akka/pattern/GracefulStopSupport.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 akka.pattern
@@ -58,4 +58,4 @@ trait GracefulStopSupport {
       case s ⇒ throw new IllegalArgumentException("Unknown ActorSystem implementation: '" + s + "'")
     }
   }
-}
\ No newline at end of file
+}
diff --git a/akka-actor/src/main/scala/akka/pattern/Patterns.scala b/akka-actor/src/main/scala/akka/pattern/Patterns.scala
index 66e391c285..484181a71e 100644
--- a/akka-actor/src/main/scala/akka/pattern/Patterns.scala
+++ b/akka-actor/src/main/scala/akka/pattern/Patterns.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 akka.pattern
 
diff --git a/akka-actor/src/main/scala/akka/pattern/PipeToSupport.scala b/akka-actor/src/main/scala/akka/pattern/PipeToSupport.scala
index c0c3780319..49a019f03f 100644
--- a/akka-actor/src/main/scala/akka/pattern/PipeToSupport.scala
+++ b/akka-actor/src/main/scala/akka/pattern/PipeToSupport.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 akka.pattern
 
@@ -41,4 +41,4 @@ trait PipeToSupport {
    * }}}
    */
   implicit def pipe[T](future: Future[T])(implicit executionContext: ExecutionContext): PipeableFuture[T] = new PipeableFuture(future)
-}
\ No newline at end of file
+}
diff --git a/akka-actor/src/main/scala/akka/pattern/package.scala b/akka-actor/src/main/scala/akka/pattern/package.scala
index b2f232de8f..f6dcbb9377 100644
--- a/akka-actor/src/main/scala/akka/pattern/package.scala
+++ b/akka-actor/src/main/scala/akka/pattern/package.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 akka
 
@@ -40,4 +40,4 @@ import akka.actor._
  */
 package object pattern extends PipeToSupport with AskSupport with GracefulStopSupport with FutureTimeoutSupport {
 
-}
\ No newline at end of file
+}
diff --git a/akka-actor/src/main/scala/akka/routing/ConsistentHash.scala b/akka-actor/src/main/scala/akka/routing/ConsistentHash.scala
index 84100f0f21..c98fd7031c 100644
--- a/akka-actor/src/main/scala/akka/routing/ConsistentHash.scala
+++ b/akka-actor/src/main/scala/akka/routing/ConsistentHash.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 akka.routing
diff --git a/akka-actor/src/main/scala/akka/routing/ConsistentHashingRouter.scala b/akka-actor/src/main/scala/akka/routing/ConsistentHashingRouter.scala
index e88195f577..a7a5c43e2e 100644
--- a/akka-actor/src/main/scala/akka/routing/ConsistentHashingRouter.scala
+++ b/akka-actor/src/main/scala/akka/routing/ConsistentHashingRouter.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 akka.routing
 
@@ -312,4 +312,4 @@ private[akka] case class ConsistentActorRef(actorRef: ActorRef, selfAddress: Add
       case a                         ⇒ actorRef.path.toString
     }
   }
-}
\ No newline at end of file
+}
diff --git a/akka-actor/src/main/scala/akka/routing/Listeners.scala b/akka-actor/src/main/scala/akka/routing/Listeners.scala
index 346f994a2f..dede8940fe 100644
--- a/akka-actor/src/main/scala/akka/routing/Listeners.scala
+++ b/akka-actor/src/main/scala/akka/routing/Listeners.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 akka.routing
diff --git a/akka-actor/src/main/scala/akka/routing/Routing.scala b/akka-actor/src/main/scala/akka/routing/Routing.scala
index 8c2c81bac2..ee98de0f10 100644
--- a/akka-actor/src/main/scala/akka/routing/Routing.scala
+++ b/akka-actor/src/main/scala/akka/routing/Routing.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 akka.routing
 
diff --git a/akka-actor/src/main/scala/akka/routing/package.scala b/akka-actor/src/main/scala/akka/routing/package.scala
index 76dc2f3104..22074f7f10 100644
--- a/akka-actor/src/main/scala/akka/routing/package.scala
+++ b/akka-actor/src/main/scala/akka/routing/package.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 akka
diff --git a/akka-actor/src/main/scala/akka/serialization/Serialization.scala b/akka-actor/src/main/scala/akka/serialization/Serialization.scala
index e0e52e8189..ef21355502 100644
--- a/akka-actor/src/main/scala/akka/serialization/Serialization.scala
+++ b/akka-actor/src/main/scala/akka/serialization/Serialization.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 akka.serialization
diff --git a/akka-actor/src/main/scala/akka/serialization/SerializationExtension.scala b/akka-actor/src/main/scala/akka/serialization/SerializationExtension.scala
index f96aa26e0c..d2b3844750 100644
--- a/akka-actor/src/main/scala/akka/serialization/SerializationExtension.scala
+++ b/akka-actor/src/main/scala/akka/serialization/SerializationExtension.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 akka.serialization
 
@@ -13,4 +13,4 @@ object SerializationExtension extends ExtensionId[Serialization] with ExtensionI
   override def get(system: ActorSystem): Serialization = super.get(system)
   override def lookup = SerializationExtension
   override def createExtension(system: ExtendedActorSystem): Serialization = new Serialization(system)
-}
\ No newline at end of file
+}
diff --git a/akka-actor/src/main/scala/akka/serialization/Serializer.scala b/akka-actor/src/main/scala/akka/serialization/Serializer.scala
index bdf8adbf85..736a4a6175 100644
--- a/akka-actor/src/main/scala/akka/serialization/Serializer.scala
+++ b/akka-actor/src/main/scala/akka/serialization/Serializer.scala
@@ -1,7 +1,7 @@
 package akka.serialization
 
 /**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
  */
 
 import java.io.{ ObjectOutputStream, ByteArrayOutputStream, ObjectInputStream, ByteArrayInputStream }
diff --git a/akka-actor/src/main/scala/akka/util/BoundedBlockingQueue.scala b/akka-actor/src/main/scala/akka/util/BoundedBlockingQueue.scala
index 613599fa8e..fbcb1b315e 100644
--- a/akka-actor/src/main/scala/akka/util/BoundedBlockingQueue.scala
+++ b/akka-actor/src/main/scala/akka/util/BoundedBlockingQueue.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 akka.util
diff --git a/akka-actor/src/main/scala/akka/util/BoxedType.scala b/akka-actor/src/main/scala/akka/util/BoxedType.scala
index f5f95096d9..29cbc79d01 100644
--- a/akka-actor/src/main/scala/akka/util/BoxedType.scala
+++ b/akka-actor/src/main/scala/akka/util/BoxedType.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 akka.util
 
diff --git a/akka-actor/src/main/scala/akka/util/ByteIterator.scala b/akka-actor/src/main/scala/akka/util/ByteIterator.scala
index ef4c0c49bc..49292bb877 100644
--- a/akka-actor/src/main/scala/akka/util/ByteIterator.scala
+++ b/akka-actor/src/main/scala/akka/util/ByteIterator.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 akka.util
diff --git a/akka-actor/src/main/scala/akka/util/ByteString.scala b/akka-actor/src/main/scala/akka/util/ByteString.scala
index 70f929c11a..b694528541 100644
--- a/akka-actor/src/main/scala/akka/util/ByteString.scala
+++ b/akka-actor/src/main/scala/akka/util/ByteString.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 akka.util
diff --git a/akka-actor/src/main/scala/akka/util/ClassLoaderObjectInputStream.scala b/akka-actor/src/main/scala/akka/util/ClassLoaderObjectInputStream.scala
index ab2514861e..bc71e54006 100644
--- a/akka-actor/src/main/scala/akka/util/ClassLoaderObjectInputStream.scala
+++ b/akka-actor/src/main/scala/akka/util/ClassLoaderObjectInputStream.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 akka.util
diff --git a/akka-actor/src/main/scala/akka/util/Collections.scala b/akka-actor/src/main/scala/akka/util/Collections.scala
index 0ccbcd408c..f7a6368f45 100644
--- a/akka-actor/src/main/scala/akka/util/Collections.scala
+++ b/akka-actor/src/main/scala/akka/util/Collections.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 akka.util
@@ -51,4 +51,4 @@ private[akka] object Collections {
     override def foreach[C](f: To ⇒ C) = iterator foreach f
   }
 
-}
\ No newline at end of file
+}
diff --git a/akka-actor/src/main/scala/akka/util/Crypt.scala b/akka-actor/src/main/scala/akka/util/Crypt.scala
index 280cd90768..86b98a2cfd 100644
--- a/akka-actor/src/main/scala/akka/util/Crypt.scala
+++ b/akka-actor/src/main/scala/akka/util/Crypt.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 akka.util
diff --git a/akka-actor/src/main/scala/akka/util/HashCode.scala b/akka-actor/src/main/scala/akka/util/HashCode.scala
index 9e19c5e7c6..486434f577 100644
--- a/akka-actor/src/main/scala/akka/util/HashCode.scala
+++ b/akka-actor/src/main/scala/akka/util/HashCode.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 akka.util
diff --git a/akka-actor/src/main/scala/akka/util/Helpers.scala b/akka-actor/src/main/scala/akka/util/Helpers.scala
index 430d4582ae..d071829148 100644
--- a/akka-actor/src/main/scala/akka/util/Helpers.scala
+++ b/akka-actor/src/main/scala/akka/util/Helpers.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 akka.util
 
diff --git a/akka-actor/src/main/scala/akka/util/Index.scala b/akka-actor/src/main/scala/akka/util/Index.scala
index 83d8a40885..5022db9865 100644
--- a/akka-actor/src/main/scala/akka/util/Index.scala
+++ b/akka-actor/src/main/scala/akka/util/Index.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 akka.util
 
diff --git a/akka-actor/src/main/scala/akka/util/LockUtil.scala b/akka-actor/src/main/scala/akka/util/LockUtil.scala
index 8279fcc7df..4647e2e9b2 100644
--- a/akka-actor/src/main/scala/akka/util/LockUtil.scala
+++ b/akka-actor/src/main/scala/akka/util/LockUtil.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 akka.util
diff --git a/akka-actor/src/main/scala/akka/util/Reflect.scala b/akka-actor/src/main/scala/akka/util/Reflect.scala
index f62ea5fb8c..5761fe5dd3 100644
--- a/akka-actor/src/main/scala/akka/util/Reflect.scala
+++ b/akka-actor/src/main/scala/akka/util/Reflect.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 akka.util
 import scala.util.control.NonFatal
@@ -50,4 +50,4 @@ private[akka] object Reflect {
    * @return a function which when applied will create a new instance from the default constructor of the given class
    */
   private[akka] def instantiator[T](clazz: Class[T]): () ⇒ T = () ⇒ instantiate(clazz)
-}
\ No newline at end of file
+}
diff --git a/akka-actor/src/main/scala/akka/util/SubclassifiedIndex.scala b/akka-actor/src/main/scala/akka/util/SubclassifiedIndex.scala
index 236f645864..206082c464 100644
--- a/akka-actor/src/main/scala/akka/util/SubclassifiedIndex.scala
+++ b/akka-actor/src/main/scala/akka/util/SubclassifiedIndex.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 akka.util
 
diff --git a/akka-actor/src/main/scala/akka/util/Timeout.scala b/akka-actor/src/main/scala/akka/util/Timeout.scala
index 7062eabd35..4e758a6373 100644
--- a/akka-actor/src/main/scala/akka/util/Timeout.scala
+++ b/akka-actor/src/main/scala/akka/util/Timeout.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 akka.util
diff --git a/akka-actor/src/main/scala/akka/util/Unsafe.java b/akka-actor/src/main/scala/akka/util/Unsafe.java
index 005d1b3441..b43e1704ca 100644
--- a/akka-actor/src/main/scala/akka/util/Unsafe.java
+++ b/akka-actor/src/main/scala/akka/util/Unsafe.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
  */
 
 
diff --git a/akka-actor/src/main/scala/akka/util/WildcardTree.scala b/akka-actor/src/main/scala/akka/util/WildcardTree.scala
index 519e1a73e5..76c5b2124c 100644
--- a/akka-actor/src/main/scala/akka/util/WildcardTree.scala
+++ b/akka-actor/src/main/scala/akka/util/WildcardTree.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 akka.util
diff --git a/akka-agent/src/main/scala/akka/agent/Agent.scala b/akka-agent/src/main/scala/akka/agent/Agent.scala
index 215de37c28..a19d01c338 100644
--- a/akka-agent/src/main/scala/akka/agent/Agent.scala
+++ b/akka-agent/src/main/scala/akka/agent/Agent.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 akka.agent
diff --git a/akka-camel/src/main/scala/akka/camel/Activation.scala b/akka-camel/src/main/scala/akka/camel/Activation.scala
index b035cbd267..983dba0b2d 100644
--- a/akka-camel/src/main/scala/akka/camel/Activation.scala
+++ b/akka-camel/src/main/scala/akka/camel/Activation.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 akka.camel
diff --git a/akka-camel/src/main/scala/akka/camel/ActorRouteDefinition.scala b/akka-camel/src/main/scala/akka/camel/ActorRouteDefinition.scala
index e8b1be8550..c75d45933a 100644
--- a/akka-camel/src/main/scala/akka/camel/ActorRouteDefinition.scala
+++ b/akka-camel/src/main/scala/akka/camel/ActorRouteDefinition.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 akka.camel
diff --git a/akka-camel/src/main/scala/akka/camel/Camel.scala b/akka-camel/src/main/scala/akka/camel/Camel.scala
index c72193becb..1273f525f1 100644
--- a/akka-camel/src/main/scala/akka/camel/Camel.scala
+++ b/akka-camel/src/main/scala/akka/camel/Camel.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 akka.camel
diff --git a/akka-camel/src/main/scala/akka/camel/CamelMessage.scala b/akka-camel/src/main/scala/akka/camel/CamelMessage.scala
index c9dc32e597..f6b5073534 100644
--- a/akka-camel/src/main/scala/akka/camel/CamelMessage.scala
+++ b/akka-camel/src/main/scala/akka/camel/CamelMessage.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 akka.camel
diff --git a/akka-camel/src/main/scala/akka/camel/Consumer.scala b/akka-camel/src/main/scala/akka/camel/Consumer.scala
index 19ddc85b59..dfbe3ac840 100644
--- a/akka-camel/src/main/scala/akka/camel/Consumer.scala
+++ b/akka-camel/src/main/scala/akka/camel/Consumer.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 akka.camel
diff --git a/akka-camel/src/main/scala/akka/camel/Producer.scala b/akka-camel/src/main/scala/akka/camel/Producer.scala
index ca05f7a45d..64ab0f61f8 100644
--- a/akka-camel/src/main/scala/akka/camel/Producer.scala
+++ b/akka-camel/src/main/scala/akka/camel/Producer.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 akka.camel
diff --git a/akka-camel/src/main/scala/akka/camel/internal/ActivationMessage.scala b/akka-camel/src/main/scala/akka/camel/internal/ActivationMessage.scala
index 7b27dbc789..2208cad046 100644
--- a/akka-camel/src/main/scala/akka/camel/internal/ActivationMessage.scala
+++ b/akka-camel/src/main/scala/akka/camel/internal/ActivationMessage.scala
@@ -1,7 +1,7 @@
 package akka.camel.internal
 
 /**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
  */
 
 import akka.actor.ActorRef
@@ -66,4 +66,4 @@ private[camel] object ActivationProtocol {
    */
   @SerialVersionUID(1L)
   final case class EndpointFailedToDeActivate(actorRef: ActorRef, cause: Throwable) extends ActivationMessage(actorRef)
-}
\ No newline at end of file
+}
diff --git a/akka-camel/src/main/scala/akka/camel/internal/ActivationTracker.scala b/akka-camel/src/main/scala/akka/camel/internal/ActivationTracker.scala
index 9beb6a8894..17ee254bd5 100644
--- a/akka-camel/src/main/scala/akka/camel/internal/ActivationTracker.scala
+++ b/akka-camel/src/main/scala/akka/camel/internal/ActivationTracker.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 akka.camel.internal
diff --git a/akka-camel/src/main/scala/akka/camel/internal/ConsumerActorRouteBuilder.scala b/akka-camel/src/main/scala/akka/camel/internal/ConsumerActorRouteBuilder.scala
index a27c23ec2f..27f25af1ab 100644
--- a/akka-camel/src/main/scala/akka/camel/internal/ConsumerActorRouteBuilder.scala
+++ b/akka-camel/src/main/scala/akka/camel/internal/ConsumerActorRouteBuilder.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 akka.camel.internal
diff --git a/akka-camel/src/main/scala/akka/camel/internal/component/ActorComponent.scala b/akka-camel/src/main/scala/akka/camel/internal/component/ActorComponent.scala
index 2585b970c9..a42ef51abc 100644
--- a/akka-camel/src/main/scala/akka/camel/internal/component/ActorComponent.scala
+++ b/akka-camel/src/main/scala/akka/camel/internal/component/ActorComponent.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 akka.camel.internal.component
diff --git a/akka-camel/src/main/scala/akka/camel/javaapi/UntypedConsumerActor.scala b/akka-camel/src/main/scala/akka/camel/javaapi/UntypedConsumerActor.scala
index 77526dab08..7bfa26ce20 100644
--- a/akka-camel/src/main/scala/akka/camel/javaapi/UntypedConsumerActor.scala
+++ b/akka-camel/src/main/scala/akka/camel/javaapi/UntypedConsumerActor.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 akka.camel.javaapi
diff --git a/akka-camel/src/main/scala/akka/camel/javaapi/UntypedProducerActor.scala b/akka-camel/src/main/scala/akka/camel/javaapi/UntypedProducerActor.scala
index 7688df5130..aa7e7cb8df 100644
--- a/akka-camel/src/main/scala/akka/camel/javaapi/UntypedProducerActor.scala
+++ b/akka-camel/src/main/scala/akka/camel/javaapi/UntypedProducerActor.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 akka.camel.javaapi
diff --git a/akka-camel/src/main/scala/akka/package.scala b/akka-camel/src/main/scala/akka/package.scala
index 9347580e76..c36d83322f 100644
--- a/akka-camel/src/main/scala/akka/package.scala
+++ b/akka-camel/src/main/scala/akka/package.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 akka
diff --git a/akka-camel/src/test/java/akka/camel/ConsumerJavaTestBase.java b/akka-camel/src/test/java/akka/camel/ConsumerJavaTestBase.java
index d8aec8a761..0ed6f85520 100644
--- a/akka-camel/src/test/java/akka/camel/ConsumerJavaTestBase.java
+++ b/akka-camel/src/test/java/akka/camel/ConsumerJavaTestBase.java
@@ -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 akka.camel;
diff --git a/akka-camel/src/test/java/akka/camel/MessageJavaTestBase.java b/akka-camel/src/test/java/akka/camel/MessageJavaTestBase.java
index d805a8b2c1..3eeb8c4186 100644
--- a/akka-camel/src/test/java/akka/camel/MessageJavaTestBase.java
+++ b/akka-camel/src/test/java/akka/camel/MessageJavaTestBase.java
@@ -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 akka.camel;
diff --git a/akka-camel/src/test/java/akka/camel/SampleErrorHandlingConsumer.java b/akka-camel/src/test/java/akka/camel/SampleErrorHandlingConsumer.java
index 92fb124a11..4e6efdde5b 100644
--- a/akka-camel/src/test/java/akka/camel/SampleErrorHandlingConsumer.java
+++ b/akka-camel/src/test/java/akka/camel/SampleErrorHandlingConsumer.java
@@ -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 akka.camel;
diff --git a/akka-camel/src/test/java/akka/camel/SampleUntypedConsumer.java b/akka-camel/src/test/java/akka/camel/SampleUntypedConsumer.java
index 030c951cc9..39e7759508 100644
--- a/akka-camel/src/test/java/akka/camel/SampleUntypedConsumer.java
+++ b/akka-camel/src/test/java/akka/camel/SampleUntypedConsumer.java
@@ -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 akka.camel;
diff --git a/akka-camel/src/test/java/akka/camel/SampleUntypedForwardingProducer.java b/akka-camel/src/test/java/akka/camel/SampleUntypedForwardingProducer.java
index b99a7ecc31..83bf56affc 100644
--- a/akka-camel/src/test/java/akka/camel/SampleUntypedForwardingProducer.java
+++ b/akka-camel/src/test/java/akka/camel/SampleUntypedForwardingProducer.java
@@ -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 akka.camel;
diff --git a/akka-camel/src/test/java/akka/camel/SampleUntypedReplyingProducer.java b/akka-camel/src/test/java/akka/camel/SampleUntypedReplyingProducer.java
index c47187d1da..adfabe3097 100644
--- a/akka-camel/src/test/java/akka/camel/SampleUntypedReplyingProducer.java
+++ b/akka-camel/src/test/java/akka/camel/SampleUntypedReplyingProducer.java
@@ -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 akka.camel;
diff --git a/akka-camel/src/test/scala/akka/camel/ActivationIntegrationTest.scala b/akka-camel/src/test/scala/akka/camel/ActivationIntegrationTest.scala
index a945e3a63e..a8edab40ce 100644
--- a/akka-camel/src/test/scala/akka/camel/ActivationIntegrationTest.scala
+++ b/akka-camel/src/test/scala/akka/camel/ActivationIntegrationTest.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 akka.camel
@@ -79,4 +79,4 @@ class ActivationIntegrationTest extends WordSpec with MustMatchers with SharedCa
     }
   }
 
-}
\ No newline at end of file
+}
diff --git a/akka-camel/src/test/scala/akka/camel/CamelConfigSpec.scala b/akka-camel/src/test/scala/akka/camel/CamelConfigSpec.scala
index ca7b4ba3cc..7de26bb1cd 100644
--- a/akka-camel/src/test/scala/akka/camel/CamelConfigSpec.scala
+++ b/akka-camel/src/test/scala/akka/camel/CamelConfigSpec.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 akka.camel
diff --git a/akka-camel/src/test/scala/akka/camel/CamelExchangeAdapterTest.scala b/akka-camel/src/test/scala/akka/camel/CamelExchangeAdapterTest.scala
index 29863b146a..0fc1cd7f38 100644
--- a/akka-camel/src/test/scala/akka/camel/CamelExchangeAdapterTest.scala
+++ b/akka-camel/src/test/scala/akka/camel/CamelExchangeAdapterTest.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 akka.camel
diff --git a/akka-camel/src/test/scala/akka/camel/CamelMessageTest.scala b/akka-camel/src/test/scala/akka/camel/CamelMessageTest.scala
index 0fd0a73fb6..d2ac74324e 100644
--- a/akka-camel/src/test/scala/akka/camel/CamelMessageTest.scala
+++ b/akka-camel/src/test/scala/akka/camel/CamelMessageTest.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 akka.camel
diff --git a/akka-camel/src/test/scala/akka/camel/ConcurrentActivationTest.scala b/akka-camel/src/test/scala/akka/camel/ConcurrentActivationTest.scala
index ff5524ad6c..9e51164819 100644
--- a/akka-camel/src/test/scala/akka/camel/ConcurrentActivationTest.scala
+++ b/akka-camel/src/test/scala/akka/camel/ConcurrentActivationTest.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 akka.camel
 
diff --git a/akka-camel/src/test/scala/akka/camel/ConsumerIntegrationTest.scala b/akka-camel/src/test/scala/akka/camel/ConsumerIntegrationTest.scala
index 6462e0b191..e903d2ce19 100644
--- a/akka-camel/src/test/scala/akka/camel/ConsumerIntegrationTest.scala
+++ b/akka-camel/src/test/scala/akka/camel/ConsumerIntegrationTest.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 akka.camel
diff --git a/akka-camel/src/test/scala/akka/camel/ConsumerJavaTest.scala b/akka-camel/src/test/scala/akka/camel/ConsumerJavaTest.scala
index 5685db2cea..e0685bdf06 100644
--- a/akka-camel/src/test/scala/akka/camel/ConsumerJavaTest.scala
+++ b/akka-camel/src/test/scala/akka/camel/ConsumerJavaTest.scala
@@ -1,9 +1,9 @@
 /**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
  */
 
 package akka.camel
 
 import org.scalatest.junit.JUnitSuite
 
-class ConsumerJavaTest extends ConsumerJavaTestBase with JUnitSuite
\ No newline at end of file
+class ConsumerJavaTest extends ConsumerJavaTestBase with JUnitSuite
diff --git a/akka-camel/src/test/scala/akka/camel/MessageJavaTest.scala b/akka-camel/src/test/scala/akka/camel/MessageJavaTest.scala
index 9d56642b9f..eb8ba6e194 100644
--- a/akka-camel/src/test/scala/akka/camel/MessageJavaTest.scala
+++ b/akka-camel/src/test/scala/akka/camel/MessageJavaTest.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 akka.camel
diff --git a/akka-camel/src/test/scala/akka/camel/MessageScalaTest.scala b/akka-camel/src/test/scala/akka/camel/MessageScalaTest.scala
index cbf0190e91..9e2a901ec5 100644
--- a/akka-camel/src/test/scala/akka/camel/MessageScalaTest.scala
+++ b/akka-camel/src/test/scala/akka/camel/MessageScalaTest.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 akka.camel
diff --git a/akka-camel/src/test/scala/akka/camel/ProducerFeatureTest.scala b/akka-camel/src/test/scala/akka/camel/ProducerFeatureTest.scala
index 58cd0713d6..8463c185ae 100644
--- a/akka-camel/src/test/scala/akka/camel/ProducerFeatureTest.scala
+++ b/akka-camel/src/test/scala/akka/camel/ProducerFeatureTest.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 akka.camel
diff --git a/akka-camel/src/test/scala/akka/camel/TestSupport.scala b/akka-camel/src/test/scala/akka/camel/TestSupport.scala
index 4ff7155666..0102d06f9f 100644
--- a/akka-camel/src/test/scala/akka/camel/TestSupport.scala
+++ b/akka-camel/src/test/scala/akka/camel/TestSupport.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 akka.camel
diff --git a/akka-camel/src/test/scala/akka/camel/UntypedProducerTest.scala b/akka-camel/src/test/scala/akka/camel/UntypedProducerTest.scala
index e89a568b42..7964d78b71 100644
--- a/akka-camel/src/test/scala/akka/camel/UntypedProducerTest.scala
+++ b/akka-camel/src/test/scala/akka/camel/UntypedProducerTest.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 akka.camel
diff --git a/akka-camel/src/test/scala/akka/camel/internal/component/ActorComponentConfigurationTest.scala b/akka-camel/src/test/scala/akka/camel/internal/component/ActorComponentConfigurationTest.scala
index 1be5295225..3f5a8f33cf 100644
--- a/akka-camel/src/test/scala/akka/camel/internal/component/ActorComponentConfigurationTest.scala
+++ b/akka-camel/src/test/scala/akka/camel/internal/component/ActorComponentConfigurationTest.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 akka.camel.internal.component
@@ -26,4 +26,4 @@ class ActorComponentConfigurationTest extends WordSpec with MustMatchers with Sh
       'replyTimeout(987000000 nanos))
   }
 
-}
\ No newline at end of file
+}
diff --git a/akka-camel/src/test/scala/akka/camel/internal/component/ActorProducerTest.scala b/akka-camel/src/test/scala/akka/camel/internal/component/ActorProducerTest.scala
index 57d4ee02c6..35dfb53b18 100644
--- a/akka-camel/src/test/scala/akka/camel/internal/component/ActorProducerTest.scala
+++ b/akka-camel/src/test/scala/akka/camel/internal/component/ActorProducerTest.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 akka.camel.internal.component
diff --git a/akka-camel/src/test/scala/akka/camel/internal/component/DurationConverterTest.scala b/akka-camel/src/test/scala/akka/camel/internal/component/DurationConverterTest.scala
index 06c5d5aa5e..83bf137af3 100644
--- a/akka-camel/src/test/scala/akka/camel/internal/component/DurationConverterTest.scala
+++ b/akka-camel/src/test/scala/akka/camel/internal/component/DurationConverterTest.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 akka.camel.internal.component
diff --git a/akka-cluster/src/main/scala/akka/cluster/AccrualFailureDetector.scala b/akka-cluster/src/main/scala/akka/cluster/AccrualFailureDetector.scala
index feb950a9a8..6e812ab6cc 100644
--- a/akka-cluster/src/main/scala/akka/cluster/AccrualFailureDetector.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/AccrualFailureDetector.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 akka.cluster
diff --git a/akka-cluster/src/main/scala/akka/cluster/Cluster.scala b/akka-cluster/src/main/scala/akka/cluster/Cluster.scala
index 54d3e6bfa3..6da8af20e5 100644
--- a/akka-cluster/src/main/scala/akka/cluster/Cluster.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/Cluster.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 akka.cluster
diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterActorRefProvider.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterActorRefProvider.scala
index 5adb57615a..f2e3b9e3be 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterActorRefProvider.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/ClusterActorRefProvider.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 akka.cluster
 
diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterDaemon.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterDaemon.scala
index 50644e431c..e6ed4922b7 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterDaemon.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/ClusterDaemon.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 akka.cluster
 
diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterEvent.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterEvent.scala
index 7d1997649d..f7d07cebfa 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterEvent.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/ClusterEvent.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 akka.cluster
 
diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterHeartbeat.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterHeartbeat.scala
index 94e4e9b9f9..a5d230019f 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterHeartbeat.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/ClusterHeartbeat.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 akka.cluster
 
diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterJmx.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterJmx.scala
index ec0c38a944..2e735b89d1 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterJmx.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/ClusterJmx.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 akka.cluster
diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterMetricsCollector.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterMetricsCollector.scala
index 2a7951a667..8f08180b1c 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterMetricsCollector.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/ClusterMetricsCollector.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 akka.cluster
diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterReadView.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterReadView.scala
index 831d72f9c8..ce57413287 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterReadView.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/ClusterReadView.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 akka.cluster
diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterSettings.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterSettings.scala
index 5b5c26ae33..0477bbd002 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterSettings.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/ClusterSettings.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 akka.cluster
 
diff --git a/akka-cluster/src/main/scala/akka/cluster/FailureDetector.scala b/akka-cluster/src/main/scala/akka/cluster/FailureDetector.scala
index 1aa926c5e5..9ef77c6834 100644
--- a/akka-cluster/src/main/scala/akka/cluster/FailureDetector.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/FailureDetector.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 akka.cluster
diff --git a/akka-cluster/src/main/scala/akka/cluster/Gossip.scala b/akka-cluster/src/main/scala/akka/cluster/Gossip.scala
index 1f96434995..0a48dba08d 100644
--- a/akka-cluster/src/main/scala/akka/cluster/Gossip.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/Gossip.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 akka.cluster
diff --git a/akka-cluster/src/main/scala/akka/cluster/Member.scala b/akka-cluster/src/main/scala/akka/cluster/Member.scala
index 1ee4aae804..1b4cf54dfc 100644
--- a/akka-cluster/src/main/scala/akka/cluster/Member.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/Member.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 akka.cluster
@@ -126,4 +126,4 @@ object MemberStatus {
    * JAVA API
    */
   def removed: MemberStatus = Removed
-}
\ No newline at end of file
+}
diff --git a/akka-cluster/src/main/scala/akka/cluster/VectorClock.scala b/akka-cluster/src/main/scala/akka/cluster/VectorClock.scala
index baef66f26c..45fa26aa5c 100644
--- a/akka-cluster/src/main/scala/akka/cluster/VectorClock.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/VectorClock.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 akka.cluster
diff --git a/akka-cluster/src/main/scala/akka/cluster/routing/AdaptiveLoadBalancingRouter.scala b/akka-cluster/src/main/scala/akka/cluster/routing/AdaptiveLoadBalancingRouter.scala
index 60a9c5b6a7..ab86177275 100644
--- a/akka-cluster/src/main/scala/akka/cluster/routing/AdaptiveLoadBalancingRouter.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/routing/AdaptiveLoadBalancingRouter.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 akka.cluster.routing
@@ -431,4 +431,4 @@ private[cluster] class WeightedRoutees(refs: immutable.IndexedSeq[ActorRef], sel
       else j
     }
   }
-}
\ No newline at end of file
+}
diff --git a/akka-cluster/src/main/scala/akka/cluster/routing/ClusterRouterConfig.scala b/akka-cluster/src/main/scala/akka/cluster/routing/ClusterRouterConfig.scala
index 59c88c9fee..4b6c3b5c30 100644
--- a/akka-cluster/src/main/scala/akka/cluster/routing/ClusterRouterConfig.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/routing/ClusterRouterConfig.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 akka.cluster.routing
 
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUnreachableSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUnreachableSpec.scala
index a10e941c3f..79f5a72c4b 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUnreachableSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUnreachableSpec.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 akka.cluster
 
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUpSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUpSpec.scala
index a8c8bdb736..92622dd13a 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUpSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUpSpec.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 akka.cluster
 
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterAccrualFailureDetectorSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterAccrualFailureDetectorSpec.scala
index 552f90bd49..3ef3beddcc 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterAccrualFailureDetectorSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterAccrualFailureDetectorSpec.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 akka.cluster
 
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterDeathWatchSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterDeathWatchSpec.scala
index d711aec55f..aca2ea196d 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterDeathWatchSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterDeathWatchSpec.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 akka.cluster
 
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterMetricsDisabledSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterMetricsDisabledSpec.scala
index 0352a2c084..0bfc0a5975 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterMetricsDisabledSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterMetricsDisabledSpec.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 akka.cluster
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterMetricsSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterMetricsSpec.scala
index 6712502312..dc16f8dfe7 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterMetricsSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterMetricsSpec.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 akka.cluster
@@ -55,4 +55,4 @@ abstract class ClusterMetricsSpec extends MultiNodeSpec(ClusterMetricsMultiJvmSp
       enterBarrier("finished")
     }
   }
-}
\ No newline at end of file
+}
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/ConvergenceSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/ConvergenceSpec.scala
index ae5dea869e..763d2623c2 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/ConvergenceSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/ConvergenceSpec.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 akka.cluster
 
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinInProgressSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinInProgressSpec.scala
index f59db3f21e..ed0a667a8b 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinInProgressSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinInProgressSpec.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 akka.cluster
 
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinSeedNodeSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinSeedNodeSpec.scala
index 464b627944..577ea213ec 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinSeedNodeSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinSeedNodeSpec.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 akka.cluster
 
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinTwoClustersSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinTwoClustersSpec.scala
index efa9e3f25d..46ec2780b8 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinTwoClustersSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinTwoClustersSpec.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 akka.cluster
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderDowningNodeThatIsUnreachableSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderDowningNodeThatIsUnreachableSpec.scala
index 6a917be56e..1203ac2740 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderDowningNodeThatIsUnreachableSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderDowningNodeThatIsUnreachableSpec.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 akka.cluster
 
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderElectionSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderElectionSpec.scala
index dfe1553369..655f86ab3b 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderElectionSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderElectionSpec.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 akka.cluster
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderLeavingSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderLeavingSpec.scala
index acaf909d57..bcd8b48c61 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderLeavingSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderLeavingSpec.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 akka.cluster
 
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MBeanSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/MBeanSpec.scala
index 5d55afb00f..15bd8d75e4 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MBeanSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/MBeanSpec.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 akka.cluster
 
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerExitingSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerExitingSpec.scala
index b36ffccf7c..6b3bac9341 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerExitingSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerExitingSpec.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 akka.cluster
 
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerJoinSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerJoinSpec.scala
index effff75438..381780c810 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerJoinSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerJoinSpec.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 akka.cluster
 
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerLeavingSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerLeavingSpec.scala
index 835c3d722e..281ef451c1 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerLeavingSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerLeavingSpec.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 akka.cluster
 
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerUpSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerUpSpec.scala
index f4faf4234b..2fbdc298df 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerUpSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerUpSpec.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 akka.cluster
 
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MinMembersBeforeUpSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/MinMembersBeforeUpSpec.scala
index 46891bbc49..4cad603747 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MinMembersBeforeUpSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/MinMembersBeforeUpSpec.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 akka.cluster
 
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiNodeClusterSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiNodeClusterSpec.scala
index 9d7447e6c9..08f6d96937 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiNodeClusterSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiNodeClusterSpec.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 akka.cluster
 
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeLeavingAndExitingAndBeingRemovedSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeLeavingAndExitingAndBeingRemovedSpec.scala
index 2dfddc330f..f6d132df42 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeLeavingAndExitingAndBeingRemovedSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeLeavingAndExitingAndBeingRemovedSpec.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 akka.cluster
 
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeLeavingAndExitingSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeLeavingAndExitingSpec.scala
index e1051e4161..d38cc06e1f 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeLeavingAndExitingSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeLeavingAndExitingSpec.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 akka.cluster
 
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeMembershipSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeMembershipSpec.scala
index 336acc2769..da11b5b7d0 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeMembershipSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeMembershipSpec.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 akka.cluster
 
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeUpSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeUpSpec.scala
index 0a82b74563..43ca4fae3e 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeUpSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeUpSpec.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 akka.cluster
 
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/SingletonClusterSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/SingletonClusterSpec.scala
index d1e7098f9b..5910f48ac3 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/SingletonClusterSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/SingletonClusterSpec.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 akka.cluster
 
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/SplitBrainSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/SplitBrainSpec.scala
index 0633969319..a8ca35684d 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/SplitBrainSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/SplitBrainSpec.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 akka.cluster
 
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/StressSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/StressSpec.scala
index 707e96610f..bceb723031 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/StressSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/StressSpec.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 akka.cluster
 
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/SunnyWeatherSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/SunnyWeatherSpec.scala
index 581eca3978..2f0325c51a 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/SunnyWeatherSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/SunnyWeatherSpec.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 akka.cluster
 
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/TransitionSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/TransitionSpec.scala
index 4c9054d3d1..c7c6bf685e 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/TransitionSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/TransitionSpec.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 akka.cluster
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/UnreachableNodeRejoinsClusterSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/UnreachableNodeRejoinsClusterSpec.scala
index a33ca8146e..afe20e1614 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/UnreachableNodeRejoinsClusterSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/UnreachableNodeRejoinsClusterSpec.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 akka.cluster
 
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/AdaptiveLoadBalancingRouterSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/AdaptiveLoadBalancingRouterSpec.scala
index 723ef6b8ec..c98413c21a 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/AdaptiveLoadBalancingRouterSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/AdaptiveLoadBalancingRouterSpec.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 akka.cluster.routing
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/ClusterConsistentHashingRouterSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/ClusterConsistentHashingRouterSpec.scala
index daf4e81038..7f6cdba39a 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/ClusterConsistentHashingRouterSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/ClusterConsistentHashingRouterSpec.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 akka.cluster.routing
 
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/ClusterRoundRobinRoutedActorSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/ClusterRoundRobinRoutedActorSpec.scala
index 8a6ac1935f..0caf029de2 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/ClusterRoundRobinRoutedActorSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/ClusterRoundRobinRoutedActorSpec.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 akka.cluster.routing
 
diff --git a/akka-cluster/src/test/scala/akka/cluster/AccrualFailureDetectorSpec.scala b/akka-cluster/src/test/scala/akka/cluster/AccrualFailureDetectorSpec.scala
index 9af8eacc7e..ee140dec1a 100644
--- a/akka-cluster/src/test/scala/akka/cluster/AccrualFailureDetectorSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/AccrualFailureDetectorSpec.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 akka.cluster
diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterConfigSpec.scala b/akka-cluster/src/test/scala/akka/cluster/ClusterConfigSpec.scala
index ce7f7a4a70..ec2b113a85 100644
--- a/akka-cluster/src/test/scala/akka/cluster/ClusterConfigSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/ClusterConfigSpec.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 akka.cluster
diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterDeployerSpec.scala b/akka-cluster/src/test/scala/akka/cluster/ClusterDeployerSpec.scala
index 6432b991ab..0bd481ac31 100644
--- a/akka-cluster/src/test/scala/akka/cluster/ClusterDeployerSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/ClusterDeployerSpec.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 akka.cluster
 
@@ -73,4 +73,4 @@ class ClusterDeployerSpec extends AkkaSpec(ClusterDeployerSpec.deployerConf) {
 
   }
 
-}
\ No newline at end of file
+}
diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterDomainEventPublisherSpec.scala b/akka-cluster/src/test/scala/akka/cluster/ClusterDomainEventPublisherSpec.scala
index 6c13c79f23..23e11b0b03 100644
--- a/akka-cluster/src/test/scala/akka/cluster/ClusterDomainEventPublisherSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/ClusterDomainEventPublisherSpec.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 akka.cluster
diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterDomainEventSpec.scala b/akka-cluster/src/test/scala/akka/cluster/ClusterDomainEventSpec.scala
index 284f6676f0..590f0b7a76 100644
--- a/akka-cluster/src/test/scala/akka/cluster/ClusterDomainEventSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/ClusterDomainEventSpec.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 akka.cluster
diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterHeartbeatSenderStateSpec.scala b/akka-cluster/src/test/scala/akka/cluster/ClusterHeartbeatSenderStateSpec.scala
index b9e6df49dc..82ad7c2cf2 100644
--- a/akka-cluster/src/test/scala/akka/cluster/ClusterHeartbeatSenderStateSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/ClusterHeartbeatSenderStateSpec.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 akka.cluster
diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterSpec.scala b/akka-cluster/src/test/scala/akka/cluster/ClusterSpec.scala
index 008c98d4b7..7d766bf17e 100644
--- a/akka-cluster/src/test/scala/akka/cluster/ClusterSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/ClusterSpec.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 akka.cluster
diff --git a/akka-cluster/src/test/scala/akka/cluster/EWMASpec.scala b/akka-cluster/src/test/scala/akka/cluster/EWMASpec.scala
index ed954b7bb6..519c07bc20 100644
--- a/akka-cluster/src/test/scala/akka/cluster/EWMASpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/EWMASpec.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 akka.cluster
diff --git a/akka-cluster/src/test/scala/akka/cluster/FailureDetectorPuppet.scala b/akka-cluster/src/test/scala/akka/cluster/FailureDetectorPuppet.scala
index 869df97f84..58fbd220fc 100644
--- a/akka-cluster/src/test/scala/akka/cluster/FailureDetectorPuppet.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/FailureDetectorPuppet.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 akka.cluster
diff --git a/akka-cluster/src/test/scala/akka/cluster/GossipSpec.scala b/akka-cluster/src/test/scala/akka/cluster/GossipSpec.scala
index 704b12dac0..9c0007c984 100644
--- a/akka-cluster/src/test/scala/akka/cluster/GossipSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/GossipSpec.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 akka.cluster
diff --git a/akka-cluster/src/test/scala/akka/cluster/MemberOrderingSpec.scala b/akka-cluster/src/test/scala/akka/cluster/MemberOrderingSpec.scala
index 6f93f9827a..a9ae44e160 100644
--- a/akka-cluster/src/test/scala/akka/cluster/MemberOrderingSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/MemberOrderingSpec.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 akka.cluster
diff --git a/akka-cluster/src/test/scala/akka/cluster/MetricNumericConverterSpec.scala b/akka-cluster/src/test/scala/akka/cluster/MetricNumericConverterSpec.scala
index f572b13233..20ad0e62bd 100644
--- a/akka-cluster/src/test/scala/akka/cluster/MetricNumericConverterSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/MetricNumericConverterSpec.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 akka.cluster
@@ -46,4 +46,4 @@ class MetricNumericConverterSpec extends WordSpec with MustMatchers with MetricN
       defined(Double.NaN) must be(false)
     }
   }
-}
\ No newline at end of file
+}
diff --git a/akka-cluster/src/test/scala/akka/cluster/MetricValuesSpec.scala b/akka-cluster/src/test/scala/akka/cluster/MetricValuesSpec.scala
index 2b3b23e8c5..1fdf0ff60b 100644
--- a/akka-cluster/src/test/scala/akka/cluster/MetricValuesSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/MetricValuesSpec.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 akka.cluster
@@ -63,4 +63,4 @@ class MetricValuesSpec extends AkkaSpec(MetricsEnabledSpec.config) with MetricsC
     }
   }
 
-}
\ No newline at end of file
+}
diff --git a/akka-cluster/src/test/scala/akka/cluster/MetricsCollectorSpec.scala b/akka-cluster/src/test/scala/akka/cluster/MetricsCollectorSpec.scala
index 2ce3892645..b92ec1eb71 100644
--- a/akka-cluster/src/test/scala/akka/cluster/MetricsCollectorSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/MetricsCollectorSpec.scala
@@ -1,6 +1,6 @@
 /*
 
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
  */
 
 package akka.cluster
diff --git a/akka-cluster/src/test/scala/akka/cluster/MetricsGossipSpec.scala b/akka-cluster/src/test/scala/akka/cluster/MetricsGossipSpec.scala
index c6b8d64eb1..9c54703409 100644
--- a/akka-cluster/src/test/scala/akka/cluster/MetricsGossipSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/MetricsGossipSpec.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 akka.cluster
diff --git a/akka-cluster/src/test/scala/akka/cluster/NodeMetricsSpec.scala b/akka-cluster/src/test/scala/akka/cluster/NodeMetricsSpec.scala
index 8ddd0af7ce..8ab39e78aa 100644
--- a/akka-cluster/src/test/scala/akka/cluster/NodeMetricsSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/NodeMetricsSpec.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 akka.cluster
diff --git a/akka-cluster/src/test/scala/akka/cluster/VectorClockSpec.scala b/akka-cluster/src/test/scala/akka/cluster/VectorClockSpec.scala
index 19ad9410c4..fad1665e5f 100644
--- a/akka-cluster/src/test/scala/akka/cluster/VectorClockSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/VectorClockSpec.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 akka.cluster
diff --git a/akka-cluster/src/test/scala/akka/cluster/routing/MetricsSelectorSpec.scala b/akka-cluster/src/test/scala/akka/cluster/routing/MetricsSelectorSpec.scala
index 659f1a7cf6..605cf0253b 100644
--- a/akka-cluster/src/test/scala/akka/cluster/routing/MetricsSelectorSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/routing/MetricsSelectorSpec.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 akka.cluster.routing
diff --git a/akka-cluster/src/test/scala/akka/cluster/routing/WeightedRouteesSpec.scala b/akka-cluster/src/test/scala/akka/cluster/routing/WeightedRouteesSpec.scala
index 76a00fa6ae..95e5bd0d54 100644
--- a/akka-cluster/src/test/scala/akka/cluster/routing/WeightedRouteesSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/routing/WeightedRouteesSpec.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 akka.cluster.routing
diff --git a/akka-contrib/src/main/scala/akka/contrib/pattern/ReliableProxy.scala b/akka-contrib/src/main/scala/akka/contrib/pattern/ReliableProxy.scala
index 9d4b9ecd7b..b3e24e2361 100644
--- a/akka-contrib/src/main/scala/akka/contrib/pattern/ReliableProxy.scala
+++ b/akka-contrib/src/main/scala/akka/contrib/pattern/ReliableProxy.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 akka.contrib.pattern
diff --git a/akka-contrib/src/main/scala/akka/contrib/throttle/TimerBasedThrottler.scala b/akka-contrib/src/main/scala/akka/contrib/throttle/TimerBasedThrottler.scala
index de614619f7..0841130f34 100644
--- a/akka-contrib/src/main/scala/akka/contrib/throttle/TimerBasedThrottler.scala
+++ b/akka-contrib/src/main/scala/akka/contrib/throttle/TimerBasedThrottler.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 akka.contrib.throttle
@@ -293,4 +293,4 @@ class TimerBasedThrottler(var rate: Rate) extends Actor with Throttler with FSM[
 
     data.copy(queue = queue.drop(nrOfMsgToSend), callsLeftInThisPeriod = data.callsLeftInThisPeriod - nrOfMsgToSend)
   }
-}
\ No newline at end of file
+}
diff --git a/akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ReliableProxySpec.scala b/akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ReliableProxySpec.scala
index cd2d2b6157..934d437ed7 100644
--- a/akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ReliableProxySpec.scala
+++ b/akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ReliableProxySpec.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 akka.contrib.pattern
diff --git a/akka-contrib/src/test/java/akka/contrib/pattern/ReliableProxyTest.java b/akka-contrib/src/test/java/akka/contrib/pattern/ReliableProxyTest.java
index 4ae2c20b1f..8a293bc201 100644
--- a/akka-contrib/src/test/java/akka/contrib/pattern/ReliableProxyTest.java
+++ b/akka-contrib/src/test/java/akka/contrib/pattern/ReliableProxyTest.java
@@ -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 akka.contrib.pattern;
diff --git a/akka-contrib/src/test/scala/akka/contrib/pattern/ReliableProxyDocSpec.scala b/akka-contrib/src/test/scala/akka/contrib/pattern/ReliableProxyDocSpec.scala
index 07c2d7af74..7e3809123b 100644
--- a/akka-contrib/src/test/scala/akka/contrib/pattern/ReliableProxyDocSpec.scala
+++ b/akka-contrib/src/test/scala/akka/contrib/pattern/ReliableProxyDocSpec.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 akka.contrib.pattern
diff --git a/akka-contrib/src/test/scala/akka/contrib/throttle/TimerBasedThrottlerSpec.scala b/akka-contrib/src/test/scala/akka/contrib/throttle/TimerBasedThrottlerSpec.scala
index 7304df1448..b6963ff093 100644
--- a/akka-contrib/src/test/scala/akka/contrib/throttle/TimerBasedThrottlerSpec.scala
+++ b/akka-contrib/src/test/scala/akka/contrib/throttle/TimerBasedThrottlerSpec.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 akka.contrib.throttle
@@ -203,4 +203,4 @@ class TimerBasedThrottlerSpec extends TestKit(ActorSystem("TimerBasedThrottlerSp
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/akka-dataflow/src/main/scala/akka/dataflow/package.scala b/akka-dataflow/src/main/scala/akka/dataflow/package.scala
index 31248958d1..4537668f6b 100644
--- a/akka-dataflow/src/main/scala/akka/dataflow/package.scala
+++ b/akka-dataflow/src/main/scala/akka/dataflow/package.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 akka
@@ -99,4 +99,4 @@ package object dataflow {
      */
     final def apply()(implicit ec: ExecutionContext): T @cps[Future[Any]] = shift(future flatMap (_: T ⇒ Future[Any]))
   }
-}
\ No newline at end of file
+}
diff --git a/akka-dataflow/src/test/scala/akka/dataflow/DataflowSpec.scala b/akka-dataflow/src/test/scala/akka/dataflow/DataflowSpec.scala
index 0543b557c3..a9999b7083 100644
--- a/akka-dataflow/src/test/scala/akka/dataflow/DataflowSpec.scala
+++ b/akka-dataflow/src/test/scala/akka/dataflow/DataflowSpec.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 akka.dataflow
 
diff --git a/akka-docs/_sphinx/themes/akka/layout.html b/akka-docs/_sphinx/themes/akka/layout.html
index 1e0f13bdc2..d60fe7d599 100644
--- a/akka-docs/_sphinx/themes/akka/layout.html
+++ b/akka-docs/_sphinx/themes/akka/layout.html
@@ -141,7 +141,7 @@
   </div>
   <div class="container copyright">
     <p style="float: left;">
-      © 2012 <a href="http://typesafe.com/">Typesafe Inc.</a> <span class="license">Akka is Open Source and available under the Apache 2 License.</span>
+      © 2013 <a href="http://typesafe.com/">Typesafe Inc.</a> <span class="license">Akka is Open Source and available under the Apache 2 License.</span>
     </p>
     <p style="float: right; font-size: 12px;">
       Last updated: {{ last_updated }}
diff --git a/akka-docs/rst/common/code/docs/circuitbreaker/CircuitBreakerDocSpec.scala b/akka-docs/rst/common/code/docs/circuitbreaker/CircuitBreakerDocSpec.scala
index 55d5cfb657..525492ab44 100644
--- a/akka-docs/rst/common/code/docs/circuitbreaker/CircuitBreakerDocSpec.scala
+++ b/akka-docs/rst/common/code/docs/circuitbreaker/CircuitBreakerDocSpec.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.circuitbreaker
diff --git a/akka-docs/rst/common/code/docs/circuitbreaker/DangerousJavaActor.java b/akka-docs/rst/common/code/docs/circuitbreaker/DangerousJavaActor.java
index f3347937fc..4558d9db7c 100644
--- a/akka-docs/rst/common/code/docs/circuitbreaker/DangerousJavaActor.java
+++ b/akka-docs/rst/common/code/docs/circuitbreaker/DangerousJavaActor.java
@@ -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.circuitbreaker;
 
@@ -79,4 +79,4 @@ public class DangerousJavaActor extends UntypedActor {
   }
 //#circuit-breaker-usage
 
-}
\ No newline at end of file
+}
diff --git a/akka-docs/rst/common/code/docs/duration/Java.java b/akka-docs/rst/common/code/docs/duration/Java.java
index cd46c2c822..3358503232 100644
--- a/akka-docs/rst/common/code/docs/duration/Java.java
+++ b/akka-docs/rst/common/code/docs/duration/Java.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
+ *  Copyright (C) 2013 Typesafe Inc. <http://www.typesafe.com>
  */
 
 package docs.duration;
diff --git a/akka-docs/rst/common/code/docs/duration/Sample.scala b/akka-docs/rst/common/code/docs/duration/Sample.scala
index d374313900..26d1f85f69 100644
--- a/akka-docs/rst/common/code/docs/duration/Sample.scala
+++ b/akka-docs/rst/common/code/docs/duration/Sample.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.duration
diff --git a/akka-docs/rst/general/code/docs/config/ConfigDoc.java b/akka-docs/rst/general/code/docs/config/ConfigDoc.java
index ee6393fb1a..a61a9ab19f 100644
--- a/akka-docs/rst/general/code/docs/config/ConfigDoc.java
+++ b/akka-docs/rst/general/code/docs/config/ConfigDoc.java
@@ -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.config;
 
diff --git a/akka-docs/rst/general/code/docs/config/ConfigDocSpec.scala b/akka-docs/rst/general/code/docs/config/ConfigDocSpec.scala
index 643116e14f..264ed6147b 100644
--- a/akka-docs/rst/general/code/docs/config/ConfigDocSpec.scala
+++ b/akka-docs/rst/general/code/docs/config/ConfigDocSpec.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.config
 
diff --git a/akka-docs/rst/java/code/docs/actor/FSMDocTest.scala b/akka-docs/rst/java/code/docs/actor/FSMDocTest.scala
index 7077365d6d..09bdcc8785 100644
--- a/akka-docs/rst/java/code/docs/actor/FSMDocTest.scala
+++ b/akka-docs/rst/java/code/docs/actor/FSMDocTest.scala
@@ -1,8 +1,8 @@
 /**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
  */
 package docs.actor
 
 import org.scalatest.junit.JUnitSuite
 
-class FSMDocTest extends FSMDocTestBase with JUnitSuite
\ No newline at end of file
+class FSMDocTest extends FSMDocTestBase with JUnitSuite
diff --git a/akka-docs/rst/java/code/docs/actor/FSMDocTestBase.java b/akka-docs/rst/java/code/docs/actor/FSMDocTestBase.java
index bbd9e30017..91bd5af888 100644
--- a/akka-docs/rst/java/code/docs/actor/FSMDocTestBase.java
+++ b/akka-docs/rst/java/code/docs/actor/FSMDocTestBase.java
@@ -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;
 
diff --git a/akka-docs/rst/java/code/docs/actor/FaultHandlingTest.scala b/akka-docs/rst/java/code/docs/actor/FaultHandlingTest.scala
index 9b6fad0609..d656bd10f8 100644
--- a/akka-docs/rst/java/code/docs/actor/FaultHandlingTest.scala
+++ b/akka-docs/rst/java/code/docs/actor/FaultHandlingTest.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
 import org.scalatest.junit.JUnitSuite
diff --git a/akka-docs/rst/java/code/docs/actor/FaultHandlingTestBase.java b/akka-docs/rst/java/code/docs/actor/FaultHandlingTestBase.java
index 4494bb0c51..5de6a2eb31 100644
--- a/akka-docs/rst/java/code/docs/actor/FaultHandlingTestBase.java
+++ b/akka-docs/rst/java/code/docs/actor/FaultHandlingTestBase.java
@@ -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;
 
diff --git a/akka-docs/rst/java/code/docs/actor/FirstUntypedActor.java b/akka-docs/rst/java/code/docs/actor/FirstUntypedActor.java
index a4aea8c1cd..3512449aaf 100644
--- a/akka-docs/rst/java/code/docs/actor/FirstUntypedActor.java
+++ b/akka-docs/rst/java/code/docs/actor/FirstUntypedActor.java
@@ -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;
 
diff --git a/akka-docs/rst/java/code/docs/actor/ImmutableMessage.java b/akka-docs/rst/java/code/docs/actor/ImmutableMessage.java
index 60e72ecfb5..93911e5204 100644
--- a/akka-docs/rst/java/code/docs/actor/ImmutableMessage.java
+++ b/akka-docs/rst/java/code/docs/actor/ImmutableMessage.java
@@ -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;
 
diff --git a/akka-docs/rst/java/code/docs/actor/MyReceivedTimeoutUntypedActor.java b/akka-docs/rst/java/code/docs/actor/MyReceivedTimeoutUntypedActor.java
index 1c09272582..1fcbe72036 100644
--- a/akka-docs/rst/java/code/docs/actor/MyReceivedTimeoutUntypedActor.java
+++ b/akka-docs/rst/java/code/docs/actor/MyReceivedTimeoutUntypedActor.java
@@ -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,4 +29,4 @@ public class MyReceivedTimeoutUntypedActor extends UntypedActor {
     }
   }
 }
-//#receive-timeout
\ No newline at end of file
+//#receive-timeout
diff --git a/akka-docs/rst/java/code/docs/actor/MyUntypedActor.java b/akka-docs/rst/java/code/docs/actor/MyUntypedActor.java
index f31fc402c7..0388913b9e 100644
--- a/akka-docs/rst/java/code/docs/actor/MyUntypedActor.java
+++ b/akka-docs/rst/java/code/docs/actor/MyUntypedActor.java
@@ -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;
 
diff --git a/akka-docs/rst/java/code/docs/actor/SchedulerDocTest.scala b/akka-docs/rst/java/code/docs/actor/SchedulerDocTest.scala
index 9e6b4c9613..271dcf0582 100644
--- a/akka-docs/rst/java/code/docs/actor/SchedulerDocTest.scala
+++ b/akka-docs/rst/java/code/docs/actor/SchedulerDocTest.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
 
diff --git a/akka-docs/rst/java/code/docs/actor/SchedulerDocTestBase.java b/akka-docs/rst/java/code/docs/actor/SchedulerDocTestBase.java
index 66b5181ba8..0a0f055fb9 100644
--- a/akka-docs/rst/java/code/docs/actor/SchedulerDocTestBase.java
+++ b/akka-docs/rst/java/code/docs/actor/SchedulerDocTestBase.java
@@ -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;
 
diff --git a/akka-docs/rst/java/code/docs/actor/TypedActorDocTest.scala b/akka-docs/rst/java/code/docs/actor/TypedActorDocTest.scala
index 0d9796ca56..c753f67ff7 100644
--- a/akka-docs/rst/java/code/docs/actor/TypedActorDocTest.scala
+++ b/akka-docs/rst/java/code/docs/actor/TypedActorDocTest.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
 
diff --git a/akka-docs/rst/java/code/docs/actor/TypedActorDocTestBase.java b/akka-docs/rst/java/code/docs/actor/TypedActorDocTestBase.java
index 35c8441263..53fb9eebd4 100644
--- a/akka-docs/rst/java/code/docs/actor/TypedActorDocTestBase.java
+++ b/akka-docs/rst/java/code/docs/actor/TypedActorDocTestBase.java
@@ -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;
 
diff --git a/akka-docs/rst/java/code/docs/actor/UntypedActorDocTest.scala b/akka-docs/rst/java/code/docs/actor/UntypedActorDocTest.scala
index 8047b94df9..999eff1f85 100644
--- a/akka-docs/rst/java/code/docs/actor/UntypedActorDocTest.scala
+++ b/akka-docs/rst/java/code/docs/actor/UntypedActorDocTest.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
 
diff --git a/akka-docs/rst/java/code/docs/actor/UntypedActorDocTestBase.java b/akka-docs/rst/java/code/docs/actor/UntypedActorDocTestBase.java
index fded2ddb3b..1c696577eb 100644
--- a/akka-docs/rst/java/code/docs/actor/UntypedActorDocTestBase.java
+++ b/akka-docs/rst/java/code/docs/actor/UntypedActorDocTestBase.java
@@ -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;
 
diff --git a/akka-docs/rst/java/code/docs/actor/UntypedActorSwapper.java b/akka-docs/rst/java/code/docs/actor/UntypedActorSwapper.java
index 5098278a38..a741c02da7 100644
--- a/akka-docs/rst/java/code/docs/actor/UntypedActorSwapper.java
+++ b/akka-docs/rst/java/code/docs/actor/UntypedActorSwapper.java
@@ -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;
 
diff --git a/akka-docs/rst/java/code/docs/actor/japi/FaultHandlingDocSample.java b/akka-docs/rst/java/code/docs/actor/japi/FaultHandlingDocSample.java
index 37d1da703a..d59090a66d 100644
--- a/akka-docs/rst/java/code/docs/actor/japi/FaultHandlingDocSample.java
+++ b/akka-docs/rst/java/code/docs/actor/japi/FaultHandlingDocSample.java
@@ -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.japi;
 
@@ -491,4 +491,4 @@ public class FaultHandlingDocSample {
   }
   //#dummydb
 }
-//#all
\ No newline at end of file
+//#all
diff --git a/akka-docs/rst/java/code/docs/agent/AgentDocJavaSpec.scala b/akka-docs/rst/java/code/docs/agent/AgentDocJavaSpec.scala
index 566a439c62..7c80c41cc6 100644
--- a/akka-docs/rst/java/code/docs/agent/AgentDocJavaSpec.scala
+++ b/akka-docs/rst/java/code/docs/agent/AgentDocJavaSpec.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,4 +7,4 @@ import org.scalatest.junit.JUnitWrapperSuite
 
 class AgentDocJavaSpec extends JUnitWrapperSuite(
   "docs.agent.AgentDocTest",
-  Thread.currentThread.getContextClassLoader)
\ No newline at end of file
+  Thread.currentThread.getContextClassLoader)
diff --git a/akka-docs/rst/java/code/docs/agent/AgentDocTest.java b/akka-docs/rst/java/code/docs/agent/AgentDocTest.java
index b57eaa4189..6d7345b52a 100644
--- a/akka-docs/rst/java/code/docs/agent/AgentDocTest.java
+++ b/akka-docs/rst/java/code/docs/agent/AgentDocTest.java
@@ -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;
 
@@ -108,4 +108,4 @@ public class AgentDocTest {
 
     agent.close();
   }
-}
\ No newline at end of file
+}
diff --git a/akka-docs/rst/java/code/docs/dispatcher/DispatcherDocTest.scala b/akka-docs/rst/java/code/docs/dispatcher/DispatcherDocTest.scala
index 62c9e37051..86260df57f 100644
--- a/akka-docs/rst/java/code/docs/dispatcher/DispatcherDocTest.scala
+++ b/akka-docs/rst/java/code/docs/dispatcher/DispatcherDocTest.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
 
diff --git a/akka-docs/rst/java/code/docs/dispatcher/DispatcherDocTestBase.java b/akka-docs/rst/java/code/docs/dispatcher/DispatcherDocTestBase.java
index 5c0c2d1711..2a6f6a88fe 100644
--- a/akka-docs/rst/java/code/docs/dispatcher/DispatcherDocTestBase.java
+++ b/akka-docs/rst/java/code/docs/dispatcher/DispatcherDocTestBase.java
@@ -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;
 
diff --git a/akka-docs/rst/java/code/docs/event/LoggingDocTest.scala b/akka-docs/rst/java/code/docs/event/LoggingDocTest.scala
index 1d7f34827f..c421c78ce3 100644
--- a/akka-docs/rst/java/code/docs/event/LoggingDocTest.scala
+++ b/akka-docs/rst/java/code/docs/event/LoggingDocTest.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
 
diff --git a/akka-docs/rst/java/code/docs/event/LoggingDocTestBase.java b/akka-docs/rst/java/code/docs/event/LoggingDocTestBase.java
index 3e3fa46844..fc0a2f2588 100644
--- a/akka-docs/rst/java/code/docs/event/LoggingDocTestBase.java
+++ b/akka-docs/rst/java/code/docs/event/LoggingDocTestBase.java
@@ -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;
 
diff --git a/akka-docs/rst/java/code/docs/extension/ExtensionDocTest.scala b/akka-docs/rst/java/code/docs/extension/ExtensionDocTest.scala
index f22e300cfc..1c99c093ca 100644
--- a/akka-docs/rst/java/code/docs/extension/ExtensionDocTest.scala
+++ b/akka-docs/rst/java/code/docs/extension/ExtensionDocTest.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
 
diff --git a/akka-docs/rst/java/code/docs/extension/ExtensionDocTestBase.java b/akka-docs/rst/java/code/docs/extension/ExtensionDocTestBase.java
index def4672558..aed891e209 100644
--- a/akka-docs/rst/java/code/docs/extension/ExtensionDocTestBase.java
+++ b/akka-docs/rst/java/code/docs/extension/ExtensionDocTestBase.java
@@ -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;
 
diff --git a/akka-docs/rst/java/code/docs/extension/SettingsExtensionDocTest.scala b/akka-docs/rst/java/code/docs/extension/SettingsExtensionDocTest.scala
index 60289bfdca..871b776826 100644
--- a/akka-docs/rst/java/code/docs/extension/SettingsExtensionDocTest.scala
+++ b/akka-docs/rst/java/code/docs/extension/SettingsExtensionDocTest.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
 
diff --git a/akka-docs/rst/java/code/docs/extension/SettingsExtensionDocTestBase.java b/akka-docs/rst/java/code/docs/extension/SettingsExtensionDocTestBase.java
index 72836b503d..a8c125a343 100644
--- a/akka-docs/rst/java/code/docs/extension/SettingsExtensionDocTestBase.java
+++ b/akka-docs/rst/java/code/docs/extension/SettingsExtensionDocTestBase.java
@@ -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;
 
diff --git a/akka-docs/rst/java/code/docs/future/FutureDocTest.scala b/akka-docs/rst/java/code/docs/future/FutureDocTest.scala
index fef5f3d967..dd153d5f25 100644
--- a/akka-docs/rst/java/code/docs/future/FutureDocTest.scala
+++ b/akka-docs/rst/java/code/docs/future/FutureDocTest.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
 
diff --git a/akka-docs/rst/java/code/docs/future/FutureDocTestBase.java b/akka-docs/rst/java/code/docs/future/FutureDocTestBase.java
index 975814ded2..1becfb39ac 100644
--- a/akka-docs/rst/java/code/docs/future/FutureDocTestBase.java
+++ b/akka-docs/rst/java/code/docs/future/FutureDocTestBase.java
@@ -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;
 
diff --git a/akka-docs/rst/java/code/docs/jrouting/ConsistentHashingRouterDocTestBase.java b/akka-docs/rst/java/code/docs/jrouting/ConsistentHashingRouterDocTestBase.java
index e61ca9ab19..9a1ed88ba6 100644
--- a/akka-docs/rst/java/code/docs/jrouting/ConsistentHashingRouterDocTestBase.java
+++ b/akka-docs/rst/java/code/docs/jrouting/ConsistentHashingRouterDocTestBase.java
@@ -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.jrouting;
 
diff --git a/akka-docs/rst/java/code/docs/jrouting/CustomRouterDocTestBase.java b/akka-docs/rst/java/code/docs/jrouting/CustomRouterDocTestBase.java
index 239a3c318d..61fa23292f 100644
--- a/akka-docs/rst/java/code/docs/jrouting/CustomRouterDocTestBase.java
+++ b/akka-docs/rst/java/code/docs/jrouting/CustomRouterDocTestBase.java
@@ -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.jrouting;
 
diff --git a/akka-docs/rst/java/code/docs/jrouting/FibonacciActor.java b/akka-docs/rst/java/code/docs/jrouting/FibonacciActor.java
index 7c084849b7..c0de40ae8e 100644
--- a/akka-docs/rst/java/code/docs/jrouting/FibonacciActor.java
+++ b/akka-docs/rst/java/code/docs/jrouting/FibonacciActor.java
@@ -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.jrouting;
 
diff --git a/akka-docs/rst/java/code/docs/jrouting/ParentActor.java b/akka-docs/rst/java/code/docs/jrouting/ParentActor.java
index e3750bfd23..e2684d7c55 100644
--- a/akka-docs/rst/java/code/docs/jrouting/ParentActor.java
+++ b/akka-docs/rst/java/code/docs/jrouting/ParentActor.java
@@ -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.jrouting;
 
@@ -72,4 +72,4 @@ public class ParentActor extends UntypedActor {
   }
 }
 
-//#parentActor
\ No newline at end of file
+//#parentActor
diff --git a/akka-docs/rst/java/code/docs/jrouting/PrintlnActor.java b/akka-docs/rst/java/code/docs/jrouting/PrintlnActor.java
index 531fd046c7..3a09170252 100644
--- a/akka-docs/rst/java/code/docs/jrouting/PrintlnActor.java
+++ b/akka-docs/rst/java/code/docs/jrouting/PrintlnActor.java
@@ -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.jrouting;
 
diff --git a/akka-docs/rst/java/code/docs/jrouting/RouterViaConfigExample.java b/akka-docs/rst/java/code/docs/jrouting/RouterViaConfigExample.java
index fba40216a1..c21881c80b 100644
--- a/akka-docs/rst/java/code/docs/jrouting/RouterViaConfigExample.java
+++ b/akka-docs/rst/java/code/docs/jrouting/RouterViaConfigExample.java
@@ -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.jrouting;
 
@@ -58,4 +58,4 @@ public class RouterViaConfigExample {
       router2.tell(new ExampleActor.Message(i), null);
     }
   }
-}
\ No newline at end of file
+}
diff --git a/akka-docs/rst/java/code/docs/jrouting/RouterViaProgramExample.java b/akka-docs/rst/java/code/docs/jrouting/RouterViaProgramExample.java
index a3a48f300c..4d6dd1e485 100644
--- a/akka-docs/rst/java/code/docs/jrouting/RouterViaProgramExample.java
+++ b/akka-docs/rst/java/code/docs/jrouting/RouterViaProgramExample.java
@@ -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.jrouting;
 
@@ -98,4 +98,4 @@ public class RouterViaProgramExample {
     }
     
   }
-}
\ No newline at end of file
+}
diff --git a/akka-docs/rst/java/code/docs/pattern/JavaTemplate.java b/akka-docs/rst/java/code/docs/pattern/JavaTemplate.java
index 7e6fd175fb..3bc64ecaa3 100644
--- a/akka-docs/rst/java/code/docs/pattern/JavaTemplate.java
+++ b/akka-docs/rst/java/code/docs/pattern/JavaTemplate.java
@@ -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;
diff --git a/akka-docs/rst/java/code/docs/pattern/SchedulerPatternTest.java b/akka-docs/rst/java/code/docs/pattern/SchedulerPatternTest.java
index bb3eb8b777..7bb004060f 100644
--- a/akka-docs/rst/java/code/docs/pattern/SchedulerPatternTest.java
+++ b/akka-docs/rst/java/code/docs/pattern/SchedulerPatternTest.java
@@ -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;
diff --git a/akka-docs/rst/java/code/docs/remoting/RemoteDeploymentDocTest.scala b/akka-docs/rst/java/code/docs/remoting/RemoteDeploymentDocTest.scala
index 4ac46c4504..8b3e69f37e 100644
--- a/akka-docs/rst/java/code/docs/remoting/RemoteDeploymentDocTest.scala
+++ b/akka-docs/rst/java/code/docs/remoting/RemoteDeploymentDocTest.scala
@@ -1,8 +1,8 @@
 /**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
  */
 package docs.remoting
 
 import org.scalatest.junit.JUnitSuite
 
-class RemoteDeploymentDocTest extends RemoteDeploymentDocTestBase with JUnitSuite
\ No newline at end of file
+class RemoteDeploymentDocTest extends RemoteDeploymentDocTestBase with JUnitSuite
diff --git a/akka-docs/rst/java/code/docs/remoting/RemoteDeploymentDocTestBase.java b/akka-docs/rst/java/code/docs/remoting/RemoteDeploymentDocTestBase.java
index 49d0a631f6..a3b659f4ac 100644
--- a/akka-docs/rst/java/code/docs/remoting/RemoteDeploymentDocTestBase.java
+++ b/akka-docs/rst/java/code/docs/remoting/RemoteDeploymentDocTestBase.java
@@ -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;
 
@@ -72,4 +72,4 @@ public class RemoteDeploymentDocTestBase {
   }
 
   
-}
\ No newline at end of file
+}
diff --git a/akka-docs/rst/java/code/docs/serialization/SerializationDocTest.scala b/akka-docs/rst/java/code/docs/serialization/SerializationDocTest.scala
index ffac606928..7f736e9b4e 100644
--- a/akka-docs/rst/java/code/docs/serialization/SerializationDocTest.scala
+++ b/akka-docs/rst/java/code/docs/serialization/SerializationDocTest.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
 
diff --git a/akka-docs/rst/java/code/docs/serialization/SerializationDocTestBase.java b/akka-docs/rst/java/code/docs/serialization/SerializationDocTestBase.java
index db46031584..bd4f246d18 100644
--- a/akka-docs/rst/java/code/docs/serialization/SerializationDocTestBase.java
+++ b/akka-docs/rst/java/code/docs/serialization/SerializationDocTestBase.java
@@ -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;
 
diff --git a/akka-docs/rst/java/code/docs/testkit/TestKitDocTest.java b/akka-docs/rst/java/code/docs/testkit/TestKitDocTest.java
index 89253110ff..1310ac2a8c 100644
--- a/akka-docs/rst/java/code/docs/testkit/TestKitDocTest.java
+++ b/akka-docs/rst/java/code/docs/testkit/TestKitDocTest.java
@@ -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;
 
diff --git a/akka-docs/rst/java/code/docs/testkit/TestKitSampleTest.java b/akka-docs/rst/java/code/docs/testkit/TestKitSampleTest.java
index fc8178b7f2..fd6351339c 100644
--- a/akka-docs/rst/java/code/docs/testkit/TestKitSampleTest.java
+++ b/akka-docs/rst/java/code/docs/testkit/TestKitSampleTest.java
@@ -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;
 
diff --git a/akka-docs/rst/java/code/docs/transactor/CoordinatedCounter.java b/akka-docs/rst/java/code/docs/transactor/CoordinatedCounter.java
index 4c90eb0d23..b9ab6a523d 100644
--- a/akka-docs/rst/java/code/docs/transactor/CoordinatedCounter.java
+++ b/akka-docs/rst/java/code/docs/transactor/CoordinatedCounter.java
@@ -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;
diff --git a/akka-docs/rst/java/code/docs/transactor/Coordinator.java b/akka-docs/rst/java/code/docs/transactor/Coordinator.java
index 644eb4312e..1559a7fcce 100644
--- a/akka-docs/rst/java/code/docs/transactor/Coordinator.java
+++ b/akka-docs/rst/java/code/docs/transactor/Coordinator.java
@@ -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;
diff --git a/akka-docs/rst/java/code/docs/transactor/Counter.java b/akka-docs/rst/java/code/docs/transactor/Counter.java
index c72151e916..274fd6496f 100644
--- a/akka-docs/rst/java/code/docs/transactor/Counter.java
+++ b/akka-docs/rst/java/code/docs/transactor/Counter.java
@@ -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;
diff --git a/akka-docs/rst/java/code/docs/transactor/FriendlyCounter.java b/akka-docs/rst/java/code/docs/transactor/FriendlyCounter.java
index 3dc4df9cb7..3242e006fd 100644
--- a/akka-docs/rst/java/code/docs/transactor/FriendlyCounter.java
+++ b/akka-docs/rst/java/code/docs/transactor/FriendlyCounter.java
@@ -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;
diff --git a/akka-docs/rst/java/code/docs/transactor/Increment.java b/akka-docs/rst/java/code/docs/transactor/Increment.java
index 3794ce631d..7dda01189f 100644
--- a/akka-docs/rst/java/code/docs/transactor/Increment.java
+++ b/akka-docs/rst/java/code/docs/transactor/Increment.java
@@ -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;
diff --git a/akka-docs/rst/java/code/docs/transactor/Message.java b/akka-docs/rst/java/code/docs/transactor/Message.java
index 0f1edfc51f..aae2924558 100644
--- a/akka-docs/rst/java/code/docs/transactor/Message.java
+++ b/akka-docs/rst/java/code/docs/transactor/Message.java
@@ -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;
diff --git a/akka-docs/rst/java/code/docs/transactor/TransactorDocJavaSpec.scala b/akka-docs/rst/java/code/docs/transactor/TransactorDocJavaSpec.scala
index 6293b2effa..35b335c8e6 100644
--- a/akka-docs/rst/java/code/docs/transactor/TransactorDocJavaSpec.scala
+++ b/akka-docs/rst/java/code/docs/transactor/TransactorDocJavaSpec.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
@@ -8,4 +8,4 @@ import org.scalatest.junit.JUnitWrapperSuite
 
 class TransactorDocJavaSpec extends JUnitWrapperSuite(
   "docs.transactor.TransactorDocTest",
-  Thread.currentThread.getContextClassLoader)
\ No newline at end of file
+  Thread.currentThread.getContextClassLoader)
diff --git a/akka-docs/rst/java/code/docs/transactor/TransactorDocTest.java b/akka-docs/rst/java/code/docs/transactor/TransactorDocTest.java
index 84077d3a2d..bb129cf577 100644
--- a/akka-docs/rst/java/code/docs/transactor/TransactorDocTest.java
+++ b/akka-docs/rst/java/code/docs/transactor/TransactorDocTest.java
@@ -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;
diff --git a/akka-docs/rst/java/code/docs/zeromq/ZeromqDocTest.scala b/akka-docs/rst/java/code/docs/zeromq/ZeromqDocTest.scala
index c5e6f224da..b2af76bec6 100644
--- a/akka-docs/rst/java/code/docs/zeromq/ZeromqDocTest.scala
+++ b/akka-docs/rst/java/code/docs/zeromq/ZeromqDocTest.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
 
diff --git a/akka-docs/rst/java/code/docs/zeromq/ZeromqDocTestBase.java b/akka-docs/rst/java/code/docs/zeromq/ZeromqDocTestBase.java
index d0020c0a5a..8f1eb0d38f 100644
--- a/akka-docs/rst/java/code/docs/zeromq/ZeromqDocTestBase.java
+++ b/akka-docs/rst/java/code/docs/zeromq/ZeromqDocTestBase.java
@@ -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;
 
diff --git a/akka-docs/rst/modules/code/docs/actor/mailbox/DurableMailboxDocSpec.scala b/akka-docs/rst/modules/code/docs/actor/mailbox/DurableMailboxDocSpec.scala
index 018a14fcc0..0b0c320a42 100644
--- a/akka-docs/rst/modules/code/docs/actor/mailbox/DurableMailboxDocSpec.scala
+++ b/akka-docs/rst/modules/code/docs/actor/mailbox/DurableMailboxDocSpec.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.mailbox
 
@@ -140,4 +140,4 @@ class MyMailboxSpec extends DurableMailboxSpec("MyStorage", MyMailboxSpec.config
 
     // add more tests
   }
-}
\ No newline at end of file
+}
diff --git a/akka-docs/rst/modules/code/docs/actor/mailbox/DurableMailboxDocTest.scala b/akka-docs/rst/modules/code/docs/actor/mailbox/DurableMailboxDocTest.scala
index 6b156ef791..186c71b490 100644
--- a/akka-docs/rst/modules/code/docs/actor/mailbox/DurableMailboxDocTest.scala
+++ b/akka-docs/rst/modules/code/docs/actor/mailbox/DurableMailboxDocTest.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.mailbox
 
diff --git a/akka-docs/rst/modules/code/docs/actor/mailbox/DurableMailboxDocTestBase.java b/akka-docs/rst/modules/code/docs/actor/mailbox/DurableMailboxDocTestBase.java
index 331aee0da7..5a0266c1a9 100644
--- a/akka-docs/rst/modules/code/docs/actor/mailbox/DurableMailboxDocTestBase.java
+++ b/akka-docs/rst/modules/code/docs/actor/mailbox/DurableMailboxDocTestBase.java
@@ -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.mailbox;
 
diff --git a/akka-docs/rst/scala/code/docs/actor/ActorDocSpec.scala b/akka-docs/rst/scala/code/docs/actor/ActorDocSpec.scala
index fc936ff13b..23409a741f 100644
--- a/akka-docs/rst/scala/code/docs/actor/ActorDocSpec.scala
+++ b/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
 
diff --git a/akka-docs/rst/scala/code/docs/actor/FSMDocSpec.scala b/akka-docs/rst/scala/code/docs/actor/FSMDocSpec.scala
index 49d51a19a4..4ce3ac07a6 100644
--- a/akka-docs/rst/scala/code/docs/actor/FSMDocSpec.scala
+++ b/akka-docs/rst/scala/code/docs/actor/FSMDocSpec.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
 
diff --git a/akka-docs/rst/scala/code/docs/actor/FaultHandlingDocSample.scala b/akka-docs/rst/scala/code/docs/actor/FaultHandlingDocSample.scala
index cc1bd3053a..5be1f9a542 100644
--- a/akka-docs/rst/scala/code/docs/actor/FaultHandlingDocSample.scala
+++ b/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
 
diff --git a/akka-docs/rst/scala/code/docs/actor/FaultHandlingDocSpec.scala b/akka-docs/rst/scala/code/docs/actor/FaultHandlingDocSpec.scala
index 5c35ae6e2a..aa029823a4 100644
--- a/akka-docs/rst/scala/code/docs/actor/FaultHandlingDocSpec.scala
+++ b/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
 
diff --git a/akka-docs/rst/scala/code/docs/actor/SchedulerDocSpec.scala b/akka-docs/rst/scala/code/docs/actor/SchedulerDocSpec.scala
index 5b46d94298..a90f383ff4 100644
--- a/akka-docs/rst/scala/code/docs/actor/SchedulerDocSpec.scala
+++ b/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
 
diff --git a/akka-docs/rst/scala/code/docs/actor/TypedActorDocSpec.scala b/akka-docs/rst/scala/code/docs/actor/TypedActorDocSpec.scala
index 487ff8f04c..573653564e 100644
--- a/akka-docs/rst/scala/code/docs/actor/TypedActorDocSpec.scala
+++ b/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
 
diff --git a/akka-docs/rst/scala/code/docs/actor/UnnestedReceives.scala b/akka-docs/rst/scala/code/docs/actor/UnnestedReceives.scala
index bb77fe4d1d..0ec35fe9ee 100644
--- a/akka-docs/rst/scala/code/docs/actor/UnnestedReceives.scala
+++ b/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
 
diff --git a/akka-docs/rst/scala/code/docs/agent/AgentDocSpec.scala b/akka-docs/rst/scala/code/docs/agent/AgentDocSpec.scala
index 1eaf81f15d..121d2d695f 100644
--- a/akka-docs/rst/scala/code/docs/agent/AgentDocSpec.scala
+++ b/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
 
diff --git a/akka-docs/rst/scala/code/docs/camel/Consumers.scala b/akka-docs/rst/scala/code/docs/camel/Consumers.scala
index f1d184ec66..81d40ebe22 100644
--- a/akka-docs/rst/scala/code/docs/camel/Consumers.scala
+++ b/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
   }
-}
\ No newline at end of file
+}
diff --git a/akka-docs/rst/scala/code/docs/camel/CustomRoute.scala b/akka-docs/rst/scala/code/docs/camel/CustomRoute.scala
index 8cc705b673..09a608ff55 100644
--- a/akka-docs/rst/scala/code/docs/camel/CustomRoute.scala
+++ b/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
diff --git a/akka-docs/rst/scala/code/docs/dataflow/DataflowDocSpec.scala b/akka-docs/rst/scala/code/docs/dataflow/DataflowDocSpec.scala
index 345d23b4ac..3f3cdf492c 100644
--- a/akka-docs/rst/scala/code/docs/dataflow/DataflowDocSpec.scala
+++ b/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
 
diff --git a/akka-docs/rst/scala/code/docs/dispatcher/DispatcherDocSpec.scala b/akka-docs/rst/scala/code/docs/dispatcher/DispatcherDocSpec.scala
index 666e533c18..55d7e71249 100644
--- a/akka-docs/rst/scala/code/docs/dispatcher/DispatcherDocSpec.scala
+++ b/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
 
diff --git a/akka-docs/rst/scala/code/docs/event/LoggingDocSpec.scala b/akka-docs/rst/scala/code/docs/event/LoggingDocSpec.scala
index 7e2fccb876..ba5963fd8c 100644
--- a/akka-docs/rst/scala/code/docs/event/LoggingDocSpec.scala
+++ b/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
 
diff --git a/akka-docs/rst/scala/code/docs/extension/ExtensionDocSpec.scala b/akka-docs/rst/scala/code/docs/extension/ExtensionDocSpec.scala
index a7973826da..08b5cf893d 100644
--- a/akka-docs/rst/scala/code/docs/extension/ExtensionDocSpec.scala
+++ b/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
 
diff --git a/akka-docs/rst/scala/code/docs/extension/SettingsExtensionDocSpec.scala b/akka-docs/rst/scala/code/docs/extension/SettingsExtensionDocSpec.scala
index 502a214761..1c9de857e9 100644
--- a/akka-docs/rst/scala/code/docs/extension/SettingsExtensionDocSpec.scala
+++ b/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
 
diff --git a/akka-docs/rst/scala/code/docs/future/FutureDocSpec.scala b/akka-docs/rst/scala/code/docs/future/FutureDocSpec.scala
index a80f920a6b..3a04d9b109 100644
--- a/akka-docs/rst/scala/code/docs/future/FutureDocSpec.scala
+++ b/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
 
diff --git a/akka-docs/rst/scala/code/docs/io/BinaryCoding.scala b/akka-docs/rst/scala/code/docs/io/BinaryCoding.scala
index 5af45a5bf2..b0deacfce4 100644
--- a/akka-docs/rst/scala/code/docs/io/BinaryCoding.scala
+++ b/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
 
diff --git a/akka-docs/rst/scala/code/docs/io/HTTPServer.scala b/akka-docs/rst/scala/code/docs/io/HTTPServer.scala
index ef679ff47a..f9792c06b7 100644
--- a/akka-docs/rst/scala/code/docs/io/HTTPServer.scala
+++ b/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
 
diff --git a/akka-docs/rst/scala/code/docs/pattern/ScalaTemplate.scala b/akka-docs/rst/scala/code/docs/pattern/ScalaTemplate.scala
index beceae17b7..2d86037cf0 100644
--- a/akka-docs/rst/scala/code/docs/pattern/ScalaTemplate.scala
+++ b/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
diff --git a/akka-docs/rst/scala/code/docs/pattern/SchedulerPatternSpec.scala b/akka-docs/rst/scala/code/docs/pattern/SchedulerPatternSpec.scala
index fba8ed9ff9..697557113f 100644
--- a/akka-docs/rst/scala/code/docs/pattern/SchedulerPatternSpec.scala
+++ b/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
diff --git a/akka-docs/rst/scala/code/docs/remoting/RemoteDeploymentDocSpec.scala b/akka-docs/rst/scala/code/docs/remoting/RemoteDeploymentDocSpec.scala
index ddea525a13..6284b4ca8e 100644
--- a/akka-docs/rst/scala/code/docs/remoting/RemoteDeploymentDocSpec.scala
+++ b/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
 
@@ -56,4 +56,4 @@ class RemoteDeploymentDocSpec extends AkkaSpec("""
     //#sample-actor
   }
 
-}
\ No newline at end of file
+}
diff --git a/akka-docs/rst/scala/code/docs/routing/ConsistentHashingRouterDocSpec.scala b/akka-docs/rst/scala/code/docs/routing/ConsistentHashingRouterDocSpec.scala
index dcb40b0c67..90f8f16854 100644
--- a/akka-docs/rst/scala/code/docs/routing/ConsistentHashingRouterDocSpec.scala
+++ b/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
 
diff --git a/akka-docs/rst/scala/code/docs/routing/RouterDocSpec.scala b/akka-docs/rst/scala/code/docs/routing/RouterDocSpec.scala
index 54ccfa9211..33b34eb49f 100644
--- a/akka-docs/rst/scala/code/docs/routing/RouterDocSpec.scala
+++ b/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
 
diff --git a/akka-docs/rst/scala/code/docs/routing/RouterTypeExample.scala b/akka-docs/rst/scala/code/docs/routing/RouterTypeExample.scala
index 6fc5920ec9..e3bf3ab0d3 100644
--- a/akka-docs/rst/scala/code/docs/routing/RouterTypeExample.scala
+++ b/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
\ No newline at end of file
+//#parentActor
diff --git a/akka-docs/rst/scala/code/docs/routing/RouterViaConfigDocSpec.scala b/akka-docs/rst/scala/code/docs/routing/RouterViaConfigDocSpec.scala
index 24dc291087..578600df2e 100644
--- a/akka-docs/rst/scala/code/docs/routing/RouterViaConfigDocSpec.scala
+++ b/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)
   }
 
-}
\ No newline at end of file
+}
diff --git a/akka-docs/rst/scala/code/docs/routing/RouterViaConfigExample.scala b/akka-docs/rst/scala/code/docs/routing/RouterViaConfigExample.scala
index 5d34e429bb..7f63f2781f 100644
--- a/akka-docs/rst/scala/code/docs/routing/RouterViaConfigExample.scala
+++ b/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) }
-}
\ No newline at end of file
+}
diff --git a/akka-docs/rst/scala/code/docs/routing/RouterViaProgramExample.scala b/akka-docs/rst/scala/code/docs/routing/RouterViaProgramExample.scala
index 6269e7f698..5244a89b84 100644
--- a/akka-docs/rst/scala/code/docs/routing/RouterViaProgramExample.scala
+++ b/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
 
-}
\ No newline at end of file
+}
diff --git a/akka-docs/rst/scala/code/docs/serialization/SerializationDocSpec.scala b/akka-docs/rst/scala/code/docs/serialization/SerializationDocSpec.scala
index 1607556ab2..33d7ea09b7 100644
--- a/akka-docs/rst/scala/code/docs/serialization/SerializationDocSpec.scala
+++ b/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 {
diff --git a/akka-docs/rst/scala/code/docs/testkit/PlainWordSpec.scala b/akka-docs/rst/scala/code/docs/testkit/PlainWordSpec.scala
index 2da67c9156..44d13f640f 100644
--- a/akka-docs/rst/scala/code/docs/testkit/PlainWordSpec.scala
+++ b/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
\ No newline at end of file
+//#plain-spec
diff --git a/akka-docs/rst/scala/code/docs/testkit/TestKitUsageSpec.scala b/akka-docs/rst/scala/code/docs/testkit/TestKitUsageSpec.scala
index 8b153c5944..6cdc0a88b2 100644
--- a/akka-docs/rst/scala/code/docs/testkit/TestKitUsageSpec.scala
+++ b/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
\ No newline at end of file
+//#testkit-usage
diff --git a/akka-docs/rst/scala/code/docs/testkit/TestkitDocSpec.scala b/akka-docs/rst/scala/code/docs/testkit/TestkitDocSpec.scala
index da3fd43270..18f583f034 100644
--- a/akka-docs/rst/scala/code/docs/testkit/TestkitDocSpec.scala
+++ b/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
 
diff --git a/akka-docs/rst/scala/code/docs/transactor/TransactorDocSpec.scala b/akka-docs/rst/scala/code/docs/transactor/TransactorDocSpec.scala
index 2b75a15b92..10025f01df 100644
--- a/akka-docs/rst/scala/code/docs/transactor/TransactorDocSpec.scala
+++ b/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
diff --git a/akka-docs/rst/scala/code/docs/zeromq/ZeromqDocSpec.scala b/akka-docs/rst/scala/code/docs/zeromq/ZeromqDocSpec.scala
index ca2db8f675..83877d1714 100644
--- a/akka-docs/rst/scala/code/docs/zeromq/ZeromqDocSpec.scala
+++ b/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
 
diff --git a/akka-durable-mailboxes/akka-file-mailbox/src/main/scala/akka/actor/mailbox/filebased/FileBasedMailbox.scala b/akka-durable-mailboxes/akka-file-mailbox/src/main/scala/akka/actor/mailbox/filebased/FileBasedMailbox.scala
index 47ad1483c3..85fae3d4a5 100644
--- a/akka-durable-mailboxes/akka-file-mailbox/src/main/scala/akka/actor/mailbox/filebased/FileBasedMailbox.scala
+++ b/akka-durable-mailboxes/akka-file-mailbox/src/main/scala/akka/actor/mailbox/filebased/FileBasedMailbox.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 akka.actor.mailbox.filebased
diff --git a/akka-durable-mailboxes/akka-file-mailbox/src/main/scala/akka/actor/mailbox/filebased/FileBasedMailboxSettings.scala b/akka-durable-mailboxes/akka-file-mailbox/src/main/scala/akka/actor/mailbox/filebased/FileBasedMailboxSettings.scala
index 305a3d3a43..b346906c35 100644
--- a/akka-durable-mailboxes/akka-file-mailbox/src/main/scala/akka/actor/mailbox/filebased/FileBasedMailboxSettings.scala
+++ b/akka-durable-mailboxes/akka-file-mailbox/src/main/scala/akka/actor/mailbox/filebased/FileBasedMailboxSettings.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 akka.actor.mailbox.filebased
 
diff --git a/akka-durable-mailboxes/akka-mailboxes-common/src/main/scala/akka/actor/mailbox/DurableMailbox.scala b/akka-durable-mailboxes/akka-mailboxes-common/src/main/scala/akka/actor/mailbox/DurableMailbox.scala
index 79ece7625d..98170ff851 100644
--- a/akka-durable-mailboxes/akka-mailboxes-common/src/main/scala/akka/actor/mailbox/DurableMailbox.scala
+++ b/akka-durable-mailboxes/akka-mailboxes-common/src/main/scala/akka/actor/mailbox/DurableMailbox.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 akka.actor.mailbox
 
diff --git a/akka-durable-mailboxes/akka-mailboxes-common/src/test/scala/akka/actor/mailbox/DurableMailboxSpec.scala b/akka-durable-mailboxes/akka-mailboxes-common/src/test/scala/akka/actor/mailbox/DurableMailboxSpec.scala
index decfec6014..c438edd2fa 100644
--- a/akka-durable-mailboxes/akka-mailboxes-common/src/test/scala/akka/actor/mailbox/DurableMailboxSpec.scala
+++ b/akka-durable-mailboxes/akka-mailboxes-common/src/test/scala/akka/actor/mailbox/DurableMailboxSpec.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 akka.actor.mailbox
 
diff --git a/akka-osgi-aries/src/main/scala/akka/osgi/aries/blueprint/BlueprintActorSystemFactory.scala b/akka-osgi-aries/src/main/scala/akka/osgi/aries/blueprint/BlueprintActorSystemFactory.scala
index ce759a4fa8..c09dfe6984 100644
--- a/akka-osgi-aries/src/main/scala/akka/osgi/aries/blueprint/BlueprintActorSystemFactory.scala
+++ b/akka-osgi-aries/src/main/scala/akka/osgi/aries/blueprint/BlueprintActorSystemFactory.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 akka.osgi.aries.blueprint
 
diff --git a/akka-osgi-aries/src/test/scala/akka/osgi/aries/blueprint/ActorSystemAwareBean.scala b/akka-osgi-aries/src/test/scala/akka/osgi/aries/blueprint/ActorSystemAwareBean.scala
index ade4a17bda..a7c9f5c08a 100644
--- a/akka-osgi-aries/src/test/scala/akka/osgi/aries/blueprint/ActorSystemAwareBean.scala
+++ b/akka-osgi-aries/src/test/scala/akka/osgi/aries/blueprint/ActorSystemAwareBean.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 akka.osgi.aries.blueprint
 
diff --git a/akka-osgi-aries/src/test/scala/akka/osgi/aries/blueprint/NamespaceHandlerTest.scala b/akka-osgi-aries/src/test/scala/akka/osgi/aries/blueprint/NamespaceHandlerTest.scala
index 79d07c65a3..166e595c86 100644
--- a/akka-osgi-aries/src/test/scala/akka/osgi/aries/blueprint/NamespaceHandlerTest.scala
+++ b/akka-osgi-aries/src/test/scala/akka/osgi/aries/blueprint/NamespaceHandlerTest.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 akka.osgi.aries.blueprint
 
diff --git a/akka-osgi/src/main/scala/akka/osgi/ActorSystemActivator.scala b/akka-osgi/src/main/scala/akka/osgi/ActorSystemActivator.scala
index 4318ebc44f..7e33467c32 100644
--- a/akka-osgi/src/main/scala/akka/osgi/ActorSystemActivator.scala
+++ b/akka-osgi/src/main/scala/akka/osgi/ActorSystemActivator.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 akka.osgi
 
diff --git a/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala b/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala
index 447719ef39..40d959aeb6 100644
--- a/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala
+++ b/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.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 akka.osgi
 
diff --git a/akka-osgi/src/main/scala/akka/osgi/impl/BundleDelegatingClassLoader.scala b/akka-osgi/src/main/scala/akka/osgi/impl/BundleDelegatingClassLoader.scala
index 47476e6a82..512cd68509 100644
--- a/akka-osgi/src/main/scala/akka/osgi/impl/BundleDelegatingClassLoader.scala
+++ b/akka-osgi/src/main/scala/akka/osgi/impl/BundleDelegatingClassLoader.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 akka.osgi.impl
 
diff --git a/akka-osgi/src/test/scala/akka/osgi/ActorSystemActivatorTest.scala b/akka-osgi/src/test/scala/akka/osgi/ActorSystemActivatorTest.scala
index 27455be75e..f55bf9d815 100644
--- a/akka-osgi/src/test/scala/akka/osgi/ActorSystemActivatorTest.scala
+++ b/akka-osgi/src/test/scala/akka/osgi/ActorSystemActivatorTest.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 akka.osgi
 
@@ -78,4 +78,4 @@ class RuntimeNameActorSystemActivatorTest extends WordSpec with MustMatchers wit
     }
   }
 
-}
\ No newline at end of file
+}
diff --git a/akka-osgi/src/test/scala/akka/osgi/PojoSRTestSupport.scala b/akka-osgi/src/test/scala/akka/osgi/PojoSRTestSupport.scala
index d1d77daf1e..08871d6164 100644
--- a/akka-osgi/src/test/scala/akka/osgi/PojoSRTestSupport.scala
+++ b/akka-osgi/src/test/scala/akka/osgi/PojoSRTestSupport.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 akka.osgi
 
diff --git a/akka-osgi/src/test/scala/akka/osgi/test/PingPong.scala b/akka-osgi/src/test/scala/akka/osgi/test/PingPong.scala
index cd2294f3b0..255f47640c 100644
--- a/akka-osgi/src/test/scala/akka/osgi/test/PingPong.scala
+++ b/akka-osgi/src/test/scala/akka/osgi/test/PingPong.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 akka.osgi.test
 
diff --git a/akka-osgi/src/test/scala/akka/osgi/test/TestActivators.scala b/akka-osgi/src/test/scala/akka/osgi/test/TestActivators.scala
index eec07b99e1..d9d85f38c2 100644
--- a/akka-osgi/src/test/scala/akka/osgi/test/TestActivators.scala
+++ b/akka-osgi/src/test/scala/akka/osgi/test/TestActivators.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 akka.osgi.test
 
@@ -39,4 +39,4 @@ class RuntimeNameActorSystemActivator extends ActorSystemActivator {
   override def getActorSystemName(context: BundleContext) =
     TestActivators.ACTOR_SYSTEM_NAME_PATTERN.format(context.getBundle.getBundleId)
 
-}
\ No newline at end of file
+}
diff --git a/akka-remote-tests/src/main/scala/akka/remote/testconductor/Conductor.scala b/akka-remote-tests/src/main/scala/akka/remote/testconductor/Conductor.scala
index ea14dccc57..cd98cc74c7 100644
--- a/akka-remote-tests/src/main/scala/akka/remote/testconductor/Conductor.scala
+++ b/akka-remote-tests/src/main/scala/akka/remote/testconductor/Conductor.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 akka.remote.testconductor
 
diff --git a/akka-remote-tests/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala b/akka-remote-tests/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala
index f390c1b32f..1d00e30c51 100644
--- a/akka-remote-tests/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala
+++ b/akka-remote-tests/src/main/scala/akka/remote/testkit/MultiNodeSpec.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 akka.remote.testkit
 
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/LookupRemoteActorSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/LookupRemoteActorSpec.scala
index c4084bde50..3469f331bb 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/LookupRemoteActorSpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/LookupRemoteActorSpec.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 akka.remote
 
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/NewRemoteActorSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/NewRemoteActorSpec.scala
index cf7a4cb5bb..d34d4e94f6 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/NewRemoteActorSpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/NewRemoteActorSpec.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 akka.remote
 
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/router/RandomRoutedRemoteActorSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/router/RandomRoutedRemoteActorSpec.scala
index 90de3e7970..360096992e 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/router/RandomRoutedRemoteActorSpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/router/RandomRoutedRemoteActorSpec.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 akka.remote.router
 
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/router/RoundRobinRoutedRemoteActorSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/router/RoundRobinRoutedRemoteActorSpec.scala
index a75b983f07..510d0d0941 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/router/RoundRobinRoutedRemoteActorSpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/router/RoundRobinRoutedRemoteActorSpec.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 akka.remote.router
 
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/router/ScatterGatherRoutedRemoteActorSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/router/ScatterGatherRoutedRemoteActorSpec.scala
index 69a8ff02e5..edd20d923d 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/router/ScatterGatherRoutedRemoteActorSpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/router/ScatterGatherRoutedRemoteActorSpec.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 akka.remote.router
 
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/testconductor/TestConductorSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/testconductor/TestConductorSpec.scala
index 3eb667d0c9..361a471b95 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/testconductor/TestConductorSpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/testconductor/TestConductorSpec.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 akka.remote.testconductor
 
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/testkit/MultiNodeSpecSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/testkit/MultiNodeSpecSpec.scala
index 6a316b708d..689d8aacb9 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/testkit/MultiNodeSpecSpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/testkit/MultiNodeSpecSpec.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 akka.remote.testkit
 
diff --git a/akka-remote-tests/src/test/scala/akka/remote/QuietReporter.scala b/akka-remote-tests/src/test/scala/akka/remote/QuietReporter.scala
index eea5f079d3..1fb6641423 100644
--- a/akka-remote-tests/src/test/scala/akka/remote/QuietReporter.scala
+++ b/akka-remote-tests/src/test/scala/akka/remote/QuietReporter.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 org.scalatest.akka
diff --git a/akka-remote-tests/src/test/scala/akka/remote/testconductor/BarrierSpec.scala b/akka-remote-tests/src/test/scala/akka/remote/testconductor/BarrierSpec.scala
index 7bcbe0a1d1..fe6a0cfebe 100644
--- a/akka-remote-tests/src/test/scala/akka/remote/testconductor/BarrierSpec.scala
+++ b/akka-remote-tests/src/test/scala/akka/remote/testconductor/BarrierSpec.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 akka.remote.testconductor
 
diff --git a/akka-remote-tests/src/test/scala/akka/remote/testconductor/ControllerSpec.scala b/akka-remote-tests/src/test/scala/akka/remote/testconductor/ControllerSpec.scala
index ee8dc2b4e6..17d8932590 100644
--- a/akka-remote-tests/src/test/scala/akka/remote/testconductor/ControllerSpec.scala
+++ b/akka-remote-tests/src/test/scala/akka/remote/testconductor/ControllerSpec.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 akka.remote.testconductor
 
@@ -39,4 +39,4 @@ class ControllerSpec extends AkkaSpec(ControllerSpec.config) with ImplicitSender
 
   }
 
-}
\ No newline at end of file
+}
diff --git a/akka-remote-tests/src/test/scala/akka/remote/testkit/LogRoleReplace.scala b/akka-remote-tests/src/test/scala/akka/remote/testkit/LogRoleReplace.scala
index 6905b9b116..6877e16310 100644
--- a/akka-remote-tests/src/test/scala/akka/remote/testkit/LogRoleReplace.scala
+++ b/akka-remote-tests/src/test/scala/akka/remote/testkit/LogRoleReplace.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 akka.remote.testkit
@@ -142,4 +142,4 @@ class LogRoleReplace {
     result
   }
 
-}
\ No newline at end of file
+}
diff --git a/akka-remote-tests/src/test/scala/akka/remote/testkit/STMultiNodeSpec.scala b/akka-remote-tests/src/test/scala/akka/remote/testkit/STMultiNodeSpec.scala
index e10604d1ac..6fe49c0082 100644
--- a/akka-remote-tests/src/test/scala/akka/remote/testkit/STMultiNodeSpec.scala
+++ b/akka-remote-tests/src/test/scala/akka/remote/testkit/STMultiNodeSpec.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 akka.remote.testkit
diff --git a/akka-remote/src/main/protocol/RemoteProtocol.proto b/akka-remote/src/main/protocol/RemoteProtocol.proto
index 5a400e883f..39c19f5a2f 100644
--- a/akka-remote/src/main/protocol/RemoteProtocol.proto
+++ b/akka-remote/src/main/protocol/RemoteProtocol.proto
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
  */
 
 option java_package = "akka.remote";
@@ -110,4 +110,4 @@ message DeployProtocol {
   optional bytes config = 2;
   optional bytes routerConfig = 3;
   optional bytes scope = 4;
-}
\ No newline at end of file
+}
diff --git a/akka-remote/src/main/scala/akka/remote/DefaultFailureDetectorRegistry.scala b/akka-remote/src/main/scala/akka/remote/DefaultFailureDetectorRegistry.scala
index 7500016788..c98daa7ed2 100644
--- a/akka-remote/src/main/scala/akka/remote/DefaultFailureDetectorRegistry.scala
+++ b/akka-remote/src/main/scala/akka/remote/DefaultFailureDetectorRegistry.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 akka.remote
diff --git a/akka-remote/src/main/scala/akka/remote/FailureDetectorRegistry.scala b/akka-remote/src/main/scala/akka/remote/FailureDetectorRegistry.scala
index 86dcaa13ad..2339a6409a 100644
--- a/akka-remote/src/main/scala/akka/remote/FailureDetectorRegistry.scala
+++ b/akka-remote/src/main/scala/akka/remote/FailureDetectorRegistry.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 akka.remote
diff --git a/akka-remote/src/main/scala/akka/remote/MessageSerializer.scala b/akka-remote/src/main/scala/akka/remote/MessageSerializer.scala
index f028757ff7..fec24e3eef 100644
--- a/akka-remote/src/main/scala/akka/remote/MessageSerializer.scala
+++ b/akka-remote/src/main/scala/akka/remote/MessageSerializer.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 akka.remote
diff --git a/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala b/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
index 912e7d4cab..b0c27fb91c 100644
--- a/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
+++ b/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.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 akka.remote
diff --git a/akka-remote/src/main/scala/akka/remote/RemoteDaemon.scala b/akka-remote/src/main/scala/akka/remote/RemoteDaemon.scala
index 8d191c3bc5..d1add9522a 100644
--- a/akka-remote/src/main/scala/akka/remote/RemoteDaemon.scala
+++ b/akka-remote/src/main/scala/akka/remote/RemoteDaemon.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 akka.remote
diff --git a/akka-remote/src/main/scala/akka/remote/RemoteDeployer.scala b/akka-remote/src/main/scala/akka/remote/RemoteDeployer.scala
index 60c77fb4cc..e714e453ea 100644
--- a/akka-remote/src/main/scala/akka/remote/RemoteDeployer.scala
+++ b/akka-remote/src/main/scala/akka/remote/RemoteDeployer.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 akka.remote
 
@@ -32,4 +32,4 @@ private[akka] class RemoteDeployer(_settings: ActorSystem.Settings, _pm: Dynamic
       case None ⇒ None
     }
   }
-}
\ No newline at end of file
+}
diff --git a/akka-remote/src/main/scala/akka/remote/RemoteSettings.scala b/akka-remote/src/main/scala/akka/remote/RemoteSettings.scala
index 804ccf5525..3d60667435 100644
--- a/akka-remote/src/main/scala/akka/remote/RemoteSettings.scala
+++ b/akka-remote/src/main/scala/akka/remote/RemoteSettings.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 akka.remote
 
diff --git a/akka-remote/src/main/scala/akka/remote/netty/Client.scala b/akka-remote/src/main/scala/akka/remote/netty/Client.scala
index 372cc6dd0c..f8a2943320 100644
--- a/akka-remote/src/main/scala/akka/remote/netty/Client.scala
+++ b/akka-remote/src/main/scala/akka/remote/netty/Client.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 akka.remote.netty
 
diff --git a/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala b/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
index 9951df6ee8..a63394869e 100644
--- a/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
+++ b/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.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 akka.remote.netty
diff --git a/akka-remote/src/main/scala/akka/remote/netty/NettySSLSupport.scala b/akka-remote/src/main/scala/akka/remote/netty/NettySSLSupport.scala
index bbac7e9619..65ae01f8b4 100644
--- a/akka-remote/src/main/scala/akka/remote/netty/NettySSLSupport.scala
+++ b/akka-remote/src/main/scala/akka/remote/netty/NettySSLSupport.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 akka.remote.netty
diff --git a/akka-remote/src/main/scala/akka/remote/netty/Server.scala b/akka-remote/src/main/scala/akka/remote/netty/Server.scala
index 077d30f9ba..2141df30a9 100644
--- a/akka-remote/src/main/scala/akka/remote/netty/Server.scala
+++ b/akka-remote/src/main/scala/akka/remote/netty/Server.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 akka.remote.netty
 
diff --git a/akka-remote/src/main/scala/akka/remote/netty/Settings.scala b/akka-remote/src/main/scala/akka/remote/netty/Settings.scala
index 0a27914734..2d4183b46d 100644
--- a/akka-remote/src/main/scala/akka/remote/netty/Settings.scala
+++ b/akka-remote/src/main/scala/akka/remote/netty/Settings.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 akka.remote.netty
 
diff --git a/akka-remote/src/main/scala/akka/remote/routing/RemoteRouterConfig.scala b/akka-remote/src/main/scala/akka/remote/routing/RemoteRouterConfig.scala
index 369d8b0c7b..9a2fb0fb08 100644
--- a/akka-remote/src/main/scala/akka/remote/routing/RemoteRouterConfig.scala
+++ b/akka-remote/src/main/scala/akka/remote/routing/RemoteRouterConfig.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 akka.remote.routing
 
diff --git a/akka-remote/src/main/scala/akka/remote/security/provider/AES128CounterInetRNG.scala b/akka-remote/src/main/scala/akka/remote/security/provider/AES128CounterInetRNG.scala
index 7019b4b1a3..cb1722c41c 100644
--- a/akka-remote/src/main/scala/akka/remote/security/provider/AES128CounterInetRNG.scala
+++ b/akka-remote/src/main/scala/akka/remote/security/provider/AES128CounterInetRNG.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 akka.remote.security.provider
 
diff --git a/akka-remote/src/main/scala/akka/remote/security/provider/AES128CounterSecureRNG.scala b/akka-remote/src/main/scala/akka/remote/security/provider/AES128CounterSecureRNG.scala
index acf936d46e..feae55de02 100644
--- a/akka-remote/src/main/scala/akka/remote/security/provider/AES128CounterSecureRNG.scala
+++ b/akka-remote/src/main/scala/akka/remote/security/provider/AES128CounterSecureRNG.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 akka.remote.security.provider
 
diff --git a/akka-remote/src/main/scala/akka/remote/security/provider/AES256CounterInetRNG.scala b/akka-remote/src/main/scala/akka/remote/security/provider/AES256CounterInetRNG.scala
index edd6b3cab5..321b66200c 100644
--- a/akka-remote/src/main/scala/akka/remote/security/provider/AES256CounterInetRNG.scala
+++ b/akka-remote/src/main/scala/akka/remote/security/provider/AES256CounterInetRNG.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 akka.remote.security.provider
 
diff --git a/akka-remote/src/main/scala/akka/remote/security/provider/AES256CounterSecureRNG.scala b/akka-remote/src/main/scala/akka/remote/security/provider/AES256CounterSecureRNG.scala
index aadb2131e3..833ca32109 100644
--- a/akka-remote/src/main/scala/akka/remote/security/provider/AES256CounterSecureRNG.scala
+++ b/akka-remote/src/main/scala/akka/remote/security/provider/AES256CounterSecureRNG.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 akka.remote.security.provider
 
diff --git a/akka-remote/src/main/scala/akka/remote/security/provider/AkkaProvider.scala b/akka-remote/src/main/scala/akka/remote/security/provider/AkkaProvider.scala
index ed32cd04d8..ee3d61d157 100644
--- a/akka-remote/src/main/scala/akka/remote/security/provider/AkkaProvider.scala
+++ b/akka-remote/src/main/scala/akka/remote/security/provider/AkkaProvider.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 akka.remote.security.provider
 
diff --git a/akka-remote/src/main/scala/akka/remote/security/provider/SeedSize.scala b/akka-remote/src/main/scala/akka/remote/security/provider/SeedSize.scala
index a659c924bf..c55e39ab99 100644
--- a/akka-remote/src/main/scala/akka/remote/security/provider/SeedSize.scala
+++ b/akka-remote/src/main/scala/akka/remote/security/provider/SeedSize.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 akka.remote.security.provider
diff --git a/akka-remote/src/main/scala/akka/remote/serialization/DaemonMsgCreateSerializer.scala b/akka-remote/src/main/scala/akka/remote/serialization/DaemonMsgCreateSerializer.scala
index caa0e2d9af..3d098b0712 100644
--- a/akka-remote/src/main/scala/akka/remote/serialization/DaemonMsgCreateSerializer.scala
+++ b/akka-remote/src/main/scala/akka/remote/serialization/DaemonMsgCreateSerializer.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 akka.remote.serialization
@@ -132,4 +132,4 @@ private[akka] class DaemonMsgCreateSerializer(val system: ExtendedActorSystem) e
         }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/akka-remote/src/main/scala/akka/remote/serialization/ProtobufSerializer.scala b/akka-remote/src/main/scala/akka/remote/serialization/ProtobufSerializer.scala
index 26bf6621ac..42f2978db6 100644
--- a/akka-remote/src/main/scala/akka/remote/serialization/ProtobufSerializer.scala
+++ b/akka-remote/src/main/scala/akka/remote/serialization/ProtobufSerializer.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 akka.remote.serialization
@@ -52,4 +52,4 @@ class ProtobufSerializer extends Serializer {
       case None    ⇒ throw new IllegalArgumentException("Need a protobuf message class to be able to serialize bytes using protobuf")
       case Some(c) ⇒ c.getDeclaredMethod("parseFrom", ARRAY_OF_BYTE_ARRAY: _*).invoke(null, bytes).asInstanceOf[Message]
     }
-}
\ No newline at end of file
+}
diff --git a/akka-remote/src/test/protocol/ProtobufProtocol.proto b/akka-remote/src/test/protocol/ProtobufProtocol.proto
index 0ff2663821..f59df11899 100644
--- a/akka-remote/src/test/protocol/ProtobufProtocol.proto
+++ b/akka-remote/src/test/protocol/ProtobufProtocol.proto
@@ -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 akka.actor;
diff --git a/akka-remote/src/test/scala/akka/remote/AccrualFailureDetectorSpec.scala b/akka-remote/src/test/scala/akka/remote/AccrualFailureDetectorSpec.scala
index 3daa799bbf..5783897148 100644
--- a/akka-remote/src/test/scala/akka/remote/AccrualFailureDetectorSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/AccrualFailureDetectorSpec.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 akka.remote
diff --git a/akka-remote/src/test/scala/akka/remote/NetworkFailureSpec.scala b/akka-remote/src/test/scala/akka/remote/NetworkFailureSpec.scala
index dad24b8d4b..752f7c4faa 100644
--- a/akka-remote/src/test/scala/akka/remote/NetworkFailureSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/NetworkFailureSpec.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 akka.remote
diff --git a/akka-remote/src/test/scala/akka/remote/RemoteCommunicationSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteCommunicationSpec.scala
index 7e27c1ffc1..18c3018827 100644
--- a/akka-remote/src/test/scala/akka/remote/RemoteCommunicationSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/RemoteCommunicationSpec.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 akka.remote
 
diff --git a/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala
index e07251048c..be87d1a942 100644
--- a/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.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 akka.remote
 
diff --git a/akka-remote/src/test/scala/akka/remote/RemoteDeathWatchSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteDeathWatchSpec.scala
index 95eb10f3af..533f8745b7 100644
--- a/akka-remote/src/test/scala/akka/remote/RemoteDeathWatchSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/RemoteDeathWatchSpec.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 akka.remote
 
diff --git a/akka-remote/src/test/scala/akka/remote/RemoteDeployerSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteDeployerSpec.scala
index b071a353e6..369d1232db 100644
--- a/akka-remote/src/test/scala/akka/remote/RemoteDeployerSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/RemoteDeployerSpec.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 akka.remote
 
@@ -47,4 +47,4 @@ class RemoteDeployerSpec extends AkkaSpec(RemoteDeployerSpec.deployerConf) {
 
   }
 
-}
\ No newline at end of file
+}
diff --git a/akka-remote/src/test/scala/akka/remote/RemoteRouterSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteRouterSpec.scala
index 869a45445f..9f88ea8b19 100644
--- a/akka-remote/src/test/scala/akka/remote/RemoteRouterSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/RemoteRouterSpec.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 akka.remote
 
diff --git a/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala b/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala
index 177fb49a9a..c68fdda63d 100644
--- a/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/RemotingSpec.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 akka.remote
 
diff --git a/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala b/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala
index 73d857aefc..5b40c48944 100644
--- a/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.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 akka.remote
 
diff --git a/akka-remote/src/test/scala/akka/remote/UntrustedSpec.scala b/akka-remote/src/test/scala/akka/remote/UntrustedSpec.scala
index 8e555ee9f6..2bc84a9763 100644
--- a/akka-remote/src/test/scala/akka/remote/UntrustedSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/UntrustedSpec.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 akka.remote
@@ -86,4 +86,4 @@ akka.loglevel = DEBUG
 
   }
 
-}
\ No newline at end of file
+}
diff --git a/akka-remote/src/test/scala/akka/remote/serialization/DaemonMsgCreateSerializerSpec.scala b/akka-remote/src/test/scala/akka/remote/serialization/DaemonMsgCreateSerializerSpec.scala
index 776feb410c..e516b7f53e 100644
--- a/akka-remote/src/test/scala/akka/remote/serialization/DaemonMsgCreateSerializerSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/serialization/DaemonMsgCreateSerializerSpec.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 akka.remote.serialization
diff --git a/akka-remote/src/test/scala/akka/remote/serialization/ProtobufSerializerSpec.scala b/akka-remote/src/test/scala/akka/remote/serialization/ProtobufSerializerSpec.scala
index f9fac112bd..a5881c9e9e 100644
--- a/akka-remote/src/test/scala/akka/remote/serialization/ProtobufSerializerSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/serialization/ProtobufSerializerSpec.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 akka.remote.serialization
diff --git a/akka-samples/akka-sample-hello-kernel/src/main/java/sample/kernel/hello/java/HelloKernel.java b/akka-samples/akka-sample-hello-kernel/src/main/java/sample/kernel/hello/java/HelloKernel.java
index fa1cdf08d1..8d3936d400 100644
--- a/akka-samples/akka-sample-hello-kernel/src/main/java/sample/kernel/hello/java/HelloKernel.java
+++ b/akka-samples/akka-sample-hello-kernel/src/main/java/sample/kernel/hello/java/HelloKernel.java
@@ -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 sample.kernel.hello.java;
 
diff --git a/akka-samples/akka-sample-hello-kernel/src/main/scala/sample/kernel/hello/HelloKernel.scala b/akka-samples/akka-sample-hello-kernel/src/main/scala/sample/kernel/hello/HelloKernel.scala
index fd34795a95..0878ee7ee7 100644
--- a/akka-samples/akka-sample-hello-kernel/src/main/scala/sample/kernel/hello/HelloKernel.scala
+++ b/akka-samples/akka-sample-hello-kernel/src/main/scala/sample/kernel/hello/HelloKernel.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 sample.kernel.hello
 
diff --git a/akka-samples/akka-sample-hello/src/main/scala/sample/hello/Main.scala b/akka-samples/akka-sample-hello/src/main/scala/sample/hello/Main.scala
index bbb5c36bc9..3767bfb890 100644
--- a/akka-samples/akka-sample-hello/src/main/scala/sample/hello/Main.scala
+++ b/akka-samples/akka-sample-hello/src/main/scala/sample/hello/Main.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 sample.hello
 
diff --git a/akka-samples/akka-sample-multi-node/src/multi-jvm/scala/sample/multinode/MultiNodeSample.scala b/akka-samples/akka-sample-multi-node/src/multi-jvm/scala/sample/multinode/MultiNodeSample.scala
index 0fad522659..35fc4e7774 100644
--- a/akka-samples/akka-sample-multi-node/src/multi-jvm/scala/sample/multinode/MultiNodeSample.scala
+++ b/akka-samples/akka-sample-multi-node/src/multi-jvm/scala/sample/multinode/MultiNodeSample.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
 package sample.multinode
diff --git a/akka-samples/akka-sample-multi-node/src/test/scala/sample/multinode/STMultiNodeSpec.scala b/akka-samples/akka-sample-multi-node/src/test/scala/sample/multinode/STMultiNodeSpec.scala
index 114b1559cd..fccfdddb24 100644
--- a/akka-samples/akka-sample-multi-node/src/test/scala/sample/multinode/STMultiNodeSpec.scala
+++ b/akka-samples/akka-sample-multi-node/src/test/scala/sample/multinode/STMultiNodeSpec.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>
  */
 //#example
 package sample.multinode
diff --git a/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/InternalMsg.java b/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/InternalMsg.java
index b348aa9537..865ba31053 100644
--- a/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/InternalMsg.java
+++ b/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/InternalMsg.java
@@ -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 sample.remote.calculator.java;
 
diff --git a/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JAdvancedCalculatorActor.java b/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JAdvancedCalculatorActor.java
index bb04e4631d..adb5581657 100644
--- a/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JAdvancedCalculatorActor.java
+++ b/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JAdvancedCalculatorActor.java
@@ -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 sample.remote.calculator.java;
 
diff --git a/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JCalcApp.java b/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JCalcApp.java
index 2e840a1ff4..89ecf70238 100644
--- a/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JCalcApp.java
+++ b/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JCalcApp.java
@@ -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 sample.remote.calculator.java;
 
diff --git a/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JCalculatorApplication.java b/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JCalculatorApplication.java
index 916af2f5f8..4d9cf78ad6 100644
--- a/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JCalculatorApplication.java
+++ b/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JCalculatorApplication.java
@@ -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 sample.remote.calculator.java;
 
@@ -29,4 +29,4 @@ public class JCalculatorApplication implements Bootable {
     system.shutdown();
   }
 }
-// #setup
\ No newline at end of file
+// #setup
diff --git a/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JCreationActor.java b/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JCreationActor.java
index c639a7e91e..358335879b 100644
--- a/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JCreationActor.java
+++ b/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JCreationActor.java
@@ -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 sample.remote.calculator.java;
 
diff --git a/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JCreationApp.java b/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JCreationApp.java
index 40252694eb..fd5ef8c2dc 100644
--- a/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JCreationApp.java
+++ b/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JCreationApp.java
@@ -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 sample.remote.calculator.java;
 
diff --git a/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JCreationApplication.java b/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JCreationApplication.java
index 97d91508fc..961c760cb9 100644
--- a/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JCreationApplication.java
+++ b/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JCreationApplication.java
@@ -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 sample.remote.calculator.java;
 
diff --git a/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JLookupActor.java b/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JLookupActor.java
index 568b8147ec..b67ce2a980 100644
--- a/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JLookupActor.java
+++ b/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JLookupActor.java
@@ -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 sample.remote.calculator.java;
 
diff --git a/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JLookupApp.java b/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JLookupApp.java
index 542b0e2407..614f90798b 100644
--- a/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JLookupApp.java
+++ b/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JLookupApp.java
@@ -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 sample.remote.calculator.java;
 
diff --git a/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JLookupApplication.java b/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JLookupApplication.java
index df254bf176..e7535cdd5a 100644
--- a/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JLookupApplication.java
+++ b/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JLookupApplication.java
@@ -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 sample.remote.calculator.java;
 
diff --git a/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JSimpleCalculatorActor.java b/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JSimpleCalculatorActor.java
index 958fb6bee4..4c3b6fc889 100644
--- a/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JSimpleCalculatorActor.java
+++ b/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JSimpleCalculatorActor.java
@@ -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 sample.remote.calculator.java;
 
diff --git a/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/Op.java b/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/Op.java
index 17bd550d61..4656f58521 100644
--- a/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/Op.java
+++ b/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/Op.java
@@ -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 sample.remote.calculator.java;
 
diff --git a/akka-samples/akka-sample-remote/src/main/scala/sample/remote/calculator/CalculatorApplication.scala b/akka-samples/akka-sample-remote/src/main/scala/sample/remote/calculator/CalculatorApplication.scala
index a62db8a3ac..f87d259268 100644
--- a/akka-samples/akka-sample-remote/src/main/scala/sample/remote/calculator/CalculatorApplication.scala
+++ b/akka-samples/akka-sample-remote/src/main/scala/sample/remote/calculator/CalculatorApplication.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 sample.remote.calculator
 
diff --git a/akka-samples/akka-sample-remote/src/main/scala/sample/remote/calculator/CreationApplication.scala b/akka-samples/akka-sample-remote/src/main/scala/sample/remote/calculator/CreationApplication.scala
index a227611fdf..b45e2e7ec4 100644
--- a/akka-samples/akka-sample-remote/src/main/scala/sample/remote/calculator/CreationApplication.scala
+++ b/akka-samples/akka-sample-remote/src/main/scala/sample/remote/calculator/CreationApplication.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 sample.remote.calculator
 
diff --git a/akka-samples/akka-sample-remote/src/main/scala/sample/remote/calculator/LookupApplication.scala b/akka-samples/akka-sample-remote/src/main/scala/sample/remote/calculator/LookupApplication.scala
index 70f49eb29d..09425f3378 100644
--- a/akka-samples/akka-sample-remote/src/main/scala/sample/remote/calculator/LookupApplication.scala
+++ b/akka-samples/akka-sample-remote/src/main/scala/sample/remote/calculator/LookupApplication.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 sample.remote.calculator
 
diff --git a/akka-samples/akka-sample-remote/src/main/scala/sample/remote/calculator/MathOp.scala b/akka-samples/akka-sample-remote/src/main/scala/sample/remote/calculator/MathOp.scala
index f223323f45..bd92530d98 100644
--- a/akka-samples/akka-sample-remote/src/main/scala/sample/remote/calculator/MathOp.scala
+++ b/akka-samples/akka-sample-remote/src/main/scala/sample/remote/calculator/MathOp.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 sample.remote.calculator
 
@@ -34,4 +34,4 @@ class AdvancedCalculatorActor extends Actor {
       println("Calculating %.0f / %d".format(n1, n2))
       sender ! DivisionResult(n1, n2, n1 / n2)
   }
-}
\ No newline at end of file
+}
diff --git a/akka-sbt-plugin/sample/src/main/scala/HelloKernel.scala b/akka-sbt-plugin/sample/src/main/scala/HelloKernel.scala
index bef50fed72..e10595d157 100644
--- a/akka-sbt-plugin/sample/src/main/scala/HelloKernel.scala
+++ b/akka-sbt-plugin/sample/src/main/scala/HelloKernel.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 sample.kernel.hello
 
@@ -34,4 +34,4 @@ class HelloKernel extends Bootable {
   def shutdown = {
     system.shutdown()
   }
-}
\ No newline at end of file
+}
diff --git a/akka-slf4j/src/main/scala/akka/event/slf4j/Slf4jEventHandler.scala b/akka-slf4j/src/main/scala/akka/event/slf4j/Slf4jEventHandler.scala
index 9e2fefffd9..a704d07b59 100644
--- a/akka-slf4j/src/main/scala/akka/event/slf4j/Slf4jEventHandler.scala
+++ b/akka-slf4j/src/main/scala/akka/event/slf4j/Slf4jEventHandler.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 akka.event.slf4j
diff --git a/akka-slf4j/src/test/scala/akka/event/slf4j/Slf4jEventHandlerSpec.scala b/akka-slf4j/src/test/scala/akka/event/slf4j/Slf4jEventHandlerSpec.scala
index bdc00e6c17..dab9e7b754 100644
--- a/akka-slf4j/src/test/scala/akka/event/slf4j/Slf4jEventHandlerSpec.scala
+++ b/akka-slf4j/src/test/scala/akka/event/slf4j/Slf4jEventHandlerSpec.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 akka.event.slf4j
 
diff --git a/akka-testkit/src/main/java/akka/testkit/JavaTestKit.java b/akka-testkit/src/main/java/akka/testkit/JavaTestKit.java
index 835fd1939a..a55ac7d62e 100644
--- a/akka-testkit/src/main/java/akka/testkit/JavaTestKit.java
+++ b/akka-testkit/src/main/java/akka/testkit/JavaTestKit.java
@@ -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 akka.testkit;
 
diff --git a/akka-testkit/src/main/scala/akka/testkit/CallingThreadDispatcher.scala b/akka-testkit/src/main/scala/akka/testkit/CallingThreadDispatcher.scala
index dad7f4643e..6b8ea3b5df 100644
--- a/akka-testkit/src/main/scala/akka/testkit/CallingThreadDispatcher.scala
+++ b/akka-testkit/src/main/scala/akka/testkit/CallingThreadDispatcher.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 akka.testkit
 
diff --git a/akka-testkit/src/main/scala/akka/testkit/Routing.scala b/akka-testkit/src/main/scala/akka/testkit/Routing.scala
index 54fb59b685..1a7c2964b6 100644
--- a/akka-testkit/src/main/scala/akka/testkit/Routing.scala
+++ b/akka-testkit/src/main/scala/akka/testkit/Routing.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 akka.testkit
 
diff --git a/akka-testkit/src/main/scala/akka/testkit/TestActorRef.scala b/akka-testkit/src/main/scala/akka/testkit/TestActorRef.scala
index 132e3f5e78..3d2030e0e4 100644
--- a/akka-testkit/src/main/scala/akka/testkit/TestActorRef.scala
+++ b/akka-testkit/src/main/scala/akka/testkit/TestActorRef.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 akka.testkit
diff --git a/akka-testkit/src/main/scala/akka/testkit/TestBarrier.scala b/akka-testkit/src/main/scala/akka/testkit/TestBarrier.scala
index 5d043f4b10..989d689a53 100644
--- a/akka-testkit/src/main/scala/akka/testkit/TestBarrier.scala
+++ b/akka-testkit/src/main/scala/akka/testkit/TestBarrier.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 akka.testkit
diff --git a/akka-testkit/src/main/scala/akka/testkit/TestEventListener.scala b/akka-testkit/src/main/scala/akka/testkit/TestEventListener.scala
index dfcd7b9dd2..9be43e7d97 100644
--- a/akka-testkit/src/main/scala/akka/testkit/TestEventListener.scala
+++ b/akka-testkit/src/main/scala/akka/testkit/TestEventListener.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 akka.testkit
 
diff --git a/akka-testkit/src/main/scala/akka/testkit/TestFSMRef.scala b/akka-testkit/src/main/scala/akka/testkit/TestFSMRef.scala
index a6d2cbf39e..55b8fde099 100644
--- a/akka-testkit/src/main/scala/akka/testkit/TestFSMRef.scala
+++ b/akka-testkit/src/main/scala/akka/testkit/TestFSMRef.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 akka.testkit
diff --git a/akka-testkit/src/main/scala/akka/testkit/TestKit.scala b/akka-testkit/src/main/scala/akka/testkit/TestKit.scala
index e81acb23a3..cdf5da80f8 100644
--- a/akka-testkit/src/main/scala/akka/testkit/TestKit.scala
+++ b/akka-testkit/src/main/scala/akka/testkit/TestKit.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 akka.testkit
 
diff --git a/akka-testkit/src/main/scala/akka/testkit/TestKitExtension.scala b/akka-testkit/src/main/scala/akka/testkit/TestKitExtension.scala
index 33102e09a6..417c02e0d9 100644
--- a/akka-testkit/src/main/scala/akka/testkit/TestKitExtension.scala
+++ b/akka-testkit/src/main/scala/akka/testkit/TestKitExtension.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 akka.testkit
 
@@ -23,4 +23,4 @@ class TestKitSettings(val config: Config) extends Extension {
   val SingleExpectDefaultTimeout: FiniteDuration = Duration(getMilliseconds("akka.test.single-expect-default"), MILLISECONDS)
   val TestEventFilterLeeway: FiniteDuration = Duration(getMilliseconds("akka.test.filter-leeway"), MILLISECONDS)
   val DefaultTimeout: Timeout = Timeout(Duration(getMilliseconds("akka.test.default-timeout"), MILLISECONDS))
-}
\ No newline at end of file
+}
diff --git a/akka-testkit/src/main/scala/akka/testkit/TestLatch.scala b/akka-testkit/src/main/scala/akka/testkit/TestLatch.scala
index 2bb7a8f4b5..2bfea360e6 100644
--- a/akka-testkit/src/main/scala/akka/testkit/TestLatch.scala
+++ b/akka-testkit/src/main/scala/akka/testkit/TestLatch.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 akka.testkit
diff --git a/akka-testkit/src/test/java/akka/testkit/TestActorRefJavaCompile.java b/akka-testkit/src/test/java/akka/testkit/TestActorRefJavaCompile.java
index ecf2cd6e51..2664a31a60 100644
--- a/akka-testkit/src/test/java/akka/testkit/TestActorRefJavaCompile.java
+++ b/akka-testkit/src/test/java/akka/testkit/TestActorRefJavaCompile.java
@@ -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 akka.testkit;
@@ -14,4 +14,4 @@ public class TestActorRefJavaCompile {
     TestActorRef<Actor> ref = TestActorRef.apply(new Props(), null);
     ref.toString();
   }
-}
\ No newline at end of file
+}
diff --git a/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala b/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala
index d1fc341447..274ad31ef8 100644
--- a/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala
+++ b/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.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 akka.testkit
 
diff --git a/akka-testkit/src/test/scala/akka/testkit/AkkaSpecSpec.scala b/akka-testkit/src/test/scala/akka/testkit/AkkaSpecSpec.scala
index baebc2e6d4..35dd83e7f3 100644
--- a/akka-testkit/src/test/scala/akka/testkit/AkkaSpecSpec.scala
+++ b/akka-testkit/src/test/scala/akka/testkit/AkkaSpecSpec.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 akka.testkit
 
diff --git a/akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala b/akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala
index f847c2b48a..272d2a848b 100644
--- a/akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala
+++ b/akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.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 akka.testkit
 
diff --git a/akka-testkit/src/test/scala/akka/testkit/TestFSMRefSpec.scala b/akka-testkit/src/test/scala/akka/testkit/TestFSMRefSpec.scala
index 41efe55e6d..423e500656 100644
--- a/akka-testkit/src/test/scala/akka/testkit/TestFSMRefSpec.scala
+++ b/akka-testkit/src/test/scala/akka/testkit/TestFSMRefSpec.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 akka.testkit
diff --git a/akka-testkit/src/test/scala/akka/testkit/TestTags.scala b/akka-testkit/src/test/scala/akka/testkit/TestTags.scala
index df33b511e8..ef94a2a671 100644
--- a/akka-testkit/src/test/scala/akka/testkit/TestTags.scala
+++ b/akka-testkit/src/test/scala/akka/testkit/TestTags.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 akka.testkit
 
diff --git a/akka-transactor/src/main/scala/akka/transactor/Coordinated.scala b/akka-transactor/src/main/scala/akka/transactor/Coordinated.scala
index bd6be1d093..0ae7f0b603 100644
--- a/akka-transactor/src/main/scala/akka/transactor/Coordinated.scala
+++ b/akka-transactor/src/main/scala/akka/transactor/Coordinated.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 akka.transactor
diff --git a/akka-transactor/src/main/scala/akka/transactor/Transactor.scala b/akka-transactor/src/main/scala/akka/transactor/Transactor.scala
index e89c466aa8..f115d3500c 100644
--- a/akka-transactor/src/main/scala/akka/transactor/Transactor.scala
+++ b/akka-transactor/src/main/scala/akka/transactor/Transactor.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 akka.transactor
diff --git a/akka-transactor/src/main/scala/akka/transactor/TransactorExtension.scala b/akka-transactor/src/main/scala/akka/transactor/TransactorExtension.scala
index 2225010fd8..926dbfe6b1 100644
--- a/akka-transactor/src/main/scala/akka/transactor/TransactorExtension.scala
+++ b/akka-transactor/src/main/scala/akka/transactor/TransactorExtension.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 akka.transactor
 
@@ -22,4 +22,4 @@ object TransactorExtension extends ExtensionId[TransactorSettings] with Extensio
 class TransactorSettings(val config: Config) extends Extension {
   import config._
   val CoordinatedTimeout: Timeout = Timeout(Duration(getMilliseconds("akka.transactor.coordinated-timeout"), MILLISECONDS))
-}
\ No newline at end of file
+}
diff --git a/akka-transactor/src/main/scala/akka/transactor/UntypedTransactor.scala b/akka-transactor/src/main/scala/akka/transactor/UntypedTransactor.scala
index 69fcac66ad..91bedf1832 100644
--- a/akka-transactor/src/main/scala/akka/transactor/UntypedTransactor.scala
+++ b/akka-transactor/src/main/scala/akka/transactor/UntypedTransactor.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 akka.transactor
diff --git a/akka-transactor/src/test/java/akka/transactor/ExpectedFailureException.java b/akka-transactor/src/test/java/akka/transactor/ExpectedFailureException.java
index 4094c08992..75a99e25fd 100644
--- a/akka-transactor/src/test/java/akka/transactor/ExpectedFailureException.java
+++ b/akka-transactor/src/test/java/akka/transactor/ExpectedFailureException.java
@@ -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 akka.transactor;
diff --git a/akka-transactor/src/test/java/akka/transactor/Increment.java b/akka-transactor/src/test/java/akka/transactor/Increment.java
index e8b33f9aeb..e2b8f33043 100644
--- a/akka-transactor/src/test/java/akka/transactor/Increment.java
+++ b/akka-transactor/src/test/java/akka/transactor/Increment.java
@@ -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 akka.transactor;
diff --git a/akka-transactor/src/test/java/akka/transactor/UntypedCoordinatedCounter.java b/akka-transactor/src/test/java/akka/transactor/UntypedCoordinatedCounter.java
index d1b3140416..3d887961bc 100644
--- a/akka-transactor/src/test/java/akka/transactor/UntypedCoordinatedCounter.java
+++ b/akka-transactor/src/test/java/akka/transactor/UntypedCoordinatedCounter.java
@@ -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 akka.transactor;
diff --git a/akka-transactor/src/test/java/akka/transactor/UntypedCoordinatedIncrementTest.java b/akka-transactor/src/test/java/akka/transactor/UntypedCoordinatedIncrementTest.java
index f73a659c46..13dcd2f760 100644
--- a/akka-transactor/src/test/java/akka/transactor/UntypedCoordinatedIncrementTest.java
+++ b/akka-transactor/src/test/java/akka/transactor/UntypedCoordinatedIncrementTest.java
@@ -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 akka.transactor;
diff --git a/akka-transactor/src/test/java/akka/transactor/UntypedCounter.java b/akka-transactor/src/test/java/akka/transactor/UntypedCounter.java
index 1437adc805..9c8a135ac8 100644
--- a/akka-transactor/src/test/java/akka/transactor/UntypedCounter.java
+++ b/akka-transactor/src/test/java/akka/transactor/UntypedCounter.java
@@ -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 akka.transactor;
diff --git a/akka-transactor/src/test/java/akka/transactor/UntypedFailer.java b/akka-transactor/src/test/java/akka/transactor/UntypedFailer.java
index 1e9b67998d..76085058db 100644
--- a/akka-transactor/src/test/java/akka/transactor/UntypedFailer.java
+++ b/akka-transactor/src/test/java/akka/transactor/UntypedFailer.java
@@ -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 akka.transactor;
diff --git a/akka-transactor/src/test/java/akka/transactor/UntypedTransactorTest.java b/akka-transactor/src/test/java/akka/transactor/UntypedTransactorTest.java
index ade645dfd8..91a0fa6dc2 100644
--- a/akka-transactor/src/test/java/akka/transactor/UntypedTransactorTest.java
+++ b/akka-transactor/src/test/java/akka/transactor/UntypedTransactorTest.java
@@ -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 akka.transactor;
diff --git a/akka-transactor/src/test/scala/akka/transactor/CoordinatedIncrementSpec.scala b/akka-transactor/src/test/scala/akka/transactor/CoordinatedIncrementSpec.scala
index 6dad1079a3..0ab3d913ed 100644
--- a/akka-transactor/src/test/scala/akka/transactor/CoordinatedIncrementSpec.scala
+++ b/akka-transactor/src/test/scala/akka/transactor/CoordinatedIncrementSpec.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 akka.transactor
diff --git a/akka-transactor/src/test/scala/akka/transactor/FickleFriendsSpec.scala b/akka-transactor/src/test/scala/akka/transactor/FickleFriendsSpec.scala
index eb75247164..bb3c0e841a 100644
--- a/akka-transactor/src/test/scala/akka/transactor/FickleFriendsSpec.scala
+++ b/akka-transactor/src/test/scala/akka/transactor/FickleFriendsSpec.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 akka.transactor
diff --git a/akka-transactor/src/test/scala/akka/transactor/JavaUntypedCoordinatedSpec.scala b/akka-transactor/src/test/scala/akka/transactor/JavaUntypedCoordinatedSpec.scala
index 7179d09b03..df10515647 100644
--- a/akka-transactor/src/test/scala/akka/transactor/JavaUntypedCoordinatedSpec.scala
+++ b/akka-transactor/src/test/scala/akka/transactor/JavaUntypedCoordinatedSpec.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 akka.transactor
diff --git a/akka-transactor/src/test/scala/akka/transactor/JavaUntypedTransactorSpec.scala b/akka-transactor/src/test/scala/akka/transactor/JavaUntypedTransactorSpec.scala
index ea467cdf58..552e1b4b8a 100644
--- a/akka-transactor/src/test/scala/akka/transactor/JavaUntypedTransactorSpec.scala
+++ b/akka-transactor/src/test/scala/akka/transactor/JavaUntypedTransactorSpec.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 akka.transactor
diff --git a/akka-transactor/src/test/scala/akka/transactor/TransactorSpec.scala b/akka-transactor/src/test/scala/akka/transactor/TransactorSpec.scala
index 0de8a13d97..cc21521319 100644
--- a/akka-transactor/src/test/scala/akka/transactor/TransactorSpec.scala
+++ b/akka-transactor/src/test/scala/akka/transactor/TransactorSpec.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 akka.transactor
diff --git a/akka-zeromq/src/main/scala/akka/zeromq/ConcurrentSocketActor.scala b/akka-zeromq/src/main/scala/akka/zeromq/ConcurrentSocketActor.scala
index f91ea2e318..0a8f98abd9 100644
--- a/akka-zeromq/src/main/scala/akka/zeromq/ConcurrentSocketActor.scala
+++ b/akka-zeromq/src/main/scala/akka/zeromq/ConcurrentSocketActor.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 akka.zeromq
 
diff --git a/akka-zeromq/src/main/scala/akka/zeromq/Response.scala b/akka-zeromq/src/main/scala/akka/zeromq/Response.scala
index 6b3f3e5eb6..6de41a738a 100644
--- a/akka-zeromq/src/main/scala/akka/zeromq/Response.scala
+++ b/akka-zeromq/src/main/scala/akka/zeromq/Response.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 akka.zeromq
 
diff --git a/akka-zeromq/src/main/scala/akka/zeromq/SocketOption.scala b/akka-zeromq/src/main/scala/akka/zeromq/SocketOption.scala
index b74760b5c3..f2375873ba 100644
--- a/akka-zeromq/src/main/scala/akka/zeromq/SocketOption.scala
+++ b/akka-zeromq/src/main/scala/akka/zeromq/SocketOption.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 akka.zeromq
 
diff --git a/akka-zeromq/src/main/scala/akka/zeromq/ZMQMessageDeserializer.scala b/akka-zeromq/src/main/scala/akka/zeromq/ZMQMessageDeserializer.scala
index 3325fc2c4b..b3d9a2572d 100644
--- a/akka-zeromq/src/main/scala/akka/zeromq/ZMQMessageDeserializer.scala
+++ b/akka-zeromq/src/main/scala/akka/zeromq/ZMQMessageDeserializer.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 akka.zeromq
 
diff --git a/akka-zeromq/src/main/scala/akka/zeromq/ZeroMQ.scala b/akka-zeromq/src/main/scala/akka/zeromq/ZeroMQ.scala
index df581d6a37..91fe791dd7 100644
--- a/akka-zeromq/src/main/scala/akka/zeromq/ZeroMQ.scala
+++ b/akka-zeromq/src/main/scala/akka/zeromq/ZeroMQ.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 akka.zeromq;
 
@@ -220,4 +220,4 @@ object ZeroMQ {
    * @return the single instance of Swap
    */
   def swap() = Swap
-}
\ No newline at end of file
+}
diff --git a/akka-zeromq/src/main/scala/akka/zeromq/ZeroMQExtension.scala b/akka-zeromq/src/main/scala/akka/zeromq/ZeroMQExtension.scala
index bc40ea580b..2a31498e08 100644
--- a/akka-zeromq/src/main/scala/akka/zeromq/ZeroMQExtension.scala
+++ b/akka-zeromq/src/main/scala/akka/zeromq/ZeroMQExtension.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 akka.zeromq
 
diff --git a/akka-zeromq/src/main/scala/akka/zeromq/package.scala b/akka-zeromq/src/main/scala/akka/zeromq/package.scala
index 2795505fa0..829fb150ac 100644
--- a/akka-zeromq/src/main/scala/akka/zeromq/package.scala
+++ b/akka-zeromq/src/main/scala/akka/zeromq/package.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 akka
 
@@ -20,4 +20,4 @@ package object zeromq {
    * Set the linger to 0, doesn't block and discards messages that haven't been sent yet.
    */
   val NoLinger: Linger = Linger.no
-}
\ No newline at end of file
+}
diff --git a/akka-zeromq/src/test/java/akka/zeromq/ZeroMQFromJavaTests.java b/akka-zeromq/src/test/java/akka/zeromq/ZeroMQFromJavaTests.java
index 3fd5e96aa8..6060a4b808 100644
--- a/akka-zeromq/src/test/java/akka/zeromq/ZeroMQFromJavaTests.java
+++ b/akka-zeromq/src/test/java/akka/zeromq/ZeroMQFromJavaTests.java
@@ -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 akka.zeromq;
 
diff --git a/akka-zeromq/src/test/scala/akka/zeromq/ConcurrentSocketActorSpec.scala b/akka-zeromq/src/test/scala/akka/zeromq/ConcurrentSocketActorSpec.scala
index e17ca6fb1f..8a5624126f 100644
--- a/akka-zeromq/src/test/scala/akka/zeromq/ConcurrentSocketActorSpec.scala
+++ b/akka-zeromq/src/test/scala/akka/zeromq/ConcurrentSocketActorSpec.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 akka.zeromq
 
diff --git a/akka-zeromq/src/test/scala/akka/zeromq/ZeroMQFromJavaSpec.scala b/akka-zeromq/src/test/scala/akka/zeromq/ZeroMQFromJavaSpec.scala
index 63a958060e..6c1b8cad37 100644
--- a/akka-zeromq/src/test/scala/akka/zeromq/ZeroMQFromJavaSpec.scala
+++ b/akka-zeromq/src/test/scala/akka/zeromq/ZeroMQFromJavaSpec.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 akka.zeromq
 
diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index 6bca2ff7c0..18c157667e 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.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 akka
diff --git a/scripts/generate_config_with_secure_cookie.sh b/scripts/generate_config_with_secure_cookie.sh
index ea422329ba..a8ad406dc0 100755
--- a/scripts/generate_config_with_secure_cookie.sh
+++ b/scripts/generate_config_with_secure_cookie.sh
@@ -3,7 +3,7 @@ exec scala "$0" "$@"
 !#
 
 /**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
  */
 import java.security.{MessageDigest, SecureRandom}
 

From 8a880c16d2fa0e61c981220e54e6473e0b4a399b Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Tue, 8 Jan 2013 12:06:08 +0100
Subject: [PATCH 038/122] Adjust protocol pattern in LogRoleReplace for new
 remoting

---
 .../src/test/scala/akka/remote/testkit/LogRoleReplace.scala     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/akka-remote-tests/src/test/scala/akka/remote/testkit/LogRoleReplace.scala b/akka-remote-tests/src/test/scala/akka/remote/testkit/LogRoleReplace.scala
index 6905b9b116..b2b603abab 100644
--- a/akka-remote-tests/src/test/scala/akka/remote/testkit/LogRoleReplace.scala
+++ b/akka-remote-tests/src/test/scala/akka/remote/testkit/LogRoleReplace.scala
@@ -92,7 +92,7 @@ object LogRoleReplace extends ClipboardOwner {
 
 class LogRoleReplace {
 
-  private val RoleStarted = """\[([\w\-]+)\].*Role \[([\w]+)\] started with address \[akka://.*@([\w\-\.]+):([0-9]+)\]""".r
+  private val RoleStarted = """\[([\w\-]+)\].*Role \[([\w]+)\] started with address \[[\w\-\+\.]+://.*@([\w\-\.]+):([0-9]+)\]""".r
   private val ColorCode = """\u001B?\[[0-9]+m"""
 
   private var replacements: Map[String, String] = Map.empty

From 8c6eb9aa429d66ae9c5609ae4ac97bbfa4904273 Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Wed, 9 Jan 2013 17:04:52 +0100
Subject: [PATCH 039/122] Correction of within time in
 TransformationSampleJapiSpec, see #2875

* We had the same issue in ticket 2820 and then the conclusion was that
  the within timeout should be increased due to "publish on convergence",
  but it was not done correctly in TransformationSampleJapiSpec, see
  https://github.com/akka/akka/commit/8bf7c03158cd4e064d3eecef1b331d14c2990775
* Also fixed the wrong (but harmless) subscribe in TransformationBackend
---
 .../cluster/transformation/japi/TransformationBackend.java   | 5 ++---
 .../sample/cluster/transformation/TransformationSample.scala | 5 ++---
 .../transformation/japi/TransformationSampleJapiSpec.scala   | 4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/transformation/japi/TransformationBackend.java b/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/transformation/japi/TransformationBackend.java
index a81d9db39d..9214874cbf 100644
--- a/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/transformation/japi/TransformationBackend.java
+++ b/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/transformation/japi/TransformationBackend.java
@@ -7,7 +7,6 @@ import sample.cluster.transformation.japi.TransformationMessages.TransformationR
 import akka.actor.UntypedActor;
 import akka.cluster.Cluster;
 import akka.cluster.ClusterEvent.CurrentClusterState;
-import akka.cluster.ClusterEvent.MemberEvent;
 import akka.cluster.ClusterEvent.MemberUp;
 import akka.cluster.Member;
 import akka.cluster.MemberStatus;
@@ -18,10 +17,10 @@ public class TransformationBackend extends UntypedActor {
 
   Cluster cluster = Cluster.get(getContext().system());
 
-  //subscribe to cluster changes, MemberEvent
+  //subscribe to cluster changes, MemberUp
   @Override
   public void preStart() {
-    cluster.subscribe(getSelf(), MemberEvent.class);
+    cluster.subscribe(getSelf(), MemberUp.class);
   }
 
   //re-subscribe when restart
diff --git a/akka-samples/akka-sample-cluster/src/main/scala/sample/cluster/transformation/TransformationSample.scala b/akka-samples/akka-sample-cluster/src/main/scala/sample/cluster/transformation/TransformationSample.scala
index 159e17f94b..4fc802a626 100644
--- a/akka-samples/akka-sample-cluster/src/main/scala/sample/cluster/transformation/TransformationSample.scala
+++ b/akka-samples/akka-sample-cluster/src/main/scala/sample/cluster/transformation/TransformationSample.scala
@@ -12,7 +12,6 @@ import akka.actor.RootActorPath
 import akka.actor.Terminated
 import akka.cluster.Cluster
 import akka.cluster.ClusterEvent.CurrentClusterState
-import akka.cluster.ClusterEvent.MemberEvent
 import akka.cluster.ClusterEvent.MemberUp
 import akka.cluster.Member
 import akka.cluster.MemberStatus
@@ -90,9 +89,9 @@ class TransformationBackend extends Actor {
 
   val cluster = Cluster(context.system)
 
-  // subscribe to cluster changes, MemberEvent
+  // subscribe to cluster changes, MemberUp
   // re-subscribe when restart
-  override def preStart(): Unit = cluster.subscribe(self, classOf[MemberEvent])
+  override def preStart(): Unit = cluster.subscribe(self, classOf[MemberUp])
   override def postStop(): Unit = cluster.unsubscribe(self)
 
   def receive = {
diff --git a/akka-samples/akka-sample-cluster/src/multi-jvm/scala/sample/cluster/transformation/japi/TransformationSampleJapiSpec.scala b/akka-samples/akka-sample-cluster/src/multi-jvm/scala/sample/cluster/transformation/japi/TransformationSampleJapiSpec.scala
index fff4a8a027..2fbba499ea 100644
--- a/akka-samples/akka-sample-cluster/src/multi-jvm/scala/sample/cluster/transformation/japi/TransformationSampleJapiSpec.scala
+++ b/akka-samples/akka-sample-cluster/src/multi-jvm/scala/sample/cluster/transformation/japi/TransformationSampleJapiSpec.scala
@@ -72,7 +72,7 @@ abstract class TransformationSampleJapiSpec extends MultiNodeSpec(Transformation
       testConductor.enter("frontend1-started")
     }
 
-    "illustrate how a backend automatically registers" in within(20 seconds) {
+    "illustrate how a backend automatically registers" in within(15 seconds) {
       runOn(backend1) {
         Cluster(system) join node(frontend1).address
         system.actorOf(Props[TransformationBackend], name = "backend")
@@ -86,7 +86,7 @@ abstract class TransformationSampleJapiSpec extends MultiNodeSpec(Transformation
       testConductor.enter("frontend1-backend1-ok")
     }
 
-    "illustrate how more nodes registers" in within(15 seconds) {
+    "illustrate how more nodes registers" in within(20 seconds) {
       runOn(frontend2) {
         Cluster(system) join node(frontend1).address
         system.actorOf(Props[TransformationFrontend], name = "frontend")

From 223865d67297801de48b728ec57c5b965c9b9ca9 Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Thu, 10 Jan 2013 16:02:36 +0100
Subject: [PATCH 040/122] Replace noSender in DeadLetterActorRef, see #2882

---
 akka-actor/src/main/scala/akka/actor/ActorRef.scala | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/akka-actor/src/main/scala/akka/actor/ActorRef.scala b/akka-actor/src/main/scala/akka/actor/ActorRef.scala
index a6685ae549..022c367fe0 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorRef.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorRef.scala
@@ -478,7 +478,8 @@ private[akka] class DeadLetterActorRef(_provider: ActorRefProvider,
 
   override def !(message: Any)(implicit sender: ActorRef = this): Unit = message match {
     case d: DeadLetter ⇒ if (!specialHandle(d.message)) eventStream.publish(d)
-    case _             ⇒ if (!specialHandle(message)) eventStream.publish(DeadLetter(message, sender, this))
+    case _ ⇒ if (!specialHandle(message))
+      eventStream.publish(DeadLetter(message, if (sender eq Actor.noSender) provider.deadLetters else sender, this))
   }
 
   override protected def specialHandle(msg: Any): Boolean = msg match {

From 382dc3b1e4c958c9ee5d4aa175284b926057e649 Mon Sep 17 00:00:00 2001
From: Matthew Neeley <mneeley@nestlabs.com>
Date: Thu, 10 Jan 2013 10:08:23 -0800
Subject: [PATCH 041/122] Fix HashedWheelTimer when timeout is multiple of
 wheel period #2898

---
 .../test/scala/akka/actor/SchedulerSpec.scala | 37 ++++++++++++++++++-
 .../test/scala/akka/util/DurationSpec.scala   | 23 ------------
 .../akka/util/internal/HashedWheelTimer.java  |  2 +
 3 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala
index ba34987c9c..0710be6ad5 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala
@@ -2,6 +2,7 @@ package akka.actor
 
 import language.postfixOps
 
+import com.typesafe.config.ConfigFactory
 import org.scalatest.BeforeAndAfterEach
 import scala.concurrent.duration._
 import java.util.concurrent.{ CountDownLatch, ConcurrentLinkedQueue, TimeUnit }
@@ -9,9 +10,16 @@ import akka.testkit._
 import scala.concurrent.Await
 import akka.pattern.ask
 import java.util.concurrent.atomic.AtomicInteger
+import java.util.concurrent.TimeoutException
+
+object SchedulerSpec {
+  val testConf = ConfigFactory.parseString("""
+    akka.scheduler.ticks-per-wheel = 32
+  """).withFallback(AkkaSpec.testConf)
+}
 
 @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner])
-class SchedulerSpec extends AkkaSpec with BeforeAndAfterEach with DefaultTimeout with ImplicitSender {
+class SchedulerSpec extends AkkaSpec(SchedulerSpec.testConf) with BeforeAndAfterEach with DefaultTimeout with ImplicitSender {
   private val cancellables = new ConcurrentLinkedQueue[Cancellable]()
   import system.dispatcher
 
@@ -231,4 +239,31 @@ class SchedulerSpec extends AkkaSpec with BeforeAndAfterEach with DefaultTimeout
       n * 1000.0 / (System.nanoTime - startTime).nanos.toMillis must be(4.4 plusOrMinus 0.3)
     }
   }
+
+  "A HashedWheelTimer" must {
+
+    "not mess up long timeouts" taggedAs LongRunningTest in {
+      val longish = Long.MaxValue.nanos
+      val barrier = TestLatch()
+      import system.dispatcher
+      val job = system.scheduler.scheduleOnce(longish)(barrier.countDown())
+      intercept[TimeoutException] {
+        // this used to fire after 46 seconds due to wrap-around
+        Await.ready(barrier, 90 seconds)
+      }
+      job.cancel()
+    }
+
+    "handle timeouts equal to multiple of wheel period" taggedAs TimingTest in {
+      val timeout = 3200 milliseconds
+      val barrier = TestLatch()
+      import system.dispatcher
+      val job = system.scheduler.scheduleOnce(timeout)(barrier.countDown())
+      try {
+        Await.ready(barrier, 5000 milliseconds)
+      } finally {
+        job.cancel()
+      }
+    }
+  }
 }
diff --git a/akka-actor-tests/src/test/scala/akka/util/DurationSpec.scala b/akka-actor-tests/src/test/scala/akka/util/DurationSpec.scala
index ca285274aa..de8d8ab99b 100644
--- a/akka-actor-tests/src/test/scala/akka/util/DurationSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/util/DurationSpec.scala
@@ -5,35 +5,12 @@ package akka.util
 
 import language.postfixOps
 
-import org.scalatest.WordSpec
-import org.scalatest.matchers.MustMatchers
 import scala.concurrent.duration._
-import scala.concurrent.Await
 
-import java.util.concurrent.TimeUnit._
 import akka.testkit.AkkaSpec
-import akka.testkit.TestLatch
-import java.util.concurrent.TimeoutException
-import akka.testkit.LongRunningTest
 
 class DurationSpec extends AkkaSpec {
 
-  "A HashedWheelTimer" must {
-
-    "not mess up long timeouts" taggedAs LongRunningTest in {
-      val longish = Long.MaxValue.nanos
-      val barrier = TestLatch()
-      import system.dispatcher
-      val job = system.scheduler.scheduleOnce(longish)(barrier.countDown())
-      intercept[TimeoutException] {
-        // this used to fire after 46 seconds due to wrap-around
-        Await.ready(barrier, 90 seconds)
-      }
-      job.cancel()
-    }
-
-  }
-
   "Duration" must {
 
     "form a one-dimensional vector field" in {
diff --git a/akka-actor/src/main/java/akka/util/internal/HashedWheelTimer.java b/akka-actor/src/main/java/akka/util/internal/HashedWheelTimer.java
index 73b3cf143d..fcdee4866f 100644
--- a/akka-actor/src/main/java/akka/util/internal/HashedWheelTimer.java
+++ b/akka-actor/src/main/java/akka/util/internal/HashedWheelTimer.java
@@ -268,6 +268,8 @@ public class HashedWheelTimer implements Timer {
         // one tick early; that shouldn’t matter since we’re talking 270 years here
         if (relativeIndex < 0) relativeIndex = delay / tickDuration;
         if (relativeIndex == 0) relativeIndex = 1;
+        // if an integral number of wheel rotations, schedule one tick earlier
+        if ((relativeIndex & mask) == 0) relativeIndex--;
         final long remainingRounds = relativeIndex / wheel.length;
 
         // Add the timeout to the wheel.

From bf47a16447ed22dd31bc6445da6d8f8793e0ad98 Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Fri, 11 Jan 2013 09:55:42 +0100
Subject: [PATCH 042/122] Throw startup exception from Remoting, see #2872

* The problem with NPE of defaultAddress was because if the
  init of the transport takes long time (network timeout) the
  defaultAddress was never set
---
 akka-remote/src/main/scala/akka/remote/Remoting.scala | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/akka-remote/src/main/scala/akka/remote/Remoting.scala b/akka-remote/src/main/scala/akka/remote/Remoting.scala
index be9ff83684..ba13dd2314 100644
--- a/akka-remote/src/main/scala/akka/remote/Remoting.scala
+++ b/akka-remote/src/main/scala/akka/remote/Remoting.scala
@@ -202,8 +202,12 @@ private[remote] class Remoting(_system: ExtendedActorSystem, _provider: RemoteAc
           eventPublisher.notifyListeners(RemotingListenEvent(addresses))
 
         } catch {
-          case e: TimeoutException ⇒ notifyError("Startup timed out", e)
-          case NonFatal(e)         ⇒ notifyError("Startup failed", e)
+          case e: TimeoutException ⇒
+            notifyError("Startup timed out", e)
+            throw e
+          case NonFatal(e) ⇒
+            notifyError("Startup failed", e)
+            throw e
         }
 
       case Some(_) ⇒

From 265eaef1f618d61e25e794bb27ffce842d0447df Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Wed, 9 Jan 2013 12:21:31 +0100
Subject: [PATCH 043/122] Confirmation of throttle mode change, see #2877

* added some missing copyright headers
* Use ask inside ThrottlerTransportAdapter
* Change signature of managementCommand
---
 akka-remote/src/main/resources/reference.conf |  3 ++
 .../src/main/scala/akka/remote/Endpoint.scala |  3 ++
 .../scala/akka/remote/FailureDetector.scala   |  3 ++
 .../remote/PhiAccrualFailureDetector.scala    |  3 ++
 .../src/main/scala/akka/remote/Remoting.scala | 47 ++++++++++-------
 .../scala/akka/remote/RemotingLifecycle.scala |  3 ++
 .../transport/AbstractTransportAdapter.scala  |  7 ++-
 .../akka/remote/transport/AkkaPduCodec.scala  |  3 ++
 .../transport/AkkaProtocolTransport.scala     |  9 ++--
 .../FailureInjectorTransportAdapter.scala     | 11 ++--
 .../akka/remote/transport/TestTransport.scala |  3 ++
 .../transport/ThrottlerTransportAdapter.scala | 52 ++++++++++++-------
 .../akka/remote/transport/Transport.scala     |  5 +-
 .../remote/transport/netty/NettyHelpers.scala |  3 ++
 .../transport/netty/NettyTransport.scala      |  3 ++
 .../remote/transport/netty/TcpSupport.scala   |  3 ++
 .../remote/transport/netty/UdpSupport.scala   |  3 ++
 17 files changed, 117 insertions(+), 47 deletions(-)

diff --git a/akka-remote/src/main/resources/reference.conf b/akka-remote/src/main/resources/reference.conf
index 0d23116770..505ee2a030 100644
--- a/akka-remote/src/main/resources/reference.conf
+++ b/akka-remote/src/main/resources/reference.conf
@@ -109,6 +109,9 @@ akka {
     # FIXME document
     use-passive-connections = on
 
+    # Acknowledgment timeout for commands
+    command-ack-timeout = 30 s
+
     adapters {
       gremlin = "akka.remote.transport.FailureInjectorProvider"
       trttl = "akka.remote.transport.ThrottlerProvider"
diff --git a/akka-remote/src/main/scala/akka/remote/Endpoint.scala b/akka-remote/src/main/scala/akka/remote/Endpoint.scala
index 639084e812..798819a4d4 100644
--- a/akka-remote/src/main/scala/akka/remote/Endpoint.scala
+++ b/akka-remote/src/main/scala/akka/remote/Endpoint.scala
@@ -1,3 +1,6 @@
+/**
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
+ */
 package akka.remote
 
 import akka.{ OnlyCauseStackTrace, AkkaException }
diff --git a/akka-remote/src/main/scala/akka/remote/FailureDetector.scala b/akka-remote/src/main/scala/akka/remote/FailureDetector.scala
index d3562b2afd..5c7b7ac9c0 100644
--- a/akka-remote/src/main/scala/akka/remote/FailureDetector.scala
+++ b/akka-remote/src/main/scala/akka/remote/FailureDetector.scala
@@ -1,3 +1,6 @@
+/**
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
+ */
 package akka.remote
 
 import java.util.concurrent.TimeUnit._
diff --git a/akka-remote/src/main/scala/akka/remote/PhiAccrualFailureDetector.scala b/akka-remote/src/main/scala/akka/remote/PhiAccrualFailureDetector.scala
index b0525b48d8..194e3b57be 100644
--- a/akka-remote/src/main/scala/akka/remote/PhiAccrualFailureDetector.scala
+++ b/akka-remote/src/main/scala/akka/remote/PhiAccrualFailureDetector.scala
@@ -1,3 +1,6 @@
+/**
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
+ */
 package akka.remote
 
 import akka.remote.FailureDetector.Clock
diff --git a/akka-remote/src/main/scala/akka/remote/Remoting.scala b/akka-remote/src/main/scala/akka/remote/Remoting.scala
index be9ff83684..0002257ac3 100644
--- a/akka-remote/src/main/scala/akka/remote/Remoting.scala
+++ b/akka-remote/src/main/scala/akka/remote/Remoting.scala
@@ -1,3 +1,6 @@
+/**
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
+ */
 package akka.remote
 
 import scala.language.postfixOps
@@ -27,11 +30,12 @@ class RemotingSettings(val config: Config) {
 
   val LogLifecycleEvents: Boolean = getBoolean("akka.remoting.log-remote-lifecycle-events")
 
-  val ShutdownTimeout: FiniteDuration = Duration(getMilliseconds("akka.remoting.shutdown-timeout"), MILLISECONDS)
+  val ShutdownTimeout: Timeout =
+    Duration(getMilliseconds("akka.remoting.shutdown-timeout"), MILLISECONDS)
 
   val FlushWait: FiniteDuration = Duration(getMilliseconds("akka.remoting.flush-wait-on-shutdown"), MILLISECONDS)
 
-  val StartupTimeout: FiniteDuration = Duration(getMilliseconds("akka.remoting.startup-timeout"), MILLISECONDS)
+  val StartupTimeout: Timeout = Timeout(Duration(getMilliseconds("akka.remoting.startup-timeout"), MILLISECONDS))
 
   val RetryGateClosedFor: Long = getNanoseconds("akka.remoting.retry-gate-closed-for")
 
@@ -41,8 +45,10 @@ class RemotingSettings(val config: Config) {
 
   val RetryWindow: FiniteDuration = Duration(getMilliseconds("akka.remoting.retry-window"), MILLISECONDS)
 
-  val BackoffPeriod: FiniteDuration =
-    Duration(getMilliseconds("akka.remoting.backoff-interval"), MILLISECONDS)
+  val BackoffPeriod: FiniteDuration = Duration(getMilliseconds("akka.remoting.backoff-interval"), MILLISECONDS)
+
+  val CommandAckTimeout: Timeout =
+    Timeout(Duration(getMilliseconds("akka.remoting.command-ack-timeout"), MILLISECONDS))
 
   val Transports: Seq[(String, Seq[String], Config)] = transportNames.map { name ⇒
     val transportConfig = transportConfigFor(name)
@@ -146,7 +152,7 @@ private[remote] class Remoting(_system: ExtendedActorSystem, _provider: RemoteAc
     import scala.concurrent.ExecutionContext.Implicits.global
     endpointManager match {
       case Some(manager) ⇒
-        implicit val timeout = new Timeout(settings.ShutdownTimeout)
+        implicit val timeout = settings.ShutdownTimeout
         val stopped: Future[Boolean] = (manager ? ShutdownAndFlush).mapTo[Boolean]
 
         def finalize(): Unit = {
@@ -182,18 +188,17 @@ private[remote] class Remoting(_system: ExtendedActorSystem, _provider: RemoteAc
           Props(new EndpointManager(provider.remoteSettings.config, log)), Remoting.EndpointManagerName)
         endpointManager = Some(manager)
 
-        implicit val timeout = new Timeout(settings.StartupTimeout)
-
         try {
           val addressesPromise: Promise[Seq[(Transport, Address)]] = Promise()
           manager ! Listen(addressesPromise)
 
-          val transports: Seq[(Transport, Address)] = Await.result(addressesPromise.future, timeout.duration)
+          val transports: Seq[(Transport, Address)] = Await.result(addressesPromise.future,
+            settings.StartupTimeout.duration)
           if (transports.isEmpty) throw new RemoteTransportException("No transport drivers were loaded.", null)
 
-          transportMapping = transports.groupBy { case (transport, _) ⇒ transport.schemeIdentifier }.mapValues {
-            _.toSet
-          }
+          transportMapping = transports.groupBy {
+            case (transport, _) ⇒ transport.schemeIdentifier
+          } map { case (k, v) ⇒ k -> v.toSet }
 
           defaultAddress = transports.head._2
           addresses = transports.map { _._2 }.toSet
@@ -229,9 +234,9 @@ private[remote] class Remoting(_system: ExtendedActorSystem, _provider: RemoteAc
 
   override def managementCommand(cmd: Any): Future[Boolean] = endpointManager match {
     case Some(manager) ⇒
-      val statusPromise = Promise[Boolean]()
-      manager.tell(ManagementCommand(cmd, statusPromise), sender = Actor.noSender)
-      statusPromise.future
+      import system.dispatcher
+      implicit val timeout = settings.CommandAckTimeout
+      manager ? ManagementCommand(cmd) map { case ManagementCommandAck(status) ⇒ status }
     case None ⇒ throw new IllegalStateException("Attempted to send management command but Remoting is not running.")
   }
 
@@ -253,7 +258,8 @@ private[remote] object EndpointManager {
   case class Send(message: Any, senderOption: Option[ActorRef], recipient: RemoteActorRef) extends RemotingCommand {
     override def toString = s"Remote message $senderOption -> $recipient"
   }
-  case class ManagementCommand(cmd: Any, statusPromise: Promise[Boolean]) extends RemotingCommand
+  case class ManagementCommand(cmd: Any) extends RemotingCommand
+  case class ManagementCommandAck(status: Boolean)
 
   // Messages internal to EndpointManager
   case object Prune
@@ -389,8 +395,8 @@ private[remote] class EndpointManager(conf: Config, log: LoggingAdapter) extends
           transport -> address
       }
       addressesPromise.success(transportsAndAddresses)
-    case ManagementCommand(_, statusPromise) ⇒
-      statusPromise.success(false)
+    case ManagementCommand(_) ⇒
+      sender ! ManagementCommandAck(false)
     case StartupFinished ⇒
       context.become(accepting)
     case ShutdownAndFlush ⇒
@@ -399,8 +405,11 @@ private[remote] class EndpointManager(conf: Config, log: LoggingAdapter) extends
   }
 
   val accepting: Receive = {
-    case ManagementCommand(cmd, statusPromise) ⇒
-      transportMapping.values foreach { _.managementCommand(cmd, statusPromise) }
+    case ManagementCommand(cmd) ⇒
+      val allStatuses = transportMapping.values map { transport ⇒
+        transport.managementCommand(cmd)
+      }
+      Future.fold(allStatuses)(true)(_ && _) map ManagementCommandAck pipeTo sender
 
     case s @ Send(message, senderOption, recipientRef) ⇒
       val recipientAddress = recipientRef.path.address
diff --git a/akka-remote/src/main/scala/akka/remote/RemotingLifecycle.scala b/akka-remote/src/main/scala/akka/remote/RemotingLifecycle.scala
index bd44ff3982..39977afafd 100644
--- a/akka-remote/src/main/scala/akka/remote/RemotingLifecycle.scala
+++ b/akka-remote/src/main/scala/akka/remote/RemotingLifecycle.scala
@@ -1,3 +1,6 @@
+/**
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
+ */
 package akka.remote
 
 import akka.event.{ LoggingAdapter, Logging }
diff --git a/akka-remote/src/main/scala/akka/remote/transport/AbstractTransportAdapter.scala b/akka-remote/src/main/scala/akka/remote/transport/AbstractTransportAdapter.scala
index 3dae6d479b..5643951ea4 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/AbstractTransportAdapter.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/AbstractTransportAdapter.scala
@@ -1,3 +1,6 @@
+/**
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
+ */
 package akka.remote.transport
 
 import scala.language.postfixOps
@@ -118,6 +121,8 @@ object ActorTransportAdapter {
   case class ListenUnderlying(listenAddress: Address,
                               upstreamListener: Future[AssociationEventListener]) extends TransportOperation
   case object DisassociateUnderlying extends TransportOperation
+
+  implicit val AskTimeout = Timeout(5 seconds)
 }
 
 abstract class ActorTransportAdapter(wrappedTransport: Transport, system: ActorSystem)
@@ -125,8 +130,6 @@ abstract class ActorTransportAdapter(wrappedTransport: Transport, system: ActorS
 
   import ActorTransportAdapter._
 
-  private implicit val timeout = new Timeout(3 seconds)
-
   protected def managerName: String
   protected def managerProps: Props
   // Write once variable initialized when Listen is called.
diff --git a/akka-remote/src/main/scala/akka/remote/transport/AkkaPduCodec.scala b/akka-remote/src/main/scala/akka/remote/transport/AkkaPduCodec.scala
index b6b17c68c7..26d0028c60 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/AkkaPduCodec.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/AkkaPduCodec.scala
@@ -1,3 +1,6 @@
+/**
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
+ */
 package akka.remote.transport
 
 import akka.AkkaException
diff --git a/akka-remote/src/main/scala/akka/remote/transport/AkkaProtocolTransport.scala b/akka-remote/src/main/scala/akka/remote/transport/AkkaProtocolTransport.scala
index c99cbcb398..921c88a83d 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/AkkaProtocolTransport.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/AkkaProtocolTransport.scala
@@ -1,3 +1,6 @@
+/**
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
+ */
 package akka.remote.transport
 
 import akka.{ OnlyCauseStackTrace, AkkaException }
@@ -86,8 +89,7 @@ private[remote] class AkkaProtocolTransport(
 
   override val addedSchemeIdentifier: String = AkkaScheme
 
-  override def managementCommand(cmd: Any, statusPromise: Promise[Boolean]): Unit =
-    wrappedTransport.managementCommand(cmd, statusPromise)
+  override def managementCommand(cmd: Any): Future[Boolean] = wrappedTransport.managementCommand(cmd)
 
   override val maximumOverhead: Int = AkkaProtocolTransport.AkkaOverhead
   protected def managerName = s"akkaprotocolmanager.${wrappedTransport.schemeIdentifier}${UniqueId.getAndIncrement}"
@@ -354,7 +356,8 @@ private[transport] class ProtocolStateActor(initialData: InitialProtocolStateDat
         case Disassociate ⇒
           stop()
 
-        case Heartbeat ⇒ failureDetector.heartbeat(); stay()
+        case Heartbeat ⇒
+          failureDetector.heartbeat(); stay()
 
         case Payload(payload) ⇒ stateData match {
           case AssociatedWaitHandler(handlerFuture, wrappedHandle, queue) ⇒
diff --git a/akka-remote/src/main/scala/akka/remote/transport/FailureInjectorTransportAdapter.scala b/akka-remote/src/main/scala/akka/remote/transport/FailureInjectorTransportAdapter.scala
index 59be194dde..e3f204115b 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/FailureInjectorTransportAdapter.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/FailureInjectorTransportAdapter.scala
@@ -1,3 +1,6 @@
+/**
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
+ */
 package akka.remote.transport
 
 import FailureInjectorTransportAdapter._
@@ -48,15 +51,15 @@ private[remote] class FailureInjectorTransportAdapter(wrappedTransport: Transpor
   override val addedSchemeIdentifier = FailureInjectorSchemeIdentifier
   protected def maximumOverhead = 0
 
-  override def managementCommand(cmd: Any, statusPromise: Promise[Boolean]): Unit = cmd match {
+  override def managementCommand(cmd: Any): Future[Boolean] = cmd match {
     case All(mode) ⇒
       allMode = mode
-      statusPromise.success(true)
+      Future.successful(true)
     case One(address, mode) ⇒
       //  don't care about the protocol part - we are injected in the stack anyway!
       addressChaosTable.put(address.copy(protocol = "", system = ""), mode)
-      statusPromise.success(true)
-    case _ ⇒ wrappedTransport.managementCommand(cmd, statusPromise)
+      Future.successful(true)
+    case _ ⇒ wrappedTransport.managementCommand(cmd)
   }
 
   protected def interceptListen(listenAddress: Address,
diff --git a/akka-remote/src/main/scala/akka/remote/transport/TestTransport.scala b/akka-remote/src/main/scala/akka/remote/transport/TestTransport.scala
index 200e038778..b0f11f911e 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/TestTransport.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/TestTransport.scala
@@ -1,3 +1,6 @@
+/**
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
+ */
 package akka.remote.transport
 
 import TestTransport._
diff --git a/akka-remote/src/main/scala/akka/remote/transport/ThrottlerTransportAdapter.scala b/akka-remote/src/main/scala/akka/remote/transport/ThrottlerTransportAdapter.scala
index bb74937563..76d4d77b04 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/ThrottlerTransportAdapter.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/ThrottlerTransportAdapter.scala
@@ -1,20 +1,24 @@
+/**
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
+ */
 package akka.remote.transport
 
-import ThrottlerTransportAdapter._
 import akka.actor._
+import akka.pattern.ask
 import akka.pattern.pipe
 import akka.remote.transport.ActorTransportAdapter.AssociateUnderlying
 import akka.remote.transport.AkkaPduCodec.Associate
 import akka.remote.transport.AssociationHandle.{ ActorHandleEventListener, Disassociated, InboundPayload, HandleEventListener }
 import akka.remote.transport.ThrottledAssociation._
 import akka.remote.transport.ThrottlerManager.Checkin
-import akka.remote.transport.ThrottlerTransportAdapter.SetThrottle
+import akka.remote.transport.ThrottlerTransportAdapter._
 import akka.remote.transport.Transport._
 import akka.util.ByteString
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicReference
 import scala.annotation.tailrec
 import scala.collection.immutable.Queue
+import scala.concurrent.Future
 import scala.concurrent.Promise
 import scala.math.min
 import scala.util.{ Success, Failure }
@@ -54,7 +58,9 @@ object ThrottlerTransportAdapter {
     }
   }
 
+  object SetThrottle
   case class SetThrottle(address: Address, direction: Direction, mode: ThrottleMode)
+  case object SetThrottleAck
 
   sealed trait ThrottleMode {
     def tryConsumeTokens(nanoTimeOfSend: Long, tokens: Int): (ThrottleMode, Boolean)
@@ -107,11 +113,11 @@ class ThrottlerTransportAdapter(_wrappedTransport: Transport, _system: ExtendedA
     Props(new ThrottlerManager(wt))
   }
 
-  override def managementCommand(cmd: Any, statusPromise: Promise[Boolean]): Unit = cmd match {
-    case s @ SetThrottle(_, _, _) ⇒
-      manager ! s
-      statusPromise.success(true)
-    case _ ⇒ wrappedTransport.managementCommand(cmd, statusPromise)
+  override def managementCommand(cmd: Any): Future[Boolean] = cmd match {
+    case s: SetThrottle ⇒
+      import ActorTransportAdapter.AskTimeout
+      manager ? s map { case SetThrottleAck ⇒ true }
+    case _ ⇒ wrappedTransport.managementCommand(cmd)
   }
 }
 
@@ -150,13 +156,17 @@ private[transport] class ThrottlerManager(wrappedTransport: Transport) extends A
       wrappedHandle.readHandlerPromise.future.map { (_, inMode) } pipeTo wrappedHandle.throttlerActor
       handleTable ::= nakedAddress(naked) -> wrappedHandle
       statusPromise.success(wrappedHandle)
-    case s @ SetThrottle(address, direction, mode) ⇒
+    case SetThrottle(address, direction, mode) ⇒
       val naked = nakedAddress(address)
       throttlingModes += naked -> (mode, direction)
-      handleTable.foreach {
-        case (addr, handle) ⇒
-          if (addr == naked) setMode(handle, mode, direction)
+      val ok = Future.successful(SetThrottleAck)
+      val allAcks = handleTable.map {
+        case (`naked`, handle) ⇒ setMode(handle, mode, direction)
+        case _                 ⇒ ok
       }
+
+      Future.sequence(allAcks).map(_ ⇒ SetThrottleAck) pipeTo sender
+
     case Checkin(origin, handle) ⇒
       val naked: Address = nakedAddress(origin)
       handleTable ::= naked -> handle
@@ -178,16 +188,21 @@ private[transport] class ThrottlerManager(wrappedTransport: Transport) extends A
     }
   }
 
-  private def setMode(nakedAddress: Address, handle: ThrottlerHandle): Unit = {
+  private def setMode(nakedAddress: Address, handle: ThrottlerHandle): Future[SetThrottleAck.type] = {
     throttlingModes.get(nakedAddress) match {
       case Some((mode, direction)) ⇒ setMode(handle, mode, direction)
       case None                    ⇒ setMode(handle, Unthrottled, Direction.Both)
     }
   }
 
-  private def setMode(handle: ThrottlerHandle, mode: ThrottleMode, direction: Direction): Unit = {
-    if (direction.includes(Direction.Receive)) handle.throttlerActor ! mode
-    if (direction.includes(Direction.Send)) handle.outboundThrottleMode.set(mode)
+  private def setMode(handle: ThrottlerHandle, mode: ThrottleMode, direction: Direction): Future[SetThrottleAck.type] = {
+    import ActorTransportAdapter.AskTimeout
+    if (direction.includes(Direction.Send))
+      handle.outboundThrottleMode.set(mode)
+    if (direction.includes(Direction.Receive))
+      (handle.throttlerActor ? mode).mapTo[SetThrottleAck.type]
+    else
+      Future.successful(SetThrottleAck)
   }
 
   private def wrapHandle(originalHandle: AssociationHandle, listener: AssociationEventListener, inbound: Boolean): ThrottlerHandle = {
@@ -274,7 +289,7 @@ private[transport] class ThrottledAssociation(
       stay()
     case Event(mode: ThrottleMode, ExposedHandle(exposedHandle)) ⇒
       inboundThrottleMode = mode
-      if (inboundThrottleMode == Blackhole) {
+      try if (mode == Blackhole) {
         throttledMessages = Queue.empty[ByteString]
         exposedHandle.disassociate()
         stop()
@@ -282,7 +297,7 @@ private[transport] class ThrottledAssociation(
         associationHandler notify InboundAssociation(exposedHandle)
         exposedHandle.readHandlerPromise.future pipeTo self
         goto(WaitUpstreamListener)
-      }
+      } finally sender ! SetThrottleAck
   }
 
   when(WaitUpstreamListener) {
@@ -309,10 +324,11 @@ private[transport] class ThrottledAssociation(
   when(Throttling) {
     case Event(mode: ThrottleMode, _) ⇒
       inboundThrottleMode = mode
-      if (inboundThrottleMode == Blackhole) throttledMessages = Queue.empty[ByteString]
+      if (mode == Blackhole) throttledMessages = Queue.empty[ByteString]
       cancelTimer(DequeueTimerName)
       if (throttledMessages.nonEmpty)
         scheduleDequeue(inboundThrottleMode.timeToAvailable(System.nanoTime(), throttledMessages.head.length))
+      sender ! SetThrottleAck
       stay()
     case Event(InboundPayload(p), _) ⇒
       forwardOrDelay(p)
diff --git a/akka-remote/src/main/scala/akka/remote/transport/Transport.scala b/akka-remote/src/main/scala/akka/remote/transport/Transport.scala
index b2cdbcc54e..82f361dfa0 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/Transport.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/Transport.scala
@@ -1,3 +1,6 @@
+/**
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
+ */
 package akka.remote.transport
 
 import scala.concurrent.{ Promise, Future }
@@ -129,7 +132,7 @@ trait Transport {
    * @param cmd Command message to the transport
    * @return Future that succeeds when the command was handled or dropped
    */
-  def managementCommand(cmd: Any, statusPromise: Promise[Boolean]): Unit = { statusPromise.success(false) }
+  def managementCommand(cmd: Any): Future[Boolean] = { Future.successful(false) }
 
 }
 
diff --git a/akka-remote/src/main/scala/akka/remote/transport/netty/NettyHelpers.scala b/akka-remote/src/main/scala/akka/remote/transport/netty/NettyHelpers.scala
index dec126cd6a..94d586908b 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/netty/NettyHelpers.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/netty/NettyHelpers.scala
@@ -1,3 +1,6 @@
+/**
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
+ */
 package akka.remote.transport.netty
 
 import akka.AkkaException
diff --git a/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala b/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
index 361337242a..48436b3569 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
@@ -1,3 +1,6 @@
+/**
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
+ */
 package akka.remote.transport.netty
 
 import akka.{ OnlyCauseStackTrace, ConfigurationException }
diff --git a/akka-remote/src/main/scala/akka/remote/transport/netty/TcpSupport.scala b/akka-remote/src/main/scala/akka/remote/transport/netty/TcpSupport.scala
index 515637dad0..c4c7e7c674 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/netty/TcpSupport.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/netty/TcpSupport.scala
@@ -1,3 +1,6 @@
+/**
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
+ */
 package akka.remote.transport.netty
 
 import akka.actor.Address
diff --git a/akka-remote/src/main/scala/akka/remote/transport/netty/UdpSupport.scala b/akka-remote/src/main/scala/akka/remote/transport/netty/UdpSupport.scala
index c52e8d9bc9..0b20b25fb7 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/netty/UdpSupport.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/netty/UdpSupport.scala
@@ -1,3 +1,6 @@
+/**
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
+ */
 package akka.remote.transport.netty
 
 import akka.actor.Address

From e188699c093234d011b6349414874535c5bf93bf Mon Sep 17 00:00:00 2001
From: Roland <rk@rkuhn.info>
Date: Fri, 11 Jan 2013 17:40:49 +0100
Subject: [PATCH 044/122] make ActorRefSpec more deterministic, see #2836

---
 .../test/scala/akka/actor/ActorRefSpec.scala  | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.scala
index a1da055cf6..bfefa98fd8 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.scala
@@ -145,7 +145,7 @@ class ActorRefSpec extends AkkaSpec with DefaultTimeout {
 
       def contextStackMustBeEmpty = ActorCell.contextStack.get.headOption must be === None
 
-      filterException[akka.actor.ActorInitializationException] {
+      EventFilter[ActorInitializationException](occurrences = 1) intercept {
         intercept[akka.actor.ActorInitializationException] {
           wrap(result ⇒
             actorOf(Props(new Actor {
@@ -155,49 +155,63 @@ class ActorRefSpec extends AkkaSpec with DefaultTimeout {
         }
 
         contextStackMustBeEmpty
+      }
 
+      EventFilter[ActorInitializationException](occurrences = 1) intercept {
         intercept[akka.actor.ActorInitializationException] {
           wrap(result ⇒
             actorOf(Props(promiseIntercept(new FailingOuterActor(actorOf(Props(new InnerActor))))(result))))
         }
 
         contextStackMustBeEmpty
+      }
 
+      EventFilter[ActorInitializationException](occurrences = 1) intercept {
         intercept[akka.actor.ActorInitializationException] {
           wrap(result ⇒
             actorOf(Props(new OuterActor(actorOf(Props(promiseIntercept(new FailingInnerActor)(result)))))))
         }
 
         contextStackMustBeEmpty
+      }
 
+      EventFilter[ActorInitializationException](occurrences = 1) intercept {
         intercept[akka.actor.ActorInitializationException] {
           wrap(result ⇒
             actorOf(Props(promiseIntercept(new FailingInheritingOuterActor(actorOf(Props(new InnerActor))))(result))))
         }
 
         contextStackMustBeEmpty
+      }
 
+      EventFilter[ActorInitializationException](occurrences = 2) intercept {
         intercept[akka.actor.ActorInitializationException] {
           wrap(result ⇒
             actorOf(Props(new FailingOuterActor(actorOf(Props(promiseIntercept(new FailingInheritingInnerActor)(result)))))))
         }
 
         contextStackMustBeEmpty
+      }
 
+      EventFilter[ActorInitializationException](occurrences = 2) intercept {
         intercept[akka.actor.ActorInitializationException] {
           wrap(result ⇒
             actorOf(Props(new FailingInheritingOuterActor(actorOf(Props(promiseIntercept(new FailingInheritingInnerActor)(result)))))))
         }
 
         contextStackMustBeEmpty
+      }
 
+      EventFilter[ActorInitializationException](occurrences = 2) intercept {
         intercept[akka.actor.ActorInitializationException] {
           wrap(result ⇒
             actorOf(Props(new FailingInheritingOuterActor(actorOf(Props(promiseIntercept(new FailingInnerActor)(result)))))))
         }
 
         contextStackMustBeEmpty
+      }
 
+      EventFilter[ActorInitializationException](occurrences = 1) intercept {
         intercept[akka.actor.ActorInitializationException] {
           wrap(result ⇒
             actorOf(Props(new OuterActor(actorOf(Props(new InnerActor {
@@ -206,21 +220,27 @@ class ActorRefSpec extends AkkaSpec with DefaultTimeout {
         }
 
         contextStackMustBeEmpty
+      }
 
+      EventFilter[ActorInitializationException](occurrences = 2) intercept {
         intercept[akka.actor.ActorInitializationException] {
           wrap(result ⇒
             actorOf(Props(new FailingOuterActor(actorOf(Props(promiseIntercept(new FailingInheritingInnerActor)(result)))))))
         }
 
         contextStackMustBeEmpty
+      }
 
+      EventFilter[ActorInitializationException](occurrences = 1) intercept {
         intercept[akka.actor.ActorInitializationException] {
           wrap(result ⇒
             actorOf(Props(new OuterActor(actorOf(Props(promiseIntercept(new FailingInheritingInnerActor)(result)))))))
         }
 
         contextStackMustBeEmpty
+      }
 
+      EventFilter[ActorInitializationException](occurrences = 1) intercept {
         intercept[akka.actor.ActorInitializationException] {
           wrap(result ⇒
             actorOf(Props(new OuterActor(actorOf(Props(promiseIntercept({ new InnerActor; new InnerActor })(result)))))))

From ba6e97799542a306bd15009d6d20487c90e52bca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Endre=20S=C3=A1ndor=20Varga?= <vendre@hit.bme.hu>
Date: Mon, 14 Jan 2013 09:33:39 +0100
Subject: [PATCH 045/122] Updated Netty to 3.6.1.Final #2715

---
 project/AkkaBuild.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index 6bca2ff7c0..022820c91a 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -691,7 +691,7 @@ object Dependencies {
     val camelCore     = "org.apache.camel"            % "camel-core"                   % "2.10.0" exclude("org.slf4j", "slf4j-api") // ApacheV2
 
     val config        = "com.typesafe"                % "config"                       % "1.0.0"       // ApacheV2
-    val netty         = "io.netty"                    % "netty"                        % "3.5.8.Final" // ApacheV2
+    val netty         = "io.netty"                    % "netty"                        % "3.6.1.Final" // ApacheV2
     val protobuf      = "com.google.protobuf"         % "protobuf-java"                % "2.4.1"       // New BSD
     val scalaStm      = "org.scala-stm"              %% "scala-stm"                    % "0.7"         // Modified BSD (Scala)
 

From 5bce8b9430899cc9bf8201e8e29de5aee82b9270 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Endre=20S=C3=A1ndor=20Varga?= <vendre@hit.bme.hu>
Date: Mon, 14 Jan 2013 16:05:49 +0100
Subject: [PATCH 046/122] Fixed issue with Netty not releasing worker threads
 properly #2733

---
 .../scala/akka/remote/transport/netty/NettyTransport.scala  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala b/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
index 48436b3569..6550753214 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
@@ -379,7 +379,11 @@ class NettyTransport(private val settings: NettyTransportSettings, private val s
       _ ← always(channelGroup.write(ChannelBuffers.buffer(0)))
       _ ← always({ channelGroup.unbind(); channelGroup.disconnect() })
       _ ← always(channelGroup.close())
-    } inboundBootstrap.releaseExternalResources()
+    } {
+      // Release the selectors, but don't try to kill the dispatcher
+      if (UseDispatcherForIo.isDefined) inboundBootstrap.shutdown()
+      else inboundBootstrap.releaseExternalResources()
+    }
 
   }
 

From d07f331e78e467c3bfb9aa9bb2453b127959fbef Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Mon, 14 Jan 2013 17:35:56 +0100
Subject: [PATCH 047/122] Publish InstantMemberEvent immediately, see #2803

---
 .../scala/akka/cluster/ClusterEvent.scala     | 134 ++++++++++++++++--
 .../scala/akka/cluster/ClusterReadView.scala  |   9 +-
 .../ClusterDomainEventPublisherSpec.scala     | 110 ++++++++------
 .../test/scala/akka/cluster/ClusterSpec.scala |   7 +-
 akka-docs/rst/cluster/cluster-usage-java.rst  |   2 +-
 5 files changed, 201 insertions(+), 61 deletions(-)

diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterEvent.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterEvent.scala
index e3ae50d12a..f804f1f5ac 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterEvent.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/ClusterEvent.scala
@@ -68,54 +68,140 @@ object ClusterEvent {
   }
 
   /**
-   * Marker interface for member related events.
+   * Marker interface for membership events.
+   * Only published after convergence, when all members have seen current
+   * state.
    */
   sealed trait MemberEvent extends ClusterDomainEvent {
     def member: Member
   }
 
   /**
-   * A new member joined the cluster. Only published after convergence.
+   * A new member joined the cluster.
+   * Only published after convergence, when all members have seen current
+   * state.
    */
   case class MemberJoined(member: Member) extends MemberEvent {
     if (member.status != Joining) throw new IllegalArgumentException("Expected Joining status, got: " + member)
   }
 
   /**
-   * Member status changed to Up. Only published after convergence.
+   * Member status changed to Up.
+   * Only published after convergence, when all members have seen current
+   * state.
    */
   case class MemberUp(member: Member) extends MemberEvent {
     if (member.status != Up) throw new IllegalArgumentException("Expected Up status, got: " + member)
   }
 
   /**
-   * Member status changed to Leaving. Only published after convergence.
+   * Member status changed to Leaving.
+   * Only published after convergence, when all members have seen current
+   * state.
    */
   case class MemberLeft(member: Member) extends MemberEvent {
     if (member.status != Leaving) throw new IllegalArgumentException("Expected Leaving status, got: " + member)
   }
 
   /**
-   * Member status changed to Exiting. Only published after convergence.
+   * Member status changed to Exiting.
+   * Only published after convergence, when all members have seen current
+   * state.
    */
   case class MemberExited(member: Member) extends MemberEvent {
     if (member.status != Exiting) throw new IllegalArgumentException("Expected Exiting status, got: " + member)
   }
 
   /**
-   * Member status changed to Down. Only published after convergence.
+   * Member status changed to Down.
+   * Only published after convergence, when all members have seen current
+   * state.
    */
   case class MemberDowned(member: Member) extends MemberEvent {
     if (member.status != Down) throw new IllegalArgumentException("Expected Down status, got: " + member)
   }
 
   /**
-   * Member completely removed from the cluster. Only published after convergence.
+   * Member completely removed from the cluster. Only published after convergence,
+   * when all other members have seen the state.
    */
   case class MemberRemoved(member: Member) extends MemberEvent {
     if (member.status != Removed) throw new IllegalArgumentException("Expected Removed status, got: " + member)
   }
 
+  /**
+   * Current snapshot state of the cluster. Sent to new subscriber of
+   * [akka.cluster.ClusterEvent.InstantMemberEvent].
+   */
+  case class InstantClusterState(members: immutable.SortedSet[Member] = immutable.SortedSet.empty)
+    extends ClusterDomainEvent {
+
+    /**
+     * Java API
+     * Read only
+     */
+    def getMembers: java.lang.Iterable[Member] = {
+      import scala.collection.JavaConverters._
+      members.asJava
+    }
+  }
+
+  /**
+   * Marker interface for membership events published immediately.
+   * All other members might not have seen the state.
+   */
+  sealed trait InstantMemberEvent extends ClusterDomainEvent {
+    def member: Member
+  }
+
+  /**
+   * A new member joined the cluster. Published immediately when it happened.
+   * All other members might not have seen the state.
+   */
+  case class InstantMemberJoined(member: Member) extends InstantMemberEvent {
+    if (member.status != Joining) throw new IllegalArgumentException("Expected Joining status, got: " + member)
+  }
+
+  /**
+   * Member status changed to Up. Published immediately when it happened.
+   * All other members might not have seen the state.
+   */
+  case class InstantMemberUp(member: Member) extends InstantMemberEvent {
+    if (member.status != Up) throw new IllegalArgumentException("Expected Up status, got: " + member)
+  }
+
+  /**
+   * Member status changed to Leaving. Published immediately when it happened.
+   * All other members might not have seen the state.
+   */
+  case class InstantMemberLeft(member: Member) extends InstantMemberEvent {
+    if (member.status != Leaving) throw new IllegalArgumentException("Expected Leaving status, got: " + member)
+  }
+
+  /**
+   * Member status changed to Exiting. Published immediately when it happened.
+   * All other members might not have seen the state.
+   */
+  case class InstantMemberExited(member: Member) extends InstantMemberEvent {
+    if (member.status != Exiting) throw new IllegalArgumentException("Expected Exiting status, got: " + member)
+  }
+
+  /**
+   * Member status changed to Down. Published immediately when it happened.
+   * All other members might not have seen the state.
+   */
+  case class InstantMemberDowned(member: Member) extends InstantMemberEvent {
+    if (member.status != Down) throw new IllegalArgumentException("Expected Down status, got: " + member)
+  }
+
+  /**
+   * Member completely removed from the cluster. Published immediately when it happened.
+   * All other members might not have seen the state.
+   */
+  case class InstantMemberRemoved(member: Member) extends InstantMemberEvent {
+    if (member.status != Removed) throw new IllegalArgumentException("Expected Removed status, got: " + member)
+  }
+
   /**
    * Leader of the cluster members changed. Only published after convergence.
    */
@@ -209,6 +295,21 @@ object ClusterEvent {
         ++= removedEvents).result()
     }
 
+  /**
+   * INTERNAL API
+   */
+  private[cluster] def convertToInstantMemberEvents(memberEvents: immutable.Seq[MemberEvent]): immutable.Seq[InstantMemberEvent] =
+    memberEvents map { event ⇒
+      event match {
+        case MemberJoined(m)  ⇒ InstantMemberJoined(m)
+        case MemberUp(m)      ⇒ InstantMemberUp(m)
+        case MemberDowned(m)  ⇒ InstantMemberDowned(m)
+        case MemberLeft(m)    ⇒ InstantMemberLeft(m)
+        case MemberExited(m)  ⇒ InstantMemberExited(m)
+        case MemberRemoved(m) ⇒ InstantMemberRemoved(m)
+      }
+    }
+
   /**
    * INTERNAL API
    */
@@ -269,8 +370,21 @@ private[cluster] final class ClusterDomainEventPublisher extends Actor with Acto
     }
   }
 
+  def publishInstantClusterState(receiver: ActorRef): Unit = {
+    // The state is based on latest gossip to mimic what you
+    // would have seen if you where listening to the InstantMemberEvent stream.
+    receiver ! InstantClusterState(members = latestGossip.members)
+  }
+
   def subscribe(subscriber: ActorRef, to: Class[_]): Unit = {
-    publishCurrentClusterState(Some(subscriber))
+    if (classOf[ClusterDomainEvent] == to) {
+      publishInstantClusterState(subscriber)
+      publishCurrentClusterState(Some(subscriber))
+    } else if (classOf[InstantMemberEvent].isAssignableFrom(to))
+      publishInstantClusterState(subscriber)
+    else
+      publishCurrentClusterState(Some(subscriber))
+
     eventStream.subscribe(subscriber, to)
   }
 
@@ -285,8 +399,10 @@ private[cluster] final class ClusterDomainEventPublisher extends Actor with Acto
     latestGossip = newGossip
     // first publish the diffUnreachable between the last two gossips
     diffUnreachable(oldGossip, newGossip) foreach publish
+    val newMemberEvents = diffMemberEvents(oldGossip, newGossip)
+    convertToInstantMemberEvents(newMemberEvents) foreach publish
     // buffer up the MemberEvents waiting for convergence
-    memberEvents ++= diffMemberEvents(oldGossip, newGossip)
+    memberEvents ++= newMemberEvents
     // if we have convergence then publish the MemberEvents and possibly a LeaderChanged
     if (newGossip.convergence) {
       val previousConvergedGossip = latestConvergedGossip
diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterReadView.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterReadView.scala
index ce57413287..571148af41 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterReadView.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/ClusterReadView.scala
@@ -59,10 +59,11 @@ private[akka] class ClusterReadView(cluster: Cluster) extends Closeable {
           case event: MemberEvent ⇒
             // replace current member with new member (might have different status, only address is used in equals)
             state = state.copy(members = state.members - event.member + event.member)
-          case LeaderChanged(leader)        ⇒ state = state.copy(leader = leader)
-          case s: CurrentClusterState       ⇒ state = s
-          case CurrentInternalStats(stats)  ⇒ _latestStats = stats
-          case ClusterMetricsChanged(nodes) ⇒ _clusterMetrics = nodes
+          case LeaderChanged(leader)                          ⇒ state = state.copy(leader = leader)
+          case s: CurrentClusterState                         ⇒ state = s
+          case CurrentInternalStats(stats)                    ⇒ _latestStats = stats
+          case ClusterMetricsChanged(nodes)                   ⇒ _clusterMetrics = nodes
+          case _: InstantClusterState | _: InstantMemberEvent ⇒ // not used here
         }
       }
     }).withDispatcher(cluster.settings.UseDispatcher), name = "clusterEventBusListener")
diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterDomainEventPublisherSpec.scala b/akka-cluster/src/test/scala/akka/cluster/ClusterDomainEventPublisherSpec.scala
index 12951447fe..2323dd4620 100644
--- a/akka-cluster/src/test/scala/akka/cluster/ClusterDomainEventPublisherSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/ClusterDomainEventPublisherSpec.scala
@@ -36,16 +36,18 @@ class ClusterDomainEventPublisherSpec extends AkkaSpec
   val g4 = Gossip(members = SortedSet(d1, a1, b1, c2)).seen(a1.address)
   val g5 = Gossip(members = SortedSet(d1, a1, b1, c2)).seen(a1.address).seen(b1.address).seen(c2.address).seen(d1.address)
 
-  override def atStartup(): Unit = {
-    system.eventStream.subscribe(testActor, classOf[ClusterDomainEvent])
-  }
+  // created in beforeEach
+  var memberSubscriber: TestProbe = _
 
   override def beforeEach(): Unit = {
+    memberSubscriber = TestProbe()
+    system.eventStream.subscribe(memberSubscriber.ref, classOf[MemberEvent])
+    system.eventStream.subscribe(memberSubscriber.ref, classOf[LeaderChanged])
+
     publisher = system.actorOf(Props[ClusterDomainEventPublisher])
     publisher ! PublishChanges(g0)
-    expectMsg(MemberUp(a1))
-    expectMsg(LeaderChanged(Some(a1.address)))
-    expectMsgType[SeenChanged]
+    memberSubscriber.expectMsg(MemberUp(a1))
+    memberSubscriber.expectMsg(LeaderChanged(Some(a1.address)))
   }
 
   override def afterEach(): Unit = {
@@ -56,94 +58,114 @@ class ClusterDomainEventPublisherSpec extends AkkaSpec
 
     "not publish MemberUp when there is no convergence" in {
       publisher ! PublishChanges(g2)
-      expectMsgType[SeenChanged]
     }
 
     "publish MemberEvents when there is convergence" in {
       publisher ! PublishChanges(g2)
-      expectMsgType[SeenChanged]
       publisher ! PublishChanges(g3)
-      expectMsg(MemberUp(b1))
-      expectMsg(MemberUp(c2))
-      expectMsgType[SeenChanged]
+      memberSubscriber.expectMsg(MemberUp(b1))
+      memberSubscriber.expectMsg(MemberUp(c2))
     }
 
     "publish leader changed when new leader after convergence" in {
       publisher ! PublishChanges(g4)
-      expectMsgType[SeenChanged]
-      expectNoMsg(1 second)
+      memberSubscriber.expectNoMsg(1 second)
 
       publisher ! PublishChanges(g5)
-      expectMsg(MemberUp(d1))
-      expectMsg(MemberUp(b1))
-      expectMsg(MemberUp(c2))
-      expectMsg(LeaderChanged(Some(d1.address)))
-      expectMsgType[SeenChanged]
+      memberSubscriber.expectMsg(MemberUp(d1))
+      memberSubscriber.expectMsg(MemberUp(b1))
+      memberSubscriber.expectMsg(MemberUp(c2))
+      memberSubscriber.expectMsg(LeaderChanged(Some(d1.address)))
     }
 
     "publish leader changed when new leader and convergence both before and after" in {
       // convergence both before and after
       publisher ! PublishChanges(g3)
-      expectMsg(MemberUp(b1))
-      expectMsg(MemberUp(c2))
-      expectMsgType[SeenChanged]
+      memberSubscriber.expectMsg(MemberUp(b1))
+      memberSubscriber.expectMsg(MemberUp(c2))
       publisher ! PublishChanges(g5)
-      expectMsg(MemberUp(d1))
-      expectMsg(LeaderChanged(Some(d1.address)))
-      expectMsgType[SeenChanged]
+      memberSubscriber.expectMsg(MemberUp(d1))
+      memberSubscriber.expectMsg(LeaderChanged(Some(d1.address)))
     }
 
     "not publish leader changed when not convergence" in {
       publisher ! PublishChanges(g4)
-      expectMsgType[SeenChanged]
-      expectNoMsg(1 second)
+      memberSubscriber.expectNoMsg(1 second)
     }
 
     "not publish leader changed when changed convergence but still same leader" in {
       publisher ! PublishChanges(g5)
-      expectMsg(MemberUp(d1))
-      expectMsg(MemberUp(b1))
-      expectMsg(MemberUp(c2))
-      expectMsg(LeaderChanged(Some(d1.address)))
-      expectMsgType[SeenChanged]
+      memberSubscriber.expectMsg(MemberUp(d1))
+      memberSubscriber.expectMsg(MemberUp(b1))
+      memberSubscriber.expectMsg(MemberUp(c2))
+      memberSubscriber.expectMsg(LeaderChanged(Some(d1.address)))
 
       publisher ! PublishChanges(g4)
-      expectMsgType[SeenChanged]
+      memberSubscriber.expectNoMsg(1 second)
 
       publisher ! PublishChanges(g5)
-      expectMsgType[SeenChanged]
+      memberSubscriber.expectNoMsg(1 second)
     }
 
     "send CurrentClusterState when subscribe" in {
       val subscriber = TestProbe()
       publisher ! Subscribe(subscriber.ref, classOf[ClusterDomainEvent])
+      subscriber.expectMsgType[InstantClusterState]
       subscriber.expectMsgType[CurrentClusterState]
       // but only to the new subscriber
-      expectNoMsg(1 second)
+      memberSubscriber.expectNoMsg(1 second)
     }
 
     "support unsubscribe" in {
       val subscriber = TestProbe()
-      publisher ! Subscribe(subscriber.ref, classOf[ClusterDomainEvent])
+      publisher ! Subscribe(subscriber.ref, classOf[MemberEvent])
       subscriber.expectMsgType[CurrentClusterState]
-      publisher ! Unsubscribe(subscriber.ref, Some(classOf[ClusterDomainEvent]))
+      publisher ! Unsubscribe(subscriber.ref, Some(classOf[MemberEvent]))
       publisher ! PublishChanges(g3)
       subscriber.expectNoMsg(1 second)
-      // but testActor is still subscriber
-      expectMsg(MemberUp(b1))
-      expectMsg(MemberUp(c2))
-      expectMsgType[SeenChanged]
+      // but memberSubscriber is still subscriber
+      memberSubscriber.expectMsg(MemberUp(b1))
+      memberSubscriber.expectMsg(MemberUp(c2))
     }
 
     "publish clean state when PublishStart" in {
+      val subscriber = TestProbe()
+      publisher ! Subscribe(subscriber.ref, classOf[ClusterDomainEvent])
+      subscriber.expectMsgType[InstantClusterState]
+      subscriber.expectMsgType[CurrentClusterState]
       publisher ! PublishChanges(g3)
-      expectMsg(MemberUp(b1))
-      expectMsg(MemberUp(c2))
-      expectMsgType[SeenChanged]
+      subscriber.expectMsg(InstantMemberUp(b1))
+      subscriber.expectMsg(InstantMemberUp(c2))
+      subscriber.expectMsg(MemberUp(b1))
+      subscriber.expectMsg(MemberUp(c2))
+      subscriber.expectMsgType[SeenChanged]
 
       publisher ! PublishStart
-      expectMsgType[CurrentClusterState] must be(CurrentClusterState())
+      subscriber.expectMsgType[CurrentClusterState] must be(CurrentClusterState())
+    }
 
+    "publish immediately when subscribing to InstantMemberEvent" in {
+      val subscriber = TestProbe()
+      publisher ! Subscribe(subscriber.ref, classOf[InstantMemberEvent])
+      subscriber.expectMsgType[InstantClusterState]
+      publisher ! PublishChanges(g2)
+      subscriber.expectMsg(InstantMemberUp(b1))
+      subscriber.expectMsg(InstantMemberUp(c2))
+      subscriber.expectNoMsg(1 second)
+      publisher ! PublishChanges(g3)
+      subscriber.expectNoMsg(1 second)
+    }
+
+    "publish SeenChanged" in {
+      val subscriber = TestProbe()
+      publisher ! Subscribe(subscriber.ref, classOf[SeenChanged])
+      subscriber.expectMsgType[CurrentClusterState]
+      publisher ! PublishChanges(g2)
+      subscriber.expectMsgType[SeenChanged]
+      subscriber.expectNoMsg(1 second)
+      publisher ! PublishChanges(g3)
+      subscriber.expectMsgType[SeenChanged]
+      subscriber.expectNoMsg(1 second)
     }
 
   }
diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterSpec.scala b/akka-cluster/src/test/scala/akka/cluster/ClusterSpec.scala
index 7d766bf17e..55c35ea6e3 100644
--- a/akka-cluster/src/test/scala/akka/cluster/ClusterSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/ClusterSpec.scala
@@ -76,10 +76,11 @@ class ClusterSpec extends AkkaSpec(ClusterSpec.config) with ImplicitSender {
       try {
         cluster.subscribe(testActor, classOf[ClusterEvent.ClusterDomainEvent])
         // first, is in response to the subscription
-        expectMsgClass(classOf[ClusterEvent.ClusterDomainEvent])
+        expectMsgClass(classOf[ClusterEvent.InstantClusterState])
+        expectMsgClass(classOf[ClusterEvent.CurrentClusterState])
 
         cluster.publishCurrentClusterState()
-        expectMsgClass(classOf[ClusterEvent.ClusterDomainEvent])
+        expectMsgClass(classOf[ClusterEvent.CurrentClusterState])
       } finally {
         cluster.unsubscribe(testActor)
       }
@@ -87,7 +88,7 @@ class ClusterSpec extends AkkaSpec(ClusterSpec.config) with ImplicitSender {
 
     "send CurrentClusterState to one receiver when requested" in {
       cluster.sendCurrentClusterState(testActor)
-      expectMsgClass(classOf[ClusterEvent.ClusterDomainEvent])
+      expectMsgClass(classOf[ClusterEvent.CurrentClusterState])
     }
 
   }
diff --git a/akka-docs/rst/cluster/cluster-usage-java.rst b/akka-docs/rst/cluster/cluster-usage-java.rst
index 0b418350b2..c9c158cc03 100644
--- a/akka-docs/rst/cluster/cluster-usage-java.rst
+++ b/akka-docs/rst/cluster/cluster-usage-java.rst
@@ -89,7 +89,7 @@ and becomes a member of the cluster. It's status changed to 'Up'.
 
 Switch over to the first terminal window and see in the log output that the member joined.
 
-6. Start another node. Open a sbt session in yet another terminal window and run::
+6. Start another node. Open a maven session in yet another terminal window and run::
 
     mvn exec:java -Dexec.mainClass="sample.cluster.simple.japi.SimpleClusterApp"
 

From 79303a17850a56c7680d4e163f799e51292d0c4f Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Mon, 14 Jan 2013 19:32:52 +0100
Subject: [PATCH 048/122] Incorparate review comments, see #2803

---
 .../scala/akka/cluster/ClusterEvent.scala     | 43 +++++++++----------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterEvent.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterEvent.scala
index f804f1f5ac..509536b3d8 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterEvent.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/ClusterEvent.scala
@@ -147,8 +147,8 @@ object ClusterEvent {
   }
 
   /**
-   * Marker interface for membership events published immediately.
-   * All other members might not have seen the state.
+   * Marker interface for membership events published immediately  when
+   * it happened. All other members might not have seen the state.
    */
   sealed trait InstantMemberEvent extends ClusterDomainEvent {
     def member: Member
@@ -299,15 +299,13 @@ object ClusterEvent {
    * INTERNAL API
    */
   private[cluster] def convertToInstantMemberEvents(memberEvents: immutable.Seq[MemberEvent]): immutable.Seq[InstantMemberEvent] =
-    memberEvents map { event ⇒
-      event match {
-        case MemberJoined(m)  ⇒ InstantMemberJoined(m)
-        case MemberUp(m)      ⇒ InstantMemberUp(m)
-        case MemberDowned(m)  ⇒ InstantMemberDowned(m)
-        case MemberLeft(m)    ⇒ InstantMemberLeft(m)
-        case MemberExited(m)  ⇒ InstantMemberExited(m)
-        case MemberRemoved(m) ⇒ InstantMemberRemoved(m)
-      }
+    memberEvents map {
+      case MemberJoined(m)  ⇒ InstantMemberJoined(m)
+      case MemberUp(m)      ⇒ InstantMemberUp(m)
+      case MemberDowned(m)  ⇒ InstantMemberDowned(m)
+      case MemberLeft(m)    ⇒ InstantMemberLeft(m)
+      case MemberExited(m)  ⇒ InstantMemberExited(m)
+      case MemberRemoved(m) ⇒ InstantMemberRemoved(m)
     }
 
   /**
@@ -356,9 +354,11 @@ private[cluster] final class ClusterDomainEventPublisher extends Actor with Acto
 
   def eventStream: EventStream = context.system.eventStream
 
+  /**
+   * The current snapshot state that is a mix of converged and latest gossip
+   * to mimic what you would have seen if you where listening to the events.
+   */
   def publishCurrentClusterState(receiver: Option[ActorRef]): Unit = {
-    // The state is a mix of converged and latest gossip to mimic what you
-    // would have seen if you where listening to the events.
     val state = CurrentClusterState(
       members = latestConvergedGossip.members,
       unreachable = latestGossip.overview.unreachable,
@@ -370,19 +370,18 @@ private[cluster] final class ClusterDomainEventPublisher extends Actor with Acto
     }
   }
 
-  def publishInstantClusterState(receiver: ActorRef): Unit = {
-    // The state is based on latest gossip to mimic what you
-    // would have seen if you where listening to the InstantMemberEvent stream.
+  /**
+   * Publish the snapshot state that is based on latest gossip to mimic what you
+   * would have seen if you where listening to the InstantMemberEvent stream.
+   */
+  def publishInstantClusterState(receiver: ActorRef): Unit =
     receiver ! InstantClusterState(members = latestGossip.members)
-  }
 
   def subscribe(subscriber: ActorRef, to: Class[_]): Unit = {
-    if (classOf[ClusterDomainEvent] == to) {
+    val isInstantMemberEvent = classOf[InstantMemberEvent].isAssignableFrom(to)
+    if (classOf[ClusterDomainEvent] == to || isInstantMemberEvent)
       publishInstantClusterState(subscriber)
-      publishCurrentClusterState(Some(subscriber))
-    } else if (classOf[InstantMemberEvent].isAssignableFrom(to))
-      publishInstantClusterState(subscriber)
-    else
+    if (!isInstantMemberEvent)
       publishCurrentClusterState(Some(subscriber))
 
     eventStream.subscribe(subscriber, to)

From 4f3469ed477dc4ab9e798542b5a6114f7b398e18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Endre=20S=C3=A1ndor=20Varga?= <vendre@hit.bme.hu>
Date: Mon, 14 Jan 2013 10:04:49 +0100
Subject: [PATCH 049/122]  Fixed problems handling passive connections in
 Remoting #2878

- Fixed potential race in EndpointWrite when TakeOff is processed
- Reenabled accidentally disabled gremlin due to changed defaults
- Fixed EndpointRegistry incorrectly handling passive connections
---
 .../src/main/scala/akka/remote/Endpoint.scala |  24 +-
 .../src/main/scala/akka/remote/Remoting.scala | 220 +++++++++---------
 .../akka/remote/EndpointRegistrySpec.scala    | 127 ++++++++++
 .../transport/AkkaProtocolStressTest.scala    |  16 +-
 4 files changed, 271 insertions(+), 116 deletions(-)
 create mode 100644 akka-remote/src/test/scala/akka/remote/EndpointRegistrySpec.scala

diff --git a/akka-remote/src/main/scala/akka/remote/Endpoint.scala b/akka-remote/src/main/scala/akka/remote/Endpoint.scala
index 798819a4d4..3e33633daa 100644
--- a/akka-remote/src/main/scala/akka/remote/Endpoint.scala
+++ b/akka-remote/src/main/scala/akka/remote/Endpoint.scala
@@ -108,6 +108,7 @@ private[remote] object EndpointWriter {
   case object Initializing extends State
   case object Buffering extends State
   case object Writing extends State
+  case object Handoff extends State
 }
 
 private[remote] class EndpointException(msg: String, cause: Throwable) extends AkkaException(msg, cause) with OnlyCauseStackTrace {
@@ -139,7 +140,7 @@ private[remote] class EndpointWriter(
 
   val msgDispatch = new DefaultMessageDispatcher(extendedSystem, RARP(extendedSystem).provider, log)
 
-  def inbound = handle.isDefined
+  var inbound = handle.isDefined
 
   private def publishAndThrow(reason: Throwable): Nothing = {
     try
@@ -150,6 +151,7 @@ private[remote] class EndpointWriter(
 
   override def postRestart(reason: Throwable): Unit = {
     handle = None // Wipe out the possibly injected handle
+    inbound = false
     preStart()
   }
 
@@ -210,16 +212,28 @@ private[remote] class EndpointWriter(
       }
   }
 
+  when(Handoff) {
+    case Event(Terminated(_), _) ⇒
+      reader = startReadEndpoint(handle.get)
+      unstashAll()
+      goto(Writing)
+
+    case Event(Send(msg, senderOption, recipient), _) ⇒
+      stash()
+      stay()
+
+    // TakeOver messages are not handled here but inside the whenUnhandled block, because the procedure is exactly the
+    // same. Any outstanding
+  }
+
   whenUnhandled {
     case Event(Terminated(r), _) if Some(r) == reader ⇒ publishAndThrow(new EndpointException("Disassociated"))
     case Event(TakeOver(newHandle), _) ⇒
       // Shutdown old reader
       handle foreach { _.disassociate() }
-      reader foreach { r ⇒ context stop context.unwatch(r) }
+      reader foreach context.stop
       handle = Some(newHandle)
-      reader = startReadEndpoint(newHandle)
-      unstashAll()
-      goto(Writing)
+      goto(Handoff)
   }
 
   onTransition {
diff --git a/akka-remote/src/main/scala/akka/remote/Remoting.scala b/akka-remote/src/main/scala/akka/remote/Remoting.scala
index 595b348cbe..32479cec52 100644
--- a/akka-remote/src/main/scala/akka/remote/Remoting.scala
+++ b/akka-remote/src/main/scala/akka/remote/Remoting.scala
@@ -37,7 +37,7 @@ class RemotingSettings(val config: Config) {
 
   val StartupTimeout: Timeout = Timeout(Duration(getMilliseconds("akka.remoting.startup-timeout"), MILLISECONDS))
 
-  val RetryGateClosedFor: Long = getNanoseconds("akka.remoting.retry-gate-closed-for")
+  val RetryGateClosedFor: FiniteDuration = Duration(getMilliseconds("akka.remoting.retry-gate-closed-for"), MILLISECONDS)
 
   val UsePassiveConnections: Boolean = getBoolean("akka.remoting.use-passive-connections")
 
@@ -92,7 +92,7 @@ private[remote] object Remoting {
         responsibleTransports.size match {
           case 0 ⇒
             throw new RemoteTransportException(
-              s"No transport is responsible for address: ${remote} although protocol ${remote.protocol} is available." +
+              s"No transport is responsible for address: $remote although protocol ${remote.protocol} is available." +
                 " Make sure at least one transport is configured to be responsible for the address.",
               null)
 
@@ -101,7 +101,7 @@ private[remote] object Remoting {
 
           case _ ⇒
             throw new RemoteTransportException(
-              s"Multiple transports are available for [${remote}]: [${responsibleTransports.mkString(",")}]. " +
+              s"Multiple transports are available for [$remote]: [${responsibleTransports.mkString(",")}]. " +
                 "Remoting cannot decide which transport to use to reach the remote system. Change your configuration " +
                 "so that only one transport is responsible for the address.",
               null)
@@ -270,73 +270,93 @@ private[remote] object EndpointManager {
   case class ListensResult(addressesPromise: Promise[Seq[(Transport, Address)]],
                            results: Seq[(Transport, Address, Promise[AssociationEventListener])])
 
-  sealed trait EndpointPolicy
-  case class Pass(endpoint: ActorRef) extends EndpointPolicy
-  case class Gated(timeOfFailure: Long) extends EndpointPolicy
-  case class Quarantined(reason: Throwable) extends EndpointPolicy
+  sealed trait EndpointPolicy {
+
+    /**
+     * Indicates that the policy does not contain an active endpoint, but it is a tombstone of a previous failure
+     */
+    def isTombstone: Boolean
+  }
+  case class Pass(endpoint: ActorRef) extends EndpointPolicy {
+    override def isTombstone: Boolean = false
+  }
+  case class Gated(timeOfRelease: Deadline) extends EndpointPolicy {
+    override def isTombstone: Boolean = true
+  }
+  case class Quarantined(reason: Throwable) extends EndpointPolicy {
+    override def isTombstone: Boolean = true
+  }
 
   // Not threadsafe -- only to be used in HeadActor
-  private[EndpointManager] class EndpointRegistry {
-    private var addressToEndpointAndPolicy = HashMap[Address, EndpointPolicy]()
-    private var endpointToAddress = HashMap[ActorRef, Address]()
-    private var addressToPassive = HashMap[Address, ActorRef]()
+  class EndpointRegistry {
+    private var addressToWritable = HashMap[Address, EndpointPolicy]()
+    private var writableToAddress = HashMap[ActorRef, Address]()
+    private var addressToReadonly = HashMap[Address, ActorRef]()
+    private var readonlyToAddress = HashMap[ActorRef, Address]()
 
-    def getEndpointWithPolicy(address: Address): Option[EndpointPolicy] = addressToEndpointAndPolicy.get(address)
+    def registerWritableEndpoint(address: Address, endpoint: ActorRef): ActorRef = addressToWritable.get(address) match {
+      case Some(Pass(e)) ⇒
+        throw new IllegalArgumentException(s"Attempting to overwrite existing endpoint $e with $endpoint")
+      case _ ⇒
+        addressToWritable += address -> Pass(endpoint)
+        writableToAddress += endpoint -> address
+        endpoint
+    }
 
-    def hasActiveEndpointFor(address: Address): Boolean = addressToEndpointAndPolicy.get(address) match {
+    def registerReadOnlyEndpoint(address: Address, endpoint: ActorRef): ActorRef = {
+      addressToReadonly += address -> endpoint
+      readonlyToAddress += endpoint -> address
+      endpoint
+    }
+
+    def unregisterEndpoint(endpoint: ActorRef): Unit = if (isWritable(endpoint)) {
+      val address = writableToAddress(endpoint)
+      addressToWritable.get(address) match {
+        case Some(policy) if policy.isTombstone ⇒ // There is already a tombstone directive, leave it there
+        case _                                  ⇒ addressToWritable -= address
+      }
+      writableToAddress -= endpoint
+    } else if (isReadOnly(endpoint)) {
+      addressToReadonly -= readonlyToAddress(endpoint)
+      readonlyToAddress -= endpoint
+    }
+
+    def writableEndpointWithPolicyFor(address: Address): Option[EndpointPolicy] = addressToWritable.get(address)
+
+    def hasWritableEndpointFor(address: Address): Boolean = writableEndpointWithPolicyFor(address) match {
       case Some(Pass(_)) ⇒ true
       case _             ⇒ false
     }
 
-    def passiveEndpointFor(address: Address): Option[ActorRef] = addressToPassive.get(address)
+    def readOnlyEndpointFor(address: Address): Option[ActorRef] = addressToReadonly.get(address)
 
-    def isQuarantined(address: Address): Boolean = addressToEndpointAndPolicy.get(address) match {
+    def isWritable(endpoint: ActorRef): Boolean = writableToAddress contains endpoint
+
+    def isReadOnly(endpoint: ActorRef): Boolean = readonlyToAddress contains endpoint
+
+    def isQuarantined(address: Address): Boolean = writableEndpointWithPolicyFor(address) match {
       case Some(Quarantined(_)) ⇒ true
       case _                    ⇒ false
     }
 
-    def prune(pruneAge: Long): Unit = {
-      addressToEndpointAndPolicy = addressToEndpointAndPolicy.filter {
-        case (_, Gated(timeOfFailure)) ⇒ timeOfFailure + pruneAge > System.nanoTime()
+    def markAsFailed(endpoint: ActorRef, timeOfRelease: Deadline): Unit = if (isWritable(endpoint)) {
+      addressToWritable += writableToAddress(endpoint) -> Gated(timeOfRelease)
+      writableToAddress -= endpoint
+    } else if (isReadOnly(endpoint)) {
+      addressToReadonly -= readonlyToAddress(endpoint)
+      readonlyToAddress -= endpoint
+    }
+
+    def markAsQuarantined(address: Address, reason: Throwable): Unit = addressToWritable += address -> Quarantined(reason)
+
+    def allEndpoints: collection.Iterable[ActorRef] = writableToAddress.keys ++ readonlyToAddress.keys
+
+    def pruneGatedEntries(): Unit = {
+      addressToWritable = addressToWritable.filter {
+        case (_, Gated(timeOfRelease)) ⇒ timeOfRelease.hasTimeLeft
         case _                         ⇒ true
       }
     }
-
-    def registerActiveEndpoint(address: Address, endpoint: ActorRef): ActorRef = {
-      addressToEndpointAndPolicy = addressToEndpointAndPolicy + (address -> Pass(endpoint))
-      endpointToAddress = endpointToAddress + (endpoint -> address)
-      endpoint
-    }
-
-    def registerPassiveEndpoint(address: Address, endpoint: ActorRef): ActorRef = {
-      addressToPassive = addressToPassive + (address -> endpoint)
-      endpointToAddress = endpointToAddress + (endpoint -> address)
-      endpoint
-    }
-
-    def isPassive(endpoint: ActorRef): Boolean = addressToPassive.contains(endpointToAddress(endpoint))
-
-    def markFailed(endpoint: ActorRef, timeOfFailure: Long): Unit = {
-      addressToEndpointAndPolicy += endpointToAddress(endpoint) -> Gated(timeOfFailure)
-      if (!isPassive(endpoint)) endpointToAddress = endpointToAddress - endpoint
-    }
-
-    def markQuarantine(address: Address, reason: Throwable): Unit =
-      addressToEndpointAndPolicy += address -> Quarantined(reason)
-
-    def removeIfNotGated(endpoint: ActorRef): Unit = {
-      endpointToAddress.get(endpoint) foreach { address ⇒
-        addressToEndpointAndPolicy.get(address) foreach {
-          case Pass(_) ⇒ addressToEndpointAndPolicy = addressToEndpointAndPolicy - address
-          case _       ⇒
-        }
-
-        endpointToAddress = endpointToAddress - endpoint
-        addressToPassive = addressToPassive - address
-      }
-    }
-
-    def allEndpoints: Iterable[ActorRef] = endpointToAddress.keys
   }
 }
 
@@ -357,26 +377,27 @@ private[remote] class EndpointManager(conf: Config, log: LoggingAdapter) extends
   // Mapping between transports and the local addresses they listen to
   var transportMapping: Map[Address, Transport] = Map()
 
-  def retryGateEnabled = settings.RetryGateClosedFor > 0L
-  val pruneInterval: Long = if (retryGateEnabled) settings.RetryGateClosedFor * 2L else 0L
+  def retryGateEnabled = settings.RetryGateClosedFor > Duration.Zero
+  val pruneInterval: FiniteDuration = if (retryGateEnabled) settings.RetryGateClosedFor * 2 else Duration.Zero
   val pruneTimerCancellable: Option[Cancellable] = if (retryGateEnabled)
-    Some(context.system.scheduler.schedule(pruneInterval milliseconds, pruneInterval milliseconds, self, Prune))
+    Some(context.system.scheduler.schedule(pruneInterval, pruneInterval, self, Prune))
   else None
 
   override val supervisorStrategy = OneForOneStrategy(settings.MaximumRetriesInWindow, settings.RetryWindow) {
     case InvalidAssociation(localAddress, remoteAddress, e) ⇒
-      endpoints.markQuarantine(remoteAddress, e)
+      endpoints.markAsQuarantined(remoteAddress, e)
       Stop
 
     case NonFatal(e) ⇒
-      if (!retryGateEnabled)
+      // Retrying immediately if the retry gate is disabled, and it is an endpoint used for writing.
+      if (!retryGateEnabled && endpoints.isWritable(sender)) {
         // This strategy keeps all the messages in the stash of the endpoint so restart will transfer the queue
         // to the restarted endpoint -- thus no messages are lost
         Restart
-      else {
+      } else {
         // This strategy throws away all the messages enqueued in the endpoint (in its stash), registers the time of failure,
         // keeps throwing away messages until the retry gate becomes open (time specified in RetryGateClosedFor)
-        endpoints.markFailed(sender, System.nanoTime())
+        endpoints.markAsFailed(sender, Deadline.now + settings.RetryGateClosedFor)
         Stop
       }
   }
@@ -418,51 +439,48 @@ private[remote] class EndpointManager(conf: Config, log: LoggingAdapter) extends
     case s @ Send(message, senderOption, recipientRef) ⇒
       val recipientAddress = recipientRef.path.address
 
-      endpoints.getEndpointWithPolicy(recipientAddress) match {
-        case Some(Pass(endpoint)) ⇒ endpoint ! s
-        case Some(Gated(timeOfFailure)) ⇒ if (retryGateOpen(timeOfFailure)) {
-          val endpoint = createEndpoint(
-            recipientAddress,
-            recipientRef.localAddressToUse,
-            transportMapping(recipientRef.localAddressToUse),
-            settings,
-            None)
-          endpoints.registerActiveEndpoint(recipientAddress, endpoint)
+      def createAndRegisterWritingEndpoint(): ActorRef = endpoints.registerWritableEndpoint(recipientAddress, createEndpoint(
+        recipientAddress,
+        recipientRef.localAddressToUse,
+        transportMapping(recipientRef.localAddressToUse),
+        settings,
+        None))
+
+      endpoints.writableEndpointWithPolicyFor(recipientAddress) match {
+        case Some(Pass(endpoint)) ⇒
           endpoint ! s
-        } else forwardToDeadLetters(s)
-        case Some(Quarantined(_)) ⇒ forwardToDeadLetters(s)
+        case Some(Gated(timeOfRelease)) ⇒
+          if (timeOfRelease.isOverdue()) createAndRegisterWritingEndpoint() ! s
+          else forwardToDeadLetters(s)
+        case Some(Quarantined(_)) ⇒
+          forwardToDeadLetters(s)
         case None ⇒
-          val endpoint = createEndpoint(
-            recipientAddress,
-            recipientRef.localAddressToUse,
-            transportMapping(recipientRef.localAddressToUse),
-            settings,
-            None)
-          endpoints.registerActiveEndpoint(recipientAddress, endpoint)
-          endpoint ! s
+          createAndRegisterWritingEndpoint() ! s
 
       }
 
-    case InboundAssociation(handle) ⇒ endpoints.passiveEndpointFor(handle.remoteAddress) match {
+    case InboundAssociation(handle) ⇒ endpoints.readOnlyEndpointFor(handle.remoteAddress) match {
       case Some(endpoint) ⇒ endpoint ! EndpointWriter.TakeOver(handle)
       case None ⇒
-        val endpoint = createEndpoint(
-          handle.remoteAddress,
-          handle.localAddress,
-          transportMapping(handle.localAddress),
-          settings,
-          Some(handle))
-        eventPublisher.notifyListeners(AssociatedEvent(handle.localAddress, handle.remoteAddress, true))
-        if (settings.UsePassiveConnections && !endpoints.hasActiveEndpointFor(handle.remoteAddress)) {
-          endpoints.registerActiveEndpoint(handle.remoteAddress, endpoint)
-        } else if (!endpoints.isQuarantined(handle.remoteAddress))
-          endpoints.registerPassiveEndpoint(handle.remoteAddress, endpoint)
-        else handle.disassociate()
+        if (endpoints.isQuarantined(handle.remoteAddress)) handle.disassociate()
+        else {
+          eventPublisher.notifyListeners(AssociatedEvent(handle.localAddress, handle.remoteAddress, true))
+          val endpoint = createEndpoint(
+            handle.remoteAddress,
+            handle.localAddress,
+            transportMapping(handle.localAddress),
+            settings,
+            Some(handle))
+          if (settings.UsePassiveConnections && !endpoints.hasWritableEndpointFor(handle.remoteAddress))
+            endpoints.registerWritableEndpoint(handle.remoteAddress, endpoint)
+          else
+            endpoints.registerReadOnlyEndpoint(handle.remoteAddress, endpoint)
+        }
     }
     case Terminated(endpoint) ⇒
-      endpoints.removeIfNotGated(endpoint)
+      endpoints.unregisterEndpoint(endpoint)
     case Prune ⇒
-      endpoints.prune(settings.RetryGateClosedFor)
+      endpoints.pruneGatedEntries()
     case ShutdownAndFlush ⇒
       // Shutdown all endpoints and signal to sender when ready (and whether all endpoints were shut down gracefully)
       val sys = context.system // Avoid closing over context
@@ -479,13 +497,7 @@ private[remote] class EndpointManager(conf: Config, log: LoggingAdapter) extends
     case Terminated(_)         ⇒ // why should we care now?
   }
 
-  private def forwardToDeadLetters(s: Send): Unit = {
-    val sender = s.senderOption match {
-      case Some(sender) ⇒ sender
-      case None         ⇒ extendedSystem.deadLetters
-    }
-    extendedSystem.deadLetters.tell(s.message, sender)
-  }
+  private def forwardToDeadLetters(s: Send): Unit = extendedSystem.deadLetters.tell(s.message, s.senderOption.orNull)
 
   private def listens: Future[Seq[(Transport, Address, Promise[AssociationEventListener])]] = {
     /*
@@ -553,8 +565,6 @@ private[remote] class EndpointManager(conf: Config, log: LoggingAdapter) extends
       "endpointWriter-" + AddressUrlEncoder(remoteAddress) + "-" + endpointId.next()))
   }
 
-  private def retryGateOpen(timeOfFailure: Long): Boolean = (timeOfFailure + settings.RetryGateClosedFor) < System.nanoTime()
-
   override def postStop(): Unit = {
     pruneTimerCancellable.foreach { _.cancel() }
     transportMapping.values foreach { transport ⇒
diff --git a/akka-remote/src/test/scala/akka/remote/EndpointRegistrySpec.scala b/akka-remote/src/test/scala/akka/remote/EndpointRegistrySpec.scala
new file mode 100644
index 0000000000..15f642c528
--- /dev/null
+++ b/akka-remote/src/test/scala/akka/remote/EndpointRegistrySpec.scala
@@ -0,0 +1,127 @@
+package akka.remote
+
+import akka.testkit.AkkaSpec
+import akka.actor.{ Props, ActorRef, Address }
+import akka.remote.EndpointManager._
+import scala.concurrent.duration._
+
+class EndpointRegistrySpec extends AkkaSpec {
+
+  val actorA = system.actorOf(Props.empty, "actorA")
+  val actorB = system.actorOf(Props.empty, "actorB")
+
+  val address1 = Address("test", "testsys1", "testhost1", 1234)
+  val address2 = Address("test", "testsys2", "testhost2", 1234)
+
+  "EndpointRegistry" must {
+
+    "be able to register a writable endpoint and policy" in {
+      val reg = new EndpointRegistry
+
+      reg.writableEndpointWithPolicyFor(address1) must be === None
+
+      reg.registerWritableEndpoint(address1, actorA) must be === actorA
+
+      reg.writableEndpointWithPolicyFor(address1) must be === Some(Pass(actorA))
+      reg.readOnlyEndpointFor(address1) must be === None
+      reg.isWritable(actorA) must be(true)
+      reg.isReadOnly(actorA) must be(false)
+
+      reg.isQuarantined(address1) must be(false)
+    }
+
+    "be able to register a read-only endpoint" in {
+      val reg = new EndpointRegistry
+      reg.readOnlyEndpointFor(address1) must be === None
+
+      reg.registerReadOnlyEndpoint(address1, actorA) must be === actorA
+
+      reg.readOnlyEndpointFor(address1) must be === Some(actorA)
+      reg.writableEndpointWithPolicyFor(address1) must be === None
+      reg.isWritable(actorA) must be(false)
+      reg.isReadOnly(actorA) must be(true)
+      reg.isQuarantined(address1) must be(false)
+    }
+
+    "be able to register a writable and a read-only endpoint correctly" in {
+      val reg = new EndpointRegistry
+      reg.readOnlyEndpointFor(address1) must be === None
+      reg.writableEndpointWithPolicyFor(address1) must be === None
+
+      reg.registerReadOnlyEndpoint(address1, actorA) must be === actorA
+      reg.registerWritableEndpoint(address1, actorB) must be === actorB
+
+      reg.readOnlyEndpointFor(address1) must be === Some(actorA)
+      reg.writableEndpointWithPolicyFor(address1) must be === Some(Pass(actorB))
+
+      reg.isWritable(actorA) must be(false)
+      reg.isWritable(actorB) must be(true)
+
+      reg.isReadOnly(actorA) must be(true)
+      reg.isReadOnly(actorB) must be(false)
+
+    }
+
+    "be able to register Gated policy for an address" in {
+      val reg = new EndpointRegistry
+
+      reg.writableEndpointWithPolicyFor(address1) must be === None
+      reg.registerWritableEndpoint(address1, actorA)
+      val deadline = Deadline.now
+      reg.markAsFailed(actorA, deadline)
+      reg.writableEndpointWithPolicyFor(address1) must be === Some(Gated(deadline))
+      reg.isReadOnly(actorA) must be(false)
+      reg.isWritable(actorA) must be(false)
+    }
+
+    "remove read-only endpoints if marked as failed" in {
+      val reg = new EndpointRegistry
+
+      reg.registerReadOnlyEndpoint(address1, actorA)
+      reg.markAsFailed(actorA, Deadline.now)
+      reg.readOnlyEndpointFor(address1) must be === None
+    }
+
+    "keep tombstones when removing an endpoint" in {
+      val reg = new EndpointRegistry
+
+      reg.registerWritableEndpoint(address1, actorA)
+      reg.registerWritableEndpoint(address2, actorB)
+      val deadline = Deadline.now
+      reg.markAsFailed(actorA, deadline)
+      reg.markAsQuarantined(address2, null)
+
+      reg.unregisterEndpoint(actorA)
+      reg.unregisterEndpoint(actorB)
+
+      reg.writableEndpointWithPolicyFor(address1) must be === Some(Gated(deadline))
+      reg.writableEndpointWithPolicyFor(address2) must be === Some(Quarantined(null))
+
+    }
+
+    "prune outdated Gated directives properly" in {
+      val reg = new EndpointRegistry
+
+      reg.registerWritableEndpoint(address1, actorA)
+      reg.registerWritableEndpoint(address2, actorB)
+      reg.markAsFailed(actorA, Deadline.now)
+      val farInTheFuture = Deadline.now + Duration(60, SECONDS)
+      reg.markAsFailed(actorB, farInTheFuture)
+      reg.pruneGatedEntries()
+
+      reg.writableEndpointWithPolicyFor(address1) must be === None
+      reg.writableEndpointWithPolicyFor(address2) must be === Some(Gated(farInTheFuture))
+    }
+
+    "be able to register Quarantined policy for an address" in {
+      val reg = new EndpointRegistry
+
+      reg.writableEndpointWithPolicyFor(address1) must be === None
+      reg.markAsQuarantined(address1, null)
+      reg.isQuarantined(address1) must be(true)
+      reg.writableEndpointWithPolicyFor(address1) must be === Some(Quarantined(null))
+    }
+
+  }
+
+}
diff --git a/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala b/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala
index 0d2dcb002e..aa6625ecc0 100644
--- a/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala
+++ b/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala
@@ -5,9 +5,10 @@ import com.typesafe.config.{ Config, ConfigFactory }
 import AkkaProtocolStressTest._
 import akka.actor._
 import scala.concurrent.duration._
-import akka.testkit.TestEvent
-import akka.testkit.EventFilter
-import akka.remote.EndpointException
+import akka.testkit._
+import akka.remote.{ RARP, EndpointException }
+import akka.remote.transport.FailureInjectorTransportAdapter.{ One, All, Drop }
+import scala.concurrent.Await
 
 object AkkaProtocolStressTest {
   val configA: Config = ConfigFactory parseString ("""
@@ -56,7 +57,7 @@ object AkkaProtocolStressTest {
             controller ! (maxSeq, losses)
           }
         } else {
-          controller ! "Received out of order message. Previous: ${maxSeq} Received: ${seq}"
+          controller ! s"Received out of order message. Previous: ${maxSeq} Received: ${seq}"
         }
     }
   }
@@ -72,14 +73,17 @@ class AkkaProtocolStressTest extends AkkaSpec(configA) with ImplicitSender with
     }
   }), "echo")
 
-  val rootB = RootActorPath(systemB.asInstanceOf[ExtendedActorSystem].provider.getDefaultAddress)
+  val addressB = systemB.asInstanceOf[ExtendedActorSystem].provider.getDefaultAddress
+  val rootB = RootActorPath(addressB)
   val here = system.actorFor(rootB / "user" / "echo")
 
   "AkkaProtocolTransport" must {
     "guarantee at-most-once delivery and message ordering despite packet loss" taggedAs TimingTest in {
+      Await.result(RARP(system).provider.transport.managementCommand(One(addressB, Drop(0.3, 0.3))), 3.seconds.dilated)
+
       val tester = system.actorOf(Props(new SequenceVerifier(here, self))) ! "start"
 
-      expectMsgPF(30.seconds) {
+      expectMsgPF(45.seconds) {
         case (received: Int, lost: Int) ⇒
           log.debug(s" ######## Received ${received - lost} messages from ${received} ########")
       }

From b08c331577e19e1e31c6b323ed149967810f4138 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Endre=20S=C3=A1ndor=20Varga?= <vendre@hit.bme.hu>
Date: Thu, 17 Jan 2013 12:17:19 +0100
Subject: [PATCH 050/122]  Fixed problems handling passive connections in
 Remoting #2878

- Fixed potential race in EndpointWrite when TakeOff is processed
- Reenabled accidentally disabled gremlin due to changed defaults
- Fixed EndpointRegistry incorrectly handling passive connections
---
 .../akka/remote/RemoteActorRefProvider.scala  |  10 -
 .../scala/akka/remote/RemoteTransport.scala   | 276 --------------
 .../src/main/scala/akka/remote/Remoting.scala |  11 -
 .../main/scala/akka/remote/netty/Client.scala | 339 ------------------
 .../remote/netty/NettyRemoteSupport.scala     | 335 -----------------
 .../main/scala/akka/remote/netty/Server.scala | 185 ----------
 .../scala/akka/remote/netty/Settings.scala    | 111 ------
 .../netty/NettySSLSupport.scala               |  21 +-
 .../transport/netty/NettyTransport.scala      |  25 +-
 .../akka/remote/NetworkFailureSpec.scala      |   1 -
 .../akka/remote/RemoteCommunicationSpec.scala | 159 --------
 .../scala/akka/remote/RemoteConfigSpec.scala  |  39 --
 .../remote/Ticket1978CommunicationSpec.scala  |  33 +-
 .../akka/remote/Ticket1978ConfigSpec.scala    |   2 +-
 14 files changed, 45 insertions(+), 1502 deletions(-)
 delete mode 100644 akka-remote/src/main/scala/akka/remote/netty/Client.scala
 delete mode 100644 akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
 delete mode 100644 akka-remote/src/main/scala/akka/remote/netty/Server.scala
 delete mode 100644 akka-remote/src/main/scala/akka/remote/netty/Settings.scala
 rename akka-remote/src/main/scala/akka/remote/{ => transport}/netty/NettySSLSupport.scala (99%)
 delete mode 100644 akka-remote/src/test/scala/akka/remote/RemoteCommunicationSpec.scala

diff --git a/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala b/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
index b0c27fb91c..b576ff68a3 100644
--- a/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
+++ b/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
@@ -156,16 +156,6 @@ class RemoteActorRefProvider(
     // this enables reception of remote requests
     transport.start()
 
-    val remoteClientLifeCycleHandler = system.systemActorOf(Props(new Actor {
-      def receive = {
-        case RemoteClientError(cause, remote, address) ⇒ remote.shutdownClientConnection(address)
-        case RemoteClientDisconnected(remote, address) ⇒ remote.shutdownClientConnection(address)
-        case _                                         ⇒ //ignore other
-      }
-    }), "RemoteClientLifeCycleListener")
-
-    system.eventStream.subscribe(remoteClientLifeCycleHandler, classOf[RemoteLifeCycleEvent])
-
   }
 
   def actorOf(system: ActorSystemImpl, props: Props, supervisor: InternalActorRef, path: ActorPath,
diff --git a/akka-remote/src/main/scala/akka/remote/RemoteTransport.scala b/akka-remote/src/main/scala/akka/remote/RemoteTransport.scala
index 0a580d84cf..0331402148 100644
--- a/akka-remote/src/main/scala/akka/remote/RemoteTransport.scala
+++ b/akka-remote/src/main/scala/akka/remote/RemoteTransport.scala
@@ -14,147 +14,6 @@ import akka.actor._
 import scala.collection.immutable
 import scala.concurrent.Future
 
-/**
- * Remote life-cycle events.
- */
-sealed trait RemoteLifeCycleEvent extends Serializable {
-  def logLevel: Logging.LogLevel
-}
-
-/**
- * Life-cycle events for RemoteClient.
- */
-trait RemoteClientLifeCycleEvent extends RemoteLifeCycleEvent {
-  def remoteAddress: Address
-  final def getRemoteAddress: Address = remoteAddress
-}
-
-/**
- * A RemoteClientError is a general error that is thrown within or from a RemoteClient
- */
-case class RemoteClientError(
-  @BeanProperty cause: Throwable,
-  @transient remote: RemoteTransport,
-  remoteAddress: Address) extends RemoteClientLifeCycleEvent {
-  override def logLevel: Logging.LogLevel = Logging.ErrorLevel
-  override def toString: String = "RemoteClientError@" + remoteAddress + ": Error[" + Logging.stackTraceFor(cause) + "]"
-}
-
-/**
- * RemoteClientDisconnected is published when a RemoteClient's connection is disconnected
- */
-case class RemoteClientDisconnected(
-  @transient @BeanProperty remote: RemoteTransport,
-  remoteAddress: Address) extends RemoteClientLifeCycleEvent {
-  override def logLevel: Logging.LogLevel = Logging.DebugLevel
-  override def toString: String = "RemoteClientDisconnected@" + remoteAddress
-}
-
-/**
- * RemoteClientConnected is published when a RemoteClient's connection is established
- */
-case class RemoteClientConnected(
-  @transient @BeanProperty remote: RemoteTransport,
-  remoteAddress: Address) extends RemoteClientLifeCycleEvent {
-  override def logLevel: Logging.LogLevel = Logging.DebugLevel
-  override def toString: String = "RemoteClientConnected@" + remoteAddress
-}
-
-/**
- * RemoteClientStarted is published when a RemoteClient has started up
- */
-case class RemoteClientStarted(
-  @transient @BeanProperty remote: RemoteTransport,
-  remoteAddress: Address) extends RemoteClientLifeCycleEvent {
-  override def logLevel: Logging.LogLevel = Logging.InfoLevel
-  override def toString: String = "RemoteClientStarted@" + remoteAddress
-}
-
-/**
- * RemoteClientShutdown is published when a RemoteClient has shut down
- */
-case class RemoteClientShutdown(
-  @transient @BeanProperty remote: RemoteTransport,
-  remoteAddress: Address) extends RemoteClientLifeCycleEvent {
-  override def logLevel: Logging.LogLevel = Logging.InfoLevel
-  override def toString: String = "RemoteClientShutdown@" + remoteAddress
-}
-
-/**
- *  Life-cycle events for RemoteServer.
- */
-trait RemoteServerLifeCycleEvent extends RemoteLifeCycleEvent
-
-/**
- * RemoteServerStarted is published when a local RemoteServer has started up
- */
-case class RemoteServerStarted(
-  @transient @BeanProperty remote: RemoteTransport) extends RemoteServerLifeCycleEvent {
-  override def logLevel: Logging.LogLevel = Logging.InfoLevel
-  override def toString: String = "RemoteServerStarted@" + remote
-}
-
-/**
- * RemoteServerShutdown is published when a local RemoteServer has shut down
- */
-case class RemoteServerShutdown(
-  @transient @BeanProperty remote: RemoteTransport) extends RemoteServerLifeCycleEvent {
-  override def logLevel: Logging.LogLevel = Logging.InfoLevel
-  override def toString: String = "RemoteServerShutdown@" + remote
-}
-
-/**
- * A RemoteServerError is a general error that is thrown within or from a RemoteServer
- */
-case class RemoteServerError(
-  @BeanProperty val cause: Throwable,
-  @transient @BeanProperty remote: RemoteTransport) extends RemoteServerLifeCycleEvent {
-
-  override def logLevel: Logging.LogLevel = Logging.ErrorLevel
-  override def toString: String = "RemoteServerError@" + remote + "] Error[" + cause + "]"
-}
-
-/**
- * RemoteServerClientConnected is published when an inbound connection has been established
- */
-case class RemoteServerClientConnected(
-  @transient @BeanProperty remote: RemoteTransport,
-  @BeanProperty val clientAddress: Option[Address]) extends RemoteServerLifeCycleEvent {
-  override def logLevel: Logging.LogLevel = Logging.DebugLevel
-  override def toString: String =
-    "RemoteServerClientConnected@" + remote + ": Client[" + clientAddress.getOrElse("no address") + "]"
-}
-
-/**
- * RemoteServerClientConnected is published when an inbound connection has been disconnected
- */
-case class RemoteServerClientDisconnected(
-  @transient @BeanProperty remote: RemoteTransport,
-  @BeanProperty val clientAddress: Option[Address]) extends RemoteServerLifeCycleEvent {
-  override def logLevel: Logging.LogLevel = Logging.DebugLevel
-  override def toString: String =
-    "RemoteServerClientDisconnected@" + remote + ": Client[" + clientAddress.getOrElse("no address") + "]"
-}
-
-/**
- * RemoteServerClientClosed is published when an inbound RemoteClient is closed
- */
-case class RemoteServerClientClosed(
-  @transient @BeanProperty remote: RemoteTransport,
-  @BeanProperty val clientAddress: Option[Address]) extends RemoteServerLifeCycleEvent {
-  override def logLevel: Logging.LogLevel = Logging.DebugLevel
-  override def toString: String =
-    "RemoteServerClientClosed@" + remote + ": Client[" + clientAddress.getOrElse("no address") + "]"
-}
-
-/**
- * Thrown for example when trying to send a message using a RemoteClient that is either not started or shut down.
- */
-class RemoteClientException private[akka] (
-  message: String,
-  @transient @BeanProperty val client: RemoteTransport,
-  val remoteAddress: Address, cause: Throwable = null) extends AkkaException(message, cause)
-
 /**
  * RemoteTransportException represents a general failure within a RemoteTransport,
  * such as inability to start, wrong configuration etc.
@@ -198,29 +57,11 @@ abstract class RemoteTransport(val system: ExtendedActorSystem, val provider: Re
    */
   def start(): Unit
 
-  /**
-   * Attempts to shut down a specific client connected to the supplied remote address
-   */
-  def shutdownClientConnection(address: Address): Unit
-
-  /**
-   * Attempts to restart a specific client connected to the supplied remote address, but only if the client is not shut down
-   */
-  def restartClientConnection(address: Address): Unit
-
   /**
    * Sends the given message to the recipient supplying the sender if any
    */
   def send(message: Any, senderOption: Option[ActorRef], recipient: RemoteActorRef): Unit
 
-  /**
-   * Default implementation both publishes the message to the eventStream as well as logs it using the system logger
-   */
-  def notifyListeners(message: RemoteLifeCycleEvent): Unit = {
-    system.eventStream.publish(message)
-    if (logRemoteLifeCycleEvents) log.log(message.logLevel, "{}", message)
-  }
-
   /**
    * Sends a management command to the underlying transport stack. The call returns with a Future that indicates
    * if the command was handled successfully or dropped.
@@ -244,121 +85,4 @@ abstract class RemoteTransport(val system: ExtendedActorSystem, val provider: Re
    */
   protected def logRemoteLifeCycleEvents: Boolean
 
-  /**
-   * Returns a newly created AkkaRemoteProtocol with the given message payload.
-   */
-  def createMessageSendEnvelope(rmp: RemoteMessageProtocol): AkkaRemoteProtocol =
-    AkkaRemoteProtocol.newBuilder.setPayload(rmp.toByteString).build
-
-  /**
-   * Returns a newly created AkkaRemoteProtocol with the given control payload.
-   */
-  def createControlEnvelope(rcp: RemoteControlProtocol): AkkaRemoteProtocol =
-    AkkaRemoteProtocol.newBuilder.setInstruction(rcp).build
-
-  /**
-   * Serializes the ActorRef instance into a Protocol Buffers (protobuf) Message.
-   */
-  def toRemoteActorRefProtocol(actor: ActorRef): ActorRefProtocol =
-    ActorRefProtocol.newBuilder.setPath(actor.path.toStringWithAddress(defaultAddress)).build
-
-  /**
-   * Returns a new RemoteMessageProtocol containing the serialized representation of the given parameters.
-   */
-  def createRemoteMessageProtocolBuilder(recipient: ActorRef, message: Any, senderOption: Option[ActorRef]): RemoteMessageProtocol.Builder = {
-    val messageBuilder = RemoteMessageProtocol.newBuilder.setRecipient(toRemoteActorRefProtocol(recipient))
-    if (senderOption.isDefined) messageBuilder.setSender(toRemoteActorRefProtocol(senderOption.get))
-
-    Serialization.currentTransportAddress.withValue(defaultAddress) {
-      messageBuilder.setMessage(MessageSerializer.serialize(system, message.asInstanceOf[AnyRef]))
-    }
-
-    messageBuilder
-  }
-
-  /**
-   * Call this method with an inbound RemoteMessage and this will take care of security (see: "useUntrustedMode")
-   * as well as making sure that the message ends up at its destination (best effort).
-   * There is also a fair amount of logging produced by this method, which is good for debugging.
-   */
-  def receiveMessage(remoteMessage: RemoteMessage): Unit = {
-    val remoteDaemon = provider.remoteDaemon
-
-    remoteMessage.recipient match {
-      case `remoteDaemon` ⇒
-        if (useUntrustedMode) log.debug("dropping daemon message in untrusted mode")
-        else {
-          if (provider.remoteSettings.LogReceive) log.debug("received daemon message {}", remoteMessage)
-          remoteMessage.payload match {
-            case m @ (_: DaemonMsg | _: Terminated) ⇒
-              try remoteDaemon ! m catch {
-                case e: Exception ⇒ log.error(e, "exception while processing remote command {} from {}", m, remoteMessage.sender)
-              }
-            case x ⇒ log.debug("remoteDaemon received illegal message {} from {}", x, remoteMessage.sender)
-          }
-        }
-      case l @ (_: LocalRef | _: RepointableRef) if l.isLocal ⇒
-        if (provider.remoteSettings.LogReceive) log.debug("received local message {}", remoteMessage)
-        remoteMessage.payload match {
-          case msg: PossiblyHarmful if useUntrustedMode ⇒ log.debug("operating in UntrustedMode, dropping inbound PossiblyHarmful message of type {}", msg.getClass)
-          case msg: SystemMessage                       ⇒ l.sendSystemMessage(msg)
-          case msg                                      ⇒ l.!(msg)(remoteMessage.sender)
-        }
-      case r @ (_: RemoteRef | _: RepointableRef) if !r.isLocal && !useUntrustedMode ⇒
-        if (provider.remoteSettings.LogReceive) log.debug("received remote-destined message {}", remoteMessage)
-        remoteMessage.originalReceiver match {
-          case AddressFromURIString(address) if provider.transport.addresses(address) ⇒
-            // if it was originally addressed to us but is in fact remote from our point of view (i.e. remote-deployed)
-            r.!(remoteMessage.payload)(remoteMessage.sender)
-          case r ⇒
-            log.debug("dropping message {} for non-local recipient {} arriving at {} inbound addresses are {}",
-              remoteMessage.payloadClass, r, addresses, provider.transport.addresses)
-        }
-      case r ⇒
-        log.debug("dropping message {} for unknown recipient {} arriving at {} inbound addresses are {}",
-          remoteMessage.payloadClass, r, addresses, provider.transport.addresses)
-    }
-  }
-}
-
-/**
- * RemoteMessage is a wrapper around a message that has come in over the wire,
- * it allows to easily obtain references to the deserialized message, its intended recipient
- * and the sender.
- */
-class RemoteMessage(input: RemoteMessageProtocol, system: ExtendedActorSystem) {
-  /**
-   * Returns a String-representation of the ActorPath that this RemoteMessage is destined for
-   */
-  def originalReceiver: String = input.getRecipient.getPath
-
-  /**
-   * Returns an Option with the String representation of the ActorPath of the Actor who is the sender of this message
-   */
-  def originalSender: Option[String] = if (input.hasSender) Some(input.getSender.getPath) else None
-
-  /**
-   * Returns a reference to the Actor that sent this message, or DeadLetterActorRef if not present or found.
-   */
-  lazy val sender: ActorRef =
-    if (input.hasSender) system.provider.actorFor(system.provider.rootGuardian, input.getSender.getPath)
-    else system.deadLetters
-
-  /**
-   * Returns a reference to the Actor that this message is destined for.
-   * In case this returns a DeadLetterActorRef, you have access to the path using the "originalReceiver" method.
-   */
-  lazy val recipient: InternalActorRef = system.provider.actorFor(system.provider.rootGuardian, originalReceiver)
-
-  /**
-   * Returns the message
-   */
-  lazy val payload: AnyRef = MessageSerializer.deserialize(system, input.getMessage)
-
-  def payloadClass: Class[_] = if (payload eq null) null else payload.getClass
-
-  /**
-   * Returns a String representation of this RemoteMessage, intended for debugging purposes.
-   */
-  override def toString: String = "RemoteMessage: " + payloadClass + " to " + recipient + "<+{" + originalReceiver + "} from " + sender
 }
diff --git a/akka-remote/src/main/scala/akka/remote/Remoting.scala b/akka-remote/src/main/scala/akka/remote/Remoting.scala
index 595b348cbe..3fbce8e10d 100644
--- a/akka-remote/src/main/scala/akka/remote/Remoting.scala
+++ b/akka-remote/src/main/scala/akka/remote/Remoting.scala
@@ -220,17 +220,6 @@ private[remote] class Remoting(_system: ExtendedActorSystem, _provider: RemoteAc
     }
   }
 
-  // TODO: this is called in RemoteActorRefProvider to handle the lifecycle of connections (clients)
-  // which is not how things work in the new remoting
-  override def shutdownClientConnection(address: Address): Unit = {
-    // Ignore
-  }
-
-  // TODO: this is never called anywhere, should be taken out from RemoteTransport API
-  override def restartClientConnection(address: Address): Unit = {
-    // Ignore
-  }
-
   override def send(message: Any, senderOption: Option[ActorRef], recipient: RemoteActorRef): Unit = endpointManager match {
     case Some(manager) ⇒ manager.tell(Send(message, senderOption, recipient), sender = senderOption getOrElse Actor.noSender)
     case None          ⇒ throw new IllegalStateException("Attempted to send remote message but Remoting is not running.")
diff --git a/akka-remote/src/main/scala/akka/remote/netty/Client.scala b/akka-remote/src/main/scala/akka/remote/netty/Client.scala
deleted file mode 100644
index f8a2943320..0000000000
--- a/akka-remote/src/main/scala/akka/remote/netty/Client.scala
+++ /dev/null
@@ -1,339 +0,0 @@
-/**
- *  Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
- */
-package akka.remote.netty
-
-import java.util.concurrent.TimeUnit
-import java.net.{ InetAddress, InetSocketAddress }
-import org.jboss.netty.util.{ Timeout, TimerTask, HashedWheelTimer }
-import org.jboss.netty.bootstrap.ClientBootstrap
-import org.jboss.netty.channel.group.DefaultChannelGroup
-import org.jboss.netty.channel.{ ChannelFutureListener, ChannelHandler, DefaultChannelPipeline, MessageEvent, ExceptionEvent, ChannelStateEvent, ChannelPipelineFactory, ChannelPipeline, ChannelHandlerContext, ChannelFuture, Channel }
-import org.jboss.netty.handler.codec.frame.{ LengthFieldPrepender, LengthFieldBasedFrameDecoder }
-import org.jboss.netty.handler.execution.ExecutionHandler
-import org.jboss.netty.handler.timeout.{ IdleState, IdleStateEvent, IdleStateAwareChannelHandler, IdleStateHandler }
-import akka.remote.RemoteProtocol.{ RemoteMessageProtocol, RemoteControlProtocol, CommandType, AkkaRemoteProtocol }
-import akka.remote.{ RemoteProtocol, RemoteMessage, RemoteLifeCycleEvent, RemoteClientStarted, RemoteClientShutdown, RemoteClientException, RemoteClientError, RemoteClientDisconnected, RemoteClientConnected }
-import akka.AkkaException
-import akka.event.Logging
-import akka.actor.{ DeadLetter, Address, ActorRef }
-import akka.util.Switch
-import scala.util.control.NonFatal
-import org.jboss.netty.handler.ssl.SslHandler
-import scala.concurrent.duration._
-import java.nio.channels.ClosedChannelException
-
-/**
- * This is the abstract baseclass for netty remote clients, currently there's only an
- * ActiveRemoteClient, but others could be feasible, like a PassiveRemoteClient that
- * reuses an already established connection.
- */
-private[akka] abstract class RemoteClient private[akka] (val netty: NettyRemoteTransport, val remoteAddress: Address) {
-
-  val log = Logging(netty.system, "RemoteClient")
-
-  val name = Logging.simpleName(this) + "@" + remoteAddress
-
-  private[remote] val runSwitch = new Switch()
-
-  private[remote] def isRunning = runSwitch.isOn
-
-  protected def currentChannel: Channel
-
-  def connect(reconnectIfAlreadyConnected: Boolean = false): Boolean
-
-  def shutdown(): Boolean
-
-  /**
-   * Converts the message to the wireprotocol and sends the message across the wire
-   */
-  def send(message: Any, senderOption: Option[ActorRef], recipient: ActorRef): Unit = if (isRunning) {
-    if (netty.provider.remoteSettings.LogSend) log.debug("Sending message {} from {} to {}", message, senderOption, recipient)
-    send((message, senderOption, recipient))
-  } else {
-    val exception = new RemoteClientException("RemoteModule client is not running, make sure you have invoked 'RemoteClient.connect()' before using it.", netty, remoteAddress)
-    netty.notifyListeners(RemoteClientError(exception, netty, remoteAddress))
-    throw exception
-  }
-
-  /**
-   * Sends the message across the wire
-   */
-  private def send(request: (Any, Option[ActorRef], ActorRef)): Unit = {
-    try {
-      val channel = currentChannel
-      if (channel.isOpen) {
-        val f = channel.write(request)
-        f.addListener(
-          new ChannelFutureListener {
-            import netty.system.deadLetters
-            def operationComplete(future: ChannelFuture): Unit =
-              if (future.isCancelled || !future.isSuccess) request match {
-                case (msg, sender, recipient) ⇒ deadLetters ! DeadLetter(msg, sender.getOrElse(deadLetters), recipient)
-                // We don't call notifyListeners here since we don't think failed message deliveries are errors
-                /// If the connection goes down we'll get the error reporting done by the pipeline.
-              }
-          })
-        // Check if we should back off
-        if (!channel.isWritable) {
-          val backoff = netty.settings.BackoffTimeout
-          if (backoff.length > 0 && !f.await(backoff.length, backoff.unit)) f.cancel() //Waited as long as we could, now back off
-        }
-      }
-    } catch {
-      case NonFatal(e) ⇒ netty.notifyListeners(RemoteClientError(e, netty, remoteAddress))
-    }
-  }
-
-  override def toString: String = name
-}
-
-/**
- * RemoteClient represents a connection to an Akka node. Is used to send messages to remote actors on the node.
- */
-private[akka] class ActiveRemoteClient private[akka] (
-  netty: NettyRemoteTransport,
-  remoteAddress: Address,
-  localAddress: Address)
-  extends RemoteClient(netty, remoteAddress) {
-
-  import netty.settings
-
-  //TODO rewrite to a wrapper object (minimize volatile access and maximize encapsulation)
-  @volatile
-  private var bootstrap: ClientBootstrap = _
-  @volatile
-  private var connection: ChannelFuture = _
-  @volatile
-  private[remote] var openChannels: DefaultChannelGroup = _
-
-  @volatile
-  private var reconnectionDeadline: Option[Deadline] = None
-
-  def notifyListeners(msg: RemoteLifeCycleEvent): Unit = netty.notifyListeners(msg)
-
-  def currentChannel = connection.getChannel
-
-  /**
-   * Connect to remote server.
-   */
-  def connect(reconnectIfAlreadyConnected: Boolean = false): Boolean = {
-
-    // Returns whether the handshake was written to the channel or not
-    def sendSecureCookie(connection: ChannelFuture): Boolean = {
-      val future =
-        if (!connection.isSuccess || !settings.EnableSSL) connection
-        else connection.getChannel.getPipeline.get[SslHandler](classOf[SslHandler]).handshake().awaitUninterruptibly()
-
-      if (!future.isSuccess) {
-        notifyListeners(RemoteClientError(future.getCause, netty, remoteAddress))
-        false
-      } else {
-        ChannelAddress.set(connection.getChannel, Some(remoteAddress))
-        val handshake = RemoteControlProtocol.newBuilder.setCommandType(CommandType.CONNECT)
-        if (settings.SecureCookie.nonEmpty) handshake.setCookie(settings.SecureCookie.get)
-        handshake.setOrigin(RemoteProtocol.AddressProtocol.newBuilder
-          .setSystem(localAddress.system)
-          .setHostname(localAddress.host.get)
-          .setPort(localAddress.port.get)
-          .build)
-        connection.getChannel.write(netty.createControlEnvelope(handshake.build))
-        true
-      }
-    }
-
-    def attemptReconnect(): Boolean = {
-      val remoteIP = InetAddress.getByName(remoteAddress.host.get)
-      log.debug("Remote client reconnecting to [{}|{}]", remoteAddress, remoteIP)
-      connection = bootstrap.connect(new InetSocketAddress(remoteIP, remoteAddress.port.get))
-      openChannels.add(connection.awaitUninterruptibly.getChannel) // Wait until the connection attempt succeeds or fails.
-      sendSecureCookie(connection)
-    }
-
-    runSwitch switchOn {
-      openChannels = new DefaultDisposableChannelGroup(classOf[RemoteClient].getName)
-
-      val b = new ClientBootstrap(netty.clientChannelFactory)
-      b.setPipelineFactory(netty.createPipeline(new ActiveRemoteClientHandler(name, b, remoteAddress, localAddress, netty.timer, this), withTimeout = true, isClient = true))
-      b.setOption("tcpNoDelay", true)
-      b.setOption("keepAlive", true)
-      b.setOption("connectTimeoutMillis", settings.ConnectionTimeout.toMillis)
-      settings.ReceiveBufferSize.foreach(sz ⇒ b.setOption("receiveBufferSize", sz))
-      settings.SendBufferSize.foreach(sz ⇒ b.setOption("sendBufferSize", sz))
-      settings.WriteBufferHighWaterMark.foreach(sz ⇒ b.setOption("writeBufferHighWaterMark", sz))
-      settings.WriteBufferLowWaterMark.foreach(sz ⇒ b.setOption("writeBufferLowWaterMark", sz))
-      settings.OutboundLocalAddress.foreach(s ⇒ b.setOption("localAddress", new InetSocketAddress(s, 0)))
-      bootstrap = b
-
-      val remoteIP = InetAddress.getByName(remoteAddress.host.get)
-      log.debug("Starting remote client connection to [{}|{}]", remoteAddress, remoteIP)
-
-      connection = bootstrap.connect(new InetSocketAddress(remoteIP, remoteAddress.port.get))
-
-      openChannels.add(connection.awaitUninterruptibly.getChannel) // Wait until the connection attempt succeeds or fails.
-
-      if (sendSecureCookie(connection)) {
-        notifyListeners(RemoteClientStarted(netty, remoteAddress))
-        true
-      } else {
-        connection.getChannel.close()
-        openChannels.remove(connection.getChannel)
-        false
-      }
-    } match {
-      case true ⇒ true
-      case false if reconnectIfAlreadyConnected ⇒
-        log.debug("Remote client reconnecting to [{}]", remoteAddress)
-        attemptReconnect()
-      case false ⇒ false
-    }
-  }
-
-  // Please note that this method does _not_ remove the ARC from the NettyRemoteClientModule's map of clients
-  def shutdown() = runSwitch switchOff {
-    log.debug("Shutting down remote client [{}]", name)
-
-    notifyListeners(RemoteClientShutdown(netty, remoteAddress))
-    try {
-      if ((connection ne null) && (connection.getChannel ne null)) {
-        val channel = connection.getChannel
-        ChannelAddress.remove(channel)
-        // Try to disconnect first to reduce "connection reset by peer" events
-        if (channel.isConnected) channel.disconnect()
-        if (channel.isOpen) channel.close()
-      }
-    } finally {
-      try {
-        if (openChannels ne null) openChannels.close.awaitUninterruptibly()
-      } finally {
-        connection = null
-      }
-    }
-
-    log.debug("[{}] has been shut down", name)
-  }
-
-  private[akka] def isWithinReconnectionTimeWindow: Boolean = reconnectionDeadline match {
-    case None ⇒
-      reconnectionDeadline = Some(Deadline.now + settings.ReconnectionTimeWindow)
-      true
-    case Some(deadline) ⇒
-      val hasTimeLeft = deadline.hasTimeLeft
-      if (hasTimeLeft)
-        log.info("Will try to reconnect to remote server for another [{}] milliseconds", deadline.timeLeft.toMillis)
-      hasTimeLeft
-  }
-
-  private[akka] def resetReconnectionTimeWindow = reconnectionDeadline = None
-}
-
-@ChannelHandler.Sharable
-private[akka] class ActiveRemoteClientHandler(
-  val name: String,
-  val bootstrap: ClientBootstrap,
-  val remoteAddress: Address,
-  val localAddress: Address,
-  val timer: HashedWheelTimer,
-  val client: ActiveRemoteClient)
-  extends IdleStateAwareChannelHandler {
-
-  def runOnceNow(thunk: ⇒ Unit): Unit = timer.newTimeout(new TimerTask() {
-    def run(timeout: Timeout) = try { thunk } finally { timeout.cancel() }
-  }, 0, TimeUnit.MILLISECONDS)
-
-  override def channelIdle(ctx: ChannelHandlerContext, e: IdleStateEvent) {
-    import IdleState._
-
-    def createHeartBeat(localAddress: Address, cookie: Option[String]): AkkaRemoteProtocol = {
-      val beat = RemoteControlProtocol.newBuilder.setCommandType(CommandType.HEARTBEAT)
-      if (cookie.nonEmpty) beat.setCookie(cookie.get)
-
-      client.netty.createControlEnvelope(
-        beat.setOrigin(RemoteProtocol.AddressProtocol.newBuilder
-          .setSystem(localAddress.system)
-          .setHostname(localAddress.host.get)
-          .setPort(localAddress.port.get)
-          .build).build)
-    }
-
-    e.getState match {
-      case READER_IDLE | ALL_IDLE ⇒ runOnceNow { client.netty.shutdownClientConnection(remoteAddress) }
-      case WRITER_IDLE            ⇒ e.getChannel.write(createHeartBeat(localAddress, client.netty.settings.SecureCookie))
-    }
-  }
-
-  override def messageReceived(ctx: ChannelHandlerContext, event: MessageEvent) {
-    try {
-      event.getMessage match {
-        case arp: AkkaRemoteProtocol if arp.hasInstruction ⇒
-          val rcp = arp.getInstruction
-          rcp.getCommandType match {
-            case CommandType.SHUTDOWN ⇒ runOnceNow { client.netty.shutdownClientConnection(remoteAddress) }
-            case _                    ⇒ //Ignore others
-          }
-        case arp: AkkaRemoteProtocol if arp.hasPayload ⇒
-          client.netty.receiveMessage(new RemoteMessage(RemoteMessageProtocol.parseFrom(arp.getPayload), client.netty.system))
-        case other ⇒
-          throw new RemoteClientException("Unknown message received in remote client handler: " + other, client.netty, client.remoteAddress)
-      }
-    } catch {
-      case e: Exception ⇒ client.notifyListeners(RemoteClientError(e, client.netty, client.remoteAddress))
-    }
-  }
-
-  override def channelClosed(ctx: ChannelHandlerContext, event: ChannelStateEvent) = client.runSwitch ifOn {
-    if (client.isWithinReconnectionTimeWindow) {
-      timer.newTimeout(new TimerTask() {
-        def run(timeout: Timeout) =
-          if (client.isRunning) {
-            client.openChannels.remove(event.getChannel)
-            client.connect(reconnectIfAlreadyConnected = true)
-          }
-      }, client.netty.settings.ReconnectDelay.toMillis, TimeUnit.MILLISECONDS)
-    } else runOnceNow {
-      client.netty.shutdownClientConnection(remoteAddress) // spawn in another thread
-    }
-  }
-
-  override def channelConnected(ctx: ChannelHandlerContext, event: ChannelStateEvent) = {
-    try {
-      client.notifyListeners(RemoteClientConnected(client.netty, client.remoteAddress))
-      client.resetReconnectionTimeWindow
-    } catch {
-      case e: Exception ⇒ client.notifyListeners(RemoteClientError(e, client.netty, client.remoteAddress))
-    }
-  }
-
-  override def channelDisconnected(ctx: ChannelHandlerContext, event: ChannelStateEvent) = {
-    client.notifyListeners(RemoteClientDisconnected(client.netty, client.remoteAddress))
-  }
-
-  override def exceptionCaught(ctx: ChannelHandlerContext, event: ExceptionEvent) = {
-    val cause = if (event.getCause ne null) event.getCause else new AkkaException("Unknown cause")
-    cause match {
-      case _: ClosedChannelException ⇒ // Ignore
-      case NonFatal(e) ⇒
-        client.notifyListeners(RemoteClientError(e, client.netty, client.remoteAddress))
-        event.getChannel.close()
-      case e: Throwable ⇒ throw e // Rethrow fatals
-    }
-  }
-}
-
-private[akka] class PassiveRemoteClient(val currentChannel: Channel,
-                                        netty: NettyRemoteTransport,
-                                        remoteAddress: Address) extends RemoteClient(netty, remoteAddress) {
-
-  def connect(reconnectIfAlreadyConnected: Boolean = false): Boolean = runSwitch switchOn {
-    netty.notifyListeners(RemoteClientStarted(netty, remoteAddress))
-    log.debug("Starting remote client connection to [{}]", remoteAddress)
-  }
-
-  def shutdown() = runSwitch switchOff {
-    log.debug("Shutting down remote client [{}]", name)
-
-    netty.notifyListeners(RemoteClientShutdown(netty, remoteAddress))
-    log.debug("[{}] has been shut down", name)
-  }
-}
-
diff --git a/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala b/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
deleted file mode 100644
index a63394869e..0000000000
--- a/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
+++ /dev/null
@@ -1,335 +0,0 @@
-/**
- * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
- */
-
-package akka.remote.netty
-
-import java.net.InetSocketAddress
-import java.util.concurrent.atomic.{ AtomicReference, AtomicBoolean }
-import java.util.concurrent.locks.ReentrantReadWriteLock
-import java.util.concurrent.Executors
-import scala.collection.mutable
-import scala.collection.immutable
-import scala.util.control.NonFatal
-import org.jboss.netty.channel.group.{ DefaultChannelGroup, ChannelGroupFuture }
-import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory
-import org.jboss.netty.channel.{ ChannelHandlerContext, Channel, DefaultChannelPipeline, ChannelHandler, ChannelPipelineFactory, ChannelLocal }
-import org.jboss.netty.handler.codec.frame.{ LengthFieldPrepender, LengthFieldBasedFrameDecoder }
-import org.jboss.netty.handler.codec.protobuf.{ ProtobufEncoder, ProtobufDecoder }
-import org.jboss.netty.handler.execution.{ ExecutionHandler, OrderedMemoryAwareThreadPoolExecutor }
-import org.jboss.netty.handler.timeout.IdleStateHandler
-import org.jboss.netty.util.{ DefaultObjectSizeEstimator, HashedWheelTimer }
-import akka.event.Logging
-import akka.remote.RemoteProtocol.AkkaRemoteProtocol
-import akka.remote.{ RemoteTransportException, RemoteTransport, RemoteActorRefProvider, RemoteActorRef, RemoteServerStarted }
-import scala.util.control.NonFatal
-import akka.actor.{ ExtendedActorSystem, Address, ActorRef }
-import com.google.protobuf.MessageLite
-import scala.concurrent.Future
-
-private[akka] object ChannelAddress extends ChannelLocal[Option[Address]] {
-  override def initialValue(ch: Channel): Option[Address] = None
-}
-
-/**
- * Provides the implementation of the Netty remote support
- */
-private[akka] class NettyRemoteTransport(_system: ExtendedActorSystem, _provider: RemoteActorRefProvider) extends RemoteTransport(_system, _provider) {
-
-  import provider.remoteSettings
-
-  val settings = new NettySettings(remoteSettings.config.getConfig("akka.remote.netty"), remoteSettings.systemName)
-
-  // Workaround to emulate the support of multiple local addresses
-  override def localAddressForRemote(remote: Address): Address = defaultAddress
-
-  // TODO replace by system.scheduler
-  val timer: HashedWheelTimer = new HashedWheelTimer(system.threadFactory)
-
-  val clientChannelFactory = {
-    val boss, worker = settings.UseDispatcherForIO.map(system.dispatchers.lookup) getOrElse Executors.newCachedThreadPool()
-    new NioClientSocketChannelFactory(boss, worker, settings.ClientSocketWorkerPoolSize)
-  }
-
-  /**
-   * Backing scaffolding for the default implementation of NettyRemoteSupport.createPipeline.
-   */
-  object PipelineFactory {
-    /**
-     * Construct a DefaultChannelPipeline from a sequence of handlers; to be used
-     * in implementations of ChannelPipelineFactory.
-     */
-    def apply(handlers: immutable.Seq[ChannelHandler]): DefaultChannelPipeline =
-      (new DefaultChannelPipeline /: handlers) { (p, h) ⇒ p.addLast(Logging.simpleName(h.getClass), h); p }
-
-    /**
-     * Constructs the NettyRemoteTransport default pipeline with the give “head” handler, which
-     * is taken by-name to allow it not to be shared across pipelines.
-     *
-     * @param withTimeout determines whether an IdleStateHandler shall be included
-     */
-    def apply(endpoint: ⇒ Seq[ChannelHandler], withTimeout: Boolean, isClient: Boolean): ChannelPipelineFactory =
-      new ChannelPipelineFactory { override def getPipeline = apply(defaultStack(withTimeout, isClient) ++ endpoint) }
-
-    /**
-     * Construct a default protocol stack, excluding the “head” handler (i.e. the one which
-     * actually dispatches the received messages to the local target actors).
-     */
-    def defaultStack(withTimeout: Boolean, isClient: Boolean): immutable.Seq[ChannelHandler] =
-      (if (settings.EnableSSL) List(NettySSLSupport(settings.SslSettings, NettyRemoteTransport.this.log, isClient)) else Nil) :::
-        (if (withTimeout) List(timeout) else Nil) :::
-        msgFormat :::
-        authenticator :::
-        executionHandler
-
-    /**
-     * Construct an IdleStateHandler which uses [[akka.remote.netty.NettyRemoteTransport]].timer.
-     */
-    def timeout = new IdleStateHandler(timer,
-      settings.ReadTimeout.toSeconds.toInt,
-      settings.WriteTimeout.toSeconds.toInt,
-      settings.AllTimeout.toSeconds.toInt)
-
-    /**
-     * Construct frame&protobuf encoder/decoder.
-     */
-    def msgFormat = new LengthFieldBasedFrameDecoder(settings.MessageFrameSize, 0, 4, 0, 4) ::
-      new LengthFieldPrepender(4) ::
-      new RemoteMessageDecoder ::
-      new RemoteMessageEncoder(NettyRemoteTransport.this) ::
-      Nil
-
-    /**
-     * Construct an ExecutionHandler which is used to ensure that message dispatch does not
-     * happen on a netty thread (that could be bad if re-sending over the network for
-     * remote-deployed actors).
-     */
-    val executionHandler = if (settings.ExecutionPoolSize != 0)
-      List(new ExecutionHandler(new OrderedMemoryAwareThreadPoolExecutor(
-        settings.ExecutionPoolSize,
-        settings.MaxChannelMemorySize,
-        settings.MaxTotalMemorySize,
-        settings.ExecutionPoolKeepalive.length,
-        settings.ExecutionPoolKeepalive.unit,
-        AkkaProtocolMessageSizeEstimator,
-        system.threadFactory)))
-    else Nil
-
-    /**
-     * Helps keep track of how many bytes are in flight
-     */
-    object AkkaProtocolMessageSizeEstimator extends DefaultObjectSizeEstimator {
-      override final def estimateSize(o: AnyRef): Int =
-        o match {
-          case proto: MessageLite ⇒
-            val msgSize = proto.getSerializedSize
-            val misalignment = msgSize % 8
-            if (misalignment != 0) msgSize + 8 - misalignment else msgSize
-          case msg ⇒ super.estimateSize(msg)
-        }
-    }
-
-    /**
-     * Construct and authentication handler which uses the SecureCookie to somewhat
-     * protect the TCP port from unauthorized use (don’t rely on it too much, though,
-     * as this is NOT a cryptographic feature).
-     */
-    def authenticator = if (settings.RequireCookie) List(new RemoteServerAuthenticationHandler(settings.SecureCookie)) else Nil
-  }
-
-  /**
-   * This method is factored out to provide an extension point in case the
-   * pipeline shall be changed. It is recommended to use
-   */
-  def createPipeline(endpoint: ⇒ ChannelHandler, withTimeout: Boolean, isClient: Boolean): ChannelPipelineFactory =
-    PipelineFactory(Seq(endpoint), withTimeout, isClient)
-
-  private val remoteClients = new mutable.HashMap[Address, RemoteClient]
-  private val clientsLock = new ReentrantReadWriteLock
-
-  override protected def useUntrustedMode = remoteSettings.UntrustedMode
-
-  override protected def logRemoteLifeCycleEvents = remoteSettings.LogRemoteLifeCycleEvents
-
-  val server: NettyRemoteServer = try createServer() catch { case NonFatal(ex) ⇒ shutdown(); throw ex }
-
-  /**
-   * Override this method to inject a subclass of NettyRemoteServer instead of
-   * the normal one, e.g. for inserting security hooks. If this method throws
-   * an exception, the transport will shut itself down and re-throw.
-   */
-  protected def createServer(): NettyRemoteServer = new NettyRemoteServer(this)
-
-  /**
-   * Override this method to inject a subclass of RemoteClient instead of
-   * the normal one, e.g. for inserting security hooks. Get this transport’s
-   * address from `this.address`.
-   */
-  protected def createClient(recipient: Address): RemoteClient = new ActiveRemoteClient(this, recipient, defaultAddress)
-
-  // the address is set in start() or from the RemoteServerHandler, whichever comes first
-  private val _address = new AtomicReference[Address]
-  private[akka] def setAddressFromChannel(ch: Channel) = {
-    val addr = ch.getLocalAddress match {
-      case sa: InetSocketAddress ⇒ sa
-      case x                     ⇒ throw new RemoteTransportException("unknown local address type " + x.getClass, null)
-    }
-    _address.compareAndSet(null, Address("akka", remoteSettings.systemName, settings.Hostname, addr.getPort))
-  }
-
-  // Workaround to emulate the support of multiple local addresses
-  override def addresses = Set(address)
-  def address = _address.get
-  override def defaultAddress: Address = _address.get
-
-  lazy val log = Logging(system.eventStream, "NettyRemoteTransport(" + addresses + ")")
-
-  def start(): Unit = {
-    server.start()
-    setAddressFromChannel(server.channel)
-    notifyListeners(RemoteServerStarted(this))
-  }
-
-  def shutdown(): Future[Unit] = {
-    clientsLock.writeLock().lock()
-    try {
-      remoteClients foreach {
-        case (_, client) ⇒ try client.shutdown() catch {
-          case NonFatal(e) ⇒ log.error(e, "failure while shutting down [{}]", client)
-        }
-      }
-      remoteClients.clear()
-    } finally {
-      clientsLock.writeLock().unlock()
-      try {
-        if (server != null) server.shutdown()
-      } finally {
-        try {
-          timer.stop()
-        } finally {
-          clientChannelFactory.releaseExternalResources()
-        }
-      }
-    }
-    Future successful (())
-  }
-
-  def send(
-    message: Any,
-    senderOption: Option[ActorRef],
-    recipient: RemoteActorRef): Unit = {
-
-    val recipientAddress = recipient.path.address
-
-    clientsLock.readLock.lock
-    try {
-      val client = remoteClients.get(recipientAddress) match {
-        case Some(client) ⇒ client
-        case None ⇒
-          clientsLock.readLock.unlock
-          clientsLock.writeLock.lock //Lock upgrade, not supported natively
-          try {
-            try {
-              remoteClients.get(recipientAddress) match {
-                //Recheck for addition, race between upgrades
-                case Some(client) ⇒ client //If already populated by other writer
-                case None ⇒ //Populate map
-                  val client = createClient(recipientAddress)
-                  remoteClients += recipientAddress -> client
-                  client
-              }
-            } finally {
-              clientsLock.readLock.lock
-            } //downgrade
-          } finally {
-            clientsLock.writeLock.unlock
-          }
-      }
-      client.connect() // this will literally do nothing after the first time
-      client.send(message, senderOption, recipient)
-    } finally {
-      clientsLock.readLock.unlock
-    }
-  }
-
-  def bindClient(remoteAddress: Address, client: RemoteClient): Boolean = {
-    clientsLock.writeLock().lock()
-    try {
-      if (remoteClients.contains(remoteAddress)) false
-      else {
-        client.connect()
-        remoteClients.put(remoteAddress, client)
-        true
-      }
-    } finally {
-      clientsLock.writeLock().unlock()
-    }
-  }
-
-  def unbindClient(remoteAddress: Address): Unit = shutdownClientConnection(remoteAddress)
-
-  def shutdownClientConnection(remoteAddress: Address): Unit = {
-    clientsLock.writeLock().lock()
-    try {
-      remoteClients.remove(remoteAddress) foreach (_.shutdown())
-    } finally {
-      clientsLock.writeLock().unlock()
-    }
-  }
-
-  def restartClientConnection(remoteAddress: Address): Unit = {
-    clientsLock.readLock().lock()
-    try {
-      remoteClients.get(remoteAddress) foreach (_.connect(reconnectIfAlreadyConnected = true))
-    } finally {
-      clientsLock.readLock().unlock()
-    }
-  }
-
-}
-
-private[akka] class RemoteMessageEncoder(remoteSupport: NettyRemoteTransport) extends ProtobufEncoder {
-  override def encode(ctx: ChannelHandlerContext, channel: Channel, msg: AnyRef): AnyRef = {
-    msg match {
-      case (message: Any, sender: Option[_], recipient: ActorRef) ⇒
-        super.encode(ctx, channel,
-          remoteSupport.createMessageSendEnvelope(
-            remoteSupport.createRemoteMessageProtocolBuilder(
-              recipient,
-              message,
-              sender.asInstanceOf[Option[ActorRef]]).build))
-      case _ ⇒ super.encode(ctx, channel, msg)
-    }
-  }
-}
-
-private[akka] class RemoteMessageDecoder extends ProtobufDecoder(AkkaRemoteProtocol.getDefaultInstance)
-
-private[akka] class DefaultDisposableChannelGroup(name: String) extends DefaultChannelGroup(name) {
-  protected val guard = new ReentrantReadWriteLock
-  protected val open = new AtomicBoolean(true)
-
-  override def add(channel: Channel): Boolean = {
-    guard.readLock().lock()
-    try {
-      if (open.get) {
-        super.add(channel)
-      } else {
-        channel.close()
-        false
-      }
-    } finally {
-      guard.readLock().unlock()
-    }
-  }
-
-  override def close(): ChannelGroupFuture = {
-    guard.writeLock().lock()
-    try {
-      if (open.getAndSet(false)) super.close()
-      else throw new IllegalStateException("ChannelGroup already closed, cannot add new channel")
-    } finally {
-      guard.writeLock().unlock()
-    }
-  }
-}
diff --git a/akka-remote/src/main/scala/akka/remote/netty/Server.scala b/akka-remote/src/main/scala/akka/remote/netty/Server.scala
deleted file mode 100644
index 2141df30a9..0000000000
--- a/akka-remote/src/main/scala/akka/remote/netty/Server.scala
+++ /dev/null
@@ -1,185 +0,0 @@
-/**
- *  Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
- */
-package akka.remote.netty
-
-import akka.actor.Address
-import akka.remote.RemoteProtocol.{ RemoteMessageProtocol, RemoteControlProtocol, CommandType, AkkaRemoteProtocol }
-import akka.remote._
-import java.net.InetAddress
-import java.net.InetSocketAddress
-import java.nio.channels.ClosedChannelException
-import java.util.concurrent.Executors
-import org.jboss.netty.bootstrap.ServerBootstrap
-import org.jboss.netty.channel._
-import org.jboss.netty.channel.group.ChannelGroup
-import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory
-import scala.util.control.NonFatal
-import akka.AkkaException
-
-private[akka] class NettyRemoteServer(val netty: NettyRemoteTransport) {
-
-  import netty.settings
-
-  val ip = InetAddress.getByName(settings.Hostname)
-
-  private val factory = {
-    val boss, worker = settings.UseDispatcherForIO.map(netty.system.dispatchers.lookup) getOrElse Executors.newCachedThreadPool()
-    new NioServerSocketChannelFactory(boss, worker, settings.ServerSocketWorkerPoolSize)
-  }
-
-  // group of open channels, used for clean-up
-  private val openChannels: ChannelGroup = new DefaultDisposableChannelGroup("akka-remote-server")
-
-  private val bootstrap = {
-    val b = new ServerBootstrap(factory)
-    b.setPipelineFactory(netty.createPipeline(new RemoteServerHandler(openChannels, netty), withTimeout = false, isClient = false))
-    b.setOption("backlog", settings.Backlog)
-    b.setOption("tcpNoDelay", true)
-    b.setOption("child.keepAlive", true)
-    b.setOption("reuseAddress", settings.ReuseAddress)
-    settings.ReceiveBufferSize.foreach(sz ⇒ b.setOption("receiveBufferSize", sz))
-    settings.SendBufferSize.foreach(sz ⇒ b.setOption("sendBufferSize", sz))
-    settings.WriteBufferHighWaterMark.foreach(sz ⇒ b.setOption("writeBufferHighWaterMark", sz))
-    settings.WriteBufferLowWaterMark.foreach(sz ⇒ b.setOption("writeBufferLowWaterMark", sz))
-    b
-  }
-
-  @volatile
-  private[akka] var channel: Channel = _
-
-  def start(): Unit = {
-    channel = bootstrap.bind(new InetSocketAddress(ip, settings.PortSelector))
-    openChannels.add(channel)
-  }
-
-  def shutdown() {
-    try {
-      val shutdownSignal = {
-        val b = RemoteControlProtocol.newBuilder.setCommandType(CommandType.SHUTDOWN)
-        b.setOrigin(RemoteProtocol.AddressProtocol.newBuilder
-          .setSystem(netty.address.system)
-          .setHostname(netty.address.host.get)
-          .setPort(netty.address.port.get)
-          .build)
-        if (settings.SecureCookie.nonEmpty)
-          b.setCookie(settings.SecureCookie.get)
-        b.build
-      }
-      openChannels.write(netty.createControlEnvelope(shutdownSignal))
-      openChannels.disconnect
-      openChannels.close.awaitUninterruptibly
-      bootstrap.releaseExternalResources()
-      netty.notifyListeners(RemoteServerShutdown(netty))
-    } catch {
-      case e: Exception ⇒ netty.notifyListeners(RemoteServerError(e, netty))
-    }
-  }
-}
-
-@ChannelHandler.Sharable
-private[akka] class RemoteServerAuthenticationHandler(secureCookie: Option[String]) extends SimpleChannelUpstreamHandler {
-  val authenticated = new AnyRef
-
-  override def messageReceived(ctx: ChannelHandlerContext, event: MessageEvent) = secureCookie match {
-    case None ⇒ ctx.sendUpstream(event)
-    case Some(cookie) ⇒
-      ctx.getAttachment match {
-        case `authenticated` ⇒ ctx.sendUpstream(event)
-        case null ⇒ event.getMessage match {
-          case remoteProtocol: AkkaRemoteProtocol if remoteProtocol.hasInstruction ⇒
-            val instruction = remoteProtocol.getInstruction
-            instruction.getCookie match {
-              case `cookie` ⇒
-                ctx.setAttachment(authenticated)
-                ctx.sendUpstream(event)
-              case _ ⇒
-                throw new SecurityException(
-                  "The remote client [" + ctx.getChannel.getRemoteAddress + "] secure cookie is not the same as remote server secure cookie")
-            }
-          case _ ⇒
-            throw new SecurityException("The remote client [" + ctx.getChannel.getRemoteAddress + "] is not authorized!")
-        }
-      }
-  }
-}
-
-@ChannelHandler.Sharable
-private[akka] class RemoteServerHandler(
-  val openChannels: ChannelGroup,
-  val netty: NettyRemoteTransport) extends SimpleChannelUpstreamHandler {
-
-  import netty.settings
-
-  private var addressToSet = true
-
-  // TODO look into moving that into onBind or similar, but verify that that is guaranteed to be the first to be called
-  override def handleUpstream(ctx: ChannelHandlerContext, event: ChannelEvent) = {
-    if (addressToSet) {
-      netty.setAddressFromChannel(event.getChannel)
-      addressToSet = false
-    }
-    super.handleUpstream(ctx, event)
-  }
-
-  /**
-   * ChannelOpen overridden to store open channels for a clean postStop of a node.
-   * If a channel is closed before, it is automatically removed from the open channels group.
-   */
-  override def channelOpen(ctx: ChannelHandlerContext, event: ChannelStateEvent) = openChannels.add(ctx.getChannel)
-
-  // TODO might want to log or otherwise signal that a TCP connection has been established here.
-  override def channelConnected(ctx: ChannelHandlerContext, event: ChannelStateEvent) = ()
-
-  override def channelDisconnected(ctx: ChannelHandlerContext, event: ChannelStateEvent) = {
-    netty.notifyListeners(RemoteServerClientDisconnected(netty, ChannelAddress.get(ctx.getChannel)))
-  }
-
-  override def channelClosed(ctx: ChannelHandlerContext, event: ChannelStateEvent) = {
-    val address = ChannelAddress.get(ctx.getChannel)
-    if (address.isDefined && settings.UsePassiveConnections)
-      netty.unbindClient(address.get)
-
-    netty.notifyListeners(RemoteServerClientClosed(netty, address))
-    ChannelAddress.remove(ctx.getChannel)
-  }
-
-  override def messageReceived(ctx: ChannelHandlerContext, event: MessageEvent) = try {
-    event.getMessage match {
-      case remote: AkkaRemoteProtocol if remote.hasPayload ⇒
-        netty.receiveMessage(new RemoteMessage(RemoteMessageProtocol.parseFrom(remote.getPayload), netty.system))
-      case remote: AkkaRemoteProtocol if remote.hasInstruction ⇒
-        val instruction = remote.getInstruction
-        instruction.getCommandType match {
-          case CommandType.CONNECT ⇒
-            val origin = instruction.getOrigin
-            val inbound = Address("akka", origin.getSystem, origin.getHostname, origin.getPort)
-            ChannelAddress.set(event.getChannel, Option(inbound))
-
-            //If we want to reuse the inbound connections as outbound we need to get busy
-            if (settings.UsePassiveConnections)
-              netty.bindClient(inbound, new PassiveRemoteClient(event.getChannel, netty, inbound))
-
-            netty.notifyListeners(RemoteServerClientConnected(netty, Option(inbound)))
-          case CommandType.SHUTDOWN  ⇒ //Will be unbound in channelClosed
-          case CommandType.HEARTBEAT ⇒ //Other guy is still alive
-          case _                     ⇒ //Unknown command
-        }
-      case _ ⇒ //ignore
-    }
-  } catch {
-    case e: Exception ⇒ netty.notifyListeners(RemoteServerError(e, netty))
-  }
-
-  override def exceptionCaught(ctx: ChannelHandlerContext, event: ExceptionEvent) = {
-    val cause = if (event.getCause ne null) event.getCause else new AkkaException("Unknown cause")
-    cause match {
-      case _: ClosedChannelException ⇒ // Ignore
-      case NonFatal(e) ⇒
-        netty.notifyListeners(RemoteServerError(e, netty))
-        event.getChannel.close()
-      case e: Throwable ⇒ throw e // Rethrow fatals
-    }
-  }
-}
-
diff --git a/akka-remote/src/main/scala/akka/remote/netty/Settings.scala b/akka-remote/src/main/scala/akka/remote/netty/Settings.scala
deleted file mode 100644
index 2d4183b46d..0000000000
--- a/akka-remote/src/main/scala/akka/remote/netty/Settings.scala
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
- * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
- */
-package akka.remote.netty
-
-import com.typesafe.config.Config
-import scala.concurrent.duration.Duration
-import java.util.concurrent.TimeUnit._
-import java.net.InetAddress
-import akka.ConfigurationException
-import akka.japi.Util.immutableSeq
-import scala.concurrent.duration.FiniteDuration
-import akka.dispatch.ThreadPoolConfig
-import akka.util.Helpers
-
-private[akka] class NettySettings(config: Config, val systemName: String) {
-
-  import config._
-
-  val BackoffTimeout: FiniteDuration = Duration(getMilliseconds("backoff-timeout"), MILLISECONDS)
-
-  val SecureCookie: Option[String] = getString("secure-cookie") match {
-    case ""     ⇒ None
-    case cookie ⇒ Some(cookie)
-  }
-  val RequireCookie: Boolean = {
-    val requireCookie = getBoolean("require-cookie")
-    if (requireCookie && SecureCookie.isEmpty) throw new ConfigurationException(
-      "Configuration option 'akka.remote.netty.require-cookie' is turned on but no secure cookie is defined in 'akka.remote.netty.secure-cookie'.")
-    requireCookie
-  }
-
-  val UsePassiveConnections: Boolean = getBoolean("use-passive-connections")
-  val UseDispatcherForIO: Option[String] = getString("use-dispatcher-for-io") match {
-    case "" | null  ⇒ None
-    case dispatcher ⇒ Some(dispatcher)
-  }
-
-  val ReconnectionTimeWindow: FiniteDuration = Duration(getMilliseconds("reconnection-time-window"), MILLISECONDS)
-  val ReadTimeout: FiniteDuration = Duration(getMilliseconds("read-timeout"), MILLISECONDS)
-  val WriteTimeout: FiniteDuration = Duration(getMilliseconds("write-timeout"), MILLISECONDS)
-  val AllTimeout: FiniteDuration = Duration(getMilliseconds("all-timeout"), MILLISECONDS)
-  val ReconnectDelay: FiniteDuration = Duration(getMilliseconds("reconnect-delay"), MILLISECONDS)
-
-  val MessageFrameSize: Int = getBytes("message-frame-size").toInt
-
-  private[this] def optionSize(s: String): Option[Int] = getBytes(s).toInt match {
-    case 0 ⇒ None
-    case x if x < 0 ⇒
-      throw new ConfigurationException("Setting '%s' must be 0 or positive (and fit in an Int)" format s)
-    case other ⇒ Some(other)
-  }
-
-  val WriteBufferHighWaterMark: Option[Int] = optionSize("write-buffer-high-water-mark")
-  val WriteBufferLowWaterMark: Option[Int] = optionSize("write-buffer-low-water-mark")
-  val SendBufferSize: Option[Int] = optionSize("send-buffer-size")
-  val ReceiveBufferSize: Option[Int] = optionSize("receive-buffer-size")
-
-  val Hostname: String = getString("hostname") match {
-    case ""    ⇒ InetAddress.getLocalHost.getHostAddress
-    case value ⇒ value
-  }
-
-  val OutboundLocalAddress: Option[String] = getString("outbound-local-address") match {
-    case "auto" | "" | null ⇒ None
-    case some               ⇒ Some(some)
-  }
-
-  @deprecated("WARNING: This should only be used by professionals.", "2.0")
-  val PortSelector: Int = getInt("port")
-
-  val ConnectionTimeout: FiniteDuration = Duration(getMilliseconds("connection-timeout"), MILLISECONDS)
-
-  val Backlog: Int = getInt("backlog")
-
-  val ReuseAddress: Boolean = getString("reuse-address") match {
-    case "off-for-windows" ⇒ !Helpers.isWindows
-    case _                 ⇒ getBoolean("reuse-address")
-  }
-
-  val ExecutionPoolKeepalive: FiniteDuration = Duration(getMilliseconds("execution-pool-keepalive"), MILLISECONDS)
-
-  val ExecutionPoolSize: Int = getInt("execution-pool-size") match {
-    case sz if sz < 0 ⇒ throw new IllegalArgumentException("akka.remote.netty.execution-pool-size is less than 0")
-    case sz           ⇒ sz
-  }
-
-  val MaxChannelMemorySize: Long = getBytes("max-channel-memory-size") match {
-    case sz if sz < 0 ⇒ throw new IllegalArgumentException("akka.remote.netty.max-channel-memory-size is less than 0 bytes")
-    case sz           ⇒ sz
-  }
-
-  val MaxTotalMemorySize: Long = getBytes("max-total-memory-size") match {
-    case sz if sz < 0 ⇒ throw new IllegalArgumentException("akka.remote.netty.max-total-memory-size is less than 0 bytes")
-    case sz           ⇒ sz
-  }
-
-  private def computeWPS(config: Config): Int =
-    ThreadPoolConfig.scaledPoolSize(
-      config.getInt("pool-size-min"),
-      config.getDouble("pool-size-factor"),
-      config.getInt("pool-size-max"))
-
-  val ServerSocketWorkerPoolSize = computeWPS(config.getConfig("server-socket-worker-pool"))
-
-  val ClientSocketWorkerPoolSize = computeWPS(config.getConfig("client-socket-worker-pool"))
-
-  val SslSettings = new SSLSettings(config.getConfig("ssl"))
-
-  val EnableSSL = getBoolean("ssl.enable")
-}
diff --git a/akka-remote/src/main/scala/akka/remote/netty/NettySSLSupport.scala b/akka-remote/src/main/scala/akka/remote/transport/netty/NettySSLSupport.scala
similarity index 99%
rename from akka-remote/src/main/scala/akka/remote/netty/NettySSLSupport.scala
rename to akka-remote/src/main/scala/akka/remote/transport/netty/NettySSLSupport.scala
index 65ae01f8b4..949ef235fb 100644
--- a/akka-remote/src/main/scala/akka/remote/netty/NettySSLSupport.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/netty/NettySSLSupport.scala
@@ -2,20 +2,21 @@
  * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.remote.netty
+package akka.remote.transport.netty
 
-import org.jboss.netty.handler.ssl.SslHandler
-import javax.net.ssl.{ KeyManagerFactory, TrustManager, TrustManagerFactory, SSLContext }
-import akka.remote.RemoteTransportException
-import akka.event.LoggingAdapter
-import java.io.{ IOException, FileNotFoundException, FileInputStream }
-import akka.remote.security.provider.AkkaProvider
-import java.security._
-import com.typesafe.config.Config
-import akka.japi.Util._
 import akka.ConfigurationException
+import akka.event.LoggingAdapter
+import akka.japi.Util._
+import akka.remote.RemoteTransportException
+import akka.remote.security.provider.AkkaProvider
+import com.typesafe.config.Config
+import java.io.{ IOException, FileNotFoundException, FileInputStream }
+import java.security._
+import javax.net.ssl.{ KeyManagerFactory, TrustManager, TrustManagerFactory, SSLContext }
+import org.jboss.netty.handler.ssl.SslHandler
 
 private[akka] class SSLSettings(config: Config) {
+
   import config._
 
   val SSLKeyStore = Option(getString("key-store")).filter(_.length > 0)
diff --git a/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala b/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
index 6550753214..d1fee3658b 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
@@ -3,30 +3,29 @@
  */
 package akka.remote.transport.netty
 
-import akka.{ OnlyCauseStackTrace, ConfigurationException }
 import akka.actor.{ Address, ExtendedActorSystem }
+import akka.dispatch.ThreadPoolConfig
 import akka.event.Logging
-import akka.remote.netty.{ SSLSettings, NettySSLSupport, DefaultDisposableChannelGroup }
+import akka.remote.transport.AssociationHandle.HandleEventListener
 import akka.remote.transport.Transport._
 import akka.remote.transport.netty.NettyTransportSettings.{ Udp, Tcp, Mode }
 import akka.remote.transport.{ AssociationHandle, Transport }
+import akka.{ OnlyCauseStackTrace, ConfigurationException }
 import com.typesafe.config.Config
 import java.net.{ UnknownHostException, SocketAddress, InetAddress, InetSocketAddress, ConnectException }
-import java.util.concurrent.{ ConcurrentHashMap, Executor, Executors, CancellationException }
+import java.util.concurrent.atomic.AtomicInteger
+import java.util.concurrent.{ ConcurrentHashMap, Executors, CancellationException }
 import org.jboss.netty.bootstrap.{ ConnectionlessBootstrap, Bootstrap, ClientBootstrap, ServerBootstrap }
 import org.jboss.netty.buffer.{ ChannelBuffers, ChannelBuffer }
 import org.jboss.netty.channel._
-import org.jboss.netty.channel.group.{ ChannelGroup, ChannelGroupFuture, ChannelGroupFutureListener }
+import org.jboss.netty.channel.group.{ DefaultChannelGroup, ChannelGroup, ChannelGroupFuture, ChannelGroupFutureListener }
 import org.jboss.netty.channel.socket.nio.{ NioDatagramChannelFactory, NioServerSocketChannelFactory, NioClientSocketChannelFactory }
 import org.jboss.netty.handler.codec.frame.{ LengthFieldBasedFrameDecoder, LengthFieldPrepender }
+import org.jboss.netty.handler.ssl.SslHandler
 import scala.concurrent.duration.{ Duration, FiniteDuration, MILLISECONDS }
 import scala.concurrent.{ ExecutionContext, Promise, Future }
-import scala.util.{ Try, Random }
+import scala.util.Try
 import util.control.{ NoStackTrace, NonFatal }
-import akka.dispatch.ThreadPoolConfig
-import akka.remote.transport.AssociationHandle.HandleEventListener
-import java.util.concurrent.atomic.AtomicInteger
-import org.jboss.netty.handler.ssl.SslHandler
 
 object NettyTransportSettings {
   sealed trait Mode
@@ -209,7 +208,13 @@ class NettyTransport(private val settings: NettyTransportSettings, private val s
 
   final val udpConnectionTable = new ConcurrentHashMap[SocketAddress, HandleEventListener]()
 
-  val channelGroup = new DefaultDisposableChannelGroup("akka-netty-transport-driver-channelgroup-" +
+  /*
+   * Be aware, that the close() method of DefaultChannelGroup is racy, because it uses an iterator over a ConcurrentHashMap.
+   * In the old remoting this was handled by using a custom subclass, guarding the close() method with a write-lock.
+   * The usage of this class is safe in the new remoting, as close() is called after unbind() is finished, and no
+   * outbound connections are initiated in the shutdown phase.
+   */
+  val channelGroup = new DefaultChannelGroup("akka-netty-transport-driver-channelgroup-" +
     uniqueIdCounter.getAndIncrement)
 
   private val clientChannelFactory: ChannelFactory = TransportMode match {
diff --git a/akka-remote/src/test/scala/akka/remote/NetworkFailureSpec.scala b/akka-remote/src/test/scala/akka/remote/NetworkFailureSpec.scala
index 752f7c4faa..fc0ca7cded 100644
--- a/akka-remote/src/test/scala/akka/remote/NetworkFailureSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/NetworkFailureSpec.scala
@@ -6,7 +6,6 @@ package akka.remote
 
 import org.scalatest.{ BeforeAndAfterAll, BeforeAndAfterEach }
 
-import akka.remote.netty.NettyRemoteTransport
 import akka.actor.Actor
 import akka.testkit.AkkaSpec
 import akka.testkit.DefaultTimeout
diff --git a/akka-remote/src/test/scala/akka/remote/RemoteCommunicationSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteCommunicationSpec.scala
deleted file mode 100644
index 18c3018827..0000000000
--- a/akka-remote/src/test/scala/akka/remote/RemoteCommunicationSpec.scala
+++ /dev/null
@@ -1,159 +0,0 @@
-/**
- *  Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
- */
-package akka.remote
-
-import akka.testkit._
-import akka.actor._
-import com.typesafe.config._
-import scala.concurrent.Future
-import scala.concurrent.Await
-import scala.reflect.classTag
-import akka.pattern.ask
-import akka.event.Logging
-
-object RemoteCommunicationSpec {
-  class Echo extends Actor {
-    var target: ActorRef = context.system.deadLetters
-
-    def receive = {
-      case (p: Props, n: String) ⇒ sender ! context.actorOf(Props[Echo], n)
-      case ex: Exception         ⇒ throw ex
-      case s: String             ⇒ sender ! context.actorFor(s)
-      case x                     ⇒ target = sender; sender ! x
-    }
-
-    override def preStart() {}
-    override def preRestart(cause: Throwable, msg: Option[Any]) {
-      target ! "preRestart"
-    }
-    override def postRestart(cause: Throwable) {}
-    override def postStop() {
-      target ! "postStop"
-    }
-  }
-}
-
-@org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner])
-class RemoteCommunicationSpec extends AkkaSpec("""
-akka {
-  actor.provider = "akka.remote.RemoteActorRefProvider"
-  remote.transport = "akka.remote.netty.NettyRemoteTransport"
-  remote.netty {
-    hostname = localhost
-    port = 0
-  }
-}
-                                               """) with ImplicitSender with DefaultTimeout {
-
-  import RemoteCommunicationSpec._
-
-  val other = ActorSystem("remote-sys", system.settings.config)
-
-  val localAddr = system.asInstanceOf[ExtendedActorSystem].provider.getDefaultAddress
-  val remoteAddr = other.asInstanceOf[ExtendedActorSystem].provider.getDefaultAddress
-
-  val deploys = Seq(
-    Deploy("/blub", scope = RemoteScope(remoteAddr)),
-    Deploy("/looker/child", scope = RemoteScope(remoteAddr)),
-    Deploy("/looker/child/grandchild", scope = RemoteScope(localAddr)))
-
-  def deploy(sys: ActorSystem, d: Deploy) {
-    sys.asInstanceOf[ExtendedActorSystem].provider.asInstanceOf[RemoteActorRefProvider].deployer.deploy(d)
-  }
-
-  for (d ← deploys) {
-    deploy(system, d)
-    deploy(other, d)
-  }
-
-  val remote = other.actorOf(Props(new Actor {
-    def receive = {
-      case "ping" ⇒ sender ! (("pong", sender))
-    }
-  }), "echo")
-
-  val here = system.actorFor(RootActorPath(remoteAddr) / "user" / "echo")
-
-  override def afterTermination() {
-    other.shutdown()
-  }
-
-  "Remoting" must {
-
-    "support remote look-ups" in {
-      here ! "ping"
-      expectMsgPF() {
-        case ("pong", s: AnyRef) if s eq testActor ⇒ true
-      }
-    }
-
-    "send error message for wrong address" in {
-      val old = other.eventStream.logLevel
-      other.eventStream.setLogLevel(Logging.DebugLevel)
-      EventFilter.debug(start = "dropping", occurrences = 1).intercept {
-        system.actorFor(RootActorPath(remoteAddr.copy(system = "remotesys")) / "user" / "echo") ! "ping"
-      }(other)
-      other.eventStream.setLogLevel(old)
-    }
-
-    "support ask" in {
-      Await.result(here ? "ping", timeout.duration) match {
-        case ("pong", s: akka.pattern.PromiseActorRef) ⇒ // good
-        case m                                         ⇒ fail(m + " was not (pong, AskActorRef)")
-      }
-    }
-
-    "send dead letters on remote if actor does not exist" in {
-      EventFilter.warning(pattern = "dead.*buh", occurrences = 1).intercept {
-        system.actorFor(RootActorPath(remoteAddr) / "does" / "not" / "exist") ! "buh"
-      }(other)
-    }
-
-    "create and supervise children on remote node" in {
-      val r = system.actorOf(Props[Echo], "blub")
-      r.path.toString must be === s"akka://remote-sys@localhost:${remoteAddr.port.get}/remote/akka/RemoteCommunicationSpec@localhost:${localAddr.port.get}/user/blub"
-      r ! 42
-      expectMsg(42)
-      EventFilter[Exception]("crash", occurrences = 1).intercept {
-        r ! new Exception("crash")
-      }(other)
-      expectMsg("preRestart")
-      r ! 42
-      expectMsg(42)
-      system.stop(r)
-      expectMsg("postStop")
-    }
-
-    "look-up actors across node boundaries" in {
-      val l = system.actorOf(Props(new Actor {
-        def receive = {
-          case (p: Props, n: String) ⇒ sender ! context.actorOf(p, n)
-          case s: String             ⇒ sender ! context.actorFor(s)
-        }
-      }), "looker")
-      l ! (Props[Echo], "child")
-      val r = expectMsgType[ActorRef]
-      r ! (Props[Echo], "grandchild")
-      val remref = expectMsgType[ActorRef]
-      remref.asInstanceOf[ActorRefScope].isLocal must be(true)
-      val myref = system.actorFor(system / "looker" / "child" / "grandchild")
-      myref.isInstanceOf[RemoteActorRef] must be(true)
-      myref ! 43
-      expectMsg(43)
-      lastSender must be theSameInstanceAs remref
-      r.asInstanceOf[RemoteActorRef].getParent must be(l)
-      system.actorFor("/user/looker/child") must be theSameInstanceAs r
-      Await.result(l ? "child/..", timeout.duration).asInstanceOf[AnyRef] must be theSameInstanceAs l
-      Await.result(system.actorFor(system / "looker" / "child") ? "..", timeout.duration).asInstanceOf[AnyRef] must be theSameInstanceAs l
-    }
-
-    "not fail ask across node boundaries" in {
-      import system.dispatcher
-      val f = for (_ ← 1 to 1000) yield here ? "ping" mapTo classTag[(String, ActorRef)]
-      Await.result(Future.sequence(f), remaining).map(_._1).toSet must be(Set("pong"))
-    }
-
-  }
-
-}
diff --git a/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala
index be87d1a942..2cd9f3dda6 100644
--- a/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala
@@ -8,7 +8,6 @@ import language.postfixOps
 import akka.testkit.AkkaSpec
 import akka.actor.ExtendedActorSystem
 import scala.concurrent.duration._
-import akka.remote.netty.NettyRemoteTransport
 import akka.util.Helpers
 
 @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner])
@@ -33,44 +32,6 @@ class RemoteConfigSpec extends AkkaSpec(
       LogRemoteLifeCycleEvents must be(true)
     }
 
-    "be able to parse Netty config elements" ignore {
-      val settings =
-        system.asInstanceOf[ExtendedActorSystem]
-          .provider.asInstanceOf[RemoteActorRefProvider]
-          .transport.asInstanceOf[NettyRemoteTransport]
-          .settings
-      import settings._
-
-      BackoffTimeout must be(Duration.Zero)
-      SecureCookie must be(None)
-      RequireCookie must be(false)
-      UsePassiveConnections must be(true)
-      Hostname must not be "" // will be set to the local IP
-      PortSelector must be(0)
-      OutboundLocalAddress must be(None)
-      MessageFrameSize must be(1048576)
-      ConnectionTimeout must be(2 minutes)
-      Backlog must be(4096)
-      ReuseAddress must be(!Helpers.isWindows)
-      ExecutionPoolKeepalive must be(1 minute)
-      ExecutionPoolSize must be(4)
-      MaxChannelMemorySize must be(0)
-      MaxTotalMemorySize must be(0)
-      ReconnectDelay must be(5 seconds)
-      ReadTimeout must be(0 millis)
-      WriteTimeout must be(10 seconds)
-      AllTimeout must be(0 millis)
-      ReconnectionTimeWindow must be(10 minutes)
-      WriteBufferHighWaterMark must be(None)
-      WriteBufferLowWaterMark must be(None)
-      SendBufferSize must be(None)
-      ReceiveBufferSize must be(None)
-      ServerSocketWorkerPoolSize must be >= (2)
-      ServerSocketWorkerPoolSize must be <= (8)
-      ClientSocketWorkerPoolSize must be >= (2)
-      ClientSocketWorkerPoolSize must be <= (8)
-    }
-
     "contain correct configuration values in reference.conf" in {
       val c = system.asInstanceOf[ExtendedActorSystem].
         provider.asInstanceOf[RemoteActorRefProvider].
diff --git a/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala b/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala
index 5b40c48944..c7e2224efc 100644
--- a/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala
@@ -13,12 +13,12 @@ import scala.reflect.classTag
 import akka.pattern.ask
 import java.io.File
 import java.security.{ NoSuchAlgorithmException, SecureRandom, PrivilegedAction, AccessController }
-import akka.remote.netty.{ NettySettings, NettySSLSupport }
 import javax.net.ssl.SSLException
 import akka.util.Timeout
 import scala.concurrent.Await
 import scala.concurrent.duration._
 import akka.event.{ Logging, NoLogging, LoggingAdapter }
+import akka.remote.transport.netty.{ SSLSettings, NettySSLSupport }
 
 object Configuration {
   // set this in your JAVA_OPTS to see all ssl debug info: "-Djavax.net.debug=ssl,keymanager"
@@ -33,21 +33,26 @@ object Configuration {
         filter-leeway = 10s
         default-timeout = 10s
       }
-      remote.transport = "akka.remote.netty.NettyRemoteTransport"
-      remote.netty {
+
+      remoting.enabled-transports = ["ssl"]
+
+      remoting.transports.ssl {
         hostname = localhost
         port = %d
         ssl {
           enable = on
           trust-store = "%s"
           key-store = "%s"
+          key-store-password = "changeme"
+          trust-store-password = "changeme"
+          protocol = "TLSv1"
           random-number-generator = "%s"
           enabled-algorithms = [%s]
           sha1prng-random-source = "/dev/./urandom"
         }
       }
     }
-  """
+                     """
 
   case class CipherConfig(runTest: Boolean, config: Config, cipher: String, localPort: Int, remotePort: Int)
 
@@ -57,24 +62,24 @@ object Configuration {
       //if (true) throw new IllegalArgumentException("Ticket1978*Spec isn't enabled")
 
       val config = ConfigFactory.parseString(conf.format(localPort, trustStore, keyStore, cipher, enabled.mkString(", ")))
-      val fullConfig = config.withFallback(AkkaSpec.testConf).withFallback(ConfigFactory.load).getConfig("akka.remote.netty")
-      val settings = new NettySettings(fullConfig, "placeholder")
+      val fullConfig = config.withFallback(AkkaSpec.testConf).withFallback(ConfigFactory.load).getConfig("akka.remoting.transports.ssl.ssl")
+      val settings = new SSLSettings(fullConfig)
 
-      val rng = NettySSLSupport.initializeCustomSecureRandom(settings.SslSettings.SSLRandomNumberGenerator,
-        settings.SslSettings.SSLRandomSource, NoLogging)
+      val rng = NettySSLSupport.initializeCustomSecureRandom(settings.SSLRandomNumberGenerator,
+        settings.SSLRandomSource, NoLogging)
 
       rng.nextInt() // Has to work
-      settings.SslSettings.SSLRandomNumberGenerator foreach {
+      settings.SSLRandomNumberGenerator foreach {
         sRng ⇒ rng.getAlgorithm == sRng || (throw new NoSuchAlgorithmException(sRng))
       }
 
-      val engine = NettySSLSupport.initializeClientSSL(settings.SslSettings, NoLogging).getEngine
+      val engine = NettySSLSupport.initializeClientSSL(settings, NoLogging).getEngine
       val gotAllSupported = enabled.toSet -- engine.getSupportedCipherSuites.toSet
       val gotAllEnabled = enabled.toSet -- engine.getEnabledCipherSuites.toSet
       gotAllSupported.isEmpty || (throw new IllegalArgumentException("Cipher Suite not supported: " + gotAllSupported))
       gotAllEnabled.isEmpty || (throw new IllegalArgumentException("Cipher Suite not enabled: " + gotAllEnabled))
-      engine.getSupportedProtocols.contains(settings.SslSettings.SSLProtocol.get) ||
-        (throw new IllegalArgumentException("Protocol not supported: " + settings.SslSettings.SSLProtocol.get))
+      engine.getSupportedProtocols.contains(settings.SSLProtocol.get) ||
+        (throw new IllegalArgumentException("Protocol not supported: " + settings.SSLProtocol.get))
 
       CipherConfig(true, config, cipher, localPort, remotePort)
     } catch {
@@ -119,11 +124,9 @@ abstract class Ticket1978CommunicationSpec(val cipherConfig: CipherConfig) exten
 
   implicit val timeout: Timeout = Timeout(10 seconds)
 
-  import RemoteCommunicationSpec._
-
   lazy val other: ActorSystem = ActorSystem(
     "remote-sys",
-    ConfigFactory.parseString("akka.remote.netty.port=" + cipherConfig.remotePort).withFallback(system.settings.config))
+    ConfigFactory.parseString("akka.remoting.transports.ssl.port = " + cipherConfig.remotePort).withFallback(system.settings.config))
 
   override def afterTermination() {
     if (cipherConfig.runTest) {
diff --git a/akka-remote/src/test/scala/akka/remote/Ticket1978ConfigSpec.scala b/akka-remote/src/test/scala/akka/remote/Ticket1978ConfigSpec.scala
index bb396df189..88179b4ab1 100644
--- a/akka-remote/src/test/scala/akka/remote/Ticket1978ConfigSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/Ticket1978ConfigSpec.scala
@@ -4,8 +4,8 @@ import akka.testkit._
 import akka.actor._
 import com.typesafe.config._
 import scala.concurrent.duration._
-import akka.remote.netty.{ SSLSettings, NettyRemoteTransport }
 import java.util.ArrayList
+import akka.remote.transport.netty.SSLSettings
 
 @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner])
 class Ticket1978ConfigSpec extends AkkaSpec with ImplicitSender with DefaultTimeout {

From 564ba014346a3b9fee9fdb4945c0108525e4a56a Mon Sep 17 00:00:00 2001
From: Derek Mahar <derek.mahar@gmail.com>
Date: Thu, 17 Jan 2013 22:14:36 -0500
Subject: [PATCH 051/122] Update akka-docs/rst/general/actor-systems.rst

---
 akka-docs/rst/general/actor-systems.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/akka-docs/rst/general/actor-systems.rst b/akka-docs/rst/general/actor-systems.rst
index 22768a7342..6534d1426f 100644
--- a/akka-docs/rst/general/actor-systems.rst
+++ b/akka-docs/rst/general/actor-systems.rst
@@ -106,10 +106,10 @@ Actor Best Practices
    experience.
 
 #. Top-level actors are the innermost part of your Error Kernel, so create them
-   sparingly and prefer truly hierarchical systems. This has benefits wrt.
-   fault-handling (both considering the granularity of configuration and the
-   performance) and it also reduces the strain on the guardian actor, which is
-   a single point of contention if over-used.
+   sparingly and prefer truly hierarchical systems. This has benefits with
+   respect fault-handling (both considering the granularity of configuration
+   and the performance) and it also reduces the strain on the guardian actor,
+   which is a single point of contention if over-used.
 
 Blocking Needs Careful Management
 ---------------------------------

From 8a47ccf0c637d79453cf9d3852c65965093b3031 Mon Sep 17 00:00:00 2001
From: Derek Mahar <derek.mahar@gmail.com>
Date: Thu, 17 Jan 2013 22:26:06 -0500
Subject: [PATCH 052/122] Update akka-docs/rst/general/actor-systems.rst

---
 akka-docs/rst/general/actor-systems.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/akka-docs/rst/general/actor-systems.rst b/akka-docs/rst/general/actor-systems.rst
index 22768a7342..9cd2e2b91f 100644
--- a/akka-docs/rst/general/actor-systems.rst
+++ b/akka-docs/rst/general/actor-systems.rst
@@ -120,7 +120,7 @@ Examples are legacy RDBMS drivers or messaging APIs, and the underlying reason
 in typically that (network) I/O occurs under the covers. When facing this, you
 may be tempted to just wrap the blocking call inside a :class:`Future` and work
 with that instead, but this strategy is too simple: you are quite likely to
-find bottle-necks or run out of memory or threads when the application runs
+find bottlenecks or run out of memory or threads when the application runs
 under increased load.
 
 The non-exhaustive list of adequate solutions to the “blocking problem”

From eaff56defeb035e50b3546acffbc328b311b1770 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Antonsson?= <ban@rhsh.net>
Date: Fri, 18 Jan 2013 08:45:42 +0100
Subject: [PATCH 053/122] Shut down both client and server channels. See #2862

---
 .../akka/remote/transport/netty/NettyTransport.scala     | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala b/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
index 6550753214..d2bb8f1e11 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
@@ -381,8 +381,13 @@ class NettyTransport(private val settings: NettyTransportSettings, private val s
       _ ← always(channelGroup.close())
     } {
       // Release the selectors, but don't try to kill the dispatcher
-      if (UseDispatcherForIo.isDefined) inboundBootstrap.shutdown()
-      else inboundBootstrap.releaseExternalResources()
+      if (UseDispatcherForIo.isDefined) {
+        clientChannelFactory.shutdown()
+        serverChannelFactory.shutdown()
+      } else {
+        clientChannelFactory.releaseExternalResources()
+        serverChannelFactory.releaseExternalResources()
+      }
     }
 
   }

From a694946f194389d935da8758f812d3c2f071636c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Antonsson?= <ban@rhsh.net>
Date: Fri, 18 Jan 2013 09:22:22 +0100
Subject: [PATCH 054/122] Clean up network connections from the test
 coordinator and player. See #2862

---
 .../akka/remote/testconductor/Conductor.scala  |  4 ++++
 .../akka/remote/testconductor/Player.scala     |  1 +
 .../testconductor/RemoteConnection.scala       |  4 ++++
 .../remote/testconductor/BarrierSpec.scala     | 18 +++++++++++++++++-
 .../remote/testconductor/ControllerSpec.scala  |  4 ++--
 5 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/akka-remote-tests/src/main/scala/akka/remote/testconductor/Conductor.scala b/akka-remote-tests/src/main/scala/akka/remote/testconductor/Conductor.scala
index cd98cc74c7..5ea1b2e8cb 100644
--- a/akka-remote-tests/src/main/scala/akka/remote/testconductor/Conductor.scala
+++ b/akka-remote-tests/src/main/scala/akka/remote/testconductor/Conductor.scala
@@ -448,6 +448,10 @@ private[akka] class Controller(private var initialParticipants: Int, controllerP
     case GetNodes    ⇒ sender ! nodes.keys
     case GetSockAddr ⇒ sender ! connection.getLocalAddress
   }
+
+  override def postStop() {
+    RemoteConnection.shutdown(connection)
+  }
 }
 
 /**
diff --git a/akka-remote-tests/src/main/scala/akka/remote/testconductor/Player.scala b/akka-remote-tests/src/main/scala/akka/remote/testconductor/Player.scala
index f3b7a89c08..2a0ed93733 100644
--- a/akka-remote-tests/src/main/scala/akka/remote/testconductor/Player.scala
+++ b/akka-remote-tests/src/main/scala/akka/remote/testconductor/Player.scala
@@ -313,6 +313,7 @@ private[akka] class PlayerHandler(
     val channel = event.getChannel
     log.debug("disconnected from {}", getAddrString(channel))
     fsm ! PoisonPill
+    RemoteConnection.shutdown(channel)
   }
 
   override def messageReceived(ctx: ChannelHandlerContext, event: MessageEvent) = {
diff --git a/akka-remote-tests/src/main/scala/akka/remote/testconductor/RemoteConnection.scala b/akka-remote-tests/src/main/scala/akka/remote/testconductor/RemoteConnection.scala
index adca9518b4..2c542a2632 100644
--- a/akka-remote-tests/src/main/scala/akka/remote/testconductor/RemoteConnection.scala
+++ b/akka-remote-tests/src/main/scala/akka/remote/testconductor/RemoteConnection.scala
@@ -70,4 +70,8 @@ private[akka] object RemoteConnection {
     case i: InetSocketAddress ⇒ i.toString
     case _                    ⇒ "[unknown]"
   }
+
+  def shutdown(channel: Channel) = {
+    channel.getFactory.releaseExternalResources()
+  }
 }
diff --git a/akka-remote-tests/src/test/scala/akka/remote/testconductor/BarrierSpec.scala b/akka-remote-tests/src/test/scala/akka/remote/testconductor/BarrierSpec.scala
index fe6a0cfebe..0e1604ff1b 100644
--- a/akka-remote-tests/src/test/scala/akka/remote/testconductor/BarrierSpec.scala
+++ b/akka-remote-tests/src/test/scala/akka/remote/testconductor/BarrierSpec.scala
@@ -5,7 +5,7 @@ package akka.remote.testconductor
 
 import language.postfixOps
 
-import akka.actor.{ Props, AddressFromURIString, ActorRef, Actor, OneForOneStrategy, SupervisorStrategy }
+import akka.actor.{ Props, AddressFromURIString, ActorRef, Actor, OneForOneStrategy, SupervisorStrategy, PoisonPill }
 import akka.testkit.{ AkkaSpec, ImplicitSender, EventFilter, TestProbe, TimingTest }
 import scala.concurrent.duration._
 import akka.event.Logging
@@ -243,6 +243,7 @@ class BarrierSpec extends AkkaSpec(BarrierSpec.config) with ImplicitSender {
       EventFilter[BarrierEmpty](occurrences = 1) intercept {
         b ! Remove(A)
       }
+      b ! PoisonPill // clean up so network connections don't accumulate during test run
     }
 
     "register clients and disconnect them" taggedAs TimingTest in {
@@ -253,12 +254,14 @@ class BarrierSpec extends AkkaSpec(BarrierSpec.config) with ImplicitSender {
       expectNoMsg(1 second)
       b ! ClientDisconnected(A)
       expectNoMsg(1 second)
+      b ! PoisonPill // clean up so network connections don't accumulate during test run
     }
 
     "fail entering barrier when nobody registered" taggedAs TimingTest in {
       val b = getController(0)
       b ! EnterBarrier("b", None)
       expectMsg(ToClient(BarrierResult("b", false)))
+      b ! PoisonPill // clean up so network connections don't accumulate during test run
     }
 
     "enter barrier" taggedAs TimingTest in {
@@ -275,6 +278,7 @@ class BarrierSpec extends AkkaSpec(BarrierSpec.config) with ImplicitSender {
         a.expectMsg(ToClient(BarrierResult("bar11", true)))
         b.expectMsg(ToClient(BarrierResult("bar11", true)))
       }
+      barrier ! PoisonPill // clean up so network connections don't accumulate during test run
     }
 
     "enter barrier with joining node" taggedAs TimingTest in {
@@ -295,6 +299,7 @@ class BarrierSpec extends AkkaSpec(BarrierSpec.config) with ImplicitSender {
         b.expectMsg(ToClient(BarrierResult("bar12", true)))
         c.expectMsg(ToClient(BarrierResult("bar12", true)))
       }
+      barrier ! PoisonPill // clean up so network connections don't accumulate during test run
     }
 
     "enter barrier with leaving node" taggedAs TimingTest in {
@@ -317,6 +322,7 @@ class BarrierSpec extends AkkaSpec(BarrierSpec.config) with ImplicitSender {
       }
       barrier ! ClientDisconnected(C)
       expectNoMsg(1 second)
+      barrier ! PoisonPill // clean up so network connections don't accumulate during test run
     }
 
     "leave barrier when last “arrived” is removed" taggedAs TimingTest in {
@@ -330,6 +336,7 @@ class BarrierSpec extends AkkaSpec(BarrierSpec.config) with ImplicitSender {
       barrier ! Remove(A)
       b.send(barrier, EnterBarrier("foo", None))
       b.expectMsg(ToClient(BarrierResult("foo", true)))
+      barrier ! PoisonPill // clean up so network connections don't accumulate during test run
     }
 
     "fail barrier with disconnecing node" taggedAs TimingTest in {
@@ -347,6 +354,7 @@ class BarrierSpec extends AkkaSpec(BarrierSpec.config) with ImplicitSender {
         barrier ! ClientDisconnected(B)
       }
       a.expectMsg(ToClient(BarrierResult("bar15", false)))
+      barrier ! PoisonPill // clean up so network connections don't accumulate during test run
     }
 
     "fail barrier with disconnecing node who already arrived" taggedAs TimingTest in {
@@ -366,6 +374,7 @@ class BarrierSpec extends AkkaSpec(BarrierSpec.config) with ImplicitSender {
         barrier ! ClientDisconnected(B)
       }
       a.expectMsg(ToClient(BarrierResult("bar16", false)))
+      barrier ! PoisonPill // clean up so network connections don't accumulate during test run
     }
 
     "fail when entering wrong barrier" taggedAs TimingTest in {
@@ -383,6 +392,7 @@ class BarrierSpec extends AkkaSpec(BarrierSpec.config) with ImplicitSender {
       }
       a.expectMsg(ToClient(BarrierResult("bar17", false)))
       b.expectMsg(ToClient(BarrierResult("foo", false)))
+      barrier ! PoisonPill // clean up so network connections don't accumulate during test run
     }
 
     "fail after barrier timeout" taggedAs TimingTest in {
@@ -401,6 +411,7 @@ class BarrierSpec extends AkkaSpec(BarrierSpec.config) with ImplicitSender {
       b.send(barrier, EnterBarrier("bar18", None))
       a.expectMsg(ToClient(BarrierResult("bar18", false)))
       b.expectMsg(ToClient(BarrierResult("bar18", false)))
+      barrier ! PoisonPill // clean up so network connections don't accumulate during test run
     }
 
     "fail if a node registers twice" taggedAs TimingTest in {
@@ -414,6 +425,7 @@ class BarrierSpec extends AkkaSpec(BarrierSpec.config) with ImplicitSender {
       }
       a.expectMsg(ToClient(BarrierResult("initial startup", false)))
       b.expectMsg(ToClient(BarrierResult("initial startup", false)))
+      controller ! PoisonPill // clean up so network connections don't accumulate during test run
     }
 
     "fail subsequent barriers if a node registers twice" taggedAs TimingTest in {
@@ -429,6 +441,7 @@ class BarrierSpec extends AkkaSpec(BarrierSpec.config) with ImplicitSender {
       }
       a.send(controller, EnterBarrier("bar19", None))
       a.expectMsg(ToClient(BarrierResult("bar19", false)))
+      controller ! PoisonPill // clean up so network connections don't accumulate during test run
     }
 
     "fail subsequent barriers after foreced failure" taggedAs TimingTest in {
@@ -450,6 +463,7 @@ class BarrierSpec extends AkkaSpec(BarrierSpec.config) with ImplicitSender {
       b.send(barrier, EnterBarrier("bar21", None))
       a.expectMsg(ToClient(BarrierResult("bar21", false)))
       b.expectMsg(ToClient(BarrierResult("bar21", false)))
+      barrier ! PoisonPill // clean up so network connections don't accumulate during test run
     }
 
     "timeout within the shortest timeout if the new timeout is shorter" taggedAs TimingTest in {
@@ -473,6 +487,7 @@ class BarrierSpec extends AkkaSpec(BarrierSpec.config) with ImplicitSender {
       a.expectMsg(ToClient(BarrierResult("bar22", false)))
       b.expectMsg(ToClient(BarrierResult("bar22", false)))
       c.expectMsg(ToClient(BarrierResult("bar22", false)))
+      barrier ! PoisonPill // clean up so network connections don't accumulate during test run
     }
 
     "timeout within the shortest timeout if the new timeout is longer" taggedAs TimingTest in {
@@ -496,6 +511,7 @@ class BarrierSpec extends AkkaSpec(BarrierSpec.config) with ImplicitSender {
       a.expectMsg(ToClient(BarrierResult("bar23", false)))
       b.expectMsg(ToClient(BarrierResult("bar23", false)))
       c.expectMsg(ToClient(BarrierResult("bar23", false)))
+      barrier ! PoisonPill // clean up so network connections don't accumulate during test run
     }
 
     "finally have no failure messages left" taggedAs TimingTest in {
diff --git a/akka-remote-tests/src/test/scala/akka/remote/testconductor/ControllerSpec.scala b/akka-remote-tests/src/test/scala/akka/remote/testconductor/ControllerSpec.scala
index 17d8932590..742ef36c9c 100644
--- a/akka-remote-tests/src/test/scala/akka/remote/testconductor/ControllerSpec.scala
+++ b/akka-remote-tests/src/test/scala/akka/remote/testconductor/ControllerSpec.scala
@@ -4,10 +4,9 @@
 package akka.remote.testconductor
 
 import akka.testkit.AkkaSpec
-import akka.actor.Props
+import akka.actor.{ PoisonPill, Props, AddressFromURIString }
 import akka.testkit.ImplicitSender
 import akka.remote.testconductor.Controller.NodeInfo
-import akka.actor.AddressFromURIString
 import java.net.InetSocketAddress
 import java.net.InetAddress
 
@@ -35,6 +34,7 @@ class ControllerSpec extends AkkaSpec(ControllerSpec.config) with ImplicitSender
       expectMsg(ToClient(Done))
       c ! Controller.GetNodes
       expectMsgType[Iterable[RoleName]].toSet must be(Set(A, B))
+      c ! PoisonPill // clean up so network connections don't accumulate during test run
     }
 
   }

From c38be1bc4aca9530fb8c0e3a3c52477dbba28bfa Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Thu, 17 Jan 2013 18:24:57 +0100
Subject: [PATCH 055/122] Preserving Envelopes in UnstartedActorCell as
 requested by Mr Pink

---
 .../src/main/scala/akka/actor/ActorCell.scala | 24 +++++++++++++------
 .../src/main/scala/akka/actor/ActorRef.scala  |  2 +-
 .../akka/actor/RepointableActorRef.scala      | 19 +++++++--------
 .../scala/akka/actor/dungeon/Dispatch.scala   | 16 +++++++++----
 .../akka/dispatch/AbstractDispatcher.scala    | 16 ++++---------
 .../src/main/scala/akka/routing/Routing.scala | 19 +++++++--------
 .../throttle/TimerBasedThrottler.scala        |  2 +-
 .../akka/osgi/OsgiActorSystemFactory.scala    |  4 ++--
 8 files changed, 55 insertions(+), 47 deletions(-)

diff --git a/akka-actor/src/main/scala/akka/actor/ActorCell.scala b/akka-actor/src/main/scala/akka/actor/ActorCell.scala
index 6f48fd235e..7b216969ba 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorCell.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorCell.scala
@@ -214,19 +214,19 @@ private[akka] trait Cell {
    */
   def start(): this.type
   /**
-   * Recursively suspend this actor and all its children. Must not throw exceptions.
+   * Recursively suspend this actor and all its children. Is only allowed to throw Fatal Throwables.
    */
   def suspend(): Unit
   /**
-   * Recursively resume this actor and all its children. Must not throw exceptions.
+   * Recursively resume this actor and all its children. Is only allowed to throw Fatal Throwables.
    */
   def resume(causedByFailure: Throwable): Unit
   /**
-   * Restart this actor (will recursively restart or stop all children). Must not throw exceptions.
+   * Restart this actor (will recursively restart or stop all children). Is only allowed to throw Fatal Throwables.
    */
   def restart(cause: Throwable): Unit
   /**
-   * Recursively terminate this actor and all its children. Must not throw exceptions.
+   * Recursively terminate this actor and all its children. Is only allowed to throw Fatal Throwables.
    */
   def stop(): Unit
   /**
@@ -246,16 +246,26 @@ private[akka] trait Cell {
    * Get the stats for the named child, if that exists.
    */
   def getChildByName(name: String): Option[ChildStats]
+
   /**
    * Enqueue a message to be sent to the actor; may or may not actually
    * schedule the actor to run, depending on which type of cell it is.
-   * Must not throw exceptions.
+   * Is only allowed to throw Fatal Throwables.
    */
-  def tell(message: Any, sender: ActorRef): Unit
+  def sendMessage(msg: Envelope): Unit
+
   /**
    * Enqueue a message to be sent to the actor; may or may not actually
    * schedule the actor to run, depending on which type of cell it is.
-   * Must not throw exceptions.
+   * Is only allowed to throw Fatal Throwables.
+   */
+  final def sendMessage(message: Any, sender: ActorRef): Unit =
+    sendMessage(Envelope(message, sender, system))
+
+  /**
+   * Enqueue a message to be sent to the actor; may or may not actually
+   * schedule the actor to run, depending on which type of cell it is.
+   * Is only allowed to throw Fatal Throwables.
    */
   def sendSystemMessage(msg: SystemMessage): Unit
   /**
diff --git a/akka-actor/src/main/scala/akka/actor/ActorRef.scala b/akka-actor/src/main/scala/akka/actor/ActorRef.scala
index d33821cd92..df8948a03d 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorRef.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorRef.scala
@@ -350,7 +350,7 @@ private[akka] class LocalActorRef private[akka] (
 
   override def sendSystemMessage(message: SystemMessage): Unit = actorCell.sendSystemMessage(message)
 
-  override def !(message: Any)(implicit sender: ActorRef = Actor.noSender): Unit = actorCell.tell(message, sender)
+  override def !(message: Any)(implicit sender: ActorRef = Actor.noSender): Unit = actorCell.sendMessage(message, sender)
 
   override def restart(cause: Throwable): Unit = actorCell.restart(cause)
 
diff --git a/akka-actor/src/main/scala/akka/actor/RepointableActorRef.scala b/akka-actor/src/main/scala/akka/actor/RepointableActorRef.scala
index 300481ad06..62cca3477b 100644
--- a/akka-actor/src/main/scala/akka/actor/RepointableActorRef.scala
+++ b/akka-actor/src/main/scala/akka/actor/RepointableActorRef.scala
@@ -151,7 +151,7 @@ private[akka] class RepointableActorRef(
       }
     } else this
 
-  def !(message: Any)(implicit sender: ActorRef = Actor.noSender) = underlying.tell(message, sender)
+  def !(message: Any)(implicit sender: ActorRef = Actor.noSender) = underlying.sendMessage(message, sender)
 
   def sendSystemMessage(message: SystemMessage) = underlying.sendSystemMessage(message)
 
@@ -181,7 +181,7 @@ private[akka] class UnstartedCell(val systemImpl: ActorSystemImpl,
       while (!queue.isEmpty) {
         queue.poll() match {
           case s: SystemMessage ⇒ cell.sendSystemMessage(s)
-          case e: Envelope      ⇒ cell.tell(e.message, e.sender)
+          case e: Envelope      ⇒ cell.sendMessage(e)
         }
       }
     } finally {
@@ -203,21 +203,20 @@ private[akka] class UnstartedCell(val systemImpl: ActorSystemImpl,
   def childrenRefs: ChildrenContainer = ChildrenContainer.EmptyChildrenContainer
   def getChildByName(name: String): Option[ChildRestartStats] = None
 
-  def tell(message: Any, sender: ActorRef): Unit = {
-    val useSender = if (sender eq Actor.noSender) system.deadLetters else sender
+  def sendMessage(msg: Envelope): Unit = {
     if (lock.tryLock(timeout.length, timeout.unit)) {
       try {
         val cell = self.underlying
         if (cellIsReady(cell)) {
-          cell.tell(message, useSender)
-        } else if (!queue.offer(Envelope(message, useSender, system))) {
-          system.eventStream.publish(Warning(self.path.toString, getClass, "dropping message of type " + message.getClass + " due to enqueue failure"))
-          system.deadLetters ! DeadLetter(message, useSender, self)
+          cell.sendMessage(msg)
+        } else if (!queue.offer(msg)) {
+          system.eventStream.publish(Warning(self.path.toString, getClass, "dropping message of type " + msg.message.getClass + " due to enqueue failure"))
+          system.deadLetters ! DeadLetter(msg.message, msg.sender, self)
         }
       } finally lock.unlock()
     } else {
-      system.eventStream.publish(Warning(self.path.toString, getClass, "dropping message of type" + message.getClass + " due to lock timeout"))
-      system.deadLetters ! DeadLetter(message, useSender, self)
+      system.eventStream.publish(Warning(self.path.toString, getClass, "dropping message of type" + msg.message.getClass + " due to lock timeout"))
+      system.deadLetters ! DeadLetter(msg.message, msg.sender, self)
     }
   }
 
diff --git a/akka-actor/src/main/scala/akka/actor/dungeon/Dispatch.scala b/akka-actor/src/main/scala/akka/actor/dungeon/Dispatch.scala
index 1d3b498c2b..9bce41fc4f 100644
--- a/akka-actor/src/main/scala/akka/actor/dungeon/Dispatch.scala
+++ b/akka-actor/src/main/scala/akka/actor/dungeon/Dispatch.scala
@@ -5,12 +5,13 @@
 package akka.actor.dungeon
 
 import scala.annotation.tailrec
-import akka.actor.{ ActorRef, ActorCell }
 import akka.dispatch.{ Terminate, SystemMessage, Suspend, Resume, Recreate, MessageDispatcher, Mailbox, Envelope, Create }
 import akka.event.Logging.Error
 import akka.util.Unsafe
 import scala.util.control.NonFatal
 import akka.dispatch.NullMessage
+import akka.actor.{ NoSerializationVerificationNeeded, InvalidMessageException, ActorRef, ActorCell }
+import akka.serialization.SerializationExtension
 
 private[akka] trait Dispatch { this: ActorCell ⇒
 
@@ -102,9 +103,16 @@ private[akka] trait Dispatch { this: ActorCell ⇒
         system.eventStream.publish(Error(e, self.path.toString, clazz(actor), "swallowing exception during message send"))
     }
 
-  def tell(message: Any, sender: ActorRef): Unit =
-    try dispatcher.dispatch(this, Envelope(message, if (sender eq null) system.deadLetters else sender, system))
-    catch {
+  def sendMessage(msg: Envelope): Unit =
+    try {
+      val m = msg.message.asInstanceOf[AnyRef]
+      if (m eq null) throw new InvalidMessageException("Message is null")
+      if (system.settings.SerializeAllMessages && !m.isInstanceOf[NoSerializationVerificationNeeded]) {
+        val s = SerializationExtension(system)
+        s.deserialize(s.serialize(m).get, m.getClass).get
+      }
+      dispatcher.dispatch(this, msg)
+    } catch {
       case e @ (_: InterruptedException | NonFatal(_)) ⇒
         system.eventStream.publish(Error(e, self.path.toString, clazz(actor), "swallowing exception during message send"))
     }
diff --git a/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala b/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala
index 5d470746f4..ff59242c39 100644
--- a/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala
@@ -9,27 +9,19 @@ import akka.event.Logging.{ Error, LogEventException }
 import akka.actor._
 import akka.event.EventStream
 import com.typesafe.config.Config
-import akka.serialization.SerializationExtension
 import akka.util.{ Unsafe, Index }
 import scala.annotation.tailrec
 import scala.concurrent.forkjoin.{ ForkJoinTask, ForkJoinPool }
 import scala.concurrent.duration.Duration
-import scala.concurrent.{ ExecutionContext, Await, Awaitable }
-import scala.util.control.NonFatal
+import scala.concurrent.ExecutionContext
 import scala.concurrent.duration.FiniteDuration
+import scala.util.control.NonFatal
 
 final case class Envelope private (val message: Any, val sender: ActorRef)
 
 object Envelope {
-  def apply(message: Any, sender: ActorRef, system: ActorSystem): Envelope = {
-    val msg = message.asInstanceOf[AnyRef]
-    if (msg eq null) throw new InvalidMessageException("Message is null")
-    if (system.settings.SerializeAllMessages && !msg.isInstanceOf[NoSerializationVerificationNeeded]) {
-      val ser = SerializationExtension(system)
-      ser.deserialize(ser.serialize(msg).get, msg.getClass).get
-    }
-    new Envelope(message, sender)
-  }
+  def apply(message: Any, sender: ActorRef, system: ActorSystem): Envelope =
+    new Envelope(message, if (sender ne Actor.noSender) sender else system.deadLetters)
 }
 
 /**
diff --git a/akka-actor/src/main/scala/akka/routing/Routing.scala b/akka-actor/src/main/scala/akka/routing/Routing.scala
index ee98de0f10..14d2de39a9 100644
--- a/akka-actor/src/main/scala/akka/routing/Routing.scala
+++ b/akka-actor/src/main/scala/akka/routing/Routing.scala
@@ -10,7 +10,7 @@ import scala.collection.immutable
 import scala.concurrent.duration._
 import akka.actor._
 import akka.ConfigurationException
-import akka.dispatch.Dispatchers
+import akka.dispatch.{ Envelope, Dispatchers }
 import akka.pattern.pipe
 import akka.japi.Util.immutableSeq
 import com.typesafe.config.Config
@@ -118,25 +118,24 @@ private[akka] class RoutedActorCell(_system: ActorSystemImpl, _ref: InternalActo
    * resizer is invoked asynchronously, i.e. not necessarily before the
    * message has been sent.
    */
-  override def tell(message: Any, sender: ActorRef): Unit = {
-    val s = if (sender eq null) system.deadLetters else sender
-    val msg = message match {
+  override def sendMessage(msg: Envelope): Unit = {
+    val message = msg.message match {
       case wrapped: RouterEnvelope ⇒ wrapped.message
       case m                       ⇒ m
     }
-    applyRoute(s, message) foreach {
-      case Destination(snd, `self`) ⇒
-        super.tell(msg, snd)
-      case Destination(snd, recipient) ⇒
+    applyRoute(msg.sender, msg.message) foreach {
+      case Destination(sender, `self`) ⇒
+        super.sendMessage(Envelope(message, sender, system))
+      case Destination(sender, recipient) ⇒
         resize() // only resize when the message target is one of the routees
-        recipient.tell(msg, snd)
+        recipient.tell(message, sender)
     }
   }
 
   def resize(): Unit =
     for (r ← routerConfig.resizer) {
       if (r.isTimeForResize(resizeCounter.getAndIncrement()) && resizeInProgress.compareAndSet(false, true))
-        super.tell(Router.Resize, self)
+        super.sendMessage(Envelope(Router.Resize, self, system))
     }
 }
 
diff --git a/akka-contrib/src/main/scala/akka/contrib/throttle/TimerBasedThrottler.scala b/akka-contrib/src/main/scala/akka/contrib/throttle/TimerBasedThrottler.scala
index 0841130f34..3e1d2c6908 100644
--- a/akka-contrib/src/main/scala/akka/contrib/throttle/TimerBasedThrottler.scala
+++ b/akka-contrib/src/main/scala/akka/contrib/throttle/TimerBasedThrottler.scala
@@ -293,4 +293,4 @@ class TimerBasedThrottler(var rate: Rate) extends Actor with Throttler with FSM[
 
     data.copy(queue = queue.drop(nrOfMsgToSend), callsLeftInThisPeriod = data.callsLeftInThisPeriod - nrOfMsgToSend)
   }
-}
+}
diff --git a/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala b/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala
index 6b799df30c..4194afba01 100644
--- a/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala
+++ b/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala
@@ -44,8 +44,8 @@ class OsgiActorSystemFactory(val context: BundleContext, val fallbackClassLoader
   def actorSystemConfig(context: BundleContext): Config = {
     val bundleSymbolicName = context.getBundle.getSymbolicName
     val bundleId = context.getBundle.getBundleId
-    val acceptedFilePath = List(s"bundle-$bundleSymbolicName", s"bundle-$bundleId", "akka").map(x =>  s"etc/$x")
-    val applicationConfiguration = acceptedFilePath.foldLeft(ConfigFactory.empty())((x, y) => x.withFallback(ConfigFactory.parseFileAnySyntax(new File(y))))
+    val acceptedFilePath = List(s"bundle-$bundleSymbolicName", s"bundle-$bundleId", "akka").map(x ⇒ s"etc/$x")
+    val applicationConfiguration = acceptedFilePath.foldLeft(ConfigFactory.empty())((x, y) ⇒ x.withFallback(ConfigFactory.parseFileAnySyntax(new File(y))))
     applicationConfiguration.withFallback(ConfigFactory.load(classloader).withFallback(ConfigFactory.defaultReference(OsgiActorSystemFactory.akkaActorClassLoader)))
   }
 

From 8b4e903e7d817a81dd1db073d479a13878db03be Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Tue, 15 Jan 2013 09:35:07 +0100
Subject: [PATCH 056/122] Detect failure when no heartbeats sent, see #2907

* Subscribe to InstantMemberEvent and start heartbeating when
  InstantMemberUp. Same for metrics.
* HeartbeatNodeRing data structure for bidirectional mapping of
  heartbeat sender and receiver. Not using ConsistentHash anymore.
  Node addresses are hashed to ensure that neighbors are spread out.
* HeartbeatRequest when receiver detects that it has not received
  expected heartbeats.
* New test InitialHeartbeatSpec that simulates the problem
* Add/remove some related conf properties
* Add some more logging to be able to diagnose eventual problems
* Explicit config of nr-of-end-heartbeats
---
 .../src/main/resources/reference.conf         |  26 +-
 .../akka/cluster/AccrualFailureDetector.scala |  17 +-
 .../src/main/scala/akka/cluster/Cluster.scala |   9 +-
 .../scala/akka/cluster/ClusterDaemon.scala    |  11 +-
 .../scala/akka/cluster/ClusterHeartbeat.scala | 258 ++++++++++++------
 .../cluster/ClusterMetricsCollector.scala     |  16 +-
 .../scala/akka/cluster/ClusterSettings.scala  |  19 +-
 .../scala/akka/cluster/FailureDetector.scala  |   6 +
 .../src/main/scala/akka/cluster/Member.scala  |   1 +
 .../akka/cluster/InitialHeartbeatSpec.scala   |  87 ++++++
 .../akka/cluster/LeaderElectionSpec.scala     |   4 +-
 .../akka/cluster/MultiNodeClusterSpec.scala   |   3 +-
 .../scala/akka/cluster/SplitBrainSpec.scala   |   4 +-
 .../scala/akka/cluster/StressSpec.scala       |   6 +-
 .../akka/cluster/ClusterConfigSpec.scala      |   6 +-
 .../ClusterHeartbeatSenderStateSpec.scala     |  42 ++-
 .../akka/cluster/FailureDetectorPuppet.scala  |   2 +
 .../akka/cluster/HeartbeatNodeRingSpec.scala  |  61 +++++
 .../DefaultFailureDetectorRegistry.scala      |   9 +-
 .../scala/akka/remote/FailureDetector.scala   |   6 +
 .../akka/remote/FailureDetectorRegistry.scala |   7 +
 .../remote/PhiAccrualFailureDetector.scala    |   2 +
 .../remote/AccrualFailureDetectorSpec.scala   |   4 +-
 .../remote/FailureDetectorRegistrySpec.scala  |   4 +
 .../remote/transport/AkkaProtocolSpec.scala   |   2 +
 25 files changed, 466 insertions(+), 146 deletions(-)
 create mode 100644 akka-cluster/src/multi-jvm/scala/akka/cluster/InitialHeartbeatSpec.scala
 create mode 100644 akka-cluster/src/test/scala/akka/cluster/HeartbeatNodeRingSpec.scala

diff --git a/akka-cluster/src/main/resources/reference.conf b/akka-cluster/src/main/resources/reference.conf
index f8d18a516b..4532c0ff8a 100644
--- a/akka-cluster/src/main/resources/reference.conf
+++ b/akka-cluster/src/main/resources/reference.conf
@@ -55,10 +55,6 @@ akka {
     # A value of 0 s can be used to always publish the stats, when it happens.
     publish-stats-interval = 10s
 
-    # A joining node stops sending heartbeats to the node to join if it hasn't
-    # become member of the cluster within this deadline.
-    join-timeout = 60s
-
     # The id of the dispatcher to use for cluster actors. If not specified
     # default dispatcher is used.
     # If specified you need to define the settings of the actual dispatcher.
@@ -109,7 +105,29 @@ akka {
       # network drop.
       acceptable-heartbeat-pause = 3s
 
+      # Number of samples to use for calculation of mean and standard deviation of
+      # inter-arrival times.
       max-sample-size = 1000
+
+      # When a node stops sending heartbeats to another node it will end that
+      # with this number of EndHeartbeat messages, which will remove the
+      # monitoring from the failure detector.
+      nr-of-end-heartbeats = 8
+
+      # When no expected heartbeat message has been received an explicit
+      # heartbeat request is sent to the node that should emit heartbeats.
+      heartbeat-request {
+        # Grace period until an explicit heartbeat request is sent
+        grace-period = 10 s
+
+        # After the heartbeat request has been sent the first failure detection
+        # will start after this period, even though no heartbeat mesage has
+        # been received.
+        expected-response-after = 3 s
+
+        # Cleanup of obsolete heartbeat requests
+        time-to-live = 60 s
+      }
     }
 
     metrics {
diff --git a/akka-cluster/src/main/scala/akka/cluster/AccrualFailureDetector.scala b/akka-cluster/src/main/scala/akka/cluster/AccrualFailureDetector.scala
index 6e812ab6cc..92c876b22d 100644
--- a/akka-cluster/src/main/scala/akka/cluster/AccrualFailureDetector.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/AccrualFailureDetector.scala
@@ -109,18 +109,19 @@ class AccrualFailureDetector(
 
   private val state = new AtomicReference[State](State())
 
-  /**
-   * Returns true if the connection is considered to be up and healthy
-   * and returns false otherwise.
-   */
-  def isAvailable(connection: Address): Boolean = phi(connection) < threshold
+  override def isAvailable(connection: Address): Boolean = phi(connection) < threshold
+
+  override def isMonitoring(connection: Address): Boolean = state.get.timestamps.get(connection).nonEmpty
 
   /**
    * Records a heartbeat for a connection.
    */
   @tailrec
   final def heartbeat(connection: Address) {
-    log.debug("Heartbeat from connection [{}] ", connection)
+    if (isMonitoring(connection))
+      log.debug("Heartbeat from connection [{}] ", connection)
+    else
+      log.info("First heartbeat from connection [{}] ", connection)
 
     val timestamp = clock()
     val oldState = state.get
@@ -197,7 +198,9 @@ class AccrualFailureDetector(
    */
   @tailrec
   final def remove(connection: Address): Unit = {
-    log.debug("Remove connection [{}] ", connection)
+    if (isMonitoring(connection))
+      log.info("Remove heartbeat connection [{}] ", connection)
+
     val oldState = state.get
 
     if (oldState.history.contains(connection)) {
diff --git a/akka-cluster/src/main/scala/akka/cluster/Cluster.scala b/akka-cluster/src/main/scala/akka/cluster/Cluster.scala
index 6da8af20e5..a3ee862eca 100644
--- a/akka-cluster/src/main/scala/akka/cluster/Cluster.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/Cluster.scala
@@ -176,8 +176,13 @@ class Cluster(val system: ExtendedActorSystem) extends Extension {
   /**
    * Subscribe to cluster domain events.
    * The `to` Class can be [[akka.cluster.ClusterEvent.ClusterDomainEvent]]
-   * or subclass. A snapshot of [[akka.cluster.ClusterEvent.CurrentClusterState]]
-   * will also be sent to the subscriber.
+   * or subclass.
+   *
+   * A snapshot of [[akka.cluster.ClusterEvent.CurrentClusterState]]
+   * will be sent to the subscriber as the first event. When
+   * `to` Class is a [[akka.cluster.ClusterEvent.InstantMemberEvent]]
+   * (or subclass) the snapshot event will instead be a
+   * [[akka.cluster.ClusterEvent.InstantClusterState]].
    */
   def subscribe(subscriber: ActorRef, to: Class[_]): Unit =
     clusterCore ! InternalClusterAction.Subscribe(subscriber, to)
diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterDaemon.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterDaemon.scala
index f43c53926e..5271bd6cd5 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterDaemon.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/ClusterDaemon.scala
@@ -181,7 +181,6 @@ private[cluster] final class ClusterDaemon(settings: ClusterSettings) extends Ac
 private[cluster] final class ClusterCoreDaemon(publisher: ActorRef) extends Actor with ActorLogging {
   import ClusterLeaderAction._
   import InternalClusterAction._
-  import ClusterHeartbeatSender.JoinInProgress
 
   val cluster = Cluster(context.system)
   import cluster.{ selfAddress, scheduler, failureDetector }
@@ -281,7 +280,13 @@ private[cluster] final class ClusterCoreDaemon(publisher: ActorRef) extends Acto
    * A 'Join(thisNodeAddress)' command is sent to the node to join.
    */
   def join(address: Address): Unit = {
-    if (!latestGossip.members.exists(_.address == address)) {
+    if (address.protocol != selfAddress.protocol)
+      log.info("Member with wrong protocol tried to join, but was ignored, expected [{}] but was [{}]",
+        selfAddress.protocol, address.protocol)
+    else if (address.system != selfAddress.system)
+      log.info("Member with wrong ActorSystem name tried to join, but was ignored, expected [{}] but was [{}]",
+        selfAddress.system, address.system)
+    else if (!latestGossip.members.exists(_.address == address)) {
       // wipe our state since a node that joins a cluster must be empty
       latestGossip = Gossip.empty
       // wipe the failure detector since we are starting fresh and shouldn't care about the past
@@ -290,7 +295,6 @@ private[cluster] final class ClusterCoreDaemon(publisher: ActorRef) extends Acto
       publisher ! PublishStart
 
       publish(latestGossip)
-      heartbeatSender ! JoinInProgress(address, Deadline.now + JoinTimeout)
 
       context.become(initialized)
       if (address == selfAddress)
@@ -331,7 +335,6 @@ private[cluster] final class ClusterCoreDaemon(publisher: ActorRef) extends Acto
       log.debug("Cluster Node [{}] - Node [{}] is JOINING", selfAddress, node)
       // treat join as initial heartbeat, so that it becomes unavailable if nothing more happens
       if (node != selfAddress) {
-        failureDetector heartbeat node
         gossipTo(node)
       }
 
diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterHeartbeat.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterHeartbeat.scala
index a5d230019f..81ac04e64c 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterHeartbeat.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/ClusterHeartbeat.scala
@@ -6,13 +6,12 @@ package akka.cluster
 import language.postfixOps
 
 import scala.collection.immutable
-import scala.annotation.tailrec
 import scala.concurrent.duration._
 import java.net.URLEncoder
 import akka.actor.{ ActorLogging, ActorRef, Address, Actor, RootActorPath, PoisonPill, Props }
 import akka.pattern.{ CircuitBreaker, CircuitBreakerOpenException }
 import akka.cluster.ClusterEvent._
-import akka.routing.ConsistentHash
+import akka.routing.MurmurHash
 
 /**
  * INTERNAL API
@@ -55,13 +54,26 @@ private[cluster] final class ClusterHeartbeatReceiver extends Actor with ActorLo
  */
 private[cluster] object ClusterHeartbeatSender {
   /**
-   * Tell [akka.cluster.ClusterHeartbeatSender]] that this node has started joining of
-   * another node and heartbeats should be sent unconditionally until it becomes
-   * member or deadline is overdue. This is done to be able to detect immediate death
-   * of the joining node.
+   * Request heartbeats from another node. Sent from the node that is
+   * expecting heartbeats from a specific sender, but has not received any.
+   */
+  case class HeartbeatRequest(from: Address) extends ClusterMessage
+
+  /**
+   * Delayed sending of a HeartbeatRequest. The actual request is
+   * only sent if no expected heartbeat message has been received.
    * Local only, no need to serialize.
    */
-  case class JoinInProgress(address: Address, deadline: Deadline)
+  case class SendHeartbeatRequest(to: Address)
+
+  /**
+   * Trigger a fake heartbeat message to trigger start of failure detection
+   * of a node that this node is expecting heartbeats from. HeartbeatRequest
+   * has been sent to the node so it should have started sending heartbeat
+   * messages.
+   * Local only, no need to serialize.
+   */
+  case class ExpectedFirstHeartbeat(from: Address)
 }
 
 /*
@@ -88,16 +100,16 @@ private[cluster] final class ClusterHeartbeatSender extends Actor with ActorLogg
 
   val selfHeartbeat = Heartbeat(selfAddress)
   val selfEndHeartbeat = EndHeartbeat(selfAddress)
+  val selfHeartbeatRequest = HeartbeatRequest(selfAddress)
 
-  var state = ClusterHeartbeatSenderState.empty(ConsistentHash(Seq.empty[Address], HeartbeatConsistentHashingVirtualNodesFactor),
-    selfAddress.toString, MonitoredByNrOfMembers)
+  var state = ClusterHeartbeatSenderState.empty(selfAddress, MonitoredByNrOfMembers)
 
   // start periodic heartbeat to other nodes in cluster
   val heartbeatTask = scheduler.schedule(PeriodicTasksInitialDelay max HeartbeatInterval,
     HeartbeatInterval, self, HeartbeatTick)
 
   override def preStart(): Unit = {
-    cluster.subscribe(self, classOf[MemberEvent])
+    cluster.subscribe(self, classOf[InstantMemberEvent])
     cluster.subscribe(self, classOf[UnreachableMember])
   }
 
@@ -112,18 +124,27 @@ private[cluster] final class ClusterHeartbeatSender extends Actor with ActorLogg
   def clusterHeartbeatConnectionFor(address: Address): ActorRef =
     context.actorFor(RootActorPath(address) / "system" / "cluster" / "heartbeatReceiver")
 
+  /**
+   * Looks up and returns the remote cluster heartbeat sender for the specific address.
+   */
+  def heartbeatSenderFor(address: Address): ActorRef = context.actorFor(self.path.toStringWithAddress(address))
+
   def receive = {
-    case HeartbeatTick          ⇒ heartbeat()
-    case s: CurrentClusterState ⇒ reset(s)
-    case UnreachableMember(m)   ⇒ removeMember(m)
-    case MemberDowned(m)        ⇒ removeMember(m)
-    case MemberRemoved(m)       ⇒ removeMember(m)
-    case e: MemberEvent         ⇒ addMember(e.member)
-    case JoinInProgress(a, d)   ⇒ addJoinInProgress(a, d)
+    case HeartbeatTick                ⇒ heartbeat()
+    case InstantMemberUp(m)           ⇒ addMember(m)
+    case UnreachableMember(m)         ⇒ removeMember(m)
+    case InstantMemberDowned(m)       ⇒ removeMember(m)
+    case InstantMemberRemoved(m)      ⇒ removeMember(m)
+    case s: InstantClusterState       ⇒ reset(s)
+    case _: CurrentClusterState       ⇒ // enough with InstantClusterState
+    case _: InstantMemberEvent        ⇒ // not interested in other types of InstantMemberEvent
+    case HeartbeatRequest(from)       ⇒ addHeartbeatRequest(from)
+    case SendHeartbeatRequest(to)     ⇒ sendHeartbeatRequest(to)
+    case ExpectedFirstHeartbeat(from) ⇒ triggerFirstHeartbeat(from)
   }
 
-  def reset(snapshot: CurrentClusterState): Unit =
-    state = state.reset(snapshot.members.collect { case m if m.address != selfAddress ⇒ m.address })
+  def reset(snapshot: InstantClusterState): Unit =
+    state = state.reset(snapshot.members.map(_.address))
 
   def addMember(m: Member): Unit = if (m.address != selfAddress)
     state = state addMember m.address
@@ -131,11 +152,26 @@ private[cluster] final class ClusterHeartbeatSender extends Actor with ActorLogg
   def removeMember(m: Member): Unit = if (m.address != selfAddress)
     state = state removeMember m.address
 
-  def addJoinInProgress(address: Address, deadline: Deadline): Unit = if (address != selfAddress)
-    state = state.addJoinInProgress(address, deadline)
+  def addHeartbeatRequest(address: Address): Unit = if (address != selfAddress)
+    state = state.addHeartbeatRequest(address, Deadline.now + HeartbeatRequestTimeToLive)
+
+  def sendHeartbeatRequest(address: Address): Unit =
+    if (!cluster.failureDetector.isMonitoring(address) && state.ring.mySenders.contains(address)) {
+      heartbeatSenderFor(address) ! selfHeartbeatRequest
+      // schedule the expected heartbeat for later, which will give the
+      // sender a chance to start heartbeating, and also trigger some resends of
+      // the heartbeat request
+      scheduler.scheduleOnce(HeartbeatExpectedResponseAfter, self, ExpectedFirstHeartbeat(address))
+    }
+
+  def triggerFirstHeartbeat(address: Address): Unit =
+    if (!cluster.failureDetector.isMonitoring(address)) {
+      log.info("Trigger extra expected heartbeat from [{}]", address)
+      cluster.failureDetector.heartbeat(address)
+    }
 
   def heartbeat(): Unit = {
-    state = state.removeOverdueJoinInProgress()
+    state = state.removeOverdueHeartbeatRequest()
 
     def connection(to: Address): ActorRef = {
       // URL encoded target address as child actor name
@@ -161,6 +197,13 @@ private[cluster] final class ClusterHeartbeatSender extends Actor with ActorLogg
       } else
         state = state.increaseEndingCount(to)
     }
+
+    // request heartbeats from expected sender node if no heartbeat messages has been received
+    state.ring.mySenders foreach { address ⇒
+      if (!cluster.failureDetector.isMonitoring(address))
+        scheduler.scheduleOnce(HeartbeatRequestDelay, self, SendHeartbeatRequest(address))
+    }
+
   }
 
 }
@@ -172,9 +215,8 @@ private[cluster] object ClusterHeartbeatSenderState {
   /**
    * Initial, empty state
    */
-  def empty(consistentHash: ConsistentHash[Address], selfAddressStr: String,
-            monitoredByNrOfMembers: Int): ClusterHeartbeatSenderState =
-    ClusterHeartbeatSenderState(consistentHash, selfAddressStr, monitoredByNrOfMembers)
+  def empty(selfAddress: Address, monitoredByNrOfMembers: Int): ClusterHeartbeatSenderState =
+    ClusterHeartbeatSenderState(HeartbeatNodeRing(selfAddress, Set(selfAddress), monitoredByNrOfMembers))
 
   /**
    * Create a new state based on previous state, and
@@ -182,33 +224,13 @@ private[cluster] object ClusterHeartbeatSenderState {
    */
   private def apply(
     old: ClusterHeartbeatSenderState,
-    consistentHash: ConsistentHash[Address],
-    all: Set[Address]): ClusterHeartbeatSenderState = {
+    ring: HeartbeatNodeRing): ClusterHeartbeatSenderState = {
 
-    /**
-     * Select a few peers that heartbeats will be sent to, i.e. that will
-     * monitor this node. Try to send heartbeats to same nodes as much
-     * as possible, but re-balance with consistent hashing algorithm when
-     * new members are added or removed.
-     */
-    def selectPeers: Set[Address] = {
-      val allSize = all.size
-      val nrOfPeers = math.min(allSize, old.monitoredByNrOfMembers)
-      // try more if consistentHash results in same node as already selected
-      val attemptLimit = nrOfPeers * 2
-      @tailrec def select(acc: Set[Address], n: Int): Set[Address] = {
-        if (acc.size == nrOfPeers || n == attemptLimit) acc
-        else select(acc + consistentHash.nodeFor(old.selfAddressStr + n), n + 1)
-      }
-      if (nrOfPeers >= allSize) all
-      else select(Set.empty[Address], 0)
-    }
-
-    val curr = selectPeers
+    val curr = ring.myReceivers
     // start ending process for nodes not selected any more
     // abort ending process for nodes that have been selected again
     val end = old.ending ++ (old.current -- curr).map(_ -> 0) -- curr
-    old.copy(consistentHash = consistentHash, all = all, current = curr, ending = end)
+    old.copy(ring = ring, current = curr, ending = end, heartbeatRequest = old.heartbeatRequest -- curr)
   }
 
 }
@@ -223,13 +245,10 @@ private[cluster] object ClusterHeartbeatSenderState {
  * i.e. the methods return new instances.
  */
 private[cluster] case class ClusterHeartbeatSenderState private (
-  consistentHash: ConsistentHash[Address],
-  selfAddressStr: String,
-  monitoredByNrOfMembers: Int,
-  all: Set[Address] = Set.empty,
+  ring: HeartbeatNodeRing,
   current: Set[Address] = Set.empty,
   ending: Map[Address, Int] = Map.empty,
-  joinInProgress: Map[Address, Deadline] = Map.empty) {
+  heartbeatRequest: Map[Address, Deadline] = Map.empty) {
 
   // FIXME can be disabled as optimization
   assertInvariants
@@ -237,50 +256,53 @@ private[cluster] case class ClusterHeartbeatSenderState private (
   private def assertInvariants: Unit = {
     val currentAndEnding = current.intersect(ending.keySet)
     require(currentAndEnding.isEmpty,
-      "Same nodes in current and ending not allowed, got [%s]" format currentAndEnding)
-    val joinInProgressAndAll = joinInProgress.keySet.intersect(all)
-    require(joinInProgressAndAll.isEmpty,
-      "Same nodes in joinInProgress and all not allowed, got [%s]" format joinInProgressAndAll)
-    val currentNotInAll = current -- all
-    require(currentNotInAll.isEmpty,
-      "Nodes in current but not in all not allowed, got [%s]" format currentNotInAll)
-    require(all.isEmpty == consistentHash.isEmpty, "ConsistentHash doesn't correspond to all nodes [%s]"
-      format all)
+      s"Same nodes in current and ending not allowed, got [${currentAndEnding}]")
+
+    val currentAndHeartbeatRequest = current.intersect(heartbeatRequest.keySet)
+    require(currentAndHeartbeatRequest.isEmpty,
+      s"Same nodes in current and heartbeatRequest not allowed, got [${currentAndHeartbeatRequest}]")
+
+    val currentNotInAll = current -- ring.nodes
+    require(current.isEmpty || currentNotInAll.isEmpty,
+      s"Nodes in current but not in ring nodes not allowed, got [${currentNotInAll}]")
+
+    require(!current.contains(ring.selfAddress),
+      s"Self in current not allowed, got [${ring.selfAddress}]")
+    require(!heartbeatRequest.contains(ring.selfAddress),
+      s"Self in heartbeatRequest not allowed, got [${ring.selfAddress}]")
   }
 
-  val active: Set[Address] = current ++ joinInProgress.keySet
+  val active: Set[Address] = current ++ heartbeatRequest.keySet
 
-  def reset(nodes: Set[Address]): ClusterHeartbeatSenderState =
-    ClusterHeartbeatSenderState(nodes.foldLeft(this) { _ removeJoinInProgress _ },
-      consistentHash = ConsistentHash(nodes, consistentHash.virtualNodesFactor),
-      all = nodes)
+  def reset(nodes: Set[Address]): ClusterHeartbeatSenderState = {
+    ClusterHeartbeatSenderState(nodes.foldLeft(this) { _ removeHeartbeatRequest _ }, ring.copy(nodes = nodes + ring.selfAddress))
+  }
 
   def addMember(a: Address): ClusterHeartbeatSenderState =
-    ClusterHeartbeatSenderState(removeJoinInProgress(a), all = all + a, consistentHash = consistentHash :+ a)
+    ClusterHeartbeatSenderState(removeHeartbeatRequest(a), ring :+ a)
 
   def removeMember(a: Address): ClusterHeartbeatSenderState =
-    ClusterHeartbeatSenderState(removeJoinInProgress(a), all = all - a, consistentHash = consistentHash :- a)
+    ClusterHeartbeatSenderState(removeHeartbeatRequest(a), ring :- a)
 
-  private def removeJoinInProgress(address: Address): ClusterHeartbeatSenderState = {
-    if (joinInProgress contains address)
-      copy(joinInProgress = joinInProgress - address, ending = ending + (address -> 0))
+  private def removeHeartbeatRequest(address: Address): ClusterHeartbeatSenderState = {
+    if (heartbeatRequest contains address)
+      copy(heartbeatRequest = heartbeatRequest - address, ending = ending + (address -> 0))
     else this
   }
 
-  def addJoinInProgress(address: Address, deadline: Deadline): ClusterHeartbeatSenderState = {
-    if (all contains address) this
-    else copy(joinInProgress = joinInProgress + (address -> deadline), ending = ending - address)
+  def addHeartbeatRequest(address: Address, deadline: Deadline): ClusterHeartbeatSenderState = {
+    if (current.contains(address)) this
+    else copy(heartbeatRequest = heartbeatRequest + (address -> deadline), ending = ending - address)
   }
 
   /**
-   * Cleanup overdue joinInProgress, in case a joining node never
-   * became member, for some reason.
+   * Cleanup overdue heartbeatRequest
    */
-  def removeOverdueJoinInProgress(): ClusterHeartbeatSenderState = {
-    val overdue = joinInProgress collect { case (address, deadline) if deadline.isOverdue ⇒ address }
+  def removeOverdueHeartbeatRequest(): ClusterHeartbeatSenderState = {
+    val overdue = heartbeatRequest collect { case (address, deadline) if deadline.isOverdue ⇒ address }
     if (overdue.isEmpty) this
     else
-      copy(ending = ending ++ overdue.map(_ -> 0), joinInProgress = joinInProgress -- overdue)
+      copy(ending = ending ++ overdue.map(_ -> 0), heartbeatRequest = heartbeatRequest -- overdue)
   }
 
   def removeEnding(a: Address): ClusterHeartbeatSenderState = copy(ending = ending - a)
@@ -330,7 +352,7 @@ private[cluster] final class ClusterHeartbeatSenderConnection(toRef: ActorRef)
     CircuitBreaker(context.system.scheduler,
       cbSettings.maxFailures, cbSettings.callTimeout, cbSettings.resetTimeout).
       onHalfOpen(log.debug("CircuitBreaker Half-Open for: [{}]", toRef)).
-      onOpen(log.debug("CircuitBreaker Open for [{}]", toRef)).
+      onOpen(log.info("CircuitBreaker Open for [{}]", toRef)).
       onClose(log.debug("CircuitBreaker Closed for [{}]", toRef))
   }
 
@@ -344,9 +366,81 @@ private[cluster] final class ClusterHeartbeatSenderConnection(toRef: ActorRef)
           toRef ! heartbeatMsg
         } catch { case e: CircuitBreakerOpenException ⇒ /* skip sending heartbeat to broken connection */ }
       }
-      if (deadline.isOverdue) log.debug("Sending heartbeat to [{}] took longer than expected", toRef)
+      if (deadline.isOverdue) log.info("Sending heartbeat to [{}] took longer than expected", toRef)
     case SendEndHeartbeat(endHeartbeatMsg, _) ⇒
       log.debug("Cluster Node [{}] - EndHeartbeat to [{}]", endHeartbeatMsg.from, toRef)
       toRef ! endHeartbeatMsg
   }
 }
+
+/**
+ * INTERNAL API
+ *
+ * Data structure for picking heartbeat receivers and keep track of what nodes
+ * that are expected to send heartbeat messages to a node. The node ring is
+ * shuffled by deterministic hashing to avoid picking physically co-located
+ * neighbors.
+ *
+ * It is immutable, i.e. the methods return new instances.
+ */
+private[cluster] case class HeartbeatNodeRing(selfAddress: Address, nodes: Set[Address], monitoredByNrOfMembers: Int) {
+
+  require(nodes contains selfAddress, s"nodes [${nodes.mkString(", ")}] must contain selfAddress [${selfAddress}]")
+
+  private val nodeRing: immutable.SortedSet[Address] = {
+    implicit val ringOrdering: Ordering[Address] = Ordering.fromLessThan[Address] { (a, b) ⇒
+      val ha = hashFor(a)
+      val hb = hashFor(b)
+      ha < hb || (ha == hb && Member.addressOrdering.compare(a, b) < 0)
+    }
+
+    immutable.SortedSet() ++ nodes
+  }
+
+  private def hashFor(node: Address): Int = node match {
+    // cluster node identifier is the host and port of the address; protocol and system is assumed to be the same
+    case Address(_, _, Some(host), Some(port)) ⇒ MurmurHash.stringHash(s"${host}:${port}")
+    case _                                     ⇒ 0
+  }
+
+  /**
+   * Receivers for `selfAddress`. Cached for subsequent access.
+   */
+  lazy val myReceivers: immutable.Set[Address] = receivers(selfAddress)
+  /**
+   * Senders for `selfAddress`. Cached for subsequent access.
+   */
+  lazy val mySenders: immutable.Set[Address] = senders(selfAddress)
+
+  private val useAllAsReceivers = monitoredByNrOfMembers >= (nodeRing.size - 1)
+
+  /**
+   * The receivers to use from a specified sender.
+   */
+  def receivers(sender: Address): immutable.Set[Address] =
+    if (useAllAsReceivers)
+      nodeRing - sender
+    else {
+      val slice = nodeRing.from(sender).tail.take(monitoredByNrOfMembers)
+      if (slice.size < monitoredByNrOfMembers)
+        (slice ++ nodeRing.take(monitoredByNrOfMembers - slice.size))
+      else slice
+    }
+
+  /**
+   * The expected senders for a specific receiver.
+   */
+  def senders(receiver: Address): Set[Address] =
+    nodes filter { sender ⇒ receivers(sender) contains receiver }
+
+  /**
+   * Add a node to the ring.
+   */
+  def :+(node: Address): HeartbeatNodeRing = if (nodes contains node) this else copy(nodes = nodes + node)
+
+  /**
+   * Remove a node from the ring.
+   */
+  def :-(node: Address): HeartbeatNodeRing = if (nodes contains node) copy(nodes = nodes - node) else this
+
+}
diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterMetricsCollector.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterMetricsCollector.scala
index 8f08180b1c..bd093c9f74 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterMetricsCollector.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/ClusterMetricsCollector.scala
@@ -76,7 +76,7 @@ private[cluster] class ClusterMetricsCollector(publisher: ActorRef) extends Acto
     MetricsInterval, self, MetricsTick)
 
   override def preStart(): Unit = {
-    cluster.subscribe(self, classOf[MemberEvent])
+    cluster.subscribe(self, classOf[InstantMemberEvent])
     cluster.subscribe(self, classOf[UnreachableMember])
     log.info("Metrics collection has started successfully on node [{}]", selfAddress)
   }
@@ -84,11 +84,15 @@ private[cluster] class ClusterMetricsCollector(publisher: ActorRef) extends Acto
   def receive = {
     case GossipTick                 ⇒ gossip()
     case MetricsTick                ⇒ collect()
-    case state: CurrentClusterState ⇒ receiveState(state)
-    case MemberUp(m)                ⇒ addMember(m)
-    case e: MemberEvent             ⇒ removeMember(e.member)
-    case UnreachableMember(m)       ⇒ removeMember(m)
     case msg: MetricsGossipEnvelope ⇒ receiveGossip(msg)
+    case state: InstantClusterState ⇒ receiveState(state)
+    case state: CurrentClusterState ⇒ // enough with InstantClusterState
+    case InstantMemberUp(m)         ⇒ addMember(m)
+    case InstantMemberDowned(m)     ⇒ removeMember(m)
+    case InstantMemberRemoved(m)    ⇒ removeMember(m)
+    case UnreachableMember(m)       ⇒ removeMember(m)
+    case _: InstantMemberEvent      ⇒ // not interested in other types of InstantMemberEvent
+
   }
 
   override def postStop: Unit = {
@@ -115,7 +119,7 @@ private[cluster] class ClusterMetricsCollector(publisher: ActorRef) extends Acto
   /**
    * Updates the initial node ring for those nodes that are [[akka.cluster.MemberStatus.Up]].
    */
-  def receiveState(state: CurrentClusterState): Unit =
+  def receiveState(state: InstantClusterState): Unit =
     nodes = state.members collect { case m if m.status == Up ⇒ m.address }
 
   /**
diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterSettings.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterSettings.scala
index 0477bbd002..7ccf7e48a8 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterSettings.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/ClusterSettings.scala
@@ -39,8 +39,22 @@ class ClusterSettings(val config: Config, val systemName: String) {
     val d = Duration(getMilliseconds("akka.cluster.failure-detector.heartbeat-interval"), MILLISECONDS)
     require(d > Duration.Zero, "failure-detector.heartbeat-interval must be > 0"); d
   }
-  final val HeartbeatConsistentHashingVirtualNodesFactor = 10 // no need for configuration
-  final val NumberOfEndHeartbeats: Int = (FailureDetectorAcceptableHeartbeatPause / HeartbeatInterval + 1).toInt
+  final val HeartbeatRequestDelay: FiniteDuration = {
+    val d = Duration(getMilliseconds("akka.cluster.failure-detector.heartbeat-request.grace-period"), MILLISECONDS)
+    require(d > Duration.Zero, "failure-detector.heartbeat-request.grace-period must be > 0"); d
+  }
+  final val HeartbeatExpectedResponseAfter: FiniteDuration = {
+    val d = Duration(getMilliseconds("akka.cluster.failure-detector.heartbeat-request.expected-response-after"), MILLISECONDS)
+    require(d > Duration.Zero, "failure-detector.heartbeat-request.expected-response-after > 0"); d
+  }
+  final val HeartbeatRequestTimeToLive: FiniteDuration = {
+    val d = Duration(getMilliseconds("akka.cluster.failure-detector.heartbeat-request.time-to-live"), MILLISECONDS)
+    require(d > Duration.Zero, "failure-detector.heartbeat-request.time-to-live > 0"); d
+  }
+  final val NumberOfEndHeartbeats: Int = {
+    val n = getInt("akka.cluster.failure-detector.nr-of-end-heartbeats")
+    require(n > 0, "failure-detector.nr-of-end-heartbeats must be > 0"); n
+  }
   final val MonitoredByNrOfMembers: Int = {
     val n = getInt("akka.cluster.failure-detector.monitored-by-nr-of-members")
     require(n > 0, "failure-detector.monitored-by-nr-of-members must be > 0"); n
@@ -61,7 +75,6 @@ class ClusterSettings(val config: Config, val systemName: String) {
     require(n > 0, "min-nr-of-members must be > 0"); n
   }
   final val JmxEnabled: Boolean = getBoolean("akka.cluster.jmx.enabled")
-  final val JoinTimeout: FiniteDuration = Duration(getMilliseconds("akka.cluster.join-timeout"), MILLISECONDS)
   final val UseDispatcher: String = getString("akka.cluster.use-dispatcher") match {
     case "" ⇒ Dispatchers.DefaultDispatcherId
     case id ⇒ id
diff --git a/akka-cluster/src/main/scala/akka/cluster/FailureDetector.scala b/akka-cluster/src/main/scala/akka/cluster/FailureDetector.scala
index 9ef77c6834..dbb17ac80a 100644
--- a/akka-cluster/src/main/scala/akka/cluster/FailureDetector.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/FailureDetector.scala
@@ -16,6 +16,12 @@ trait FailureDetector {
    */
   def isAvailable(connection: Address): Boolean
 
+  /**
+   * Returns true if the failure detector has received any heartbeats and started monitoring
+   * of the resource.
+   */
+  def isMonitoring(connection: Address): Boolean
+
   /**
    * Records a heartbeat for a connection.
    */
diff --git a/akka-cluster/src/main/scala/akka/cluster/Member.scala b/akka-cluster/src/main/scala/akka/cluster/Member.scala
index 1b4cf54dfc..141018834e 100644
--- a/akka-cluster/src/main/scala/akka/cluster/Member.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/Member.scala
@@ -34,6 +34,7 @@ object Member {
    * `Address` ordering type class, sorts addresses by host and port.
    */
   implicit val addressOrdering: Ordering[Address] = Ordering.fromLessThan[Address] { (a, b) ⇒
+    // cluster node identifier is the host and port of the address; protocol and system is assumed to be the same
     if (a.host != b.host) a.host.getOrElse("").compareTo(b.host.getOrElse("")) < 0
     else if (a.port != b.port) a.port.getOrElse(0) < b.port.getOrElse(0)
     else false
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/InitialHeartbeatSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/InitialHeartbeatSpec.scala
new file mode 100644
index 0000000000..4e6bae48d5
--- /dev/null
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/InitialHeartbeatSpec.scala
@@ -0,0 +1,87 @@
+/**
+ *  Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
+ */
+package akka.cluster
+
+import language.postfixOps
+import scala.concurrent.duration._
+import com.typesafe.config.ConfigFactory
+import akka.actor.Actor
+import akka.actor.Props
+import akka.cluster.ClusterEvent.InstantClusterState
+import akka.cluster.ClusterEvent.InstantMemberJoined
+import akka.remote.testkit.MultiNodeConfig
+import akka.remote.testkit.MultiNodeSpec
+import akka.remote.transport.ThrottlerTransportAdapter.Direction
+import akka.testkit._
+
+object InitialHeartbeatMultiJvmSpec extends MultiNodeConfig {
+  val controller = role("controller")
+  val first = role("first")
+  val second = role("second")
+
+  commonConfig(debugConfig(on = false).
+    withFallback(ConfigFactory.parseString("""
+      akka.cluster.failure-detector.heartbeat-request.grace-period = 3 s
+      akka.cluster.failure-detector.threshold = 4""")).
+    withFallback(MultiNodeClusterSpec.clusterConfig))
+
+  testTransport(on = true)
+}
+
+class InitialHeartbeatMultiJvmNode1 extends InitialHeartbeatSpec
+class InitialHeartbeatMultiJvmNode2 extends InitialHeartbeatSpec
+class InitialHeartbeatMultiJvmNode3 extends InitialHeartbeatSpec
+
+abstract class InitialHeartbeatSpec
+  extends MultiNodeSpec(InitialHeartbeatMultiJvmSpec)
+  with MultiNodeClusterSpec {
+
+  import InitialHeartbeatMultiJvmSpec._
+
+  muteMarkingAsUnreachable()
+
+  "A member" must {
+
+    "detect failure even though no heartbeats have been received" taggedAs LongRunningTest in {
+      val secondAddress = address(second)
+      awaitClusterUp(first)
+
+      runOn(first) {
+        val joinLatch = TestLatch()
+        cluster.subscribe(system.actorOf(Props(new Actor {
+          def receive = {
+            case state: InstantClusterState ⇒
+              if (state.members.exists(_.address == secondAddress))
+                joinLatch.countDown()
+            case InstantMemberJoined(m) ⇒
+              if (m.address == secondAddress)
+                joinLatch.countDown()
+          }
+        })), classOf[InstantMemberJoined])
+
+        within(10 seconds) {
+          joinLatch.await
+        }
+      }
+      runOn(second) {
+        cluster.join(first)
+      }
+      enterBarrier("second-joined")
+
+      runOn(controller) {
+        // it is likely that first has not started sending heartbeats to second yet
+        // Direction must be Receive because the gossip from first to second must pass through
+        testConductor.blackhole(first, second, Direction.Receive).await
+      }
+
+      runOn(second) {
+        within(15 seconds) {
+          awaitCond(!cluster.failureDetector.isAvailable(first))
+        }
+      }
+
+      enterBarrier("after-1")
+    }
+  }
+}
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderElectionSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderElectionSpec.scala
index 655f86ab3b..39adca3ac5 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderElectionSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderElectionSpec.scala
@@ -110,12 +110,12 @@ abstract class LeaderElectionSpec(multiNodeConfig: LeaderElectionMultiNodeConfig
       }
     }
 
-    "be able to 're-elect' a single leader after leader has left" taggedAs LongRunningTest in within(20 seconds) {
+    "be able to 're-elect' a single leader after leader has left" taggedAs LongRunningTest in within(30 seconds) {
       shutdownLeaderAndVerifyNewLeader(alreadyShutdown = 0)
       enterBarrier("after-2")
     }
 
-    "be able to 're-elect' a single leader after leader has left (again)" taggedAs LongRunningTest in within(20 seconds) {
+    "be able to 're-elect' a single leader after leader has left (again)" taggedAs LongRunningTest in within(30 seconds) {
       shutdownLeaderAndVerifyNewLeader(alreadyShutdown = 1)
       enterBarrier("after-3")
     }
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiNodeClusterSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiNodeClusterSpec.scala
index 08f6d96937..fe8deb887d 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiNodeClusterSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiNodeClusterSpec.scala
@@ -69,8 +69,7 @@ trait MultiNodeClusterSpec extends Suite with STMultiNodeSpec { self: MultiNodeS
         ".*Cluster Node.* - is starting up.*",
         ".*Shutting down cluster Node.*",
         ".*Cluster node successfully shut down.*",
-        ".*Using a dedicated scheduler for cluster.*",
-        ".*Phi value.* for connection.*") foreach { s ⇒
+        ".*Using a dedicated scheduler for cluster.*") foreach { s ⇒
           sys.eventStream.publish(Mute(EventFilter.info(pattern = s)))
         }
 
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/SplitBrainSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/SplitBrainSpec.scala
index a8ca35684d..d1c48565d5 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/SplitBrainSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/SplitBrainSpec.scala
@@ -87,10 +87,10 @@ abstract class SplitBrainSpec(multiNodeConfig: SplitBrainMultiNodeConfig)
       }
 
       runOn(side1: _*) {
-        awaitCond(clusterView.unreachableMembers.map(_.address) == (side2.toSet map address), 20 seconds)
+        awaitCond(clusterView.unreachableMembers.map(_.address) == (side2.toSet map address), 25 seconds)
       }
       runOn(side2: _*) {
-        awaitCond(clusterView.unreachableMembers.map(_.address) == (side1.toSet map address), 20 seconds)
+        awaitCond(clusterView.unreachableMembers.map(_.address) == (side1.toSet map address), 25 seconds)
       }
 
       enterBarrier("after-2")
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/StressSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/StressSpec.scala
index bceb723031..f765e764a3 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/StressSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/StressSpec.scala
@@ -351,7 +351,7 @@ object StressMultiJvmSpec extends MultiNodeConfig {
         nodes foreach { node ⇒
           val previous = phiByNode(node)
           val φ = fd.phi(node)
-          if (φ > 0) {
+          if (φ > 0 || fd.isMonitoring(node)) {
             val aboveOne = if (!φ.isInfinite && φ > 1.0) 1 else 0
             phiByNode += node -> PhiValue(node, previous.countAboveOne + aboveOne, previous.count + 1,
               math.max(previous.max, φ))
@@ -861,7 +861,7 @@ abstract class StressSpec
             name = "master-" + myself.name)
           m ! Begin
           import system.dispatcher
-          system.scheduler.scheduleOnce(highThroughputDuration) {
+          system.scheduler.scheduleOnce(duration) {
             m.tell(End, testActor)
           }
           val workResult = awaitWorkResult
@@ -931,7 +931,7 @@ abstract class StressSpec
 
   "A cluster under stress" must {
 
-    "join seed nodes" taggedAs LongRunningTest in {
+    "join seed nodes" taggedAs LongRunningTest in within(20 seconds) {
 
       val otherNodesJoiningSeedNodes = roles.slice(numberOfSeedNodes, numberOfSeedNodes + numberOfNodesJoiningToSeedNodesInitially)
       val size = seedNodes.size + otherNodesJoiningSeedNodes.size
diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterConfigSpec.scala b/akka-cluster/src/test/scala/akka/cluster/ClusterConfigSpec.scala
index ec2b113a85..60c83399be 100644
--- a/akka-cluster/src/test/scala/akka/cluster/ClusterConfigSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/ClusterConfigSpec.scala
@@ -28,12 +28,14 @@ class ClusterConfigSpec extends AkkaSpec {
       PeriodicTasksInitialDelay must be(1 seconds)
       GossipInterval must be(1 second)
       HeartbeatInterval must be(1 second)
-      NumberOfEndHeartbeats must be(4)
+      NumberOfEndHeartbeats must be(8)
       MonitoredByNrOfMembers must be(5)
+      HeartbeatRequestDelay must be(10 seconds)
+      HeartbeatExpectedResponseAfter must be(3 seconds)
+      HeartbeatRequestTimeToLive must be(1 minute)
       LeaderActionsInterval must be(1 second)
       UnreachableNodesReaperInterval must be(1 second)
       PublishStatsInterval must be(10 second)
-      JoinTimeout must be(60 seconds)
       AutoJoin must be(true)
       AutoDown must be(false)
       MinNrOfMembers must be(1)
diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterHeartbeatSenderStateSpec.scala b/akka-cluster/src/test/scala/akka/cluster/ClusterHeartbeatSenderStateSpec.scala
index 82ad7c2cf2..c3176208c5 100644
--- a/akka-cluster/src/test/scala/akka/cluster/ClusterHeartbeatSenderStateSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/ClusterHeartbeatSenderStateSpec.scala
@@ -9,6 +9,7 @@ import org.scalatest.matchers.MustMatchers
 import akka.actor.Address
 import akka.routing.ConsistentHash
 import scala.concurrent.duration._
+import scala.collection.immutable
 
 @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner])
 class ClusterHeartbeatSenderStateSpec extends WordSpec with MustMatchers {
@@ -20,8 +21,7 @@ class ClusterHeartbeatSenderStateSpec extends WordSpec with MustMatchers {
   val dd = Address("tcp.akka", "sys", "dd", 2552)
   val ee = Address("tcp.akka", "sys", "ee", 2552)
 
-  val emptyState = ClusterHeartbeatSenderState.empty(ConsistentHash(Seq.empty[Address], 10),
-    selfAddress.toString, 3)
+  val emptyState = ClusterHeartbeatSenderState.empty(selfAddress, 3)
 
   "A ClusterHeartbeatSenderState" must {
 
@@ -29,47 +29,46 @@ class ClusterHeartbeatSenderStateSpec extends WordSpec with MustMatchers {
       emptyState.active.isEmpty must be(true)
     }
 
-    "include joinInProgress in active set" in {
-      val s = emptyState.addJoinInProgress(aa, Deadline.now + 30.seconds)
-      s.joinInProgress.keySet must be(Set(aa))
+    "include heartbeatRequest in active set" in {
+      val s = emptyState.addHeartbeatRequest(aa, Deadline.now + 30.seconds)
+      s.heartbeatRequest.keySet must be(Set(aa))
       s.active must be(Set(aa))
     }
 
-    "remove joinInProgress from active set after removeOverdueJoinInProgress" in {
-      val s = emptyState.addJoinInProgress(aa, Deadline.now - 30.seconds).removeOverdueJoinInProgress()
-      s.joinInProgress must be(Map.empty)
+    "remove heartbeatRequest from active set after removeOverdueHeartbeatRequest" in {
+      val s = emptyState.addHeartbeatRequest(aa, Deadline.now - 30.seconds).removeOverdueHeartbeatRequest()
+      s.heartbeatRequest must be(Map.empty)
       s.active must be(Set.empty)
       s.ending must be(Map(aa -> 0))
     }
 
-    "remove joinInProgress after reset" in {
-      val s = emptyState.addJoinInProgress(aa, Deadline.now + 30.seconds).reset(Set(aa, bb))
-      s.joinInProgress must be(Map.empty)
+    "remove heartbeatRequest after reset" in {
+      val s = emptyState.addHeartbeatRequest(aa, Deadline.now + 30.seconds).reset(Set(aa, bb))
+      s.heartbeatRequest must be(Map.empty)
     }
 
-    "remove joinInProgress after addMember" in {
-      val s = emptyState.addJoinInProgress(aa, Deadline.now + 30.seconds).addMember(aa)
-      s.joinInProgress must be(Map.empty)
+    "remove heartbeatRequest after addMember" in {
+      val s = emptyState.addHeartbeatRequest(aa, Deadline.now + 30.seconds).addMember(aa)
+      s.heartbeatRequest must be(Map.empty)
     }
 
-    "remove joinInProgress after removeMember" in {
-      val s = emptyState.addJoinInProgress(aa, Deadline.now + 30.seconds).reset(Set(aa, bb)).removeMember(aa)
-      s.joinInProgress must be(Map.empty)
+    "remove heartbeatRequest after removeMember" in {
+      val s = emptyState.addHeartbeatRequest(aa, Deadline.now + 30.seconds).reset(Set(aa, bb)).removeMember(aa)
+      s.heartbeatRequest must be(Map.empty)
       s.ending must be(Map(aa -> 0))
     }
 
-    "remove from ending after addJoinInProgress" in {
+    "remove from ending after addHeartbeatRequest" in {
       val s = emptyState.reset(Set(aa, bb)).removeMember(aa)
       s.ending must be(Map(aa -> 0))
-      val s2 = s.addJoinInProgress(aa, Deadline.now + 30.seconds)
-      s2.joinInProgress.keySet must be(Set(aa))
+      val s2 = s.addHeartbeatRequest(aa, Deadline.now + 30.seconds)
+      s2.heartbeatRequest.keySet must be(Set(aa))
       s2.ending must be(Map.empty)
     }
 
     "include nodes from reset in active set" in {
       val nodes = Set(aa, bb, cc)
       val s = emptyState.reset(nodes)
-      s.all must be(nodes)
       s.current must be(nodes)
       s.ending must be(Map.empty)
       s.active must be(nodes)
@@ -78,7 +77,6 @@ class ClusterHeartbeatSenderStateSpec extends WordSpec with MustMatchers {
     "limit current nodes to monitoredByNrOfMembers when adding members" in {
       val nodes = Set(aa, bb, cc, dd)
       val s = nodes.foldLeft(emptyState) { _ addMember _ }
-      s.all must be(nodes)
       s.current.size must be(3)
       s.addMember(ee).current.size must be(3)
     }
diff --git a/akka-cluster/src/test/scala/akka/cluster/FailureDetectorPuppet.scala b/akka-cluster/src/test/scala/akka/cluster/FailureDetectorPuppet.scala
index 58fbd220fc..e212da2f74 100644
--- a/akka-cluster/src/test/scala/akka/cluster/FailureDetectorPuppet.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/FailureDetectorPuppet.scala
@@ -50,6 +50,8 @@ class FailureDetectorPuppet(system: ActorSystem, settings: ClusterSettings) exte
       false
   }
 
+  override def isMonitoring(connection: Address): Boolean = connections.contains(connection)
+
   def heartbeat(connection: Address): Unit = log.debug("Heart beat from cluster node[{}]", connection)
 
   def remove(connection: Address): Unit = {
diff --git a/akka-cluster/src/test/scala/akka/cluster/HeartbeatNodeRingSpec.scala b/akka-cluster/src/test/scala/akka/cluster/HeartbeatNodeRingSpec.scala
new file mode 100644
index 0000000000..8f47cc6613
--- /dev/null
+++ b/akka-cluster/src/test/scala/akka/cluster/HeartbeatNodeRingSpec.scala
@@ -0,0 +1,61 @@
+/**
+ *  Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
+ */
+
+package akka.cluster
+
+import org.scalatest.WordSpec
+import org.scalatest.matchers.MustMatchers
+import akka.actor.Address
+import akka.routing.ConsistentHash
+import scala.concurrent.duration._
+import scala.collection.immutable
+
+@org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner])
+class HeartbeatNodeRingSpec extends WordSpec with MustMatchers {
+
+  val aa = Address("tcp.akka", "sys", "aa", 2552)
+  val bb = Address("tcp.akka", "sys", "bb", 2552)
+  val cc = Address("tcp.akka", "sys", "cc", 2552)
+  val dd = Address("tcp.akka", "sys", "dd", 2552)
+  val ee = Address("tcp.akka", "sys", "ee", 2552)
+
+  val nodes = Set(aa, bb, cc, dd, ee)
+
+  "A HashedNodeRing" must {
+
+    "pick specified number of nodes as receivers" in {
+      val ring = HeartbeatNodeRing(cc, nodes, 3)
+      ring.myReceivers must be(ring.receivers(cc))
+
+      nodes foreach { n ⇒
+        val receivers = ring.receivers(n)
+        receivers.size must be(3)
+        receivers must not contain (n)
+      }
+    }
+
+    "pick all except own as receivers when less than total number of nodes" in {
+      val expected = Set(aa, bb, dd, ee)
+      HeartbeatNodeRing(cc, nodes, 4).myReceivers must be(expected)
+      HeartbeatNodeRing(cc, nodes, 5).myReceivers must be(expected)
+      HeartbeatNodeRing(cc, nodes, 6).myReceivers must be(expected)
+    }
+
+    "have matching senders and receivers" in {
+      val ring = HeartbeatNodeRing(cc, nodes, 3)
+      ring.mySenders must be(ring.senders(cc))
+
+      for (sender ← nodes; receiver ← ring.receivers(sender)) {
+        ring.senders(receiver) must contain(sender)
+      }
+    }
+
+    "pick none when alone" in {
+      val ring = HeartbeatNodeRing(cc, Set(cc), 3)
+      ring.myReceivers must be(Set())
+      ring.mySenders must be(Set())
+    }
+
+  }
+}
diff --git a/akka-remote/src/main/scala/akka/remote/DefaultFailureDetectorRegistry.scala b/akka-remote/src/main/scala/akka/remote/DefaultFailureDetectorRegistry.scala
index c98daa7ed2..7053e77603 100644
--- a/akka-remote/src/main/scala/akka/remote/DefaultFailureDetectorRegistry.scala
+++ b/akka-remote/src/main/scala/akka/remote/DefaultFailureDetectorRegistry.scala
@@ -21,15 +21,16 @@ class DefaultFailureDetectorRegistry[A](val detectorFactory: () ⇒ FailureDetec
   private val resourceToFailureDetector = new AtomicReference[Map[A, FailureDetector]](Map())
   private final val failureDetectorCreationLock: Lock = new ReentrantLock
 
-  /**
-   * Returns true if the resource is considered to be up and healthy and returns false otherwise. For unregistered
-   * resources it returns true.
-   */
   final override def isAvailable(resource: A): Boolean = resourceToFailureDetector.get.get(resource) match {
     case Some(r) ⇒ r.isAvailable
     case _       ⇒ true
   }
 
+  final override def isMonitoring(resource: A): Boolean = resourceToFailureDetector.get.get(resource) match {
+    case Some(r) ⇒ r.isMonitoring
+    case _       ⇒ false
+  }
+
   final override def heartbeat(resource: A): Unit = {
 
     resourceToFailureDetector.get.get(resource) match {
diff --git a/akka-remote/src/main/scala/akka/remote/FailureDetector.scala b/akka-remote/src/main/scala/akka/remote/FailureDetector.scala
index 5c7b7ac9c0..fc2cd61acc 100644
--- a/akka-remote/src/main/scala/akka/remote/FailureDetector.scala
+++ b/akka-remote/src/main/scala/akka/remote/FailureDetector.scala
@@ -16,6 +16,12 @@ trait FailureDetector {
    */
   def isAvailable: Boolean
 
+  /**
+   * Returns true if the failure detector has received any heartbeats and started monitoring
+   * of the resource.
+   */
+  def isMonitoring: Boolean
+
   /**
    * Notifies the FailureDetector that a heartbeat arrived from the monitored resource. This causes the FailureDetector
    * to update its state.
diff --git a/akka-remote/src/main/scala/akka/remote/FailureDetectorRegistry.scala b/akka-remote/src/main/scala/akka/remote/FailureDetectorRegistry.scala
index 2339a6409a..31fa03bfe6 100644
--- a/akka-remote/src/main/scala/akka/remote/FailureDetectorRegistry.scala
+++ b/akka-remote/src/main/scala/akka/remote/FailureDetectorRegistry.scala
@@ -15,9 +15,16 @@ trait FailureDetectorRegistry[A] {
 
   /**
    * Returns true if the resource is considered to be up and healthy and returns false otherwise.
+   * For unregistered resources it returns true.
    */
   def isAvailable(resource: A): Boolean
 
+  /**
+   * Returns true if the failure detector has received any heartbeats and started monitoring
+   * of the resource.
+   */
+  def isMonitoring(resource: A): Boolean
+
   /**
    * Records a heartbeat for a resource. If the resource is not yet registered (i.e. this is the first heartbeat) then
    * it is automatially registered.
diff --git a/akka-remote/src/main/scala/akka/remote/PhiAccrualFailureDetector.scala b/akka-remote/src/main/scala/akka/remote/PhiAccrualFailureDetector.scala
index 194e3b57be..a4117ebeaa 100644
--- a/akka-remote/src/main/scala/akka/remote/PhiAccrualFailureDetector.scala
+++ b/akka-remote/src/main/scala/akka/remote/PhiAccrualFailureDetector.scala
@@ -78,6 +78,8 @@ class PhiAccrualFailureDetector(
 
   override def isAvailable: Boolean = phi < threshold
 
+  override def isMonitoring: Boolean = state.get.timestamp.nonEmpty
+
   @tailrec
   final override def heartbeat(): Unit = {
 
diff --git a/akka-remote/src/test/scala/akka/remote/AccrualFailureDetectorSpec.scala b/akka-remote/src/test/scala/akka/remote/AccrualFailureDetectorSpec.scala
index 5783897148..9b50be79e7 100644
--- a/akka-remote/src/test/scala/akka/remote/AccrualFailureDetectorSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/AccrualFailureDetectorSpec.scala
@@ -94,14 +94,16 @@ class AccrualFailureDetectorSpec extends AkkaSpec("akka.loglevel = INFO") {
       fd.phi must be > (0.0)
     }
 
-    "mark node as available after a series of successful heartbeats" in {
+    "mark node as monitored after a series of successful heartbeats" in {
       val timeInterval = List[Long](0, 1000, 100, 100)
       val fd = createFailureDetector(clock = fakeTimeGenerator(timeInterval))
+      fd.isMonitoring must be(false)
 
       fd.heartbeat()
       fd.heartbeat()
       fd.heartbeat()
 
+      fd.isMonitoring must be(true)
       fd.isAvailable must be(true)
     }
 
diff --git a/akka-remote/src/test/scala/akka/remote/FailureDetectorRegistrySpec.scala b/akka-remote/src/test/scala/akka/remote/FailureDetectorRegistrySpec.scala
index 871d37accf..7c9e9f6bab 100644
--- a/akka-remote/src/test/scala/akka/remote/FailureDetectorRegistrySpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/FailureDetectorRegistrySpec.scala
@@ -112,6 +112,7 @@ class FailureDetectorRegistrySpec extends AkkaSpec("akka.loglevel = INFO") {
   "mark node as available after explicit removal of connection and receiving heartbeat again" in {
     val timeInterval = List[Long](0, 1000, 100, 1100, 1100, 1100, 1100, 1100, 100)
     val fd = createFailureDetectorRegistry(clock = fakeTimeGenerator(timeInterval))
+    fd.isMonitoring("resource1") must be(false)
 
     fd.heartbeat("resource1") //0
 
@@ -119,9 +120,11 @@ class FailureDetectorRegistrySpec extends AkkaSpec("akka.loglevel = INFO") {
     fd.heartbeat("resource1") //1100
 
     fd.isAvailable("resource1") must be(true) //2200
+    fd.isMonitoring("resource1") must be(true)
 
     fd.remove("resource1")
 
+    fd.isMonitoring("resource1") must be(false)
     fd.isAvailable("resource1") must be(true) //3300
 
     // it receives heartbeat from an explicitly removed node
@@ -130,6 +133,7 @@ class FailureDetectorRegistrySpec extends AkkaSpec("akka.loglevel = INFO") {
     fd.heartbeat("resource1") //6600
 
     fd.isAvailable("resource1") must be(true) //6700
+    fd.isMonitoring("resource1") must be(true)
   }
 
 }
diff --git a/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolSpec.scala b/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolSpec.scala
index 592a491693..5b61c1e875 100644
--- a/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolSpec.scala
@@ -19,6 +19,8 @@ object AkkaProtocolSpec {
   class TestFailureDetector extends FailureDetector {
     @volatile var isAvailable: Boolean = true
 
+    def isMonitoring: Boolean = called
+
     @volatile var called: Boolean = false
 
     def heartbeat(): Unit = called = true

From bdd69f7cddd007578ba7796900ba3bcb3fe3c52c Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Thu, 17 Jan 2013 13:37:01 +0100
Subject: [PATCH 057/122] Unique barriers for each round in
 StressSpec.exerciseSupervision, see #2905

* Looks like the issue was caused by a mixup of barriers and/or name
  of the result aggregator actor
---
 akka-cluster/src/multi-jvm/scala/akka/cluster/StressSpec.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/StressSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/StressSpec.scala
index f765e764a3..e2d8c19daf 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/StressSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/StressSpec.scala
@@ -832,7 +832,6 @@ abstract class StressSpec
 
         step += 1
         loop(counter + 1, nextAS, nextAddresses)
-
       }
     }
 
@@ -926,6 +925,7 @@ abstract class StressSpec
         }
 
         awaitClusterResult
+        step += 1
       }
     }
 

From 5dc108567d40b60ecc4cc006ccae008ec63aa190 Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Thu, 17 Jan 2013 14:00:01 +0100
Subject: [PATCH 058/122] Style change of def starting with if

* When a def starts with if and is not a oneliner the if
  should be on a new line.
* The reason is that it might be easy to miss the if when
  reading the code.
---
 .../akka/actor/dispatch/ActorModelSpec.scala  | 51 ++++++-------
 .../src/main/scala/akka/actor/ActorCell.scala | 50 +++++++------
 .../scala/akka/actor/ActorRefProvider.scala   | 11 +--
 .../src/main/scala/akka/actor/FSM.scala       |  9 ++-
 .../scala/akka/actor/dungeon/DeathWatch.scala | 11 +--
 .../akka/dispatch/AbstractDispatcher.scala    | 31 ++++----
 .../akka/dispatch/BalancingDispatcher.scala   | 25 ++++---
 .../akka/util/BoundedBlockingQueue.scala      | 13 ++--
 .../main/scala/akka/util/ByteIterator.scala   | 74 ++++++++++---------
 .../main/scala/akka/util/Collections.scala    | 13 ++--
 .../scala/akka/cluster/ClusterDaemon.scala    |  5 +-
 .../scala/akka/cluster/ClusterHeartbeat.scala | 13 ++--
 .../cluster/ClusterMetricsCollector.scala     | 13 ++--
 .../scala/akka/cluster/ClusterReadView.scala  |  6 +-
 .../akka/cluster/MultiNodeClusterSpec.scala   | 31 ++++----
 .../scala/akka/cluster/StressSpec.scala       | 11 +--
 .../throttle/TimerBasedThrottler.scala        |  2 +-
 .../akka/osgi/OsgiActorSystemFactory.scala    |  4 +-
 .../akka/remote/testconductor/Conductor.scala |  9 ++-
 .../akka/remote/testkit/LogRoleReplace.scala  |  9 ++-
 .../src/main/scala/akka/remote/Remoting.scala | 36 ++++-----
 .../transport/AbstractTransportAdapter.scala  |  7 +-
 .../FailureInjectorTransportAdapter.scala     |  5 +-
 .../transport/ThrottlerTransportAdapter.scala |  7 +-
 .../remote/transport/netty/TcpSupport.scala   |  9 ++-
 .../remote/transport/AkkaProtocolSpec.scala   | 51 +++++++------
 .../transport/GenericTransportSpec.scala      |  9 ++-
 27 files changed, 271 insertions(+), 244 deletions(-)

diff --git a/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala
index 3fa308ca3e..0073857809 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala
@@ -80,21 +80,21 @@ object ActorModelSpec {
     }
 
     def receive = {
-      case AwaitLatch(latch)            ⇒ ack; latch.await(); busy.switchOff()
-      case Meet(sign, wait)             ⇒ ack; sign.countDown(); wait.await(); busy.switchOff()
-      case Wait(time)                   ⇒ ack; Thread.sleep(time); busy.switchOff()
-      case WaitAck(time, l)             ⇒ ack; Thread.sleep(time); l.countDown(); busy.switchOff()
-      case Reply(msg)                   ⇒ ack; sender ! msg; busy.switchOff()
-      case TryReply(msg)                ⇒ ack; sender.tell(msg, null); busy.switchOff()
-      case Forward(to, msg)             ⇒ ack; to.forward(msg); busy.switchOff()
-      case CountDown(latch)             ⇒ ack; latch.countDown(); busy.switchOff()
-      case Increment(count)             ⇒ ack; count.incrementAndGet(); busy.switchOff()
-      case CountDownNStop(l)            ⇒ ack; l.countDown(); context.stop(self); busy.switchOff()
-      case Restart                      ⇒ ack; busy.switchOff(); throw new Exception("Restart requested")
-      case Interrupt                    ⇒ ack; sender ! Status.Failure(new ActorInterruptedException(new InterruptedException("Ping!"))); busy.switchOff(); throw new InterruptedException("Ping!")
-      case InterruptNicely(msg)         ⇒ ack; sender ! msg; busy.switchOff(); Thread.currentThread().interrupt()
-      case ThrowException(e: Throwable) ⇒ ack; busy.switchOff(); throw e
-      case DoubleStop                   ⇒ ack; context.stop(self); context.stop(self); busy.switchOff
+      case AwaitLatch(latch)            ⇒ { ack; latch.await(); busy.switchOff() }
+      case Meet(sign, wait)             ⇒ { ack; sign.countDown(); wait.await(); busy.switchOff() }
+      case Wait(time)                   ⇒ { ack; Thread.sleep(time); busy.switchOff() }
+      case WaitAck(time, l)             ⇒ { ack; Thread.sleep(time); l.countDown(); busy.switchOff() }
+      case Reply(msg)                   ⇒ { ack; sender ! msg; busy.switchOff() }
+      case TryReply(msg)                ⇒ { ack; sender.tell(msg, null); busy.switchOff() }
+      case Forward(to, msg)             ⇒ { ack; to.forward(msg); busy.switchOff() }
+      case CountDown(latch)             ⇒ { ack; latch.countDown(); busy.switchOff() }
+      case Increment(count)             ⇒ { ack; count.incrementAndGet(); busy.switchOff() }
+      case CountDownNStop(l)            ⇒ { ack; l.countDown(); context.stop(self); busy.switchOff() }
+      case Restart                      ⇒ { ack; busy.switchOff(); throw new Exception("Restart requested") }
+      case Interrupt                    ⇒ { ack; sender ! Status.Failure(new ActorInterruptedException(new InterruptedException("Ping!"))); busy.switchOff(); throw new InterruptedException("Ping!") }
+      case InterruptNicely(msg)         ⇒ { ack; sender ! msg; busy.switchOff(); Thread.currentThread().interrupt() }
+      case ThrowException(e: Throwable) ⇒ { ack; busy.switchOff(); throw e }
+      case DoubleStop                   ⇒ { ack; context.stop(self); context.stop(self); busy.switchOff }
     }
   }
 
@@ -229,16 +229,17 @@ object ActorModelSpec {
     }
   }
 
-  @tailrec def await(until: Long)(condition: ⇒ Boolean): Unit = if (System.currentTimeMillis() <= until) {
-    var done = false
-    try {
-      done = condition
-      if (!done) Thread.sleep(25)
-    } catch {
-      case e: InterruptedException ⇒
-    }
-    if (!done) await(until)(condition)
-  } else throw new AssertionError("await failed")
+  @tailrec def await(until: Long)(condition: ⇒ Boolean): Unit =
+    if (System.currentTimeMillis() <= until) {
+      var done = false
+      try {
+        done = condition
+        if (!done) Thread.sleep(25)
+      } catch {
+        case e: InterruptedException ⇒
+      }
+      if (!done) await(until)(condition)
+    } else throw new AssertionError("await failed")
 }
 
 abstract class ActorModelSpec(config: String) extends AkkaSpec(config) with DefaultTimeout {
diff --git a/akka-actor/src/main/scala/akka/actor/ActorCell.scala b/akka-actor/src/main/scala/akka/actor/ActorCell.scala
index 6f48fd235e..60f4398e17 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorCell.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorCell.scala
@@ -392,23 +392,24 @@ private[akka] class ActorCell(
     checkReceiveTimeout // Reschedule receive timeout
   }
 
-  def autoReceiveMessage(msg: Envelope): Unit = if (msg.message != NullMessage) {
-    if (system.settings.DebugAutoReceive)
-      publish(Debug(self.path.toString, clazz(actor), "received AutoReceiveMessage " + msg))
+  def autoReceiveMessage(msg: Envelope): Unit =
+    if (msg.message != NullMessage) {
+      if (system.settings.DebugAutoReceive)
+        publish(Debug(self.path.toString, clazz(actor), "received AutoReceiveMessage " + msg))
 
-    msg.message match {
-      case Failed(cause, uid) ⇒ handleFailure(sender, cause, uid)
-      case t: Terminated ⇒
-        if (t.addressTerminated) removeChildWhenToAddressTerminated(t.actor)
-        watchedActorTerminated(t)
-      case AddressTerminated(address) ⇒ addressTerminated(address)
-      case Kill                       ⇒ throw new ActorKilledException("Kill")
-      case PoisonPill                 ⇒ self.stop()
-      case SelectParent(m)            ⇒ parent.tell(m, msg.sender)
-      case SelectChildName(name, m)   ⇒ getChildByName(name) match { case Some(c: ChildRestartStats) ⇒ c.child.tell(m, msg.sender); case _ ⇒ }
-      case SelectChildPattern(p, m)   ⇒ for (c ← children if p.matcher(c.path.name).matches) c.tell(m, msg.sender)
+      msg.message match {
+        case Failed(cause, uid) ⇒ handleFailure(sender, cause, uid)
+        case t: Terminated ⇒
+          if (t.addressTerminated) removeChildWhenToAddressTerminated(t.actor)
+          watchedActorTerminated(t)
+        case AddressTerminated(address) ⇒ addressTerminated(address)
+        case Kill                       ⇒ throw new ActorKilledException("Kill")
+        case PoisonPill                 ⇒ self.stop()
+        case SelectParent(m)            ⇒ parent.tell(m, msg.sender)
+        case SelectChildName(name, m)   ⇒ getChildByName(name) match { case Some(c: ChildRestartStats) ⇒ c.child.tell(m, msg.sender); case _ ⇒ }
+        case SelectChildPattern(p, m)   ⇒ for (c ← children if p.matcher(c.path.name).matches) c.tell(m, msg.sender)
+      }
     }
-  }
 
   /**
    * When a parent is watching a child and it terminates due to AddressTerminated,
@@ -497,16 +498,17 @@ private[akka] class ActorCell(
         }
     }
 
-  private def supervise(child: ActorRef, async: Boolean, uid: Int): Unit = if (!isTerminating) {
-    // Supervise is the first thing we get from a new child, so store away the UID for later use in handleFailure()
-    initChild(child) match {
-      case Some(crs) ⇒
-        crs.uid = uid
-        handleSupervise(child, async)
-        if (system.settings.DebugLifecycle) publish(Debug(self.path.toString, clazz(actor), "now supervising " + child))
-      case None ⇒ publish(Error(self.path.toString, clazz(actor), "received Supervise from unregistered child " + child + ", this will not end well"))
+  private def supervise(child: ActorRef, async: Boolean, uid: Int): Unit =
+    if (!isTerminating) {
+      // Supervise is the first thing we get from a new child, so store away the UID for later use in handleFailure()
+      initChild(child) match {
+        case Some(crs) ⇒
+          crs.uid = uid
+          handleSupervise(child, async)
+          if (system.settings.DebugLifecycle) publish(Debug(self.path.toString, clazz(actor), "now supervising " + child))
+        case None ⇒ publish(Error(self.path.toString, clazz(actor), "received Supervise from unregistered child " + child + ", this will not end well"))
+      }
     }
-  }
 
   // future extension point
   protected def handleSupervise(child: ActorRef, async: Boolean): Unit = child match {
diff --git a/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala b/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala
index f1a8d95fd0..184478c727 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala
@@ -382,7 +382,7 @@ class LocalActorRefProvider(
     override def isTerminated: Boolean = stopped.isOn
 
     override def !(message: Any)(implicit sender: ActorRef = Actor.noSender): Unit = stopped.ifOff(message match {
-      case Failed(ex, _) if sender ne null ⇒ causeOfTermination = Some(ex); sender.asInstanceOf[InternalActorRef].stop()
+      case Failed(ex, _) if sender ne null ⇒ { causeOfTermination = Some(ex); sender.asInstanceOf[InternalActorRef].stop() }
       case NullMessage                     ⇒ // do nothing
       case _                               ⇒ log.error(this + " received unexpected message [" + message + "]")
     })
@@ -449,10 +449,11 @@ class LocalActorRefProvider(
       stopWhenAllTerminationHooksDone()
     }
 
-    def stopWhenAllTerminationHooksDone(): Unit = if (terminationHooks.isEmpty) {
-      eventStream.stopDefaultLoggers()
-      context.stop(self)
-    }
+    def stopWhenAllTerminationHooksDone(): Unit =
+      if (terminationHooks.isEmpty) {
+        eventStream.stopDefaultLoggers()
+        context.stop(self)
+      }
 
     // guardian MUST NOT lose its children during restart
     override def preRestart(cause: Throwable, msg: Option[Any]) {}
diff --git a/akka-actor/src/main/scala/akka/actor/FSM.scala b/akka-actor/src/main/scala/akka/actor/FSM.scala
index ad0e0bf7f0..d6f6ac488f 100644
--- a/akka-actor/src/main/scala/akka/actor/FSM.scala
+++ b/akka-actor/src/main/scala/akka/actor/FSM.scala
@@ -97,10 +97,11 @@ object FSM {
         if (repeat) scheduler.schedule(timeout, timeout, actor, this)
         else scheduler.scheduleOnce(timeout, actor, this))
 
-    def cancel(): Unit = if (ref.isDefined) {
-      ref.get.cancel()
-      ref = None
-    }
+    def cancel(): Unit =
+      if (ref.isDefined) {
+        ref.get.cancel()
+        ref = None
+      }
   }
 
   /**
diff --git a/akka-actor/src/main/scala/akka/actor/dungeon/DeathWatch.scala b/akka-actor/src/main/scala/akka/actor/dungeon/DeathWatch.scala
index eb191ff415..017a880b1a 100644
--- a/akka-actor/src/main/scala/akka/actor/dungeon/DeathWatch.scala
+++ b/akka-actor/src/main/scala/akka/actor/dungeon/DeathWatch.scala
@@ -40,12 +40,13 @@ private[akka] trait DeathWatch { this: ActorCell ⇒
    * When this actor is watching the subject of [[akka.actor.Terminated]] message
    * it will be propagated to user's receive.
    */
-  protected def watchedActorTerminated(t: Terminated): Unit = if (watching.contains(t.actor)) {
-    maintainAddressTerminatedSubscription(t.actor) {
-      watching -= t.actor
+  protected def watchedActorTerminated(t: Terminated): Unit =
+    if (watching.contains(t.actor)) {
+      maintainAddressTerminatedSubscription(t.actor) {
+        watching -= t.actor
+      }
+      receiveMessage(t)
     }
-    receiveMessage(t)
-  }
 
   protected def tellWatchersWeDied(actor: Actor): Unit = {
     if (!watchedBy.isEmpty) {
diff --git a/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala b/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala
index 5d470746f4..f06e03ae1a 100644
--- a/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala
@@ -158,23 +158,24 @@ private[akka] object MessageDispatcher {
   // since this is a compile-time constant, scalac will elide code behind if (MessageDispatcher.debug) (RK checked with 2.9.1)
   final val debug = false // Deliberately without type ascription to make it a compile-time constant
   lazy val actors = new Index[MessageDispatcher, ActorRef](16, _ compareTo _)
-  def printActors: Unit = if (debug) {
-    for {
-      d ← actors.keys
-      a ← { println(d + " inhabitants: " + d.inhabitants); actors.valueIterator(d) }
-    } {
-      val status = if (a.isTerminated) " (terminated)" else " (alive)"
-      val messages = a match {
-        case r: ActorRefWithCell ⇒ " " + r.underlying.numberOfMessages + " messages"
-        case _                   ⇒ " " + a.getClass
+  def printActors: Unit =
+    if (debug) {
+      for {
+        d ← actors.keys
+        a ← { println(d + " inhabitants: " + d.inhabitants); actors.valueIterator(d) }
+      } {
+        val status = if (a.isTerminated) " (terminated)" else " (alive)"
+        val messages = a match {
+          case r: ActorRefWithCell ⇒ " " + r.underlying.numberOfMessages + " messages"
+          case _                   ⇒ " " + a.getClass
+        }
+        val parent = a match {
+          case i: InternalActorRef ⇒ ", parent: " + i.getParent
+          case _                   ⇒ ""
+        }
+        println(" -> " + a + status + messages + parent)
       }
-      val parent = a match {
-        case i: InternalActorRef ⇒ ", parent: " + i.getParent
-        case _                   ⇒ ""
-      }
-      println(" -> " + a + status + messages + parent)
     }
-  }
 
   implicit def defaultDispatcher(implicit system: ActorSystem): MessageDispatcher = system.dispatcher
 }
diff --git a/akka-actor/src/main/scala/akka/dispatch/BalancingDispatcher.scala b/akka-actor/src/main/scala/akka/dispatch/BalancingDispatcher.scala
index 2190130440..895d48a0e7 100644
--- a/akka-actor/src/main/scala/akka/dispatch/BalancingDispatcher.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/BalancingDispatcher.scala
@@ -85,17 +85,18 @@ class BalancingDispatcher(
     if (!registerForExecution(receiver.mailbox, false, false)) teamWork()
   }
 
-  protected def teamWork(): Unit = if (attemptTeamWork) {
-    @tailrec def scheduleOne(i: Iterator[ActorCell] = team.iterator): Unit =
-      if (messageQueue.hasMessages
-        && i.hasNext
-        && (executorService.executor match {
-          case lm: LoadMetrics ⇒ lm.atFullThrottle == false
-          case other           ⇒ true
-        })
-        && !registerForExecution(i.next.mailbox, false, false))
-        scheduleOne(i)
+  protected def teamWork(): Unit =
+    if (attemptTeamWork) {
+      @tailrec def scheduleOne(i: Iterator[ActorCell] = team.iterator): Unit =
+        if (messageQueue.hasMessages
+          && i.hasNext
+          && (executorService.executor match {
+            case lm: LoadMetrics ⇒ lm.atFullThrottle == false
+            case other           ⇒ true
+          })
+          && !registerForExecution(i.next.mailbox, false, false))
+          scheduleOne(i)
 
-    scheduleOne()
-  }
+      scheduleOne()
+    }
 }
diff --git a/akka-actor/src/main/scala/akka/util/BoundedBlockingQueue.scala b/akka-actor/src/main/scala/akka/util/BoundedBlockingQueue.scala
index b6167ffece..24fc20b824 100644
--- a/akka-actor/src/main/scala/akka/util/BoundedBlockingQueue.scala
+++ b/akka-actor/src/main/scala/akka/util/BoundedBlockingQueue.scala
@@ -285,12 +285,13 @@ class BoundedBlockingQueue[E <: AnyRef](
           last = -1 //To avoid 2 subsequent removes without a next in between
           lock.lock()
           try {
-            @tailrec def removeTarget(i: Iterator[E] = backing.iterator()): Unit = if (i.hasNext) {
-              if (i.next eq target) {
-                i.remove()
-                notFull.signal()
-              } else removeTarget(i)
-            }
+            @tailrec def removeTarget(i: Iterator[E] = backing.iterator()): Unit =
+              if (i.hasNext) {
+                if (i.next eq target) {
+                  i.remove()
+                  notFull.signal()
+                } else removeTarget(i)
+              }
 
             removeTarget()
           } finally {
diff --git a/akka-actor/src/main/scala/akka/util/ByteIterator.scala b/akka-actor/src/main/scala/akka/util/ByteIterator.scala
index 49292bb877..ded49f63a6 100644
--- a/akka-actor/src/main/scala/akka/util/ByteIterator.scala
+++ b/akka-actor/src/main/scala/akka/util/ByteIterator.scala
@@ -252,14 +252,15 @@ object ByteIterator {
       normalize()
     }
 
-    @tailrec final override def drop(n: Int): this.type = if ((n > 0) && !isEmpty) {
-      val nCurrent = math.min(n, current.len)
-      current.drop(n)
-      val rest = n - nCurrent
-      assert(current.isEmpty || (rest == 0))
-      normalize()
-      drop(rest)
-    } else this
+    @tailrec final override def drop(n: Int): this.type =
+      if ((n > 0) && !isEmpty) {
+        val nCurrent = math.min(n, current.len)
+        current.drop(n)
+        val rest = n - nCurrent
+        assert(current.isEmpty || (rest == 0))
+        normalize()
+        drop(rest)
+      } else this
 
     final override def takeWhile(p: Byte ⇒ Boolean): this.type = {
       var stop = false
@@ -275,12 +276,13 @@ object ByteIterator {
       normalize()
     }
 
-    @tailrec final override def dropWhile(p: Byte ⇒ Boolean): this.type = if (!isEmpty) {
-      current.dropWhile(p)
-      val dropMore = current.isEmpty
-      normalize()
-      if (dropMore) dropWhile(p) else this
-    } else this
+    @tailrec final override def dropWhile(p: Byte ⇒ Boolean): this.type =
+      if (!isEmpty) {
+        current.dropWhile(p)
+        val dropMore = current.isEmpty
+        normalize()
+        if (dropMore) dropWhile(p) else this
+      } else this
 
     final override def copyToArray[B >: Byte](xs: Array[B], start: Int, len: Int): Unit = {
       var pos = start
@@ -309,19 +311,20 @@ object ByteIterator {
       }
     }
 
-    @tailrec protected final def getToArray[A](xs: Array[A], offset: Int, n: Int, elemSize: Int)(getSingle: ⇒ A)(getMult: (Array[A], Int, Int) ⇒ Unit): this.type = if (n <= 0) this else {
-      if (isEmpty) Iterator.empty.next
-      val nDone = if (current.len >= elemSize) {
-        val nCurrent = math.min(n, current.len / elemSize)
-        getMult(xs, offset, nCurrent)
-        nCurrent
-      } else {
-        xs(offset) = getSingle
-        1
+    @tailrec protected final def getToArray[A](xs: Array[A], offset: Int, n: Int, elemSize: Int)(getSingle: ⇒ A)(getMult: (Array[A], Int, Int) ⇒ Unit): this.type =
+      if (n <= 0) this else {
+        if (isEmpty) Iterator.empty.next
+        val nDone = if (current.len >= elemSize) {
+          val nCurrent = math.min(n, current.len / elemSize)
+          getMult(xs, offset, nCurrent)
+          nCurrent
+        } else {
+          xs(offset) = getSingle
+          1
+        }
+        normalize()
+        getToArray(xs, offset + nDone, n - nDone, elemSize)(getSingle)(getMult)
       }
-      normalize()
-      getToArray(xs, offset + nDone, n - nDone, elemSize)(getSingle)(getMult)
-    }
 
     def getBytes(xs: Array[Byte], offset: Int, n: Int): this.type =
       getToArray(xs, offset, n, 1) { getByte } { current.getBytes(_, _, _) }
@@ -359,16 +362,17 @@ object ByteIterator {
       }
 
       override def skip(n: Long): Long = {
-        @tailrec def skipImpl(n: Long, skipped: Long): Long = if (n > 0) {
-          if (!isEmpty) {
-            val m = current.asInputStream.skip(n)
-            normalize()
-            val newN = n - m
-            val newSkipped = skipped + m
-            if (newN > 0) skipImpl(newN, newSkipped)
-            else newSkipped
+        @tailrec def skipImpl(n: Long, skipped: Long): Long =
+          if (n > 0) {
+            if (!isEmpty) {
+              val m = current.asInputStream.skip(n)
+              normalize()
+              val newN = n - m
+              val newSkipped = skipped + m
+              if (newN > 0) skipImpl(newN, newSkipped)
+              else newSkipped
+            } else 0
           } else 0
-        } else 0
 
         skipImpl(n, 0)
       }
diff --git a/akka-actor/src/main/scala/akka/util/Collections.scala b/akka-actor/src/main/scala/akka/util/Collections.scala
index f7a6368f45..293556861b 100644
--- a/akka-actor/src/main/scala/akka/util/Collections.scala
+++ b/akka-actor/src/main/scala/akka/util/Collections.scala
@@ -38,12 +38,13 @@ private[akka] object Collections {
             } else hasNext //Attempt to find the next
           } else _hasNext // Return if we found one
 
-        override final def next(): To = if (hasNext) {
-          val ret = _next
-          _next = null.asInstanceOf[To] // Mark as consumed (nice to the GC, don't leak the last returned value)
-          _hasNext = false // Mark as consumed (we need to look for the next value)
-          ret
-        } else throw new java.util.NoSuchElementException("next")
+        override final def next(): To =
+          if (hasNext) {
+            val ret = _next
+            _next = null.asInstanceOf[To] // Mark as consumed (nice to the GC, don't leak the last returned value)
+            _hasNext = false // Mark as consumed (we need to look for the next value)
+            ret
+          } else throw new java.util.NoSuchElementException("next")
       }
     }
 
diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterDaemon.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterDaemon.scala
index 5271bd6cd5..b2ecc0fbdb 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterDaemon.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/ClusterDaemon.scala
@@ -803,8 +803,9 @@ private[cluster] final class ClusterCoreDaemon(publisher: ActorRef) extends Acto
   def oneWayGossipTo(address: Address): Unit =
     gossipTo(address, GossipEnvelope(selfAddress, latestGossip, conversation = false))
 
-  def gossipTo(address: Address, gossipMsg: GossipEnvelope): Unit = if (address != selfAddress)
-    coreSender ! SendClusterMessage(address, gossipMsg)
+  def gossipTo(address: Address, gossipMsg: GossipEnvelope): Unit =
+    if (address != selfAddress)
+      coreSender ! SendClusterMessage(address, gossipMsg)
 
   def publish(newGossip: Gossip): Unit = {
     publisher ! PublishChanges(newGossip)
diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterHeartbeat.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterHeartbeat.scala
index 81ac04e64c..f46b611c44 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterHeartbeat.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/ClusterHeartbeat.scala
@@ -143,17 +143,14 @@ private[cluster] final class ClusterHeartbeatSender extends Actor with ActorLogg
     case ExpectedFirstHeartbeat(from) ⇒ triggerFirstHeartbeat(from)
   }
 
-  def reset(snapshot: InstantClusterState): Unit =
-    state = state.reset(snapshot.members.map(_.address))
+  def reset(snapshot: InstantClusterState): Unit = state = state.reset(snapshot.members.map(_.address))
 
-  def addMember(m: Member): Unit = if (m.address != selfAddress)
-    state = state addMember m.address
+  def addMember(m: Member): Unit = if (m.address != selfAddress) state = state addMember m.address
 
-  def removeMember(m: Member): Unit = if (m.address != selfAddress)
-    state = state removeMember m.address
+  def removeMember(m: Member): Unit = if (m.address != selfAddress) state = state removeMember m.address
 
-  def addHeartbeatRequest(address: Address): Unit = if (address != selfAddress)
-    state = state.addHeartbeatRequest(address, Deadline.now + HeartbeatRequestTimeToLive)
+  def addHeartbeatRequest(address: Address): Unit =
+    if (address != selfAddress) state = state.addHeartbeatRequest(address, Deadline.now + HeartbeatRequestTimeToLive)
 
   def sendHeartbeatRequest(address: Address): Unit =
     if (!cluster.failureDetector.isMonitoring(address) && state.ring.mySenders.contains(address)) {
diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterMetricsCollector.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterMetricsCollector.scala
index bd093c9f74..4c3f70108a 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterMetricsCollector.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/ClusterMetricsCollector.scala
@@ -307,12 +307,13 @@ case class Metric private (name: String, value: Number, private val average: Opt
    * If defined ( [[akka.cluster.MetricNumericConverter.defined()]] ), updates the new
    * data point, and if defined, updates the data stream. Returns the updated metric.
    */
-  def :+(latest: Metric): Metric = if (this sameAs latest) average match {
-    case Some(avg)                        ⇒ copy(value = latest.value, average = Some(avg :+ latest.value.doubleValue))
-    case None if latest.average.isDefined ⇒ copy(value = latest.value, average = latest.average)
-    case _                                ⇒ copy(value = latest.value)
-  }
-  else this
+  def :+(latest: Metric): Metric =
+    if (this sameAs latest) average match {
+      case Some(avg)                        ⇒ copy(value = latest.value, average = Some(avg :+ latest.value.doubleValue))
+      case None if latest.average.isDefined ⇒ copy(value = latest.value, average = latest.average)
+      case _                                ⇒ copy(value = latest.value)
+    }
+    else this
 
   /**
    * The numerical value of the average, if defined, otherwise the latest value
diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterReadView.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterReadView.scala
index 571148af41..af69f977e0 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterReadView.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/ClusterReadView.scala
@@ -143,8 +143,8 @@ private[akka] class ClusterReadView(cluster: Cluster) extends Closeable {
   /**
    * Unsubscribe to cluster events.
    */
-  def close(): Unit = if (!eventBusListener.isTerminated) {
-    eventBusListener ! PoisonPill
-  }
+  def close(): Unit =
+    if (!eventBusListener.isTerminated)
+      eventBusListener ! PoisonPill
 
 }
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiNodeClusterSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiNodeClusterSpec.scala
index fe8deb887d..1027a14279 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiNodeClusterSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiNodeClusterSpec.scala
@@ -81,13 +81,13 @@ trait MultiNodeClusterSpec extends Suite with STMultiNodeSpec { self: MultiNodeS
     }
   }
 
-  def muteMarkingAsUnreachable(sys: ActorSystem = system): Unit = if (!sys.log.isDebugEnabled) {
-    sys.eventStream.publish(Mute(EventFilter.error(pattern = ".*Marking.* as UNREACHABLE.*")))
-  }
+  def muteMarkingAsUnreachable(sys: ActorSystem = system): Unit =
+    if (!sys.log.isDebugEnabled)
+      sys.eventStream.publish(Mute(EventFilter.error(pattern = ".*Marking.* as UNREACHABLE.*")))
 
-  def muteDeadLetters(sys: ActorSystem = system): Unit = if (!sys.log.isDebugEnabled) {
-    sys.eventStream.publish(Mute(EventFilter.warning(pattern = ".*received dead letter from.*")))
-  }
+  def muteDeadLetters(sys: ActorSystem = system): Unit =
+    if (!sys.log.isDebugEnabled)
+      sys.eventStream.publish(Mute(EventFilter.warning(pattern = ".*received dead letter from.*")))
 
   override def afterAll(): Unit = {
     if (!log.isDebugEnabled) {
@@ -201,15 +201,16 @@ trait MultiNodeClusterSpec extends Suite with STMultiNodeSpec { self: MultiNodeS
    * out of all nodes in the cluster. First
    * member in the cluster ring is expected leader.
    */
-  def assertLeaderIn(nodesInCluster: immutable.Seq[RoleName]): Unit = if (nodesInCluster.contains(myself)) {
-    nodesInCluster.length must not be (0)
-    val expectedLeader = roleOfLeader(nodesInCluster)
-    val leader = clusterView.leader
-    val isLeader = leader == Some(clusterView.selfAddress)
-    assert(isLeader == isNode(expectedLeader),
-      "expectedLeader [%s], got leader [%s], members [%s]".format(expectedLeader, leader, clusterView.members))
-    clusterView.status must (be(MemberStatus.Up) or be(MemberStatus.Leaving))
-  }
+  def assertLeaderIn(nodesInCluster: immutable.Seq[RoleName]): Unit =
+    if (nodesInCluster.contains(myself)) {
+      nodesInCluster.length must not be (0)
+      val expectedLeader = roleOfLeader(nodesInCluster)
+      val leader = clusterView.leader
+      val isLeader = leader == Some(clusterView.selfAddress)
+      assert(isLeader == isNode(expectedLeader),
+        "expectedLeader [%s], got leader [%s], members [%s]".format(expectedLeader, leader, clusterView.members))
+      clusterView.status must (be(MemberStatus.Up) or be(MemberStatus.Leaving))
+    }
 
   /**
    * Wait until the expected number of members has status Up and convergence has been reached.
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/StressSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/StressSpec.scala
index e2d8c19daf..16a163c026 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/StressSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/StressSpec.scala
@@ -435,11 +435,12 @@ object StressMultiJvmSpec extends MultiNodeConfig {
       case RetryTick ⇒ resend()
     }
 
-    def done(replyTo: ActorRef): Unit = if (outstanding.isEmpty) {
-      val duration = (System.nanoTime - startTime).nanos
-      replyTo ! WorkResult(duration, sendCounter, ackCounter)
-      context stop self
-    }
+    def done(replyTo: ActorRef): Unit =
+      if (outstanding.isEmpty) {
+        val duration = (System.nanoTime - startTime).nanos
+        replyTo ! WorkResult(duration, sendCounter, ackCounter)
+        context stop self
+      }
 
     def sendJobs(): Unit = {
       0 until settings.workBatchSize foreach { _ ⇒
diff --git a/akka-contrib/src/main/scala/akka/contrib/throttle/TimerBasedThrottler.scala b/akka-contrib/src/main/scala/akka/contrib/throttle/TimerBasedThrottler.scala
index 0841130f34..3e1d2c6908 100644
--- a/akka-contrib/src/main/scala/akka/contrib/throttle/TimerBasedThrottler.scala
+++ b/akka-contrib/src/main/scala/akka/contrib/throttle/TimerBasedThrottler.scala
@@ -293,4 +293,4 @@ class TimerBasedThrottler(var rate: Rate) extends Actor with Throttler with FSM[
 
     data.copy(queue = queue.drop(nrOfMsgToSend), callsLeftInThisPeriod = data.callsLeftInThisPeriod - nrOfMsgToSend)
   }
-}
+}
diff --git a/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala b/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala
index 6b799df30c..4194afba01 100644
--- a/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala
+++ b/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala
@@ -44,8 +44,8 @@ class OsgiActorSystemFactory(val context: BundleContext, val fallbackClassLoader
   def actorSystemConfig(context: BundleContext): Config = {
     val bundleSymbolicName = context.getBundle.getSymbolicName
     val bundleId = context.getBundle.getBundleId
-    val acceptedFilePath = List(s"bundle-$bundleSymbolicName", s"bundle-$bundleId", "akka").map(x =>  s"etc/$x")
-    val applicationConfiguration = acceptedFilePath.foldLeft(ConfigFactory.empty())((x, y) => x.withFallback(ConfigFactory.parseFileAnySyntax(new File(y))))
+    val acceptedFilePath = List(s"bundle-$bundleSymbolicName", s"bundle-$bundleId", "akka").map(x ⇒ s"etc/$x")
+    val applicationConfiguration = acceptedFilePath.foldLeft(ConfigFactory.empty())((x, y) ⇒ x.withFallback(ConfigFactory.parseFileAnySyntax(new File(y))))
     applicationConfiguration.withFallback(ConfigFactory.load(classloader).withFallback(ConfigFactory.defaultReference(OsgiActorSystemFactory.akkaActorClassLoader)))
   }
 
diff --git a/akka-remote-tests/src/main/scala/akka/remote/testconductor/Conductor.scala b/akka-remote-tests/src/main/scala/akka/remote/testconductor/Conductor.scala
index 5ea1b2e8cb..8794504616 100644
--- a/akka-remote-tests/src/main/scala/akka/remote/testconductor/Conductor.scala
+++ b/akka-remote-tests/src/main/scala/akka/remote/testconductor/Conductor.scala
@@ -125,9 +125,10 @@ trait Conductor { this: TestConductorExt ⇒
   def blackhole(node: RoleName, target: RoleName, direction: Direction): Future[Done] =
     throttle(node, target, direction, 0f)
 
-  private def requireTestConductorTranport(): Unit = if (!transport.defaultAddress.protocol.contains(".gremlin.trttl."))
-    throw new ConfigurationException("To use this feature you must activate the failure injector adapters " +
-      "(gremlin, trttl) by specifying `testTransport(on = true)` in your MultiNodeConfig.")
+  private def requireTestConductorTranport(): Unit =
+    if (!transport.defaultAddress.protocol.contains(".gremlin.trttl."))
+      throw new ConfigurationException("To use this feature you must activate the failure injector adapters " +
+        "(gremlin, trttl) by specifying `testTransport(on = true)` in your MultiNodeConfig.")
 
   /**
    * Switch the Netty pipeline of the remote support into pass through mode for
@@ -377,7 +378,7 @@ private[akka] class Controller(private var initialParticipants: Int, controllerP
     case BarrierTimeout(data)             ⇒ failBarrier(data)
     case FailedBarrier(data)              ⇒ failBarrier(data)
     case BarrierEmpty(data, msg)          ⇒ SupervisorStrategy.Resume
-    case WrongBarrier(name, client, data) ⇒ client ! ToClient(BarrierResult(name, false)); failBarrier(data)
+    case WrongBarrier(name, client, data) ⇒ { client ! ToClient(BarrierResult(name, false)); failBarrier(data) }
     case ClientLost(data, node)           ⇒ failBarrier(data)
     case DuplicateNode(data, node)        ⇒ failBarrier(data)
   }
diff --git a/akka-remote-tests/src/test/scala/akka/remote/testkit/LogRoleReplace.scala b/akka-remote-tests/src/test/scala/akka/remote/testkit/LogRoleReplace.scala
index 4ec3ed2e84..584a9f2b27 100644
--- a/akka-remote-tests/src/test/scala/akka/remote/testkit/LogRoleReplace.scala
+++ b/akka-remote-tests/src/test/scala/akka/remote/testkit/LogRoleReplace.scala
@@ -100,10 +100,11 @@ class LogRoleReplace {
   def process(in: BufferedReader, out: PrintWriter): Unit = {
 
     @tailrec
-    def processLines(line: String): Unit = if (line ne null) {
-      out.println(processLine(line))
-      processLines(in.readLine)
-    }
+    def processLines(line: String): Unit =
+      if (line ne null) {
+        out.println(processLine(line))
+        processLines(in.readLine)
+      }
 
     processLines(in.readLine())
   }
diff --git a/akka-remote/src/main/scala/akka/remote/Remoting.scala b/akka-remote/src/main/scala/akka/remote/Remoting.scala
index f3d2d71301..f0e4f61043 100644
--- a/akka-remote/src/main/scala/akka/remote/Remoting.scala
+++ b/akka-remote/src/main/scala/akka/remote/Remoting.scala
@@ -298,17 +298,18 @@ private[remote] object EndpointManager {
       endpoint
     }
 
-    def unregisterEndpoint(endpoint: ActorRef): Unit = if (isWritable(endpoint)) {
-      val address = writableToAddress(endpoint)
-      addressToWritable.get(address) match {
-        case Some(policy) if policy.isTombstone ⇒ // There is already a tombstone directive, leave it there
-        case _                                  ⇒ addressToWritable -= address
+    def unregisterEndpoint(endpoint: ActorRef): Unit =
+      if (isWritable(endpoint)) {
+        val address = writableToAddress(endpoint)
+        addressToWritable.get(address) match {
+          case Some(policy) if policy.isTombstone ⇒ // There is already a tombstone directive, leave it there
+          case _                                  ⇒ addressToWritable -= address
+        }
+        writableToAddress -= endpoint
+      } else if (isReadOnly(endpoint)) {
+        addressToReadonly -= readonlyToAddress(endpoint)
+        readonlyToAddress -= endpoint
       }
-      writableToAddress -= endpoint
-    } else if (isReadOnly(endpoint)) {
-      addressToReadonly -= readonlyToAddress(endpoint)
-      readonlyToAddress -= endpoint
-    }
 
     def writableEndpointWithPolicyFor(address: Address): Option[EndpointPolicy] = addressToWritable.get(address)
 
@@ -328,13 +329,14 @@ private[remote] object EndpointManager {
       case _                    ⇒ false
     }
 
-    def markAsFailed(endpoint: ActorRef, timeOfRelease: Deadline): Unit = if (isWritable(endpoint)) {
-      addressToWritable += writableToAddress(endpoint) -> Gated(timeOfRelease)
-      writableToAddress -= endpoint
-    } else if (isReadOnly(endpoint)) {
-      addressToReadonly -= readonlyToAddress(endpoint)
-      readonlyToAddress -= endpoint
-    }
+    def markAsFailed(endpoint: ActorRef, timeOfRelease: Deadline): Unit =
+      if (isWritable(endpoint)) {
+        addressToWritable += writableToAddress(endpoint) -> Gated(timeOfRelease)
+        writableToAddress -= endpoint
+      } else if (isReadOnly(endpoint)) {
+        addressToReadonly -= readonlyToAddress(endpoint)
+        readonlyToAddress -= endpoint
+      }
 
     def markAsQuarantined(address: Address, reason: Throwable): Unit = addressToWritable += address -> Quarantined(reason)
 
diff --git a/akka-remote/src/main/scala/akka/remote/transport/AbstractTransportAdapter.scala b/akka-remote/src/main/scala/akka/remote/transport/AbstractTransportAdapter.scala
index 5643951ea4..e6fad8dd30 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/AbstractTransportAdapter.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/AbstractTransportAdapter.scala
@@ -48,9 +48,10 @@ trait SchemeAugmenter {
 
   protected def augmentScheme(address: Address): Address = address.copy(protocol = augmentScheme(address.protocol))
 
-  protected def removeScheme(scheme: String): String = if (scheme.endsWith(s".$addedSchemeIdentifier"))
-    scheme.take(scheme.length - addedSchemeIdentifier.length - 1)
-  else scheme
+  protected def removeScheme(scheme: String): String =
+    if (scheme.endsWith(s".$addedSchemeIdentifier"))
+      scheme.take(scheme.length - addedSchemeIdentifier.length - 1)
+    else scheme
 
   protected def removeScheme(address: Address): Address = address.copy(protocol = removeScheme(address.protocol))
 }
diff --git a/akka-remote/src/main/scala/akka/remote/transport/FailureInjectorTransportAdapter.scala b/akka-remote/src/main/scala/akka/remote/transport/FailureInjectorTransportAdapter.scala
index e3f204115b..ab32cbefe4 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/FailureInjectorTransportAdapter.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/FailureInjectorTransportAdapter.scala
@@ -135,7 +135,8 @@ private[remote] case class FailureInjectorHandle(_wrappedHandle: AssociationHand
 
   override def disassociate(): Unit = wrappedHandle.disassociate()
 
-  override def notify(ev: HandleEvent): Unit = if (!gremlinAdapter.shouldDropInbound(wrappedHandle.remoteAddress))
-    upstreamListener notify ev
+  override def notify(ev: HandleEvent): Unit =
+    if (!gremlinAdapter.shouldDropInbound(wrappedHandle.remoteAddress))
+      upstreamListener notify ev
 
 }
diff --git a/akka-remote/src/main/scala/akka/remote/transport/ThrottlerTransportAdapter.scala b/akka-remote/src/main/scala/akka/remote/transport/ThrottlerTransportAdapter.scala
index 76d4d77b04..bc0c9e7c0e 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/ThrottlerTransportAdapter.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/ThrottlerTransportAdapter.scala
@@ -70,9 +70,10 @@ object ThrottlerTransportAdapter {
   case class TokenBucket(capacity: Int, tokensPerSecond: Double, nanoTimeOfLastSend: Long, availableTokens: Int)
     extends ThrottleMode {
 
-    private def isAvailable(nanoTimeOfSend: Long, tokens: Int): Boolean = if ((tokens > capacity && availableTokens > 0)) {
-      true // Allow messages larger than capacity through, it will be recorded as negative tokens
-    } else min((availableTokens + tokensGenerated(nanoTimeOfSend)), capacity) >= tokens
+    private def isAvailable(nanoTimeOfSend: Long, tokens: Int): Boolean =
+      if ((tokens > capacity && availableTokens > 0)) {
+        true // Allow messages larger than capacity through, it will be recorded as negative tokens
+      } else min((availableTokens + tokensGenerated(nanoTimeOfSend)), capacity) >= tokens
 
     override def tryConsumeTokens(nanoTimeOfSend: Long, tokens: Int): (ThrottleMode, Boolean) = {
       if (isAvailable(nanoTimeOfSend, tokens))
diff --git a/akka-remote/src/main/scala/akka/remote/transport/netty/TcpSupport.scala b/akka-remote/src/main/scala/akka/remote/transport/netty/TcpSupport.scala
index c4c7e7c674..fc02383337 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/netty/TcpSupport.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/netty/TcpSupport.scala
@@ -68,10 +68,11 @@ private[remote] class TcpAssociationHandle(val localAddress: Address, val remote
 
   override val readHandlerPromise: Promise[HandleEventListener] = Promise()
 
-  override def write(payload: ByteString): Boolean = if (channel.isWritable && channel.isOpen) {
-    channel.write(ChannelBuffers.wrappedBuffer(payload.asByteBuffer))
-    true
-  } else false
+  override def write(payload: ByteString): Boolean =
+    if (channel.isWritable && channel.isOpen) {
+      channel.write(ChannelBuffers.wrappedBuffer(payload.asByteBuffer))
+      true
+    } else false
 
   override def disassociate(): Unit = NettyTransport.gracefulClose(channel)
 }
diff --git a/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolSpec.scala b/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolSpec.scala
index 5b61c1e875..af4614aa6e 100644
--- a/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolSpec.scala
@@ -90,32 +90,35 @@ class AkkaProtocolSpec extends AkkaSpec("""akka.actor.provider = "akka.remote.Re
     (new TestFailureDetector, registry, transport, handle)
   }
 
-  def lastActivityIsHeartbeat(registry: AssociationRegistry) = if (registry.logSnapshot.isEmpty) false else registry.logSnapshot.last match {
-    case WriteAttempt(sender, recipient, payload) if sender == localAddress && recipient == remoteAddress ⇒
-      codec.decodePdu(payload) match {
-        case Heartbeat ⇒ true
-        case _         ⇒ false
-      }
-    case _ ⇒ false
-  }
+  def lastActivityIsHeartbeat(registry: AssociationRegistry) =
+    if (registry.logSnapshot.isEmpty) false else registry.logSnapshot.last match {
+      case WriteAttempt(sender, recipient, payload) if sender == localAddress && recipient == remoteAddress ⇒
+        codec.decodePdu(payload) match {
+          case Heartbeat ⇒ true
+          case _         ⇒ false
+        }
+      case _ ⇒ false
+    }
 
-  def lastActivityIsAssociate(registry: AssociationRegistry, cookie: Option[String]) = if (registry.logSnapshot.isEmpty) false else registry.logSnapshot.last match {
-    case WriteAttempt(sender, recipient, payload) if sender == localAddress && recipient == remoteAddress ⇒
-      codec.decodePdu(payload) match {
-        case Associate(c, origin) if c == cookie && origin == localAddress ⇒ true
-        case _ ⇒ false
-      }
-    case _ ⇒ false
-  }
+  def lastActivityIsAssociate(registry: AssociationRegistry, cookie: Option[String]) =
+    if (registry.logSnapshot.isEmpty) false else registry.logSnapshot.last match {
+      case WriteAttempt(sender, recipient, payload) if sender == localAddress && recipient == remoteAddress ⇒
+        codec.decodePdu(payload) match {
+          case Associate(c, origin) if c == cookie && origin == localAddress ⇒ true
+          case _ ⇒ false
+        }
+      case _ ⇒ false
+    }
 
-  def lastActivityIsDisassociate(registry: AssociationRegistry) = if (registry.logSnapshot.isEmpty) false else registry.logSnapshot.last match {
-    case WriteAttempt(sender, recipient, payload) if sender == localAddress && recipient == remoteAddress ⇒
-      codec.decodePdu(payload) match {
-        case Disassociate ⇒ true
-        case _            ⇒ false
-      }
-    case _ ⇒ false
-  }
+  def lastActivityIsDisassociate(registry: AssociationRegistry) =
+    if (registry.logSnapshot.isEmpty) false else registry.logSnapshot.last match {
+      case WriteAttempt(sender, recipient, payload) if sender == localAddress && recipient == remoteAddress ⇒
+        codec.decodePdu(payload) match {
+          case Disassociate ⇒ true
+          case _            ⇒ false
+        }
+      case _ ⇒ false
+    }
 
   "ProtocolStateActor" must {
 
diff --git a/akka-remote/src/test/scala/akka/remote/transport/GenericTransportSpec.scala b/akka-remote/src/test/scala/akka/remote/transport/GenericTransportSpec.scala
index 4a33317ef3..de1b825ee1 100644
--- a/akka-remote/src/test/scala/akka/remote/transport/GenericTransportSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/transport/GenericTransportSpec.scala
@@ -25,10 +25,11 @@ abstract class GenericTransportSpec(withAkkaProtocol: Boolean = false)
   val nonExistingAddress = Address("test." + schemeIdentifier, "nosystem", "nohost", 0)
 
   def freshTransport(testTransport: TestTransport): Transport
-  def wrapTransport(transport: Transport): Transport = if (withAkkaProtocol) {
-    val provider = system.asInstanceOf[ExtendedActorSystem].provider.asInstanceOf[RemoteActorRefProvider]
-    new AkkaProtocolTransport(transport, system, new AkkaProtocolSettings(provider.remoteSettings.config), AkkaPduProtobufCodec)
-  } else transport
+  def wrapTransport(transport: Transport): Transport =
+    if (withAkkaProtocol) {
+      val provider = system.asInstanceOf[ExtendedActorSystem].provider.asInstanceOf[RemoteActorRefProvider]
+      new AkkaProtocolTransport(transport, system, new AkkaProtocolSettings(provider.remoteSettings.config), AkkaPduProtobufCodec)
+    } else transport
 
   def newTransportA(registry: AssociationRegistry): Transport =
     wrapTransport(freshTransport(new TestTransport(addressATest, registry)))

From cd9fae81e57297a06182ed9df26a8cdc583c3bfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Antonsson?= <ban@rhsh.net>
Date: Fri, 18 Jan 2013 12:19:47 +0100
Subject: [PATCH 059/122] Making test more DRY. See #2862

---
 .../remote/testconductor/BarrierSpec.scala    | 442 +++++++++---------
 1 file changed, 222 insertions(+), 220 deletions(-)

diff --git a/akka-remote-tests/src/test/scala/akka/remote/testconductor/BarrierSpec.scala b/akka-remote-tests/src/test/scala/akka/remote/testconductor/BarrierSpec.scala
index 0e1604ff1b..b33b67025e 100644
--- a/akka-remote-tests/src/test/scala/akka/remote/testconductor/BarrierSpec.scala
+++ b/akka-remote-tests/src/test/scala/akka/remote/testconductor/BarrierSpec.scala
@@ -235,283 +235,283 @@ class BarrierSpec extends AkkaSpec(BarrierSpec.config) with ImplicitSender {
   "A Controller with BarrierCoordinator" must {
 
     "register clients and remove them" taggedAs TimingTest in {
-      val b = getController(1)
-      b ! NodeInfo(A, AddressFromURIString("akka://sys"), testActor)
-      expectMsg(ToClient(Done))
-      b ! Remove(B)
-      b ! Remove(A)
-      EventFilter[BarrierEmpty](occurrences = 1) intercept {
+      withController(1) { b ⇒
+        b ! NodeInfo(A, AddressFromURIString("akka://sys"), testActor)
+        expectMsg(ToClient(Done))
+        b ! Remove(B)
         b ! Remove(A)
+        EventFilter[BarrierEmpty](occurrences = 1) intercept {
+          b ! Remove(A)
+        }
       }
-      b ! PoisonPill // clean up so network connections don't accumulate during test run
     }
 
     "register clients and disconnect them" taggedAs TimingTest in {
-      val b = getController(1)
-      b ! NodeInfo(A, AddressFromURIString("akka://sys"), testActor)
-      expectMsg(ToClient(Done))
-      b ! ClientDisconnected(B)
-      expectNoMsg(1 second)
-      b ! ClientDisconnected(A)
-      expectNoMsg(1 second)
-      b ! PoisonPill // clean up so network connections don't accumulate during test run
+      withController(1) { b ⇒
+        b ! NodeInfo(A, AddressFromURIString("akka://sys"), testActor)
+        expectMsg(ToClient(Done))
+        b ! ClientDisconnected(B)
+        expectNoMsg(1 second)
+        b ! ClientDisconnected(A)
+        expectNoMsg(1 second)
+      }
     }
 
     "fail entering barrier when nobody registered" taggedAs TimingTest in {
-      val b = getController(0)
-      b ! EnterBarrier("b", None)
-      expectMsg(ToClient(BarrierResult("b", false)))
-      b ! PoisonPill // clean up so network connections don't accumulate during test run
+      withController(0) { b ⇒
+        b ! EnterBarrier("b", None)
+        expectMsg(ToClient(BarrierResult("b", false)))
+      }
     }
 
     "enter barrier" taggedAs TimingTest in {
-      val barrier = getController(2)
-      val a, b = TestProbe()
-      barrier ! NodeInfo(A, AddressFromURIString("akka://sys"), a.ref)
-      barrier ! NodeInfo(B, AddressFromURIString("akka://sys"), b.ref)
-      a.expectMsg(ToClient(Done))
-      b.expectMsg(ToClient(Done))
-      a.send(barrier, EnterBarrier("bar11", None))
-      noMsg(a, b)
-      within(2 seconds) {
-        b.send(barrier, EnterBarrier("bar11", None))
-        a.expectMsg(ToClient(BarrierResult("bar11", true)))
-        b.expectMsg(ToClient(BarrierResult("bar11", true)))
+      withController(2) { barrier ⇒
+        val a, b = TestProbe()
+        barrier ! NodeInfo(A, AddressFromURIString("akka://sys"), a.ref)
+        barrier ! NodeInfo(B, AddressFromURIString("akka://sys"), b.ref)
+        a.expectMsg(ToClient(Done))
+        b.expectMsg(ToClient(Done))
+        a.send(barrier, EnterBarrier("bar11", None))
+        noMsg(a, b)
+        within(2 seconds) {
+          b.send(barrier, EnterBarrier("bar11", None))
+          a.expectMsg(ToClient(BarrierResult("bar11", true)))
+          b.expectMsg(ToClient(BarrierResult("bar11", true)))
+        }
       }
-      barrier ! PoisonPill // clean up so network connections don't accumulate during test run
     }
 
     "enter barrier with joining node" taggedAs TimingTest in {
-      val barrier = getController(2)
-      val a, b, c = TestProbe()
-      barrier ! NodeInfo(A, AddressFromURIString("akka://sys"), a.ref)
-      barrier ! NodeInfo(B, AddressFromURIString("akka://sys"), b.ref)
-      a.expectMsg(ToClient(Done))
-      b.expectMsg(ToClient(Done))
-      a.send(barrier, EnterBarrier("bar12", None))
-      barrier ! NodeInfo(C, AddressFromURIString("akka://sys"), c.ref)
-      c.expectMsg(ToClient(Done))
-      b.send(barrier, EnterBarrier("bar12", None))
-      noMsg(a, b, c)
-      within(2 seconds) {
-        c.send(barrier, EnterBarrier("bar12", None))
-        a.expectMsg(ToClient(BarrierResult("bar12", true)))
-        b.expectMsg(ToClient(BarrierResult("bar12", true)))
-        c.expectMsg(ToClient(BarrierResult("bar12", true)))
+      withController(2) { barrier ⇒
+        val a, b, c = TestProbe()
+        barrier ! NodeInfo(A, AddressFromURIString("akka://sys"), a.ref)
+        barrier ! NodeInfo(B, AddressFromURIString("akka://sys"), b.ref)
+        a.expectMsg(ToClient(Done))
+        b.expectMsg(ToClient(Done))
+        a.send(barrier, EnterBarrier("bar12", None))
+        barrier ! NodeInfo(C, AddressFromURIString("akka://sys"), c.ref)
+        c.expectMsg(ToClient(Done))
+        b.send(barrier, EnterBarrier("bar12", None))
+        noMsg(a, b, c)
+        within(2 seconds) {
+          c.send(barrier, EnterBarrier("bar12", None))
+          a.expectMsg(ToClient(BarrierResult("bar12", true)))
+          b.expectMsg(ToClient(BarrierResult("bar12", true)))
+          c.expectMsg(ToClient(BarrierResult("bar12", true)))
+        }
       }
-      barrier ! PoisonPill // clean up so network connections don't accumulate during test run
     }
 
     "enter barrier with leaving node" taggedAs TimingTest in {
-      val barrier = getController(3)
-      val a, b, c = TestProbe()
-      barrier ! NodeInfo(A, AddressFromURIString("akka://sys"), a.ref)
-      barrier ! NodeInfo(B, AddressFromURIString("akka://sys"), b.ref)
-      barrier ! NodeInfo(C, AddressFromURIString("akka://sys"), c.ref)
-      a.expectMsg(ToClient(Done))
-      b.expectMsg(ToClient(Done))
-      c.expectMsg(ToClient(Done))
-      a.send(barrier, EnterBarrier("bar13", None))
-      b.send(barrier, EnterBarrier("bar13", None))
-      barrier ! Remove(A)
-      barrier ! ClientDisconnected(A)
-      noMsg(a, b, c)
-      b.within(2 seconds) {
-        barrier ! Remove(C)
-        b.expectMsg(ToClient(BarrierResult("bar13", true)))
+      withController(3) { barrier ⇒
+        val a, b, c = TestProbe()
+        barrier ! NodeInfo(A, AddressFromURIString("akka://sys"), a.ref)
+        barrier ! NodeInfo(B, AddressFromURIString("akka://sys"), b.ref)
+        barrier ! NodeInfo(C, AddressFromURIString("akka://sys"), c.ref)
+        a.expectMsg(ToClient(Done))
+        b.expectMsg(ToClient(Done))
+        c.expectMsg(ToClient(Done))
+        a.send(barrier, EnterBarrier("bar13", None))
+        b.send(barrier, EnterBarrier("bar13", None))
+        barrier ! Remove(A)
+        barrier ! ClientDisconnected(A)
+        noMsg(a, b, c)
+        b.within(2 seconds) {
+          barrier ! Remove(C)
+          b.expectMsg(ToClient(BarrierResult("bar13", true)))
+        }
+        barrier ! ClientDisconnected(C)
+        expectNoMsg(1 second)
       }
-      barrier ! ClientDisconnected(C)
-      expectNoMsg(1 second)
-      barrier ! PoisonPill // clean up so network connections don't accumulate during test run
     }
 
     "leave barrier when last “arrived” is removed" taggedAs TimingTest in {
-      val barrier = getController(2)
-      val a, b = TestProbe()
-      barrier ! NodeInfo(A, AddressFromURIString("akka://sys"), a.ref)
-      barrier ! NodeInfo(B, AddressFromURIString("akka://sys"), b.ref)
-      a.expectMsg(ToClient(Done))
-      b.expectMsg(ToClient(Done))
-      a.send(barrier, EnterBarrier("bar14", None))
-      barrier ! Remove(A)
-      b.send(barrier, EnterBarrier("foo", None))
-      b.expectMsg(ToClient(BarrierResult("foo", true)))
-      barrier ! PoisonPill // clean up so network connections don't accumulate during test run
+      withController(2) { barrier ⇒
+        val a, b = TestProbe()
+        barrier ! NodeInfo(A, AddressFromURIString("akka://sys"), a.ref)
+        barrier ! NodeInfo(B, AddressFromURIString("akka://sys"), b.ref)
+        a.expectMsg(ToClient(Done))
+        b.expectMsg(ToClient(Done))
+        a.send(barrier, EnterBarrier("bar14", None))
+        barrier ! Remove(A)
+        b.send(barrier, EnterBarrier("foo", None))
+        b.expectMsg(ToClient(BarrierResult("foo", true)))
+      }
     }
 
     "fail barrier with disconnecing node" taggedAs TimingTest in {
-      val barrier = getController(2)
-      val a, b = TestProbe()
-      val nodeA = NodeInfo(A, AddressFromURIString("akka://sys"), a.ref)
-      barrier ! nodeA
-      barrier ! NodeInfo(B, AddressFromURIString("akka://sys"), b.ref)
-      a.expectMsg(ToClient(Done))
-      b.expectMsg(ToClient(Done))
-      a.send(barrier, EnterBarrier("bar15", None))
-      barrier ! ClientDisconnected(RoleName("unknown"))
-      noMsg(a)
-      EventFilter[ClientLost](occurrences = 1) intercept {
-        barrier ! ClientDisconnected(B)
+      withController(2) { barrier ⇒
+        val a, b = TestProbe()
+        val nodeA = NodeInfo(A, AddressFromURIString("akka://sys"), a.ref)
+        barrier ! nodeA
+        barrier ! NodeInfo(B, AddressFromURIString("akka://sys"), b.ref)
+        a.expectMsg(ToClient(Done))
+        b.expectMsg(ToClient(Done))
+        a.send(barrier, EnterBarrier("bar15", None))
+        barrier ! ClientDisconnected(RoleName("unknown"))
+        noMsg(a)
+        EventFilter[ClientLost](occurrences = 1) intercept {
+          barrier ! ClientDisconnected(B)
+        }
+        a.expectMsg(ToClient(BarrierResult("bar15", false)))
       }
-      a.expectMsg(ToClient(BarrierResult("bar15", false)))
-      barrier ! PoisonPill // clean up so network connections don't accumulate during test run
     }
 
     "fail barrier with disconnecing node who already arrived" taggedAs TimingTest in {
-      val barrier = getController(3)
-      val a, b, c = TestProbe()
-      val nodeA = NodeInfo(A, AddressFromURIString("akka://sys"), a.ref)
-      val nodeC = NodeInfo(C, AddressFromURIString("akka://sys"), c.ref)
-      barrier ! nodeA
-      barrier ! NodeInfo(B, AddressFromURIString("akka://sys"), b.ref)
-      barrier ! nodeC
-      a.expectMsg(ToClient(Done))
-      b.expectMsg(ToClient(Done))
-      c.expectMsg(ToClient(Done))
-      a.send(barrier, EnterBarrier("bar16", None))
-      b.send(barrier, EnterBarrier("bar16", None))
-      EventFilter[ClientLost](occurrences = 1) intercept {
-        barrier ! ClientDisconnected(B)
+      withController(3) { barrier ⇒
+        val a, b, c = TestProbe()
+        val nodeA = NodeInfo(A, AddressFromURIString("akka://sys"), a.ref)
+        val nodeC = NodeInfo(C, AddressFromURIString("akka://sys"), c.ref)
+        barrier ! nodeA
+        barrier ! NodeInfo(B, AddressFromURIString("akka://sys"), b.ref)
+        barrier ! nodeC
+        a.expectMsg(ToClient(Done))
+        b.expectMsg(ToClient(Done))
+        c.expectMsg(ToClient(Done))
+        a.send(barrier, EnterBarrier("bar16", None))
+        b.send(barrier, EnterBarrier("bar16", None))
+        EventFilter[ClientLost](occurrences = 1) intercept {
+          barrier ! ClientDisconnected(B)
+        }
+        a.expectMsg(ToClient(BarrierResult("bar16", false)))
       }
-      a.expectMsg(ToClient(BarrierResult("bar16", false)))
-      barrier ! PoisonPill // clean up so network connections don't accumulate during test run
     }
 
     "fail when entering wrong barrier" taggedAs TimingTest in {
-      val barrier = getController(2)
-      val a, b = TestProbe()
-      val nodeA = NodeInfo(A, AddressFromURIString("akka://sys"), a.ref)
-      barrier ! nodeA
-      val nodeB = NodeInfo(B, AddressFromURIString("akka://sys"), b.ref)
-      barrier ! nodeB
-      a.expectMsg(ToClient(Done))
-      b.expectMsg(ToClient(Done))
-      a.send(barrier, EnterBarrier("bar17", None))
-      EventFilter[WrongBarrier](occurrences = 1) intercept {
-        b.send(barrier, EnterBarrier("foo", None))
+      withController(2) { barrier ⇒
+        val a, b = TestProbe()
+        val nodeA = NodeInfo(A, AddressFromURIString("akka://sys"), a.ref)
+        barrier ! nodeA
+        val nodeB = NodeInfo(B, AddressFromURIString("akka://sys"), b.ref)
+        barrier ! nodeB
+        a.expectMsg(ToClient(Done))
+        b.expectMsg(ToClient(Done))
+        a.send(barrier, EnterBarrier("bar17", None))
+        EventFilter[WrongBarrier](occurrences = 1) intercept {
+          b.send(barrier, EnterBarrier("foo", None))
+        }
+        a.expectMsg(ToClient(BarrierResult("bar17", false)))
+        b.expectMsg(ToClient(BarrierResult("foo", false)))
       }
-      a.expectMsg(ToClient(BarrierResult("bar17", false)))
-      b.expectMsg(ToClient(BarrierResult("foo", false)))
-      barrier ! PoisonPill // clean up so network connections don't accumulate during test run
     }
 
     "fail after barrier timeout" taggedAs TimingTest in {
-      val barrier = getController(2)
-      val a, b = TestProbe()
-      val nodeA = NodeInfo(A, AddressFromURIString("akka://sys"), a.ref)
-      val nodeB = NodeInfo(B, AddressFromURIString("akka://sys"), b.ref)
-      barrier ! nodeA
-      barrier ! nodeB
-      a.expectMsg(ToClient(Done))
-      b.expectMsg(ToClient(Done))
-      a.send(barrier, EnterBarrier("bar18", Option(2 seconds)))
-      EventFilter[BarrierTimeout](occurrences = 1) intercept {
-        Thread.sleep(4000)
+      withController(2) { barrier ⇒
+        val a, b = TestProbe()
+        val nodeA = NodeInfo(A, AddressFromURIString("akka://sys"), a.ref)
+        val nodeB = NodeInfo(B, AddressFromURIString("akka://sys"), b.ref)
+        barrier ! nodeA
+        barrier ! nodeB
+        a.expectMsg(ToClient(Done))
+        b.expectMsg(ToClient(Done))
+        a.send(barrier, EnterBarrier("bar18", Option(2 seconds)))
+        EventFilter[BarrierTimeout](occurrences = 1) intercept {
+          Thread.sleep(4000)
+        }
+        b.send(barrier, EnterBarrier("bar18", None))
+        a.expectMsg(ToClient(BarrierResult("bar18", false)))
+        b.expectMsg(ToClient(BarrierResult("bar18", false)))
       }
-      b.send(barrier, EnterBarrier("bar18", None))
-      a.expectMsg(ToClient(BarrierResult("bar18", false)))
-      b.expectMsg(ToClient(BarrierResult("bar18", false)))
-      barrier ! PoisonPill // clean up so network connections don't accumulate during test run
     }
 
     "fail if a node registers twice" taggedAs TimingTest in {
-      val controller = getController(2)
-      val a, b = TestProbe()
-      val nodeA = NodeInfo(A, AddressFromURIString("akka://sys"), a.ref)
-      val nodeB = NodeInfo(A, AddressFromURIString("akka://sys"), b.ref)
-      controller ! nodeA
-      EventFilter[DuplicateNode](occurrences = 1) intercept {
-        controller ! nodeB
+      withController(2) { controller ⇒
+        val a, b = TestProbe()
+        val nodeA = NodeInfo(A, AddressFromURIString("akka://sys"), a.ref)
+        val nodeB = NodeInfo(A, AddressFromURIString("akka://sys"), b.ref)
+        controller ! nodeA
+        EventFilter[DuplicateNode](occurrences = 1) intercept {
+          controller ! nodeB
+        }
+        a.expectMsg(ToClient(BarrierResult("initial startup", false)))
+        b.expectMsg(ToClient(BarrierResult("initial startup", false)))
       }
-      a.expectMsg(ToClient(BarrierResult("initial startup", false)))
-      b.expectMsg(ToClient(BarrierResult("initial startup", false)))
-      controller ! PoisonPill // clean up so network connections don't accumulate during test run
     }
 
     "fail subsequent barriers if a node registers twice" taggedAs TimingTest in {
-      val controller = getController(1)
-      val a, b = TestProbe()
-      val nodeA = NodeInfo(A, AddressFromURIString("akka://sys"), a.ref)
-      val nodeB = NodeInfo(A, AddressFromURIString("akka://sys"), b.ref)
-      controller ! nodeA
-      a.expectMsg(ToClient(Done))
-      EventFilter[DuplicateNode](occurrences = 1) intercept {
-        controller ! nodeB
-        b.expectMsg(ToClient(BarrierResult("initial startup", false)))
+      withController(1) { controller ⇒
+        val a, b = TestProbe()
+        val nodeA = NodeInfo(A, AddressFromURIString("akka://sys"), a.ref)
+        val nodeB = NodeInfo(A, AddressFromURIString("akka://sys"), b.ref)
+        controller ! nodeA
+        a.expectMsg(ToClient(Done))
+        EventFilter[DuplicateNode](occurrences = 1) intercept {
+          controller ! nodeB
+          b.expectMsg(ToClient(BarrierResult("initial startup", false)))
+        }
+        a.send(controller, EnterBarrier("bar19", None))
+        a.expectMsg(ToClient(BarrierResult("bar19", false)))
       }
-      a.send(controller, EnterBarrier("bar19", None))
-      a.expectMsg(ToClient(BarrierResult("bar19", false)))
-      controller ! PoisonPill // clean up so network connections don't accumulate during test run
     }
 
     "fail subsequent barriers after foreced failure" taggedAs TimingTest in {
-      val barrier = getController(2)
-      val a, b = TestProbe()
-      val nodeA = NodeInfo(A, AddressFromURIString("akka://sys"), a.ref)
-      val nodeB = NodeInfo(B, AddressFromURIString("akka://sys"), b.ref)
-      barrier ! nodeA
-      barrier ! nodeB
-      a.expectMsg(ToClient(Done))
-      b.expectMsg(ToClient(Done))
-      a.send(barrier, EnterBarrier("bar20", Option(2 seconds)))
-      EventFilter[FailedBarrier](occurrences = 1) intercept {
-        b.send(barrier, FailBarrier("bar20"))
-        a.expectMsg(ToClient(BarrierResult("bar20", false)))
-        b.expectNoMsg(1 second)
+      withController(2) { barrier ⇒
+        val a, b = TestProbe()
+        val nodeA = NodeInfo(A, AddressFromURIString("akka://sys"), a.ref)
+        val nodeB = NodeInfo(B, AddressFromURIString("akka://sys"), b.ref)
+        barrier ! nodeA
+        barrier ! nodeB
+        a.expectMsg(ToClient(Done))
+        b.expectMsg(ToClient(Done))
+        a.send(barrier, EnterBarrier("bar20", Option(2 seconds)))
+        EventFilter[FailedBarrier](occurrences = 1) intercept {
+          b.send(barrier, FailBarrier("bar20"))
+          a.expectMsg(ToClient(BarrierResult("bar20", false)))
+          b.expectNoMsg(1 second)
+        }
+        a.send(barrier, EnterBarrier("bar21", None))
+        b.send(barrier, EnterBarrier("bar21", None))
+        a.expectMsg(ToClient(BarrierResult("bar21", false)))
+        b.expectMsg(ToClient(BarrierResult("bar21", false)))
       }
-      a.send(barrier, EnterBarrier("bar21", None))
-      b.send(barrier, EnterBarrier("bar21", None))
-      a.expectMsg(ToClient(BarrierResult("bar21", false)))
-      b.expectMsg(ToClient(BarrierResult("bar21", false)))
-      barrier ! PoisonPill // clean up so network connections don't accumulate during test run
     }
 
     "timeout within the shortest timeout if the new timeout is shorter" taggedAs TimingTest in {
-      val barrier = getController(3)
-      val a, b, c = TestProbe()
-      val nodeA = NodeInfo(A, AddressFromURIString("akka://sys"), a.ref)
-      val nodeB = NodeInfo(B, AddressFromURIString("akka://sys"), b.ref)
-      val nodeC = NodeInfo(C, AddressFromURIString("akka://sys"), c.ref)
-      barrier ! nodeA
-      barrier ! nodeB
-      barrier ! nodeC
-      a.expectMsg(ToClient(Done))
-      b.expectMsg(ToClient(Done))
-      c.expectMsg(ToClient(Done))
-      a.send(barrier, EnterBarrier("bar22", Option(10 seconds)))
-      b.send(barrier, EnterBarrier("bar22", Option(2 seconds)))
-      EventFilter[BarrierTimeout](occurrences = 1) intercept {
-        Thread.sleep(4000)
+      withController(3) { barrier ⇒
+        val a, b, c = TestProbe()
+        val nodeA = NodeInfo(A, AddressFromURIString("akka://sys"), a.ref)
+        val nodeB = NodeInfo(B, AddressFromURIString("akka://sys"), b.ref)
+        val nodeC = NodeInfo(C, AddressFromURIString("akka://sys"), c.ref)
+        barrier ! nodeA
+        barrier ! nodeB
+        barrier ! nodeC
+        a.expectMsg(ToClient(Done))
+        b.expectMsg(ToClient(Done))
+        c.expectMsg(ToClient(Done))
+        a.send(barrier, EnterBarrier("bar22", Option(10 seconds)))
+        b.send(barrier, EnterBarrier("bar22", Option(2 seconds)))
+        EventFilter[BarrierTimeout](occurrences = 1) intercept {
+          Thread.sleep(4000)
+        }
+        c.send(barrier, EnterBarrier("bar22", None))
+        a.expectMsg(ToClient(BarrierResult("bar22", false)))
+        b.expectMsg(ToClient(BarrierResult("bar22", false)))
+        c.expectMsg(ToClient(BarrierResult("bar22", false)))
       }
-      c.send(barrier, EnterBarrier("bar22", None))
-      a.expectMsg(ToClient(BarrierResult("bar22", false)))
-      b.expectMsg(ToClient(BarrierResult("bar22", false)))
-      c.expectMsg(ToClient(BarrierResult("bar22", false)))
-      barrier ! PoisonPill // clean up so network connections don't accumulate during test run
     }
 
     "timeout within the shortest timeout if the new timeout is longer" taggedAs TimingTest in {
-      val barrier = getController(3)
-      val a, b, c = TestProbe()
-      val nodeA = NodeInfo(A, AddressFromURIString("akka://sys"), a.ref)
-      val nodeB = NodeInfo(B, AddressFromURIString("akka://sys"), b.ref)
-      val nodeC = NodeInfo(C, AddressFromURIString("akka://sys"), c.ref)
-      barrier ! nodeA
-      barrier ! nodeB
-      barrier ! nodeC
-      a.expectMsg(ToClient(Done))
-      b.expectMsg(ToClient(Done))
-      c.expectMsg(ToClient(Done))
-      a.send(barrier, EnterBarrier("bar23", Option(2 seconds)))
-      b.send(barrier, EnterBarrier("bar23", Option(10 seconds)))
-      EventFilter[BarrierTimeout](occurrences = 1) intercept {
-        Thread.sleep(4000)
+      withController(3) { barrier ⇒
+        val a, b, c = TestProbe()
+        val nodeA = NodeInfo(A, AddressFromURIString("akka://sys"), a.ref)
+        val nodeB = NodeInfo(B, AddressFromURIString("akka://sys"), b.ref)
+        val nodeC = NodeInfo(C, AddressFromURIString("akka://sys"), c.ref)
+        barrier ! nodeA
+        barrier ! nodeB
+        barrier ! nodeC
+        a.expectMsg(ToClient(Done))
+        b.expectMsg(ToClient(Done))
+        c.expectMsg(ToClient(Done))
+        a.send(barrier, EnterBarrier("bar23", Option(2 seconds)))
+        b.send(barrier, EnterBarrier("bar23", Option(10 seconds)))
+        EventFilter[BarrierTimeout](occurrences = 1) intercept {
+          Thread.sleep(4000)
+        }
+        c.send(barrier, EnterBarrier("bar23", None))
+        a.expectMsg(ToClient(BarrierResult("bar23", false)))
+        b.expectMsg(ToClient(BarrierResult("bar23", false)))
+        c.expectMsg(ToClient(BarrierResult("bar23", false)))
       }
-      c.send(barrier, EnterBarrier("bar23", None))
-      a.expectMsg(ToClient(BarrierResult("bar23", false)))
-      b.expectMsg(ToClient(BarrierResult("bar23", false)))
-      c.expectMsg(ToClient(BarrierResult("bar23", false)))
-      barrier ! PoisonPill // clean up so network connections don't accumulate during test run
     }
 
     "finally have no failure messages left" taggedAs TimingTest in {
@@ -520,7 +520,7 @@ class BarrierSpec extends AkkaSpec(BarrierSpec.config) with ImplicitSender {
 
   }
 
-  private def getController(participants: Int): ActorRef = {
+  private def withController(participants: Int)(f: (ActorRef) ⇒ Unit): Unit = {
     system.actorOf(Props(new Actor {
       val controller = context.actorOf(Props(new Controller(participants, new InetSocketAddress(InetAddress.getLocalHost, 0))))
       controller ! GetSockAddr
@@ -531,7 +531,9 @@ class BarrierSpec extends AkkaSpec(BarrierSpec.config) with ImplicitSender {
         case x: InetSocketAddress ⇒ testActor ! controller
       }
     }))
-    expectMsgType[ActorRef]
+    val actor = expectMsgType[ActorRef]
+    f(actor)
+    actor ! PoisonPill // clean up so network connections don't accumulate during test run
   }
 
   /**

From 8f29022ef51f7e5affac51d5de9ddbe8abff1201 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Antonsson?= <ban@rhsh.net>
Date: Fri, 18 Jan 2013 15:00:19 +0100
Subject: [PATCH 060/122] Terminate zeromq context after actors have
 terminated. See #2838

---
 .../test/scala/akka/zeromq/ConcurrentSocketActorSpec.scala    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/akka-zeromq/src/test/scala/akka/zeromq/ConcurrentSocketActorSpec.scala b/akka-zeromq/src/test/scala/akka/zeromq/ConcurrentSocketActorSpec.scala
index 8a5624126f..8eb10ff79c 100644
--- a/akka-zeromq/src/test/scala/akka/zeromq/ConcurrentSocketActorSpec.scala
+++ b/akka-zeromq/src/test/scala/akka/zeromq/ConcurrentSocketActorSpec.scala
@@ -99,6 +99,8 @@ class ConcurrentSocketActorSpec extends AkkaSpec {
         system stop requester
         system stop replier
         replierProbe.expectMsg(Closed)
+        awaitCond(requester.isTerminated)
+        awaitCond(replier.isTerminated)
         context.term
       }
     }
@@ -120,6 +122,8 @@ class ConcurrentSocketActorSpec extends AkkaSpec {
         system stop pusher
         system stop puller
         pullerProbe.expectMsg(Closed)
+        awaitCond(pusher.isTerminated)
+        awaitCond(puller.isTerminated)
         context.term
       }
     }

From 3d662f94a0c625ab4609541f1cac6630491f1067 Mon Sep 17 00:00:00 2001
From: Derek Mahar <derek.mahar@gmail.com>
Date: Fri, 18 Jan 2013 12:11:05 -0500
Subject: [PATCH 061/122] Update akka-docs/rst/general/actor-systems.rst

Replace "with respect fault-handling" with "with respect to fault-handling".
---
 akka-docs/rst/general/actor-systems.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/akka-docs/rst/general/actor-systems.rst b/akka-docs/rst/general/actor-systems.rst
index 6534d1426f..fddfb51f85 100644
--- a/akka-docs/rst/general/actor-systems.rst
+++ b/akka-docs/rst/general/actor-systems.rst
@@ -107,7 +107,7 @@ Actor Best Practices
 
 #. Top-level actors are the innermost part of your Error Kernel, so create them
    sparingly and prefer truly hierarchical systems. This has benefits with
-   respect fault-handling (both considering the granularity of configuration
+   respect to fault-handling (both considering the granularity of configuration
    and the performance) and it also reduces the strain on the guardian actor,
    which is a single point of contention if over-used.
 

From 00a39232cc8273e54a6a472b49765c433553d2ce Mon Sep 17 00:00:00 2001
From: Roland <rk@rkuhn.info>
Date: Sun, 20 Jan 2013 21:13:19 +0100
Subject: [PATCH 062/122] add debug helper for
 CallingThreadDispatcherModelSpec, see #2821

- the problem is that the user guardian gets blocked for more than 3
  seconds, and I have no clue who blocks it where
- therefore print all stack traces two seconds into the test if still
  not finished
---
 .../test/scala/akka/actor/dispatch/ActorModelSpec.scala  | 9 +++++++++
 .../src/main/scala/akka/actor/RepointableActorRef.scala  | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala
index 0073857809..09eb75f8cb 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala
@@ -420,12 +420,21 @@ abstract class ActorModelSpec(config: String) extends AkkaSpec(config) with Defa
         val f5 = try { a ? Interrupt } catch { case ie: InterruptedException ⇒ Promise.failed(new ActorInterruptedException(ie)).future }
         val f6 = a ? Reply("bar2")
 
+        val c = system.scheduler.scheduleOnce(2.seconds) {
+          import collection.JavaConverters._
+          Thread.getAllStackTraces().asScala foreach {
+            case (thread, stack) ⇒
+              println(s"$thread:")
+              stack foreach (s => println(s"\t$s"))
+          }
+        }
         assert(Await.result(f1, remaining) === "foo")
         assert(Await.result(f2, remaining) === "bar")
         assert(Await.result(f4, remaining) === "foo2")
         assert(intercept[ActorInterruptedException](Await.result(f3, remaining)).getCause.getMessage === "Ping!")
         assert(Await.result(f6, remaining) === "bar2")
         assert(intercept[ActorInterruptedException](Await.result(f5, remaining)).getCause.getMessage === "Ping!")
+        c.cancel()
       }
     }
 
diff --git a/akka-actor/src/main/scala/akka/actor/RepointableActorRef.scala b/akka-actor/src/main/scala/akka/actor/RepointableActorRef.scala
index 62cca3477b..fec648be06 100644
--- a/akka-actor/src/main/scala/akka/actor/RepointableActorRef.scala
+++ b/akka-actor/src/main/scala/akka/actor/RepointableActorRef.scala
@@ -212,7 +212,7 @@ private[akka] class UnstartedCell(val systemImpl: ActorSystemImpl,
         } else if (!queue.offer(msg)) {
           system.eventStream.publish(Warning(self.path.toString, getClass, "dropping message of type " + msg.message.getClass + " due to enqueue failure"))
           system.deadLetters ! DeadLetter(msg.message, msg.sender, self)
-        }
+        } else if (Mailbox.debug) println(s"$self temp queueing ${msg.message} from ${msg.sender}")
       } finally lock.unlock()
     } else {
       system.eventStream.publish(Warning(self.path.toString, getClass, "dropping message of type" + msg.message.getClass + " due to lock timeout"))
@@ -243,7 +243,7 @@ private[akka] class UnstartedCell(val systemImpl: ActorSystemImpl,
           if (!wasEnqueued) {
             system.eventStream.publish(Warning(self.path.toString, getClass, "dropping system message " + msg + " due to enqueue failure"))
             system.deadLetters ! DeadLetter(msg, self, self)
-          }
+          } else if (Mailbox.debug) println(s"$self temp queueing system $msg")
         }
       } finally lock.unlock()
     } else {

From 13b1324509af729ab778940098a91dd1486ed22e Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Sun, 20 Jan 2013 12:43:24 +0100
Subject: [PATCH 063/122]  #2775 - Adding migration guide for waiting on
 promises

---
 .../project/migration-guide-2.0.x-2.1.x.rst    | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/akka-docs/rst/project/migration-guide-2.0.x-2.1.x.rst b/akka-docs/rst/project/migration-guide-2.0.x-2.1.x.rst
index fcd35ff1ee..1b6840a696 100644
--- a/akka-docs/rst/project/migration-guide-2.0.x-2.1.x.rst
+++ b/akka-docs/rst/project/migration-guide-2.0.x-2.1.x.rst
@@ -113,7 +113,15 @@ v2.1::
     case m: NoSuchElementException => 
   }
 
+A ``Promise`` is no longer also a ``Future``, obtain the reference to its Future by calling ``promise.future``.
 
+v2.0::
+
+  Await.result(promise, duration)
+
+v2.1::
+
+  Await.result(promise.future, duration)
 
 API Changes to Future - Java
 ============================
@@ -191,6 +199,16 @@ v2.1::
       }
     }, ec);
 
+A ``Promise`` is no longer also a ``Future``, obtain the reference to its Future by calling ``promise.future()``.
+
+v2.0::
+
+  Await.result(promise, duration);
+
+v2.1::
+
+  Await.result(promise.future(), duration);
+
 API changes to DynamicAccess
 ============================
 

From 846e56735539adf513c86549e36cbb0a03bdbd26 Mon Sep 17 00:00:00 2001
From: RickLatrine <latrine00@yahoo.de>
Date: Sat, 19 Jan 2013 17:37:19 +0100
Subject: [PATCH 064/122] Unwatch watched actors on termination. Fixes: #2923

unwatchWatchedActors must stay in finishTerminate as an emergency stop might occur at handleInvokeFailure
---
 .../src/main/scala/akka/actor/dungeon/FaultHandling.scala    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/akka-actor/src/main/scala/akka/actor/dungeon/FaultHandling.scala b/akka-actor/src/main/scala/akka/actor/dungeon/FaultHandling.scala
index 99ddd825b1..7ff93e9e53 100644
--- a/akka-actor/src/main/scala/akka/actor/dungeon/FaultHandling.scala
+++ b/akka-actor/src/main/scala/akka/actor/dungeon/FaultHandling.scala
@@ -141,6 +141,9 @@ private[akka] trait FaultHandling { this: ActorCell ⇒
     setReceiveTimeout(Duration.Undefined)
     cancelReceiveTimeout
 
+    // prevent Deadletter(Terminated) messages
+    unwatchWatchedActors(actor)
+
     // stop all children, which will turn childrenRefs into TerminatingChildrenContainer (if there are children)
     children foreach stop
 
@@ -200,7 +203,7 @@ private[akka] trait FaultHandling { this: ActorCell ⇒
     finally try parent.sendSystemMessage(ChildTerminated(self))
     finally try parent ! NullMessage // read ScalaDoc of NullMessage to see why
     finally try tellWatchersWeDied(a)
-    finally try unwatchWatchedActors(a)
+    finally try unwatchWatchedActors(a) // stay here as we expect an emergency stop from handleInvokeFailure
     finally {
       if (system.settings.DebugLifecycle)
         publish(Debug(self.path.toString, clazz(a), "stopped"))

From bcf81cc12c4d7dedb4779d1f8178af3643287904 Mon Sep 17 00:00:00 2001
From: Thomas Lockney <thomas@lockney.net>
Date: Mon, 21 Jan 2013 12:14:46 -0800
Subject: [PATCH 065/122] added basic support for Epub generation

---
 project/AkkaBuild.scala | 10 +++++-----
 project/plugins.sbt     |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index 744aa7beb9..3cd93db911 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -15,7 +15,7 @@ import com.typesafe.tools.mima.plugin.MimaPlugin.mimaDefaultSettings
 import com.typesafe.tools.mima.plugin.MimaKeys.previousArtifact
 import com.typesafe.sbt.SbtSite.site
 import com.typesafe.sbt.site.SphinxSupport
-import com.typesafe.sbt.site.SphinxSupport.{ enableOutput, generatePdf, generatedPdf, sphinxInputs, sphinxPackages, Sphinx }
+import com.typesafe.sbt.site.SphinxSupport.{ enableOutput, generatePdf, generatedPdf, generateEpub, generatedEpub, sphinxInputs, sphinxPackages, Sphinx }
 import com.typesafe.sbt.preprocess.Preprocess.{ preprocess, preprocessExts, preprocessVars, simplePreprocess }
 import ls.Plugin.{ lsSettings, LsKeys }
 import java.lang.Boolean.getBoolean
@@ -382,6 +382,7 @@ object AkkaBuild extends Build {
         orig
       },
       enableOutput in generatePdf in Sphinx := true,
+      enableOutput in generateEpub in Sphinx := true,
       unmanagedSourceDirectories in Test <<= sourceDirectory in Sphinx apply { _ ** "code" get },
       libraryDependencies ++= Dependencies.docs,
       unmanagedSourceDirectories in ScalariformKeys.format in Test <<= unmanagedSourceDirectories in Test,
@@ -448,19 +449,19 @@ object AkkaBuild extends Build {
 
   lazy val defaultMultiJvmOptions: Seq[String] = {
     import scala.collection.JavaConverters._
-    // multinode.D= and multinode.X= makes it possible to pass arbitrary 
+    // multinode.D= and multinode.X= makes it possible to pass arbitrary
     // -D or -X arguments to the forked jvm, e.g.
     // -Dmultinode.Djava.net.preferIPv4Stack=true -Dmultinode.Xmx512m -Dmultinode.XX:MaxPermSize=256M
     val MultinodeJvmArgs = "multinode\\.(D|X)(.*)".r
     val akkaProperties = System.getProperties.propertyNames.asScala.toList.collect {
-      case MultinodeJvmArgs(a, b) => 
+      case MultinodeJvmArgs(a, b) =>
         val value = System.getProperty("multinode." + a + b)
         "-" + a + b + (if (value == "") "" else "=" + value)
       case key: String if key.startsWith("multinode.") => "-D" + key + "=" + System.getProperty(key)
       case key: String if key.startsWith("akka.") => "-D" + key + "=" + System.getProperty(key)
     }
 
-    "-Xmx256m" :: akkaProperties ::: 
+    "-Xmx256m" :: akkaProperties :::
       (if (getBoolean("sbt.log.noformat")) List("-Dakka.test.nocolor=true") else Nil)
   }
 
@@ -771,4 +772,3 @@ object Dependencies {
 
   val multiNodeSample = Seq(Test.scalatest)
 }
-
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 72e24c5b2c..0467eff156 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -8,7 +8,7 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-multi-jvm" % "0.3.5")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.0.0")
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "0.7.0-M1")
+addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "0.6.1")
 
 addSbtPlugin("com.typesafe.sbtosgi" % "sbtosgi" % "0.3.0")
 

From 4474c34e7cdfec2f93e63031d746842f52b00744 Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Tue, 22 Jan 2013 15:11:49 +0100
Subject: [PATCH 066/122]  #2782 - Removing ConcurrentIdentityHashMap and shake
 this all about

---
 .../akka/actor/dispatch/ActorModelSpec.scala  |    2 +-
 .../internal/ConcurrentIdentityHashMap.java   | 1417 -----------------
 .../akka/util/internal/HashedWheelTimer.java  |   30 +-
 .../akka/util/internal/ReusableIterator.java  |   27 -
 .../main/scala/akka/actor/ActorSystem.scala   |    6 +-
 .../src/main/scala/akka/actor/Extension.scala |    3 +
 6 files changed, 22 insertions(+), 1463 deletions(-)
 delete mode 100644 akka-actor/src/main/java/akka/util/internal/ConcurrentIdentityHashMap.java
 delete mode 100644 akka-actor/src/main/java/akka/util/internal/ReusableIterator.java

diff --git a/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala
index 09eb75f8cb..443d6f5981 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala
@@ -425,7 +425,7 @@ abstract class ActorModelSpec(config: String) extends AkkaSpec(config) with Defa
           Thread.getAllStackTraces().asScala foreach {
             case (thread, stack) ⇒
               println(s"$thread:")
-              stack foreach (s => println(s"\t$s"))
+              stack foreach (s ⇒ println(s"\t$s"))
           }
         }
         assert(Await.result(f1, remaining) === "foo")
diff --git a/akka-actor/src/main/java/akka/util/internal/ConcurrentIdentityHashMap.java b/akka-actor/src/main/java/akka/util/internal/ConcurrentIdentityHashMap.java
deleted file mode 100644
index eb83c98f35..0000000000
--- a/akka-actor/src/main/java/akka/util/internal/ConcurrentIdentityHashMap.java
+++ /dev/null
@@ -1,1417 +0,0 @@
-/*
- * Copyright 2009 Red Hat, Inc.
- *
- * Red Hat licenses this file to you under the Apache License, version 2.0
- * (the "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at:
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Written by Doug Lea with assistance from members of JCP JSR-166
- * Expert Group and released to the public domain, as explained at
- * http://creativecommons.org/licenses/publicdomain
- */
-package akka.util.internal;
-
-import java.util.AbstractCollection;
-import java.util.AbstractMap;
-import java.util.AbstractSet;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Map.Entry; // Needed by sbt doc - do not remove
-import java.util.NoSuchElementException;
-import java.util.Set;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.locks.ReentrantLock;
-
-
-/**
- * An alternative identity-comparing {@link java.util.concurrent.ConcurrentMap} which is similar to
- * {@link java.util.concurrent.ConcurrentHashMap}.
- *
- * @author <a href="http://www.jboss.org/netty/">The Netty Project</a>
- * @author Doug Lea
- * @author Jason T. Greene
- * @author <a href="http://gleamynode.net/">Trustin Lee</a>
- * @version $Rev: 2371 $, $Date: 2010-10-19 15:00:42 +0900 (Tue, 19 Oct 2010) $
- *
- * @param <K> the type of keys maintained by this map
- * @param <V> the type of mapped values
- */
-public final class ConcurrentIdentityHashMap<K, V> extends AbstractMap<K, V>
-        implements ConcurrentMap<K, V>{
-
-    /**
-     * The default initial capacity for this table, used when not otherwise
-     * specified in a constructor.
-     */
-    static final int DEFAULT_INITIAL_CAPACITY = 16;
-
-    /**
-     * The default load factor for this table, used when not otherwise specified
-     * in a constructor.
-     */
-    static final float DEFAULT_LOAD_FACTOR = 0.75f;
-
-    /**
-     * The default concurrency level for this table, used when not otherwise
-     * specified in a constructor.
-     */
-    static final int DEFAULT_CONCURRENCY_LEVEL = 16;
-
-    /**
-     * The maximum capacity, used if a higher value is implicitly specified by
-     * either of the constructors with arguments.  MUST be a power of two
-     * <= 1<<30 to ensure that entries are indexable using integers.
-     */
-    static final int MAXIMUM_CAPACITY = 1 << 30;
-
-    /**
-     * The maximum number of segments to allow; used to bound constructor
-     * arguments.
-     */
-    static final int MAX_SEGMENTS = 1 << 16; // slightly conservative
-
-    /**
-     * Number of unsynchronized retries in size and containsValue methods before
-     * resorting to locking. This is used to avoid unbounded retries if tables
-     * undergo continuous modification which would make it impossible to obtain
-     * an accurate result.
-     */
-    static final int RETRIES_BEFORE_LOCK = 2;
-
-    /* ---------------- Fields -------------- */
-
-    /**
-     * Mask value for indexing into segments. The upper bits of a key's hash
-     * code are used to choose the segment.
-     */
-    final int segmentMask;
-
-    /**
-     * Shift value for indexing within segments.
-     */
-    final int segmentShift;
-
-    /**
-     * The segments, each of which is a specialized hash table
-     */
-    final Segment<K, V>[] segments;
-
-    Set<K> keySet;
-    Set<Entry<K, V>> entrySet;
-    Collection<V> values;
-
-    /* ---------------- Small Utilities -------------- */
-
-    /**
-     * Applies a supplemental hash function to a given hashCode, which defends
-     * against poor quality hash functions.  This is critical because
-     * ConcurrentReferenceHashMap uses power-of-two length hash tables, that
-     * otherwise encounter collisions for hashCodes that do not differ in lower
-     * or upper bits.
-     */
-    private static int hash(int h) {
-        // Spread bits to regularize both segment and index locations,
-        // using variant of single-word Wang/Jenkins hash.
-        h += h << 15 ^ 0xffffcd7d;
-        h ^= h >>> 10;
-        h += h << 3;
-        h ^= h >>> 6;
-        h += (h << 2) + (h << 14);
-        return h ^ h >>> 16;
-    }
-
-    /**
-     * Returns the segment that should be used for key with given hash.
-     *
-     * @param hash the hash code for the key
-     * @return the segment
-     */
-    final Segment<K, V> segmentFor(int hash) {
-        return segments[hash >>> segmentShift & segmentMask];
-    }
-
-    private int hashOf(Object key) {
-        return hash(System.identityHashCode(key));
-    }
-
-    /**
-     * ConcurrentReferenceHashMap list entry. Note that this is never exported
-     * out as a user-visible Map.Entry.
-     *
-     * Because the value field is volatile, not final, it is legal wrt
-     * the Java Memory Model for an unsynchronized reader to see null
-     * instead of initial value when read via a data race.  Although a
-     * reordering leading to this is not likely to ever actually
-     * occur, the Segment.readValueUnderLock method is used as a
-     * backup in case a null (pre-initialized) value is ever seen in
-     * an unsynchronized access method.
-     */
-    static final class HashEntry<K, V> {
-        final Object key;
-        final int hash;
-        volatile Object value;
-        final HashEntry<K, V> next;
-
-        HashEntry(
-                K key, int hash, HashEntry<K, V> next, V value) {
-            this.hash = hash;
-            this.next = next;
-            this.key = key;
-            this.value = value;
-        }
-
-        @SuppressWarnings("unchecked")
-        final K key() {
-            return (K) key;
-        }
-
-        @SuppressWarnings("unchecked")
-        final V value() {
-            return (V) value;
-        }
-
-        final void setValue(V value) {
-            this.value = value;
-        }
-
-        @SuppressWarnings("unchecked")
-        static final <K, V> HashEntry<K, V>[] newArray(int i) {
-            return new HashEntry[i];
-        }
-    }
-
-    /**
-     * Segments are specialized versions of hash tables.  This subclasses from
-     * ReentrantLock opportunistically, just to simplify some locking and avoid
-     * separate construction.
-     */
-    static final class Segment<K, V> extends ReentrantLock {
-        /*
-         * Segments maintain a table of entry lists that are ALWAYS kept in a
-         * consistent state, so can be read without locking. Next fields of
-         * nodes are immutable (final).  All list additions are performed at the
-         * front of each bin. This makes it easy to check changes, and also fast
-         * to traverse. When nodes would otherwise be changed, new nodes are
-         * created to replace them. This works well for hash tables since the
-         * bin lists tend to be short. (The average length is less than two for
-         * the default load factor threshold.)
-         *
-         * Read operations can thus proceed without locking, but rely on
-         * selected uses of volatiles to ensure that completed write operations
-         * performed by other threads are noticed. For most purposes, the
-         * "count" field, tracking the number of elements, serves as that
-         * volatile variable ensuring visibility.  This is convenient because
-         * this field needs to be read in many read operations anyway:
-         *
-         *   - All (unsynchronized) read operations must first read the
-         *     "count" field, and should not look at table entries if
-         *     it is 0.
-         *
-         *   - All (synchronized) write operations should write to
-         *     the "count" field after structurally changing any bin.
-         *     The operations must not take any action that could even
-         *     momentarily cause a concurrent read operation to see
-         *     inconsistent data. This is made easier by the nature of
-         *     the read operations in Map. For example, no operation
-         *     can reveal that the table has grown but the threshold
-         *     has not yet been updated, so there are no atomicity
-         *     requirements for this with respect to reads.
-         *
-         * As a guide, all critical volatile reads and writes to the count field
-         * are marked in code comments.
-         */
-
-        private static final long serialVersionUID = 5207829234977119743L;
-
-        /**
-         * The number of elements in this segment's region.
-         */
-        transient volatile int count;
-
-        /**
-         * Number of updates that alter the size of the table. This is used
-         * during bulk-read methods to make sure they see a consistent snapshot:
-         * If modCounts change during a traversal of segments computing size or
-         * checking containsValue, then we might have an inconsistent view of
-         * state so (usually) must retry.
-         */
-        int modCount;
-
-        /**
-         * The table is rehashed when its size exceeds this threshold.
-         * (The value of this field is always <tt>(capacity * loadFactor)</tt>.)
-         */
-        int threshold;
-
-        /**
-         * The per-segment table.
-         */
-        transient volatile HashEntry<K, V>[] table;
-
-        /**
-         * The load factor for the hash table.  Even though this value is same
-         * for all segments, it is replicated to avoid needing links to outer
-         * object.
-         */
-        final float loadFactor;
-
-        Segment(int initialCapacity, float lf) {
-            loadFactor = lf;
-            setTable(HashEntry.<K, V> newArray(initialCapacity));
-        }
-
-        @SuppressWarnings("unchecked")
-        static final <K, V> Segment<K, V>[] newArray(int i) {
-            return new Segment[i];
-        }
-
-        private boolean keyEq(Object src, Object dest) {
-            return src == dest;
-        }
-
-        /**
-         * Sets table to new HashEntry array. Call only while holding lock or in
-         * constructor.
-         */
-        void setTable(HashEntry<K, V>[] newTable) {
-            threshold = (int) (newTable.length * loadFactor);
-            table = newTable;
-        }
-
-        /**
-         * Returns properly casted first entry of bin for given hash.
-         */
-        HashEntry<K, V> getFirst(int hash) {
-            HashEntry<K, V>[] tab = table;
-            return tab[hash & tab.length - 1];
-        }
-
-        HashEntry<K, V> newHashEntry(
-                K key, int hash, HashEntry<K, V> next, V value) {
-            return new HashEntry<K, V>(key, hash, next, value);
-        }
-
-        /**
-         * Reads value field of an entry under lock. Called if value field ever
-         * appears to be null. This is possible only if a compiler happens to
-         * reorder a HashEntry initialization with its table assignment, which
-         * is legal under memory model but is not known to ever occur.
-         */
-        V readValueUnderLock(HashEntry<K, V> e) {
-            lock();
-            try {
-                return e.value();
-            } finally {
-                unlock();
-            }
-        }
-
-        /* Specialized implementations of map methods */
-
-        V get(Object key, int hash) {
-            if (count != 0) { // read-volatile
-                HashEntry<K, V> e = getFirst(hash);
-                while (e != null) {
-                    if (e.hash == hash && keyEq(key, e.key())) {
-                        V opaque = e.value();
-                        if (opaque != null) {
-                            return opaque;
-                        }
-
-                        return readValueUnderLock(e); // recheck
-                    }
-                    e = e.next;
-                }
-            }
-            return null;
-        }
-
-        boolean containsKey(Object key, int hash) {
-            if (count != 0) { // read-volatile
-                HashEntry<K, V> e = getFirst(hash);
-                while (e != null) {
-                    if (e.hash == hash && keyEq(key, e.key())) {
-                        return true;
-                    }
-                    e = e.next;
-                }
-            }
-            return false;
-        }
-
-        boolean containsValue(Object value) {
-            if (count != 0) { // read-volatile
-                HashEntry<K, V>[] tab = table;
-                int len = tab.length;
-                for (int i = 0; i < len; i ++) {
-                    for (HashEntry<K, V> e = tab[i]; e != null; e = e.next) {
-                        V opaque = e.value();
-                        V v;
-
-                        if (opaque == null) {
-                            v = readValueUnderLock(e); // recheck
-                        } else {
-                            v = opaque;
-                        }
-
-                        if (value.equals(v)) {
-                            return true;
-                        }
-                    }
-                }
-            }
-            return false;
-        }
-
-        boolean replace(K key, int hash, V oldValue, V newValue) {
-            lock();
-            try {
-                HashEntry<K, V> e = getFirst(hash);
-                while (e != null && (e.hash != hash || !keyEq(key, e.key()))) {
-                    e = e.next;
-                }
-
-                boolean replaced = false;
-                if (e != null && oldValue.equals(e.value())) {
-                    replaced = true;
-                    e.setValue(newValue);
-                }
-                return replaced;
-            } finally {
-                unlock();
-            }
-        }
-
-        V replace(K key, int hash, V newValue) {
-            lock();
-            try {
-                HashEntry<K, V> e = getFirst(hash);
-                while (e != null && (e.hash != hash || !keyEq(key, e.key()))) {
-                    e = e.next;
-                }
-
-                V oldValue = null;
-                if (e != null) {
-                    oldValue = e.value();
-                    e.setValue(newValue);
-                }
-                return oldValue;
-            } finally {
-                unlock();
-            }
-        }
-
-        V put(K key, int hash, V value, boolean onlyIfAbsent) {
-            lock();
-            try {
-                int c = count;
-                if (c ++ > threshold) { // ensure capacity
-                    int reduced = rehash();
-                    if (reduced > 0) {
-                        count = (c -= reduced) - 1; // write-volatile
-                    }
-                }
-
-                HashEntry<K, V>[] tab = table;
-                int index = hash & tab.length - 1;
-                HashEntry<K, V> first = tab[index];
-                HashEntry<K, V> e = first;
-                while (e != null && (e.hash != hash || !keyEq(key, e.key()))) {
-                    e = e.next;
-                }
-
-                V oldValue;
-                if (e != null) {
-                    oldValue = e.value();
-                    if (!onlyIfAbsent) {
-                        e.setValue(value);
-                    }
-                } else {
-                    oldValue = null;
-                    ++ modCount;
-                    tab[index] = newHashEntry(key, hash, first, value);
-                    count = c; // write-volatile
-                }
-                return oldValue;
-            } finally {
-                unlock();
-            }
-        }
-
-        int rehash() {
-            HashEntry<K, V>[] oldTable = table;
-            int oldCapacity = oldTable.length;
-            if (oldCapacity >= MAXIMUM_CAPACITY) {
-                return 0;
-            }
-
-            /*
-             * Reclassify nodes in each list to new Map.  Because we are using
-             * power-of-two expansion, the elements from each bin must either
-             * stay at same index, or move with a power of two offset. We
-             * eliminate unnecessary node creation by catching cases where old
-             * nodes can be reused because their next fields won't change.
-             * Statistically, at the default threshold, only about one-sixth of
-             * them need cloning when a table doubles. The nodes they replace
-             * will be garbage collectable as soon as they are no longer
-             * referenced by any reader thread that may be in the midst of
-             * traversing table right now.
-             */
-
-            HashEntry<K, V>[] newTable = HashEntry.newArray(oldCapacity << 1);
-            threshold = (int) (newTable.length * loadFactor);
-            int sizeMask = newTable.length - 1;
-            int reduce = 0;
-            for (int i = 0; i < oldCapacity; i ++) {
-                // We need to guarantee that any existing reads of old Map can
-                // proceed. So we cannot yet null out each bin.
-                HashEntry<K, V> e = oldTable[i];
-
-                if (e != null) {
-                    HashEntry<K, V> next = e.next;
-                    int idx = e.hash & sizeMask;
-
-                    // Single node on list
-                    if (next == null) {
-                        newTable[idx] = e;
-                    } else {
-                        // Reuse trailing consecutive sequence at same slot
-                        HashEntry<K, V> lastRun = e;
-                        int lastIdx = idx;
-                        for (HashEntry<K, V> last = next; last != null; last = last.next) {
-                            int k = last.hash & sizeMask;
-                            if (k != lastIdx) {
-                                lastIdx = k;
-                                lastRun = last;
-                            }
-                        }
-                        newTable[lastIdx] = lastRun;
-                        // Clone all remaining nodes
-                        for (HashEntry<K, V> p = e; p != lastRun; p = p.next) {
-                            // Skip GC'd weak references
-                            K key = p.key();
-                            if (key == null) {
-                                reduce ++;
-                                continue;
-                            }
-                            int k = p.hash & sizeMask;
-                            HashEntry<K, V> n = newTable[k];
-                            newTable[k] = newHashEntry(key, p.hash, n, p.value());
-                        }
-                    }
-                }
-            }
-            table = newTable;
-            return reduce;
-        }
-
-        /**
-         * Remove; match on key only if value null, else match both.
-         */
-        V remove(Object key, int hash, Object value, boolean refRemove) {
-            lock();
-            try {
-                int c = count - 1;
-                HashEntry<K, V>[] tab = table;
-                int index = hash & tab.length - 1;
-                HashEntry<K, V> first = tab[index];
-                HashEntry<K, V> e = first;
-                // a reference remove operation compares the Reference instance
-                while (e != null && key != e.key &&
-                        (refRemove || hash != e.hash || !keyEq(key, e.key()))) {
-                    e = e.next;
-                }
-
-                V oldValue = null;
-                if (e != null) {
-                    V v = e.value();
-                    if (value == null || value.equals(v)) {
-                        oldValue = v;
-                        // All entries following removed node can stay in list,
-                        // but all preceding ones need to be cloned.
-                        ++ modCount;
-                        HashEntry<K, V> newFirst = e.next;
-                        for (HashEntry<K, V> p = first; p != e; p = p.next) {
-                            K pKey = p.key();
-                            if (pKey == null) { // Skip GC'd keys
-                                c --;
-                                continue;
-                            }
-
-                            newFirst = newHashEntry(
-                                    pKey, p.hash, newFirst, p.value());
-                        }
-                        tab[index] = newFirst;
-                        count = c; // write-volatile
-                    }
-                }
-                return oldValue;
-            } finally {
-                unlock();
-            }
-        }
-
-        void clear() {
-            if (count != 0) {
-                lock();
-                try {
-                    HashEntry<K, V>[] tab = table;
-                    for (int i = 0; i < tab.length; i ++) {
-                        tab[i] = null;
-                    }
-                    ++ modCount;
-                    count = 0; // write-volatile
-                } finally {
-                    unlock();
-                }
-            }
-        }
-    }
-
-    /* ---------------- Public operations -------------- */
-
-    /**
-     * Creates a new, empty map with the specified initial capacity, load factor
-     * and concurrency level.
-     *
-     * @param initialCapacity the initial capacity. The implementation performs
-     *                        internal sizing to accommodate this many elements.
-     * @param loadFactor the load factor threshold, used to control resizing.
-     *                   Resizing may be performed when the average number of
-     *                   elements per bin exceeds this threshold.
-     * @param concurrencyLevel the estimated number of concurrently updating
-     *                         threads. The implementation performs internal
-     *                         sizing to try to accommodate this many threads.
-     * @throws IllegalArgumentException if the initial capacity is negative or
-     *                                  the load factor or concurrencyLevel are
-     *                                  nonpositive.
-     */
-    public ConcurrentIdentityHashMap(
-            int initialCapacity, float loadFactor,
-            int concurrencyLevel) {
-        if (!(loadFactor > 0) || initialCapacity < 0 || concurrencyLevel <= 0) {
-            throw new IllegalArgumentException();
-        }
-
-        if (concurrencyLevel > MAX_SEGMENTS) {
-            concurrencyLevel = MAX_SEGMENTS;
-        }
-
-        // Find power-of-two sizes best matching arguments
-        int sshift = 0;
-        int ssize = 1;
-        while (ssize < concurrencyLevel) {
-            ++ sshift;
-            ssize <<= 1;
-        }
-        segmentShift = 32 - sshift;
-        segmentMask = ssize - 1;
-        this.segments = Segment.newArray(ssize);
-
-        if (initialCapacity > MAXIMUM_CAPACITY) {
-            initialCapacity = MAXIMUM_CAPACITY;
-        }
-        int c = initialCapacity / ssize;
-        if (c * ssize < initialCapacity) {
-            ++ c;
-        }
-        int cap = 1;
-        while (cap < c) {
-            cap <<= 1;
-        }
-
-        for (int i = 0; i < this.segments.length; ++ i) {
-            this.segments[i] = new Segment<K, V>(cap, loadFactor);
-        }
-    }
-
-
-    /**
-     * Creates a new, empty map with the specified initial capacity and load
-     * factor and with the default reference types (weak keys, strong values),
-     * and concurrencyLevel (16).
-     *
-     * @param initialCapacity The implementation performs internal sizing to
-     *                        accommodate this many elements.
-     * @param loadFactor the load factor threshold, used to control resizing.
-     *                   Resizing may be performed when the average number of
-     *                   elements per bin exceeds this threshold.
-     * @throws IllegalArgumentException if the initial capacity of elements is
-     *                                  negative or the load factor is
-     *                                  nonpositive
-     */
-    public ConcurrentIdentityHashMap(int initialCapacity, float loadFactor) {
-        this(initialCapacity, loadFactor, DEFAULT_CONCURRENCY_LEVEL);
-    }
-
-    /**
-     * Creates a new, empty map with the specified initial capacity, and with
-     * default reference types (weak keys, strong values), load factor (0.75)
-     * and concurrencyLevel (16).
-     *
-     * @param initialCapacity the initial capacity. The implementation performs
-     *                        internal sizing to accommodate this many elements.
-     * @throws IllegalArgumentException if the initial capacity of elements is
-     *                                  negative.
-     */
-    public ConcurrentIdentityHashMap(int initialCapacity) {
-        this(initialCapacity, DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL);
-    }
-
-    /**
-     * Creates a new, empty map with a default initial capacity (16), reference
-     * types (weak keys, strong values), default load factor (0.75) and
-     * concurrencyLevel (16).
-     */
-    public ConcurrentIdentityHashMap() {
-        this(DEFAULT_INITIAL_CAPACITY, DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL);
-    }
-
-    /**
-     * Creates a new map with the same mappings as the given map. The map is
-     * created with a capacity of 1.5 times the number of mappings in the given
-     * map or 16 (whichever is greater), and a default load factor (0.75) and
-     * concurrencyLevel (16).
-     *
-     * @param m the map
-     */
-    public ConcurrentIdentityHashMap(Map<? extends K, ? extends V> m) {
-        this(Math.max((int) (m.size() / DEFAULT_LOAD_FACTOR) + 1,
-             DEFAULT_INITIAL_CAPACITY), DEFAULT_LOAD_FACTOR,
-             DEFAULT_CONCURRENCY_LEVEL);
-        putAll(m);
-    }
-
-    /**
-     * Returns <tt>true</tt> if this map contains no key-value mappings.
-     *
-     * @return <tt>true</tt> if this map contains no key-value mappings
-     */
-    @Override
-    public boolean isEmpty() {
-        final Segment<K, V>[] segments = this.segments;
-        /*
-         * We keep track of per-segment modCounts to avoid ABA problems in which
-         * an element in one segment was added and in another removed during
-         * traversal, in which case the table was never actually empty at any
-         * point. Note the similar use of modCounts in the size() and
-         * containsValue() methods, which are the only other methods also
-         * susceptible to ABA problems.
-         */
-        int[] mc = new int[segments.length];
-        int mcsum = 0;
-        for (int i = 0; i < segments.length; ++ i) {
-            if (segments[i].count != 0) {
-                return false;
-            } else {
-                mcsum += mc[i] = segments[i].modCount;
-            }
-        }
-        // If mcsum happens to be zero, then we know we got a snapshot before
-        // any modifications at all were made.  This is probably common enough
-        // to bother tracking.
-        if (mcsum != 0) {
-            for (int i = 0; i < segments.length; ++ i) {
-                if (segments[i].count != 0 || mc[i] != segments[i].modCount) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Returns the number of key-value mappings in this map. If the map contains
-     * more than <tt>Integer.MAX_VALUE</tt> elements, returns
-     * <tt>Integer.MAX_VALUE</tt>.
-     *
-     * @return the number of key-value mappings in this map
-     */
-    @Override
-    public int size() {
-        final Segment<K, V>[] segments = this.segments;
-        long sum = 0;
-        long check = 0;
-        int[] mc = new int[segments.length];
-        // Try a few times to get accurate count. On failure due to continuous
-        // async changes in table, resort to locking.
-        for (int k = 0; k < RETRIES_BEFORE_LOCK; ++ k) {
-            check = 0;
-            sum = 0;
-            int mcsum = 0;
-            for (int i = 0; i < segments.length; ++ i) {
-                sum += segments[i].count;
-                mcsum += mc[i] = segments[i].modCount;
-            }
-            if (mcsum != 0) {
-                for (int i = 0; i < segments.length; ++ i) {
-                    check += segments[i].count;
-                    if (mc[i] != segments[i].modCount) {
-                        check = -1; // force retry
-                        break;
-                    }
-                }
-            }
-            if (check == sum) {
-                break;
-            }
-        }
-        if (check != sum) { // Resort to locking all segments
-            sum = 0;
-            for (int i = 0; i < segments.length; ++ i) {
-                segments[i].lock();
-            }
-            for (int i = 0; i < segments.length; ++ i) {
-                sum += segments[i].count;
-            }
-            for (int i = 0; i < segments.length; ++ i) {
-                segments[i].unlock();
-            }
-        }
-        if (sum > Integer.MAX_VALUE) {
-            return Integer.MAX_VALUE;
-        } else {
-            return (int) sum;
-        }
-    }
-
-    /**
-     * Returns the value to which the specified key is mapped, or {@code null}
-     * if this map contains no mapping for the key.
-     *
-     * <p>More formally, if this map contains a mapping from a key {@code k} to
-     * a value {@code v} such that {@code key.equals(k)}, then this method
-     * returns {@code v}; otherwise it returns {@code null}.  (There can be at
-     * most one such mapping.)
-     *
-     * @throws NullPointerException if the specified key is null
-     */
-    @Override
-    public V get(Object key) {
-        int hash = hashOf(key);
-        return segmentFor(hash).get(key, hash);
-    }
-
-    /**
-     * Tests if the specified object is a key in this table.
-     *
-     * @param  key   possible key
-     * @return <tt>true</tt> if and only if the specified object is a key in
-     *         this table, as determined by the <tt>equals</tt> method;
-     *         <tt>false</tt> otherwise.
-     * @throws NullPointerException if the specified key is null
-     */
-    @Override
-    public boolean containsKey(Object key) {
-        int hash = hashOf(key);
-        return segmentFor(hash).containsKey(key, hash);
-    }
-
-    /**
-     * Returns <tt>true</tt> if this map maps one or more keys to the specified
-     * value. Note: This method requires a full internal traversal of the hash
-     * table, and so is much slower than method <tt>containsKey</tt>.
-     *
-     * @param value value whose presence in this map is to be tested
-     * @return <tt>true</tt> if this map maps one or more keys to the specified
-     *         value
-     * @throws NullPointerException if the specified value is null
-     */
-
-    @Override
-    public boolean containsValue(Object value) {
-        if (value == null) {
-            throw new NullPointerException();
-        }
-
-        // See explanation of modCount use above
-
-        final Segment<K, V>[] segments = this.segments;
-        int[] mc = new int[segments.length];
-
-        // Try a few times without locking
-        for (int k = 0; k < RETRIES_BEFORE_LOCK; ++ k) {
-            int mcsum = 0;
-            for (int i = 0; i < segments.length; ++ i) {
-                mcsum += mc[i] = segments[i].modCount;
-                if (segments[i].containsValue(value)) {
-                    return true;
-                }
-            }
-            boolean cleanSweep = true;
-            if (mcsum != 0) {
-                for (int i = 0; i < segments.length; ++ i) {
-                    if (mc[i] != segments[i].modCount) {
-                        cleanSweep = false;
-                        break;
-                    }
-                }
-            }
-            if (cleanSweep) {
-                return false;
-            }
-        }
-        // Resort to locking all segments
-        for (int i = 0; i < segments.length; ++ i) {
-            segments[i].lock();
-        }
-        boolean found = false;
-        try {
-            for (int i = 0; i < segments.length; ++ i) {
-                if (segments[i].containsValue(value)) {
-                    found = true;
-                    break;
-                }
-            }
-        } finally {
-            for (int i = 0; i < segments.length; ++ i) {
-                segments[i].unlock();
-            }
-        }
-        return found;
-    }
-
-    /**
-     * Legacy method testing if some key maps into the specified value in this
-     * table.  This method is identical in functionality to
-     * {@link #containsValue}, and exists solely to ensure full compatibility
-     * with class {@link java.util.Hashtable}, which supported this method prior to
-     * introduction of the Java Collections framework.
-     *
-     * @param  value a value to search for
-     * @return <tt>true</tt> if and only if some key maps to the <tt>value</tt>
-     *         argument in this table as determined by the <tt>equals</tt>
-     *         method; <tt>false</tt> otherwise
-     * @throws NullPointerException if the specified value is null
-     */
-    public boolean contains(Object value) {
-        return containsValue(value);
-    }
-
-    /**
-     * Maps the specified key to the specified value in this table.  Neither the
-     * key nor the value can be null.
-     *
-     * <p>The value can be retrieved by calling the <tt>get</tt> method with a
-     * key that is equal to the original key.
-     *
-     * @param key key with which the specified value is to be associated
-     * @param value value to be associated with the specified key
-     * @return the previous value associated with <tt>key</tt>, or <tt>null</tt>
-     *         if there was no mapping for <tt>key</tt>
-     * @throws NullPointerException if the specified key or value is null
-     */
-    @Override
-    public V put(K key, V value) {
-        if (value == null) {
-            throw new NullPointerException();
-        }
-        int hash = hashOf(key);
-        return segmentFor(hash).put(key, hash, value, false);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @return the previous value associated with the specified key, or
-     *         <tt>null</tt> if there was no mapping for the key
-     * @throws NullPointerException if the specified key or value is null
-     */
-    public V putIfAbsent(K key, V value) {
-        if (value == null) {
-            throw new NullPointerException();
-        }
-        int hash = hashOf(key);
-        return segmentFor(hash).put(key, hash, value, true);
-    }
-
-    /**
-     * Copies all of the mappings from the specified map to this one.  These
-     * mappings replace any mappings that this map had for any of the keys
-     * currently in the specified map.
-     *
-     * @param m mappings to be stored in this map
-     */
-    @Override
-    public void putAll(Map<? extends K, ? extends V> m) {
-        for (Entry<? extends K, ? extends V> e: m.entrySet()) {
-            put(e.getKey(), e.getValue());
-        }
-    }
-
-    /**
-     * Removes the key (and its corresponding value) from this map.  This method
-     * does nothing if the key is not in the map.
-     *
-     * @param  key the key that needs to be removed
-     * @return the previous value associated with <tt>key</tt>, or <tt>null</tt>
-     *         if there was no mapping for <tt>key</tt>
-     * @throws NullPointerException if the specified key is null
-     */
-    @Override
-    public V remove(Object key) {
-        int hash = hashOf(key);
-        return segmentFor(hash).remove(key, hash, null, false);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @throws NullPointerException if the specified key is null
-     */
-    public boolean remove(Object key, Object value) {
-        int hash = hashOf(key);
-        if (value == null) {
-            return false;
-        }
-        return segmentFor(hash).remove(key, hash, value, false) != null;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @throws NullPointerException if any of the arguments are null
-     */
-    public boolean replace(K key, V oldValue, V newValue) {
-        if (oldValue == null || newValue == null) {
-            throw new NullPointerException();
-        }
-        int hash = hashOf(key);
-        return segmentFor(hash).replace(key, hash, oldValue, newValue);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @return the previous value associated with the specified key, or
-     *         <tt>null</tt> if there was no mapping for the key
-     * @throws NullPointerException if the specified key or value is null
-     */
-    public V replace(K key, V value) {
-        if (value == null) {
-            throw new NullPointerException();
-        }
-        int hash = hashOf(key);
-        return segmentFor(hash).replace(key, hash, value);
-    }
-
-    /**
-     * Removes all of the mappings from this map.
-     */
-    @Override
-    public void clear() {
-        for (int i = 0; i < segments.length; ++ i) {
-            segments[i].clear();
-        }
-    }
-
-    /**
-     * Returns a {@link java.util.Set} view of the keys contained in this map.  The set is
-     * backed by the map, so changes to the map are reflected in the set, and
-     * vice-versa.  The set supports element removal, which removes the
-     * corresponding mapping from this map, via the <tt>Iterator.remove</tt>,
-     * <tt>Set.remove</tt>, <tt>removeAll</tt>, <tt>retainAll</tt>, and
-     * <tt>clear</tt> operations.  It does not support the <tt>add</tt> or
-     * <tt>addAll</tt> operations.
-     *
-     * <p>The view's <tt>iterator</tt> is a "weakly consistent" iterator that
-     * will never throw {@link java.util.ConcurrentModificationException}, and guarantees
-     * to traverse elements as they existed upon construction of the iterator,
-     * and may (but is not guaranteed to) reflect any modifications subsequent
-     * to construction.
-     */
-    @Override
-    public Set<K> keySet() {
-        Set<K> ks = keySet;
-        return ks != null? ks : (keySet = new KeySet());
-    }
-
-    /**
-     * Returns a {@link java.util.Collection} view of the values contained in this map.
-     * The collection is backed by the map, so changes to the map are reflected
-     * in the collection, and vice-versa.  The collection supports element
-     * removal, which removes the corresponding mapping from this map, via the
-     * <tt>Iterator.remove</tt>, <tt>Collection.remove</tt>, <tt>removeAll</tt>,
-     * <tt>retainAll</tt>, and <tt>clear</tt> operations.  It does not support
-     * the <tt>add</tt> or <tt>addAll</tt> operations.
-     *
-     * <p>The view's <tt>iterator</tt> is a "weakly consistent" iterator that
-     * will never throw {@link java.util.ConcurrentModificationException}, and guarantees
-     * to traverse elements as they existed upon construction of the iterator,
-     * and may (but is not guaranteed to) reflect any modifications subsequent
-     * to construction.
-     */
-    @Override
-    public Collection<V> values() {
-        Collection<V> vs = values;
-        return vs != null? vs : (values = new Values());
-    }
-
-    /**
-     * Returns a {@link java.util.Set} view of the mappings contained in this map.
-     * The set is backed by the map, so changes to the map are reflected in the
-     * set, and vice-versa.  The set supports element removal, which removes the
-     * corresponding mapping from the map, via the <tt>Iterator.remove</tt>,
-     * <tt>Set.remove</tt>, <tt>removeAll</tt>, <tt>retainAll</tt>, and
-     * <tt>clear</tt> operations.  It does not support the <tt>add</tt> or
-     * <tt>addAll</tt> operations.
-     *
-     * <p>The view's <tt>iterator</tt> is a "weakly consistent" iterator that
-     * will never throw {@link java.util.ConcurrentModificationException}, and guarantees
-     * to traverse elements as they existed upon construction of the iterator,
-     * and may (but is not guaranteed to) reflect any modifications subsequent
-     * to construction.
-     */
-    @Override
-    public Set<Entry<K, V>> entrySet() {
-        Set<Entry<K, V>> es = entrySet;
-        return es != null? es : (entrySet = new EntrySet());
-    }
-
-    /**
-     * Returns an enumeration of the keys in this table.
-     *
-     * @return an enumeration of the keys in this table
-     * @see #keySet()
-     */
-    public Enumeration<K> keys() {
-        return new KeyIterator();
-    }
-
-    /**
-     * Returns an enumeration of the values in this table.
-     *
-     * @return an enumeration of the values in this table
-     * @see #values()
-     */
-    public Enumeration<V> elements() {
-        return new ValueIterator();
-    }
-
-    /* ---------------- Iterator Support -------------- */
-
-    abstract class HashIterator {
-        int nextSegmentIndex;
-        int nextTableIndex;
-        HashEntry<K, V>[] currentTable;
-        HashEntry<K, V> nextEntry;
-        HashEntry<K, V> lastReturned;
-        K currentKey; // Strong reference to weak key (prevents gc)
-
-        HashIterator() {
-            nextSegmentIndex = segments.length - 1;
-            nextTableIndex = -1;
-            advance();
-        }
-
-        public void rewind() {
-            nextSegmentIndex = segments.length - 1;
-            nextTableIndex = -1;
-            currentTable = null;
-            nextEntry = null;
-            lastReturned = null;
-            currentKey = null;
-            advance();
-        }
-
-        public boolean hasMoreElements() {
-            return hasNext();
-        }
-
-        final void advance() {
-            if (nextEntry != null && (nextEntry = nextEntry.next) != null) {
-                return;
-            }
-
-            while (nextTableIndex >= 0) {
-                if ((nextEntry = currentTable[nextTableIndex --]) != null) {
-                    return;
-                }
-            }
-
-            while (nextSegmentIndex >= 0) {
-                Segment<K, V> seg = segments[nextSegmentIndex --];
-                if (seg.count != 0) {
-                    currentTable = seg.table;
-                    for (int j = currentTable.length - 1; j >= 0; -- j) {
-                        if ((nextEntry = currentTable[j]) != null) {
-                            nextTableIndex = j - 1;
-                            return;
-                        }
-                    }
-                }
-            }
-        }
-
-        public boolean hasNext() {
-            while (nextEntry != null) {
-                if (nextEntry.key() != null) {
-                    return true;
-                }
-                advance();
-            }
-
-            return false;
-        }
-
-        HashEntry<K, V> nextEntry() {
-            do {
-                if (nextEntry == null) {
-                    throw new NoSuchElementException();
-                }
-
-                lastReturned = nextEntry;
-                currentKey = lastReturned.key();
-                advance();
-            } while (currentKey == null); // Skip GC'd keys
-
-            return lastReturned;
-        }
-
-        public void remove() {
-            if (lastReturned == null) {
-                throw new IllegalStateException();
-            }
-            ConcurrentIdentityHashMap.this.remove(currentKey);
-            lastReturned = null;
-        }
-    }
-
-    final class KeyIterator
-            extends HashIterator implements ReusableIterator<K>, Enumeration<K> {
-
-        public K next() {
-            return super.nextEntry().key();
-        }
-
-        public K nextElement() {
-            return super.nextEntry().key();
-        }
-    }
-
-    final class ValueIterator
-            extends HashIterator implements ReusableIterator<V>, Enumeration<V> {
-
-        public V next() {
-            return super.nextEntry().value();
-        }
-
-        public V nextElement() {
-            return super.nextEntry().value();
-        }
-    }
-
-    /*
-     * This class is needed for JDK5 compatibility.
-     */
-    static class SimpleEntry<K, V> implements Entry<K, V> {
-
-        private static final long serialVersionUID = -8144765946475398746L;
-
-        private final K key;
-
-        private V value;
-
-        public SimpleEntry(K key, V value) {
-            this.key = key;
-            this.value = value;
-
-        }
-
-        public SimpleEntry(Entry<? extends K, ? extends V> entry) {
-            this.key = entry.getKey();
-            this.value = entry.getValue();
-
-        }
-
-        public K getKey() {
-            return key;
-        }
-
-        public V getValue() {
-            return value;
-        }
-
-        public V setValue(V value) {
-            V oldValue = this.value;
-            this.value = value;
-            return oldValue;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (!(o instanceof Entry<?, ?>)) {
-                return false;
-            }
-            @SuppressWarnings("rawtypes")
-            Entry e = (Entry) o;
-            return eq(key, e.getKey()) && eq(value, e.getValue());
-        }
-
-        @Override
-        public int hashCode() {
-            return (key == null? 0 : key.hashCode()) ^ (value == null? 0 : value.hashCode());
-        }
-
-        @Override
-        public String toString() {
-            return key + "=" + value;
-        }
-
-        private static boolean eq(Object o1, Object o2) {
-            return o1 == null? o2 == null : o1.equals(o2);
-        }
-    }
-
-    /**
-     * Custom Entry class used by EntryIterator.next(), that relays setValue
-     * changes to the underlying map.
-     */
-    final class WriteThroughEntry extends SimpleEntry<K, V> {
-
-        WriteThroughEntry(K k, V v) {
-            super(k, v);
-        }
-
-        /**
-         * Set our entry's value and write through to the map. The value to
-         * return is somewhat arbitrary here. Since a WriteThroughEntry does not
-         * necessarily track asynchronous changes, the most recent "previous"
-         * value could be different from what we return (or could even have been
-         * removed in which case the put will re-establish). We do not and can
-         * not guarantee more.
-         */
-        @Override
-        public V setValue(V value) {
-
-            if (value == null) {
-                throw new NullPointerException();
-            }
-            V v = super.setValue(value);
-            ConcurrentIdentityHashMap.this.put(getKey(), value);
-            return v;
-        }
-
-    }
-
-    final class EntryIterator extends HashIterator implements
-            ReusableIterator<Entry<K, V>> {
-        public Entry<K, V> next() {
-            HashEntry<K, V> e = super.nextEntry();
-            return new WriteThroughEntry(e.key(), e.value());
-        }
-    }
-
-    final class KeySet extends AbstractSet<K> {
-        @Override
-        public Iterator<K> iterator() {
-
-            return new KeyIterator();
-        }
-
-        @Override
-        public int size() {
-            return ConcurrentIdentityHashMap.this.size();
-        }
-
-        @Override
-        public boolean isEmpty() {
-            return ConcurrentIdentityHashMap.this.isEmpty();
-        }
-
-        @Override
-        public boolean contains(Object o) {
-            return ConcurrentIdentityHashMap.this.containsKey(o);
-        }
-
-        @Override
-        public boolean remove(Object o) {
-            return ConcurrentIdentityHashMap.this.remove(o) != null;
-
-        }
-
-        @Override
-        public void clear() {
-            ConcurrentIdentityHashMap.this.clear();
-        }
-    }
-
-    final class Values extends AbstractCollection<V> {
-        @Override
-        public Iterator<V> iterator() {
-            return new ValueIterator();
-        }
-
-        @Override
-        public int size() {
-            return ConcurrentIdentityHashMap.this.size();
-        }
-
-        @Override
-        public boolean isEmpty() {
-            return ConcurrentIdentityHashMap.this.isEmpty();
-        }
-
-        @Override
-        public boolean contains(Object o) {
-            return ConcurrentIdentityHashMap.this.containsValue(o);
-        }
-
-        @Override
-        public void clear() {
-            ConcurrentIdentityHashMap.this.clear();
-        }
-    }
-
-    final class EntrySet extends AbstractSet<Entry<K, V>> {
-        @Override
-        public Iterator<Entry<K, V>> iterator() {
-            return new EntryIterator();
-        }
-
-        @Override
-        public boolean contains(Object o) {
-            if (!(o instanceof Entry<?, ?>)) {
-                return false;
-            }
-            Entry<?, ?> e = (Entry<?, ?>) o;
-            V v = ConcurrentIdentityHashMap.this.get(e.getKey());
-            return v != null && v.equals(e.getValue());
-        }
-
-        @Override
-        public boolean remove(Object o) {
-            if (!(o instanceof Entry<?, ?>)) {
-                return false;
-            }
-            Entry<?, ?> e = (Entry<?, ?>) o;
-            return ConcurrentIdentityHashMap.this.remove(e.getKey(), e.getValue());
-        }
-
-        @Override
-        public int size() {
-            return ConcurrentIdentityHashMap.this.size();
-        }
-
-        @Override
-        public boolean isEmpty() {
-            return ConcurrentIdentityHashMap.this.isEmpty();
-        }
-
-        @Override
-        public void clear() {
-            ConcurrentIdentityHashMap.this.clear();
-        }
-    }
-}
diff --git a/akka-actor/src/main/java/akka/util/internal/HashedWheelTimer.java b/akka-actor/src/main/java/akka/util/internal/HashedWheelTimer.java
index fcdee4866f..b455957fc2 100644
--- a/akka-actor/src/main/java/akka/util/internal/HashedWheelTimer.java
+++ b/akka-actor/src/main/java/akka/util/internal/HashedWheelTimer.java
@@ -20,10 +20,13 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.Iterator;
 import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
+import akka.dispatch.SystemMessage;
 import akka.util.Helpers;
 import scala.concurrent.duration.Duration;
 import scala.concurrent.duration.FiniteDuration;
@@ -89,7 +92,6 @@ public class HashedWheelTimer implements Timer {
     boolean shutdown = false;
     final long tickDuration;
     final Set<HashedWheelTimeout>[] wheel;
-    final ReusableIterator<HashedWheelTimeout>[] iterators;
     final int mask;
     final ReadWriteLock lock = new ReentrantReadWriteLock();
     volatile int wheelCursor;
@@ -127,7 +129,6 @@ public class HashedWheelTimer implements Timer {
 
         // Normalize ticksPerWheel to power of two and initialize the wheel.
         wheel = createWheel(ticksPerWheel);
-        iterators = createIterators(wheel);
         mask = wheel.length - 1;
 
         // Convert to standardized tickDuration
@@ -152,20 +153,11 @@ public class HashedWheelTimer implements Timer {
 
         final Set<HashedWheelTimeout>[] wheel = new Set[normalizeTicksPerWheel(ticksPerWheel)];
         for (int i = 0; i < wheel.length; i ++) {
-            wheel[i] = Collections.newSetFromMap(new ConcurrentIdentityHashMap<HashedWheelTimeout, Boolean>(16, 0.95f, 4));
+            wheel[i] = Collections.newSetFromMap(new ConcurrentHashMap<HashedWheelTimeout, Boolean>(16, 0.95f, 4));
         }
         return wheel;
     }
 
-    @SuppressWarnings("unchecked")
-    private static ReusableIterator<HashedWheelTimeout>[] createIterators(Set<HashedWheelTimeout>[] wheel) {
-        ReusableIterator<HashedWheelTimeout>[] iterators = new ReusableIterator[wheel.length];
-        for (int i = 0; i < wheel.length; i ++) {
-            iterators[i] = (ReusableIterator<HashedWheelTimeout>) wheel[i].iterator();
-        }
-        return iterators;
-    }
-
     private static int normalizeTicksPerWheel(int ticksPerWheel) {
         int normalizedTicksPerWheel = 1;
         while (normalizedTicksPerWheel < ticksPerWheel) {
@@ -323,16 +315,16 @@ public class HashedWheelTimer implements Timer {
             lock.writeLock().lock();
             try {
                 final int newWheelCursor = wheelCursor = wheelCursor + 1 & mask;
-                return fetchExpiredTimeouts(iterators[newWheelCursor], deadline);
+                return fetchExpiredTimeouts(wheel[newWheelCursor], deadline);
             } finally {
                 lock.writeLock().unlock();
             }
         }
 
-        private ArrayList<HashedWheelTimeout> fetchExpiredTimeouts(final ReusableIterator<HashedWheelTimeout> i, final long deadline) {
+        private ArrayList<HashedWheelTimeout> fetchExpiredTimeouts(final Iterable<HashedWheelTimeout> it, final long deadline) {
             final ArrayList<HashedWheelTimeout> expiredTimeouts = new ArrayList<HashedWheelTimeout>();
             List<HashedWheelTimeout> slipped = null;
-            i.rewind();
+            Iterator<HashedWheelTimeout> i = it.iterator();
             while (i.hasNext()) {
                 HashedWheelTimeout timeout = i.next();
                 if (timeout.remainingRounds <= 0) {
@@ -483,6 +475,14 @@ public class HashedWheelTimer implements Timer {
             }
         }
 
+        @Override public final int hashCode() {
+            return System.identityHashCode(this);
+        }
+
+        @Override public final boolean equals(final Object that) {
+            return this == that;
+        }
+
         @Override
         public String toString() {
             final long currentTime = System.nanoTime();
diff --git a/akka-actor/src/main/java/akka/util/internal/ReusableIterator.java b/akka-actor/src/main/java/akka/util/internal/ReusableIterator.java
deleted file mode 100644
index 8c8e5e50e5..0000000000
--- a/akka-actor/src/main/java/akka/util/internal/ReusableIterator.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2009 Red Hat, Inc.
- *
- * Red Hat licenses this file to you under the Apache License, version 2.0
- * (the "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at:
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-package akka.util.internal;
-
-import java.util.Iterator;
-
-/**
- * @author <a href="http://www.jboss.org/netty/">The Netty Project</a>
- * @author <a href="http://gleamynode.net/">Trustin Lee</a>
- * @version $Rev: 2080 $, $Date: 2010-01-26 18:04:19 +0900 (Tue, 26 Jan 2010) $
- */
-public interface ReusableIterator<E> extends Iterator<E> {
-    void rewind();
-}
diff --git a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala
index ef253884da..d99f716e8e 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala
@@ -16,8 +16,8 @@ import scala.util.{ Failure, Success }
 import scala.util.control.NonFatal
 import akka.util._
 import java.io.Closeable
-import akka.util.internal.{ HashedWheelTimer, ConcurrentIdentityHashMap }
-import java.util.concurrent.{ ThreadFactory, CountDownLatch, TimeoutException, RejectedExecutionException }
+import akka.util.internal.{ HashedWheelTimer }
+import java.util.concurrent.{ ConcurrentHashMap, ThreadFactory, CountDownLatch, TimeoutException, RejectedExecutionException }
 import java.util.concurrent.TimeUnit.MILLISECONDS
 import akka.actor.dungeon.ChildrenContainer
 
@@ -628,7 +628,7 @@ private[akka] class ActorSystemImpl(val name: String, applicationConfig: Config,
     case _            ⇒
   }
 
-  private val extensions = new ConcurrentIdentityHashMap[ExtensionId[_], AnyRef]
+  private val extensions = new ConcurrentHashMap[ExtensionId[_], AnyRef]
 
   /**
    * Returns any extension registered to the specified Extension or returns null if not registered
diff --git a/akka-actor/src/main/scala/akka/actor/Extension.scala b/akka-actor/src/main/scala/akka/actor/Extension.scala
index 9b6f950d3f..38b6a6d37c 100644
--- a/akka-actor/src/main/scala/akka/actor/Extension.scala
+++ b/akka-actor/src/main/scala/akka/actor/Extension.scala
@@ -52,6 +52,9 @@ trait ExtensionId[T <: Extension] {
    * internal use only.
    */
   def createExtension(system: ExtendedActorSystem): T
+
+  override final def hashCode: Int = System.identityHashCode(this)
+  override final def equals(other: Any): Boolean = this eq other.asInstanceOf[AnyRef]
 }
 
 /**

From c16f226d1db5c51290ae0e60fd44e8b39b67f5b5 Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Tue, 22 Jan 2013 17:58:37 +0100
Subject: [PATCH 067/122] =?UTF-8?q?=20isProxy=20is=20internally=20using=20?=
 =?UTF-8?q?a=20single,=20fat,=20synchronized=20=E2=80=93=20yes,=20astonish?=
 =?UTF-8?q?ing=20to=20say=20the=20least,=20with=20this=20we=20lower=20the?=
 =?UTF-8?q?=20pressure=20on=20that=20lock.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 akka-actor/src/main/scala/akka/actor/TypedActor.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/akka-actor/src/main/scala/akka/actor/TypedActor.scala b/akka-actor/src/main/scala/akka/actor/TypedActor.scala
index 0bc8059ade..263a1c309d 100644
--- a/akka-actor/src/main/scala/akka/actor/TypedActor.scala
+++ b/akka-actor/src/main/scala/akka/actor/TypedActor.scala
@@ -674,7 +674,7 @@ class TypedActorExtension(val system: ExtendedActorSystem) extends TypedActorFac
    * INTERNAL USE ONLY
    */
   private[akka] def invocationHandlerFor(@deprecatedName('typedActor_?) typedActor: AnyRef): TypedActorInvocationHandler =
-    if ((typedActor ne null) && Proxy.isProxyClass(typedActor.getClass)) typedActor match {
+    if ((typedActor ne null) && classOf[Proxy].isAssignableFrom(typedActor.getClass) && Proxy.isProxyClass(typedActor.getClass)) typedActor match {
       case null ⇒ null
       case other ⇒ Proxy.getInvocationHandler(other) match {
         case null                                 ⇒ null

From af25479b6c02da090ea4ce6b81af7de5a78210f3 Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Wed, 23 Jan 2013 02:06:49 +0100
Subject: [PATCH 068/122]  Migrating Agents to greener pastures

---
 .../akka/actor/dispatch/ActorModelSpec.scala  |   2 +-
 ...erializedSuspendableExecutionContext.scala |  81 +++++++
 .../src/main/scala/akka/agent/Agent.scala     | 213 +++++-------------
 .../src/test/scala/akka/agent/AgentSpec.scala |  52 +----
 akka-docs/rst/java/agents.rst                 | 121 +++++-----
 .../java/code/docs/agent/AgentDocTest.java    | 113 +++++-----
 akka-docs/rst/scala/agents.rst                |  60 ++---
 .../scala/code/docs/agent/AgentDocSpec.scala  | 158 +++++--------
 8 files changed, 356 insertions(+), 444 deletions(-)
 create mode 100644 akka-actor/src/main/scala/akka/util/SerializedSuspendableExecutionContext.scala

diff --git a/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala
index 09eb75f8cb..443d6f5981 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala
@@ -425,7 +425,7 @@ abstract class ActorModelSpec(config: String) extends AkkaSpec(config) with Defa
           Thread.getAllStackTraces().asScala foreach {
             case (thread, stack) ⇒
               println(s"$thread:")
-              stack foreach (s => println(s"\t$s"))
+              stack foreach (s ⇒ println(s"\t$s"))
           }
         }
         assert(Await.result(f1, remaining) === "foo")
diff --git a/akka-actor/src/main/scala/akka/util/SerializedSuspendableExecutionContext.scala b/akka-actor/src/main/scala/akka/util/SerializedSuspendableExecutionContext.scala
new file mode 100644
index 0000000000..1e6cbb60e7
--- /dev/null
+++ b/akka-actor/src/main/scala/akka/util/SerializedSuspendableExecutionContext.scala
@@ -0,0 +1,81 @@
+package akka.util
+
+import java.util.concurrent.ConcurrentLinkedQueue
+import java.util.concurrent.atomic.AtomicInteger
+import scala.concurrent.ExecutionContext
+import scala.util.control.NonFatal
+import scala.annotation.{ tailrec, switch }
+
+private[akka] object SerializedSuspendableExecutionContext {
+  final val Off = 0
+  final val On = 1
+  final val Suspended = 2
+
+  def apply(batchSize: Int)(implicit context: ExecutionContext): SerializedSuspendableExecutionContext =
+    new SerializedSuspendableExecutionContext(batchSize)(context match {
+      case s: SerializedSuspendableExecutionContext ⇒ s.context
+      case other                                    ⇒ other
+    })
+}
+
+/**
+ * This `ExecutionContext` allows to wrap an underlying `ExecutionContext` and provide guaranteed serial execution
+ * of tasks submitted to it. On top of that it also allows for *suspending* and *resuming* processing of tasks.
+ *
+ * WARNING: This type must never leak into User code as anything but `ExecutionContext`
+ *
+ * @param throughput maximum number of tasks to be executed in serial before relinquishing the executing thread.
+ * @param context the underlying context which will be used to actually execute the submitted tasks
+ */
+private[akka] final class SerializedSuspendableExecutionContext(throughput: Int)(val context: ExecutionContext)
+  extends ConcurrentLinkedQueue[Runnable] with Runnable with ExecutionContext {
+  import SerializedSuspendableExecutionContext._
+  require(throughput > 0, s"SerializedSuspendableExecutionContext.throughput must be greater than 0 but was $throughput")
+
+  private final val state = new AtomicInteger(0)
+  @tailrec private final def addState(newState: Int): Boolean = {
+    val c = state.get;
+    state.compareAndSet(c, c | newState) || addState(newState)
+  }
+  @tailrec private final def remState(oldState: Int) {
+    val c = state.get
+    if (state.compareAndSet(c, c & ~oldState)) attach() else remState(oldState)
+  }
+
+  /**
+   * Resumes execution of tasks until `suspend` is called,
+   * if it isn't currently suspended, it is a no-op.
+   * This operation is idempotent.
+   */
+  final def resume(): Unit = remState(Suspended)
+
+  /**
+   * Suspends execution of tasks until `resume` is called,
+   * this operation is idempotent.
+   */
+  final def suspend(): Unit = addState(Suspended)
+
+  final def run(): Unit = {
+    @tailrec def run(done: Int): Unit =
+      if (done < throughput && state.get == On) {
+        poll() match {
+          case null ⇒ ()
+          case some ⇒
+            try some.run() catch { case NonFatal(t) ⇒ context reportFailure t }
+            run(done + 1)
+        }
+      }
+    try run(0) finally remState(On)
+  }
+
+  final def attach(): Unit = if (!isEmpty && state.compareAndSet(Off, On)) context execute this
+  override final def execute(task: Runnable): Unit = try add(task) finally attach()
+  override final def reportFailure(t: Throwable): Unit = context reportFailure t
+
+  override final def toString: String = (state.get: @switch) match {
+    case 0 ⇒ "Off"
+    case 1 ⇒ "On"
+    case 2 ⇒ "Off & Suspended"
+    case 3 ⇒ "On & Suspended"
+  }
+}
\ No newline at end of file
diff --git a/akka-agent/src/main/scala/akka/agent/Agent.scala b/akka-agent/src/main/scala/akka/agent/Agent.scala
index a19d01c338..bc6f12c3a1 100644
--- a/akka-agent/src/main/scala/akka/agent/Agent.scala
+++ b/akka-agent/src/main/scala/akka/agent/Agent.scala
@@ -7,23 +7,17 @@ package akka.agent
 import akka.actor._
 import akka.japi.{ Function ⇒ JFunc, Procedure ⇒ JProc }
 import akka.pattern.ask
-import akka.util.Timeout
 import scala.concurrent.stm._
 import scala.concurrent.{ ExecutionContext, Future, Promise, Await }
 import scala.concurrent.duration.{ FiniteDuration, Duration }
-
-/**
- * Used internally to send functions.
- */
-private[akka] case class Update[T](function: T ⇒ T)
-private[akka] case class Alter[T](function: T ⇒ T)
-private[akka] case object Get
+import akka.util.{ SerializedSuspendableExecutionContext, Timeout }
+import util.Try
 
 /**
  * Factory method for creating an Agent.
  */
 object Agent {
-  def apply[T](initialValue: T)(implicit system: ActorSystem) = new Agent(initialValue, system, system)
+  def apply[T](initialValue: T)(implicit context: ExecutionContext) = new Agent(initialValue, context)
 }
 
 /**
@@ -96,14 +90,13 @@ object Agent {
  * agent4.close
  * }}}
  */
-class Agent[T](initialValue: T, refFactory: ActorRefFactory, system: ActorSystem) {
+class Agent[T](initialValue: T, context: ExecutionContext) {
   private val ref = Ref(initialValue)
-  private val updater = refFactory.actorOf(Props(new AgentUpdater(this, ref))).asInstanceOf[InternalActorRef] //TODO can we avoid this somehow?
-
-  def this(initialValue: T, system: ActorSystem) = this(initialValue, system, system)
+  private val updater = SerializedSuspendableExecutionContext(10)(context)
 
   /**
    * Read the internal state of the agent.
+   * Java API
    */
   def get(): T = ref.single.get
 
@@ -113,22 +106,44 @@ class Agent[T](initialValue: T, refFactory: ActorRefFactory, system: ActorSystem
   def apply(): T = get
 
   /**
-   * Dispatch a function to update the internal state.
+   * Dispatch a new value for the internal state. Behaves the same
+   * as sending a function (x => newValue).
    */
-  def send(f: T ⇒ T): Unit = {
-    def dispatch = updater ! Update(f)
-    Txn.findCurrent match {
-      case Some(txn) ⇒ Txn.afterCommit(status ⇒ dispatch)(txn)
-      case _         ⇒ dispatch
-    }
-  }
+  def send(newValue: T): Unit = withinTransaction(new Runnable { def run = ref.single.update(newValue) })
+
+  /**
+   * Dispatch a function to update the internal state.
+   * In Java, pass in an instance of `akka.dispatch.Mapper`.
+   */
+  def send(f: T ⇒ T): Unit = withinTransaction(new Runnable { def run = ref.single.transform(f) })
+
+  /**
+   * Dispatch a function to update the internal state but on its own thread.
+   * This does not use the reactive thread pool and can be used for long-running
+   * or blocking operations. Dispatches using either `sendOff` or `send` will
+   * still be executed in order.
+   * In Java, pass in an instance of `akka.dispatch.Mapper`.
+   */
+  def sendOff(f: T ⇒ T)(implicit ec: ExecutionContext): Unit = withinTransaction(
+    new Runnable {
+      def run =
+        try updater.suspend() finally ec.execute(new Runnable { def run = try ref.single.transform(f) finally updater.resume() })
+    })
+
+  /**
+   * Dispatch an update to the internal state, and return a Future where
+   * that new state can be obtained.
+   * In Java, pass in an instance of `akka.dispatch.Mapper`.
+   */
+  def alter(newValue: T): Future[T] = alter(_ ⇒ newValue)
 
   /**
    * Dispatch a function to update the internal state, and return a Future where
-   * that new state can be obtained within the given timeout.
+   * that new state can be obtained.
+   * In Java, pass in an instance of `akka.dispatch.Mapper`.
    */
-  def alter(f: T ⇒ T)(implicit timeout: Timeout): Future[T] = {
-    def dispatch = ask(updater, Alter(f)).asInstanceOf[Future[T]]
+  def alter(f: T ⇒ T): Future[T] = {
+    def dispatch = Future(ref.single.transformAndGet(f))(updater)
     Txn.findCurrent match {
       case Some(txn) ⇒
         val result = Promise[T]()
@@ -138,162 +153,56 @@ class Agent[T](initialValue: T, refFactory: ActorRefFactory, system: ActorSystem
     }
   }
 
-  /**
-   * Dispatch a new value for the internal state. Behaves the same
-   * as sending a function (x => newValue).
-   */
-  def send(newValue: T): Unit = send(_ ⇒ newValue)
-
-  /**
-   * Dispatch a new value for the internal state. Behaves the same
-   * as sending a function (x => newValue).
-   */
-  def update(newValue: T): Unit = send(newValue)
-
-  /**
-   * Dispatch a function to update the internal state but on its own thread.
-   * This does not use the reactive thread pool and can be used for long-running
-   * or blocking operations. Dispatches using either `sendOff` or `send` will
-   * still be executed in order.
-   */
-  def sendOff(f: T ⇒ T)(implicit ec: ExecutionContext): Unit = {
-    send((value: T) ⇒ {
-      suspend()
-      Future(ref.single.transformAndGet(f)).andThen({ case _ ⇒ resume() })
-      value
-    })
-  }
-
   /**
    * Dispatch a function to update the internal state but on its own thread,
-   * and return a Future where that new state can be obtained within the given timeout.
+   * and return a Future where that new state can be obtained.
    * This does not use the reactive thread pool and can be used for long-running
    * or blocking operations. Dispatches using either `alterOff` or `alter` will
    * still be executed in order.
+   * In Java, pass in an instance of `akka.dispatch.Mapper`.
    */
-  def alterOff(f: T ⇒ T)(implicit timeout: Timeout, ec: ExecutionContext): Future[T] = {
+  def alterOff(f: T ⇒ T)(implicit ec: ExecutionContext): Future[T] = {
     val result = Promise[T]()
-    send((value: T) ⇒ {
-      suspend()
-      result completeWith Future(ref.single.transformAndGet(f)).andThen({ case _ ⇒ resume() })
-      value
+    withinTransaction(new Runnable {
+      def run = {
+        updater.suspend()
+        result completeWith Future(try ref.single.transformAndGet(f) finally updater.resume())
+      }
     })
     result.future
   }
 
+  private final def withinTransaction(run: Runnable): Unit = {
+    def dispatch = updater.execute(run)
+    Txn.findCurrent match {
+      case Some(txn) ⇒ Txn.afterCommit(status ⇒ dispatch)(txn)
+      case _         ⇒ dispatch
+    }
+  }
+
   /**
    * A future to the current value that will be completed after any currently
    * queued updates.
    */
-  def future(implicit timeout: Timeout): Future[T] = (updater ? Get).asInstanceOf[Future[T]] //Known to be safe
-
-  /**
-   * Gets this agent's value after all currently queued updates have completed.
-   */
-  def await(implicit timeout: Timeout): T = Await.result(future, timeout.duration)
+  def future(): Future[T] = Future(ref.single.get)(updater)
 
   /**
    * Map this agent to a new agent, applying the function to the internal state.
    * Does not change the value of this agent.
+   * In Java, pass in an instance of `akka.dispatch.Mapper`.
    */
-  def map[B](f: T ⇒ B): Agent[B] = Agent(f(get))(system)
+  def map[B](f: T ⇒ B): Agent[B] = Agent(f(get))(updater)
 
   /**
    * Flatmap this agent to a new agent, applying the function to the internal state.
    * Does not change the value of this agent.
+   * In Java, pass in an instance of `akka.dispatch.Mapper`.
    */
   def flatMap[B](f: T ⇒ Agent[B]): Agent[B] = f(get)
 
   /**
    * Applies the function to the internal state. Does not change the value of this agent.
+   * In Java, pass in an instance of `akka.dispatch.Foreach`.
    */
   def foreach[U](f: T ⇒ U): Unit = f(get)
-
-  /**
-   * Suspends processing of `send` actions for the agent.
-   */
-  def suspend(): Unit = updater.suspend()
-
-  /**
-   * Resumes processing of `send` actions for the agent.
-   */
-  def resume(): Unit = updater.resume(causedByFailure = null)
-
-  /**
-   * Closes the agents and makes it eligible for garbage collection.
-   * A closed agent cannot accept any `send` actions.
-   */
-  def close(): Unit = updater.stop()
-
-  // ---------------------------------------------
-  // Support for Java API Functions and Procedures
-  // ---------------------------------------------
-
-  /**
-   * Java API:
-   * Dispatch a function to update the internal state.
-   */
-  def send(f: JFunc[T, T]): Unit = send(x ⇒ f(x))
-
-  /**
-   * Java API
-   * Dispatch a function to update the internal state, and return a Future where that new state can be obtained
-   * within the given timeout
-   */
-  def alter(f: JFunc[T, T], timeout: FiniteDuration): Future[T] = alter(x ⇒ f(x))(timeout)
-
-  /**
-   * Java API:
-   * Dispatch a function to update the internal state but on its own thread.
-   * This does not use the reactive thread pool and can be used for long-running
-   * or blocking operations. Dispatches using either `sendOff` or `send` will
-   * still be executed in order.
-   */
-  def sendOff(f: JFunc[T, T], ec: ExecutionContext): Unit = sendOff(x ⇒ f(x))(ec)
-
-  /**
-   * Java API:
-   * Dispatch a function to update the internal state but on its own thread,
-   * and return a Future where that new state can be obtained within the given timeout.
-   * This does not use the reactive thread pool and can be used for long-running
-   * or blocking operations. Dispatches using either `alterOff` or `alter` will
-   * still be executed in order.
-   */
-  def alterOff(f: JFunc[T, T], timeout: FiniteDuration, ec: ExecutionContext): Unit = alterOff(x ⇒ f(x))(Timeout(timeout), ec)
-
-  /**
-   * Java API:
-   * Map this agent to a new agent, applying the function to the internal state.
-   * Does not change the value of this agent.
-   */
-  def map[B](f: JFunc[T, B]): Agent[B] = Agent(f(get))(system)
-
-  /**
-   * Java API:
-   * Flatmap this agent to a new agent, applying the function to the internal state.
-   * Does not change the value of this agent.
-   */
-  def flatMap[B](f: JFunc[T, Agent[B]]): Agent[B] = f(get)
-
-  /**
-   * Java API:
-   * Applies the function to the internal state. Does not change the value of this agent.
-   */
-  def foreach(f: JProc[T]): Unit = f(get)
-}
-
-/**
- * Agent updater actor. Used internally for `send` actions.
- *
- * INTERNAL API
- */
-private[akka] class AgentUpdater[T](agent: Agent[T], ref: Ref[T]) extends Actor {
-  def receive = {
-    case u: Update[_] ⇒ update(u.function.asInstanceOf[T ⇒ T])
-    case a: Alter[_]  ⇒ sender ! update(a.function.asInstanceOf[T ⇒ T])
-    case Get          ⇒ sender ! agent.get
-    case _            ⇒
-  }
-
-  def update(function: T ⇒ T): T = ref.single.transformAndGet(function)
-}
+}
\ No newline at end of file
diff --git a/akka-agent/src/test/scala/akka/agent/AgentSpec.scala b/akka-agent/src/test/scala/akka/agent/AgentSpec.scala
index e6fb305151..926720600c 100644
--- a/akka-agent/src/test/scala/akka/agent/AgentSpec.scala
+++ b/akka-agent/src/test/scala/akka/agent/AgentSpec.scala
@@ -18,7 +18,7 @@ class CountDownFunction[A](num: Int = 1) extends Function1[A, A] {
 class AgentSpec extends AkkaSpec {
 
   implicit val timeout = Timeout(5.seconds.dilated)
-
+  import system.dispatcher
   "Agent" must {
     "update with send dispatches in order sent" in {
       val countDown = new CountDownFunction[String]
@@ -31,36 +31,29 @@ class AgentSpec extends AkkaSpec {
 
       countDown.await(5 seconds)
       agent() must be("abcd")
-
-      agent.close()
     }
 
     "maintain order between send and sendOff" in {
       val countDown = new CountDownFunction[String]
-      val l1, l2 = new CountDownLatch(1)
-      import system.dispatcher
-
+      val l1, l2 = new TestLatch(1)
       val agent = Agent("a")
       agent send (_ + "b")
-      agent.sendOff((s: String) ⇒ { l1.countDown; l2.await(5, TimeUnit.SECONDS); s + "c" })
-      l1.await(5, TimeUnit.SECONDS)
+      agent.sendOff((s: String) ⇒ { l1.countDown; Await.ready(l2, timeout.duration); s + "c" })
+      Await.ready(l1, timeout.duration)
       agent send (_ + "d")
       agent send countDown
       l2.countDown
       countDown.await(5 seconds)
       agent() must be("abcd")
-
-      agent.close()
     }
 
     "maintain order between alter and alterOff" in {
-      import system.dispatcher
-      val l1, l2 = new CountDownLatch(1)
+      val l1, l2 = new TestLatch(1)
       val agent = Agent("a")
 
       val r1 = agent.alter(_ + "b")
-      val r2 = agent.alterOff((s: String) ⇒ { l1.countDown; l2.await(5, TimeUnit.SECONDS); s + "c" })
-      l1.await(5, TimeUnit.SECONDS)
+      val r2 = agent.alterOff(s ⇒ { l1.countDown; Await.ready(l2, timeout.duration); s + "c" })
+      Await.ready(l1, timeout.duration)
       val r3 = agent.alter(_ + "d")
       val result = Future.sequence(Seq(r1, r2, r3)).map(_.mkString(":"))
       l2.countDown
@@ -68,18 +61,16 @@ class AgentSpec extends AkkaSpec {
       Await.result(result, 5 seconds) must be === "ab:abc:abcd"
 
       agent() must be("abcd")
-
-      agent.close()
     }
 
     "be immediately readable" in {
       val countDown = new CountDownFunction[Int]
-      val readLatch = new CountDownLatch(1)
+      val readLatch = new TestLatch(1)
       val readTimeout = 5 seconds
 
       val agent = Agent(5)
       val f1 = (i: Int) ⇒ {
-        readLatch.await(readTimeout.length, readTimeout.unit)
+        Await.ready(readLatch, readTimeout)
         i + 5
       }
       agent send f1
@@ -90,15 +81,12 @@ class AgentSpec extends AkkaSpec {
       countDown.await(5 seconds)
       read must be(5)
       agent() must be(10)
-
-      agent.close()
     }
 
     "be readable within a transaction" in {
       val agent = Agent(5)
       val value = atomic { t ⇒ agent() }
       value must be(5)
-      agent.close()
     }
 
     "dispatch sends in successful transactions" in {
@@ -112,8 +100,6 @@ class AgentSpec extends AkkaSpec {
 
       countDown.await(5 seconds)
       agent() must be(10)
-
-      agent.close()
     }
 
     "not dispatch sends in aborted transactions" in {
@@ -132,8 +118,6 @@ class AgentSpec extends AkkaSpec {
 
       countDown.await(5 seconds)
       agent() must be(5)
-
-      agent.close()
     }
 
     "be able to return a 'queued' future" in {
@@ -142,8 +126,6 @@ class AgentSpec extends AkkaSpec {
       agent send (_ + "c")
 
       Await.result(agent.future, timeout.duration) must be("abc")
-
-      agent.close()
     }
 
     "be able to await the value after updates have completed" in {
@@ -151,9 +133,7 @@ class AgentSpec extends AkkaSpec {
       agent send (_ + "b")
       agent send (_ + "c")
 
-      agent.await must be("abc")
-
-      agent.close()
+      Await.result(agent.future, timeout.duration) must be("abc")
     }
 
     "be able to be mapped" in {
@@ -162,9 +142,6 @@ class AgentSpec extends AkkaSpec {
 
       agent1() must be(5)
       agent2() must be(10)
-
-      agent1.close()
-      agent2.close()
     }
 
     "be able to be used in a 'foreach' for comprehension" in {
@@ -176,8 +153,6 @@ class AgentSpec extends AkkaSpec {
       }
 
       result must be(3)
-
-      agent.close()
     }
 
     "be able to be used in a 'map' for comprehension" in {
@@ -186,9 +161,6 @@ class AgentSpec extends AkkaSpec {
 
       agent1() must be(5)
       agent2() must be(10)
-
-      agent1.close()
-      agent2.close()
     }
 
     "be able to be used in a 'flatMap' for comprehension" in {
@@ -203,10 +175,6 @@ class AgentSpec extends AkkaSpec {
       agent1() must be(1)
       agent2() must be(2)
       agent3() must be(3)
-
-      agent1.close()
-      agent2.close()
-      agent3.close()
     }
   }
 }
diff --git a/akka-docs/rst/java/agents.rst b/akka-docs/rst/java/agents.rst
index 0ba7dd90ce..d54b18e20f 100644
--- a/akka-docs/rst/java/agents.rst
+++ b/akka-docs/rst/java/agents.rst
@@ -15,77 +15,35 @@ functions that are asynchronously applied to the Agent's state and whose return
 value becomes the Agent's new state. The state of an Agent should be immutable.
 
 While updates to Agents are asynchronous, the state of an Agent is always
-immediately available for reading by any thread (using ``get``) without any
-messages.
+immediately available for reading by any thread (using ``get``) without any messages.
 
 Agents are reactive. The update actions of all Agents get interleaved amongst
-threads in a thread pool. At any point in time, at most one ``send`` action for
+threads in an ``ExecutionContext``. At any point in time, at most one ``send`` action for
 each Agent is being executed. Actions dispatched to an agent from another thread
 will occur in the order they were sent, potentially interleaved with actions
-dispatched to the same agent from other sources.
+dispatched to the same agent from other threads.
 
 If an Agent is used within an enclosing transaction, then it will participate in
-that transaction. Agents are integrated with the STM - any dispatches made in
+that transaction. Agents are integrated with Scala STM - any dispatches made in
 a transaction are held until that transaction commits, and are discarded if it
 is retried or aborted.
 
 
-Creating and stopping Agents
+Creating Agents
 ============================
 
-Agents are created by invoking ``new Agent(value, system)`` passing in the
-Agent's initial value and a reference to the ``ActorSystem`` for your
-application. An ``ActorSystem`` is required to create the underlying Actors. See
-:ref:`actor-systems` for more information about actor systems.
-
-Here is an example of creating an Agent:
+Agents are created by invoking ``new Agent<ValueType>(value, executionContext)`` – passing in the Agent's initial
+value and providing an ``ExecutionContext`` to be used for it:
 
 .. includecode:: code/docs/agent/AgentDocTest.java
-   :include: import-system,import-agent
+   :include: import-agent,create
    :language: java
 
-.. includecode:: code/docs/agent/AgentDocTest.java#create
-   :language: java
-
-An Agent will be running until you invoke ``close`` on it. Then it will be
-eligible for garbage collection (unless you hold on to it in some way).
-
-.. includecode:: code/docs/agent/AgentDocTest.java#close
-   :language: java
-
-
-Updating Agents
-===============
-
-You update an Agent by sending a function that transforms the current value or
-by sending just a new value. The Agent will apply the new value or function
-atomically and asynchronously. The update is done in a fire-forget manner and
-you are only guaranteed that it will be applied. There is no guarantee of when
-the update will be applied but dispatches to an Agent from a single thread will
-occur in order. You apply a value or a function by invoking the ``send``
-function.
-
-.. includecode:: code/docs/agent/AgentDocTest.java#import-function
-   :language: java
-
-.. includecode:: code/docs/agent/AgentDocTest.java#send
-   :language: java
-
-You can also dispatch a function to update the internal state but on its own
-thread. This does not use the reactive thread pool and can be used for
-long-running or blocking operations. You do this with the ``sendOff``
-method. Dispatches using either ``sendOff`` or ``send`` will still be executed
-in order.
-
-.. includecode:: code/docs/agent/AgentDocTest.java#send-off
-   :language: java
-
-
 Reading an Agent's value
 ========================
 
-Agents can be dereferenced (you can get an Agent's value) by calling the get
-method:
+Agents can be dereferenced (you can get an Agent's value) by invoking the Agent
+with ``get()`` like this:
 
 .. includecode:: code/docs/agent/AgentDocTest.java#read-get
    :language: java
@@ -94,15 +52,58 @@ Reading an Agent's current value does not involve any message passing and
 happens immediately. So while updates to an Agent are asynchronous, reading the
 state of an Agent is synchronous.
 
+You can also get a ``Future`` to the Agents value, that will be completed after the
+currently queued updates have completed:
 
-Awaiting an Agent's value
-=========================
-
-It is also possible to read the value after all currently queued sends have
-completed. You can do this with ``await``:
-
-.. includecode:: code/docs/agent/AgentDocTest.java#import-timeout
+.. includecode:: code/docs/agent/AgentDocTest.java
+   :include: import-future,read-future
    :language: java
 
-.. includecode:: code/docs/agent/AgentDocTest.java#read-await
+See :ref:`futures-java` for more information on ``Futures``.
+
+Updating Agents (send & alter)
+==============================
+
+You update an Agent by sending a function (``akka.dispatch.Mapper``) that transforms the current value or
+by sending just a new value. The Agent will apply the new value or function
+atomically and asynchronously. The update is done in a fire-forget manner and
+you are only guaranteed that it will be applied. There is no guarantee of when
+the update will be applied but dispatches to an Agent from a single thread will
+occur in order. You apply a value or a function by invoking the ``send``
+function.
+
+.. includecode:: code/docs/agent/AgentDocTest.java
+   :include: import-function,send
    :language: java
+
+You can also dispatch a function to update the internal state but on its own
+thread. This does not use the reactive thread pool and can be used for
+long-running or blocking operations. You do this with the ``sendOff``
+method. Dispatches using either ``sendOff`` or ``send`` will still be executed
+in order.
+
+.. includecode:: code/docs/agent/AgentDocTest.java
+   :include: import-function,send-off
+   :language: java
+
+All ``send`` methods also have a corresponding ``alter`` method that returns a ``Future``.
+See :ref:`futures-java` for more information on ``Futures``.
+
+.. includecode:: code/docs/agent/AgentDocTest.java
+   :include: import-future,import-function,alter
+   :language: java
+
+.. includecode:: code/docs/agent/AgentDocTest.java
+   :include: import-future,import-function,alter-off
+   :language: java
+
+Transactional Agents
+====================
+
+If an Agent is used within an enclosing transaction, then it will participate in
+that transaction. If you send to an Agent within a transaction then the dispatch
+to the Agent will be held until that transaction commits, and discarded if the
+transaction is aborted. Here's an example:
+
+.. includecode:: code/docs/agent/AgentDocTest.java#transfer-example
+   :language: java
\ No newline at end of file
diff --git a/akka-docs/rst/java/code/docs/agent/AgentDocTest.java b/akka-docs/rst/java/code/docs/agent/AgentDocTest.java
index 6d7345b52a..afe671ca6d 100644
--- a/akka-docs/rst/java/code/docs/agent/AgentDocTest.java
+++ b/akka-docs/rst/java/code/docs/agent/AgentDocTest.java
@@ -5,107 +5,112 @@ package docs.agent;
 
 import static org.junit.Assert.*;
 
-import scala.concurrent.ExecutionContext;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import akka.testkit.AkkaSpec;
 
-//#import-system
-import akka.actor.ActorSystem;
-//#import-system
+import scala.concurrent.Await;
+import scala.concurrent.duration.Duration;
 
 //#import-agent
-import akka.agent.Agent;
+    import scala.concurrent.ExecutionContext;
+    import akka.agent.Agent;
+    import akka.dispatch.ExecutionContexts;
 //#import-agent
 
 //#import-function
-import akka.japi.Function;
+    import akka.dispatch.Mapper;
 //#import-function
 
-//#import-timeout
-import akka.util.Timeout;
-import static java.util.concurrent.TimeUnit.SECONDS;
-//#import-timeout
+//#import-future
+    import scala.concurrent.Future;
+//#import-future
 
 public class AgentDocTest {
 
-  private static ActorSystem testSystem;
-  private static ExecutionContext ec;
-
-  @BeforeClass
-  public static void beforeAll() {
-    testSystem = ActorSystem.create("AgentDocTest", AkkaSpec.testConf());
-    ec = testSystem.dispatcher();
-  }
-
-  @AfterClass
-  public static void afterAll() {
-    testSystem.shutdown();
-    testSystem = null;
-  }
+  private static ExecutionContext ec = ExecutionContexts.global();
 
   @Test
-  public void createAndClose() {
-        //#create
-    ActorSystem system = ActorSystem.create("app");
-
-    Agent<Integer> agent = new Agent<Integer>(5, system);
+  public void createAndRead() throws Exception {
+    //#create
+    ExecutionContext ec = ExecutionContexts.global();
+    Agent<Integer> agent = new Agent<Integer>(5, ec);
     //#create
 
-    //#close
-    agent.close();
-    //#close
+    //#read-get
+    Integer result = agent.get();
+    //#read-get
 
-    system.shutdown();
+    //#read-future
+    Future<Integer> future = agent.future();
+    //#read-future
+
+    assertEquals(result, new Integer(5));
+    assertEquals(Await.result(future, Duration.create(5,"s")), new Integer(5));
   }
 
   @Test
-  public void sendAndSendOffAndReadAwait() {
-    Agent<Integer> agent = new Agent<Integer>(5, testSystem);
+  public void sendAndSendOffAndReadAwait() throws Exception {
+    Agent<Integer> agent = new Agent<Integer>(5, ec);
 
     //#send
     // send a value
     agent.send(7);
 
     // send a function
-    agent.send(new Function<Integer, Integer>() {
+    agent.send(new Mapper<Integer, Integer>() {
       public Integer apply(Integer i) {
         return i * 2;
       }
     });
     //#send
 
-    Function<Integer, Integer> longRunningOrBlockingFunction = new Function<Integer, Integer>() {
+      Mapper<Integer, Integer> longRunningOrBlockingFunction = new Mapper<Integer, Integer>() {
       public Integer apply(Integer i) {
         return i * 1;
       }
     };
 
+    ExecutionContext theExecutionContextToExecuteItIn = ec;
     //#send-off
     // sendOff a function
-    agent.sendOff(longRunningOrBlockingFunction, ec);
+    agent.sendOff(longRunningOrBlockingFunction,
+                  theExecutionContextToExecuteItIn);
     //#send-off
 
-    //#read-await
-    Integer result = agent.await(new Timeout(5, SECONDS));
-    //#read-await
-
-    assertEquals(result, new Integer(14));
-
-    agent.close();
+    assertEquals(Await.result(agent.future(), Duration.create(5,"s")), new Integer(14));
   }
 
-  @Test
-  public void readWithGet() {
-    Agent<Integer> agent = new Agent<Integer>(5, testSystem);
+    @Test
+    public void alterAndAlterOff() throws Exception {
+    Agent<Integer> agent = new Agent<Integer>(5, ec);
 
-    //#read-get
-    Integer result = agent.get();
-    //#read-get
+    //#alter
+    // alter a value
+    Future<Integer> f1 = agent.alter(7);
 
-    assertEquals(result, new Integer(5));
+    // alter a function (Mapper)
+    Future<Integer> f2 = agent.alter(new Mapper<Integer, Integer>() {
+        public Integer apply(Integer i) {
+            return i * 2;
+        }
+    });
+    //#alter
 
-    agent.close();
-  }
+    Mapper<Integer, Integer> longRunningOrBlockingFunction = new Mapper<Integer, Integer>() {
+        public Integer apply(Integer i) {
+            return i * 1;
+        }
+    };
+
+    ExecutionContext theExecutionContextToExecuteItIn = ec;
+    //#alter-off
+    // alterOff a function (Mapper)
+    Future<Integer> f3 = agent.alterOff(longRunningOrBlockingFunction,
+                                        theExecutionContextToExecuteItIn);
+    //#alter-off
+
+    assertEquals(Await.result(f3, Duration.create(5,"s")), new Integer(14));
+    }
 }
diff --git a/akka-docs/rst/scala/agents.rst b/akka-docs/rst/scala/agents.rst
index 5657986a88..e14b6e129c 100644
--- a/akka-docs/rst/scala/agents.rst
+++ b/akka-docs/rst/scala/agents.rst
@@ -19,10 +19,10 @@ immediately available for reading by any thread (using ``get`` or ``apply``)
 without any messages.
 
 Agents are reactive. The update actions of all Agents get interleaved amongst
-threads in a thread pool. At any point in time, at most one ``send`` action for
+threads in an ``ExecutionContext``. At any point in time, at most one ``send`` action for
 each Agent is being executed. Actions dispatched to an agent from another thread
 will occur in the order they were sent, potentially interleaved with actions
-dispatched to the same agent from other sources.
+dispatched to the same agent from other threads.
 
 If an Agent is used within an enclosing transaction, then it will participate in
 that transaction. Agents are integrated with Scala STM - any dispatches made in
@@ -30,32 +30,33 @@ a transaction are held until that transaction commits, and are discarded if it
 is retried or aborted.
 
 
-Creating and stopping Agents
+Creating Agents
 ============================
 
 Agents are created by invoking ``Agent(value)`` passing in the Agent's initial
-value:
+value and providing an implicit ``ExecutionContext`` to be used for it, for these
+examples we're going to use the default global one, but YMMV:
 
 .. includecode:: code/docs/agent/AgentDocSpec.scala#create
 
-Note that creating an Agent requires an implicit ``ActorSystem`` (for creating
-the underlying actors). See :ref:`actor-systems` for more information about
-actor systems. An ActorSystem can be in implicit scope when creating an Agent:
+Reading an Agent's value
+========================
 
-.. includecode:: code/docs/agent/AgentDocSpec.scala#create-implicit-system
+Agents can be dereferenced (you can get an Agent's value) by invoking the Agent
+with parentheses like this:
 
-Or the ActorSystem can be passed explicitly when creating an Agent:
+.. includecode:: code/docs/agent/AgentDocSpec.scala#read-apply
 
-.. includecode:: code/docs/agent/AgentDocSpec.scala#create-explicit-system
+Or by using the get method:
 
-An Agent will be running until you invoke ``close`` on it. Then it will be
-eligible for garbage collection (unless you hold on to it in some way).
+.. includecode:: code/docs/agent/AgentDocSpec.scala#read-get
 
-.. includecode:: code/docs/agent/AgentDocSpec.scala#close
+Reading an Agent's current value does not involve any message passing and
+happens immediately. So while updates to an Agent are asynchronous, reading the
+state of an Agent is synchronous.
 
-
-Updating Agents
-===============
+Updating Agents (send & alter)
+======================
 
 You update an Agent by sending a function that transforms the current value or
 by sending just a new value. The Agent will apply the new value or function
@@ -75,37 +76,22 @@ in order.
 
 .. includecode:: code/docs/agent/AgentDocSpec.scala#send-off
 
+All ``send`` methods also have a corresponding ``alter`` method that returns a ``Future``.
+See :ref:`futures-scala` for more information on ``Futures``.
 
-Reading an Agent's value
-========================
-
-Agents can be dereferenced (you can get an Agent's value) by invoking the Agent
-with parentheses like this:
-
-.. includecode:: code/docs/agent/AgentDocSpec.scala#read-apply
-
-Or by using the get method:
-
-.. includecode:: code/docs/agent/AgentDocSpec.scala#read-get
-
-Reading an Agent's current value does not involve any message passing and
-happens immediately. So while updates to an Agent are asynchronous, reading the
-state of an Agent is synchronous.
+.. includecode:: code/docs/agent/AgentDocSpec.scala#alter
 
+.. includecode:: code/docs/agent/AgentDocSpec.scala#alter-off
 
 Awaiting an Agent's value
 =========================
 
-It is also possible to read the value after all currently queued sends have
-completed. You can do this with ``await``:
-
-.. includecode:: code/docs/agent/AgentDocSpec.scala#read-await
-
-You can also get a ``Future`` to this value, that will be completed after the
+You can also get a ``Future`` to the Agents value, that will be completed after the
 currently queued updates have completed:
 
 .. includecode:: code/docs/agent/AgentDocSpec.scala#read-future
 
+See :ref:`futures-scala` for more information on ``Futures``.
 
 Transactional Agents
 ====================
diff --git a/akka-docs/rst/scala/code/docs/agent/AgentDocSpec.scala b/akka-docs/rst/scala/code/docs/agent/AgentDocSpec.scala
index 121d2d695f..9d4fd5c07b 100644
--- a/akka-docs/rst/scala/code/docs/agent/AgentDocSpec.scala
+++ b/akka-docs/rst/scala/code/docs/agent/AgentDocSpec.scala
@@ -7,54 +7,46 @@ 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
     agent send 7
@@ -64,70 +56,47 @@ class AgentDocSpec extends AkkaSpec {
     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 +114,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 +147,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()
   }
 }

From 9522add9b7dfbd5804867d4e3183288e6cb1ca99 Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Wed, 23 Jan 2013 02:06:49 +0100
Subject: [PATCH 069/122]  Migrating Agents to greener pastures

---
 .../akka/actor/dispatch/ActorModelSpec.scala  |   2 +-
 .../akka/dispatch/ExecutionContextSpec.scala  |  40 ++++
 ...erializedSuspendableExecutionContext.scala |  81 +++++++
 .../src/main/scala/akka/agent/Agent.scala     | 213 +++++-------------
 .../src/test/scala/akka/agent/AgentSpec.scala |  52 +----
 akka-docs/rst/java/agents.rst                 | 121 +++++-----
 .../java/code/docs/agent/AgentDocTest.java    | 113 +++++-----
 akka-docs/rst/scala/agents.rst                |  60 ++---
 .../scala/code/docs/agent/AgentDocSpec.scala  | 158 +++++--------
 9 files changed, 396 insertions(+), 444 deletions(-)
 create mode 100644 akka-actor/src/main/scala/akka/util/SerializedSuspendableExecutionContext.scala

diff --git a/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala
index 09eb75f8cb..443d6f5981 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala
@@ -425,7 +425,7 @@ abstract class ActorModelSpec(config: String) extends AkkaSpec(config) with Defa
           Thread.getAllStackTraces().asScala foreach {
             case (thread, stack) ⇒
               println(s"$thread:")
-              stack foreach (s => println(s"\t$s"))
+              stack foreach (s ⇒ println(s"\t$s"))
           }
         }
         assert(Await.result(f1, remaining) === "foo")
diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/ExecutionContextSpec.scala b/akka-actor-tests/src/test/scala/akka/dispatch/ExecutionContextSpec.scala
index 742805883b..be5176aee9 100644
--- a/akka-actor-tests/src/test/scala/akka/dispatch/ExecutionContextSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/dispatch/ExecutionContextSpec.scala
@@ -4,6 +4,7 @@ import java.util.concurrent.{ ExecutorService, Executor, Executors }
 import java.util.concurrent.atomic.AtomicInteger
 import scala.concurrent._
 import akka.testkit.{ TestLatch, AkkaSpec, DefaultTimeout }
+import akka.util.SerializedSuspendableExecutionContext
 
 @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner])
 class ExecutionContextSpec extends AkkaSpec with DefaultTimeout {
@@ -81,4 +82,43 @@ class ExecutionContextSpec extends AkkaSpec with DefaultTimeout {
       Await.ready(latch, timeout.duration)
     }
   }
+
+  "A SerializedSuspendableExecutionContext" must {
+    "be suspendable and resumable" in {
+      val sec = SerializedSuspendableExecutionContext(1)(ExecutionContext.global)
+      val counter = new AtomicInteger(0)
+      def perform(f: Int ⇒ Int) = sec execute new Runnable { def run = counter.set(f(counter.get)) }
+      perform(_ + 1)
+      perform(x ⇒ { sec.suspend(); x * 2 })
+      awaitCond(counter.get == 2)
+      perform(_ + 4)
+      perform(_ * 2)
+      sec.resume()
+      awaitCond(counter.get == 12)
+      perform(_ * 2)
+      awaitCond(counter.get == 24)
+      sec.isEmpty must be === true
+    }
+
+    "execute 'throughput' nmber of tasks per sweep" in {
+      val submissions = new AtomicInteger(0)
+      val counter = new AtomicInteger(0)
+      val underlying = new ExecutionContext {
+        override def execute(r: Runnable) { submissions.incrementAndGet(); ExecutionContext.global.execute(r) }
+        override def reportFailure(t: Throwable) { ExecutionContext.global.reportFailure(t) }
+      }
+      val throughput = 25
+      val sec = SerializedSuspendableExecutionContext(throughput)(underlying)
+      sec.suspend()
+      def perform(f: Int ⇒ Int) = sec execute new Runnable { def run = counter.set(f(counter.get)) }
+
+      val total = 1000
+      1 to total foreach { _ ⇒ perform(_ + 1) }
+      sec.size() must be === total
+      sec.resume()
+      awaitCond(counter.get == total)
+      submissions.get must be === (total / throughput)
+      sec.isEmpty must be === true
+    }
+  }
 }
diff --git a/akka-actor/src/main/scala/akka/util/SerializedSuspendableExecutionContext.scala b/akka-actor/src/main/scala/akka/util/SerializedSuspendableExecutionContext.scala
new file mode 100644
index 0000000000..1e6cbb60e7
--- /dev/null
+++ b/akka-actor/src/main/scala/akka/util/SerializedSuspendableExecutionContext.scala
@@ -0,0 +1,81 @@
+package akka.util
+
+import java.util.concurrent.ConcurrentLinkedQueue
+import java.util.concurrent.atomic.AtomicInteger
+import scala.concurrent.ExecutionContext
+import scala.util.control.NonFatal
+import scala.annotation.{ tailrec, switch }
+
+private[akka] object SerializedSuspendableExecutionContext {
+  final val Off = 0
+  final val On = 1
+  final val Suspended = 2
+
+  def apply(batchSize: Int)(implicit context: ExecutionContext): SerializedSuspendableExecutionContext =
+    new SerializedSuspendableExecutionContext(batchSize)(context match {
+      case s: SerializedSuspendableExecutionContext ⇒ s.context
+      case other                                    ⇒ other
+    })
+}
+
+/**
+ * This `ExecutionContext` allows to wrap an underlying `ExecutionContext` and provide guaranteed serial execution
+ * of tasks submitted to it. On top of that it also allows for *suspending* and *resuming* processing of tasks.
+ *
+ * WARNING: This type must never leak into User code as anything but `ExecutionContext`
+ *
+ * @param throughput maximum number of tasks to be executed in serial before relinquishing the executing thread.
+ * @param context the underlying context which will be used to actually execute the submitted tasks
+ */
+private[akka] final class SerializedSuspendableExecutionContext(throughput: Int)(val context: ExecutionContext)
+  extends ConcurrentLinkedQueue[Runnable] with Runnable with ExecutionContext {
+  import SerializedSuspendableExecutionContext._
+  require(throughput > 0, s"SerializedSuspendableExecutionContext.throughput must be greater than 0 but was $throughput")
+
+  private final val state = new AtomicInteger(0)
+  @tailrec private final def addState(newState: Int): Boolean = {
+    val c = state.get;
+    state.compareAndSet(c, c | newState) || addState(newState)
+  }
+  @tailrec private final def remState(oldState: Int) {
+    val c = state.get
+    if (state.compareAndSet(c, c & ~oldState)) attach() else remState(oldState)
+  }
+
+  /**
+   * Resumes execution of tasks until `suspend` is called,
+   * if it isn't currently suspended, it is a no-op.
+   * This operation is idempotent.
+   */
+  final def resume(): Unit = remState(Suspended)
+
+  /**
+   * Suspends execution of tasks until `resume` is called,
+   * this operation is idempotent.
+   */
+  final def suspend(): Unit = addState(Suspended)
+
+  final def run(): Unit = {
+    @tailrec def run(done: Int): Unit =
+      if (done < throughput && state.get == On) {
+        poll() match {
+          case null ⇒ ()
+          case some ⇒
+            try some.run() catch { case NonFatal(t) ⇒ context reportFailure t }
+            run(done + 1)
+        }
+      }
+    try run(0) finally remState(On)
+  }
+
+  final def attach(): Unit = if (!isEmpty && state.compareAndSet(Off, On)) context execute this
+  override final def execute(task: Runnable): Unit = try add(task) finally attach()
+  override final def reportFailure(t: Throwable): Unit = context reportFailure t
+
+  override final def toString: String = (state.get: @switch) match {
+    case 0 ⇒ "Off"
+    case 1 ⇒ "On"
+    case 2 ⇒ "Off & Suspended"
+    case 3 ⇒ "On & Suspended"
+  }
+}
\ No newline at end of file
diff --git a/akka-agent/src/main/scala/akka/agent/Agent.scala b/akka-agent/src/main/scala/akka/agent/Agent.scala
index a19d01c338..bc6f12c3a1 100644
--- a/akka-agent/src/main/scala/akka/agent/Agent.scala
+++ b/akka-agent/src/main/scala/akka/agent/Agent.scala
@@ -7,23 +7,17 @@ package akka.agent
 import akka.actor._
 import akka.japi.{ Function ⇒ JFunc, Procedure ⇒ JProc }
 import akka.pattern.ask
-import akka.util.Timeout
 import scala.concurrent.stm._
 import scala.concurrent.{ ExecutionContext, Future, Promise, Await }
 import scala.concurrent.duration.{ FiniteDuration, Duration }
-
-/**
- * Used internally to send functions.
- */
-private[akka] case class Update[T](function: T ⇒ T)
-private[akka] case class Alter[T](function: T ⇒ T)
-private[akka] case object Get
+import akka.util.{ SerializedSuspendableExecutionContext, Timeout }
+import util.Try
 
 /**
  * Factory method for creating an Agent.
  */
 object Agent {
-  def apply[T](initialValue: T)(implicit system: ActorSystem) = new Agent(initialValue, system, system)
+  def apply[T](initialValue: T)(implicit context: ExecutionContext) = new Agent(initialValue, context)
 }
 
 /**
@@ -96,14 +90,13 @@ object Agent {
  * agent4.close
  * }}}
  */
-class Agent[T](initialValue: T, refFactory: ActorRefFactory, system: ActorSystem) {
+class Agent[T](initialValue: T, context: ExecutionContext) {
   private val ref = Ref(initialValue)
-  private val updater = refFactory.actorOf(Props(new AgentUpdater(this, ref))).asInstanceOf[InternalActorRef] //TODO can we avoid this somehow?
-
-  def this(initialValue: T, system: ActorSystem) = this(initialValue, system, system)
+  private val updater = SerializedSuspendableExecutionContext(10)(context)
 
   /**
    * Read the internal state of the agent.
+   * Java API
    */
   def get(): T = ref.single.get
 
@@ -113,22 +106,44 @@ class Agent[T](initialValue: T, refFactory: ActorRefFactory, system: ActorSystem
   def apply(): T = get
 
   /**
-   * Dispatch a function to update the internal state.
+   * Dispatch a new value for the internal state. Behaves the same
+   * as sending a function (x => newValue).
    */
-  def send(f: T ⇒ T): Unit = {
-    def dispatch = updater ! Update(f)
-    Txn.findCurrent match {
-      case Some(txn) ⇒ Txn.afterCommit(status ⇒ dispatch)(txn)
-      case _         ⇒ dispatch
-    }
-  }
+  def send(newValue: T): Unit = withinTransaction(new Runnable { def run = ref.single.update(newValue) })
+
+  /**
+   * Dispatch a function to update the internal state.
+   * In Java, pass in an instance of `akka.dispatch.Mapper`.
+   */
+  def send(f: T ⇒ T): Unit = withinTransaction(new Runnable { def run = ref.single.transform(f) })
+
+  /**
+   * Dispatch a function to update the internal state but on its own thread.
+   * This does not use the reactive thread pool and can be used for long-running
+   * or blocking operations. Dispatches using either `sendOff` or `send` will
+   * still be executed in order.
+   * In Java, pass in an instance of `akka.dispatch.Mapper`.
+   */
+  def sendOff(f: T ⇒ T)(implicit ec: ExecutionContext): Unit = withinTransaction(
+    new Runnable {
+      def run =
+        try updater.suspend() finally ec.execute(new Runnable { def run = try ref.single.transform(f) finally updater.resume() })
+    })
+
+  /**
+   * Dispatch an update to the internal state, and return a Future where
+   * that new state can be obtained.
+   * In Java, pass in an instance of `akka.dispatch.Mapper`.
+   */
+  def alter(newValue: T): Future[T] = alter(_ ⇒ newValue)
 
   /**
    * Dispatch a function to update the internal state, and return a Future where
-   * that new state can be obtained within the given timeout.
+   * that new state can be obtained.
+   * In Java, pass in an instance of `akka.dispatch.Mapper`.
    */
-  def alter(f: T ⇒ T)(implicit timeout: Timeout): Future[T] = {
-    def dispatch = ask(updater, Alter(f)).asInstanceOf[Future[T]]
+  def alter(f: T ⇒ T): Future[T] = {
+    def dispatch = Future(ref.single.transformAndGet(f))(updater)
     Txn.findCurrent match {
       case Some(txn) ⇒
         val result = Promise[T]()
@@ -138,162 +153,56 @@ class Agent[T](initialValue: T, refFactory: ActorRefFactory, system: ActorSystem
     }
   }
 
-  /**
-   * Dispatch a new value for the internal state. Behaves the same
-   * as sending a function (x => newValue).
-   */
-  def send(newValue: T): Unit = send(_ ⇒ newValue)
-
-  /**
-   * Dispatch a new value for the internal state. Behaves the same
-   * as sending a function (x => newValue).
-   */
-  def update(newValue: T): Unit = send(newValue)
-
-  /**
-   * Dispatch a function to update the internal state but on its own thread.
-   * This does not use the reactive thread pool and can be used for long-running
-   * or blocking operations. Dispatches using either `sendOff` or `send` will
-   * still be executed in order.
-   */
-  def sendOff(f: T ⇒ T)(implicit ec: ExecutionContext): Unit = {
-    send((value: T) ⇒ {
-      suspend()
-      Future(ref.single.transformAndGet(f)).andThen({ case _ ⇒ resume() })
-      value
-    })
-  }
-
   /**
    * Dispatch a function to update the internal state but on its own thread,
-   * and return a Future where that new state can be obtained within the given timeout.
+   * and return a Future where that new state can be obtained.
    * This does not use the reactive thread pool and can be used for long-running
    * or blocking operations. Dispatches using either `alterOff` or `alter` will
    * still be executed in order.
+   * In Java, pass in an instance of `akka.dispatch.Mapper`.
    */
-  def alterOff(f: T ⇒ T)(implicit timeout: Timeout, ec: ExecutionContext): Future[T] = {
+  def alterOff(f: T ⇒ T)(implicit ec: ExecutionContext): Future[T] = {
     val result = Promise[T]()
-    send((value: T) ⇒ {
-      suspend()
-      result completeWith Future(ref.single.transformAndGet(f)).andThen({ case _ ⇒ resume() })
-      value
+    withinTransaction(new Runnable {
+      def run = {
+        updater.suspend()
+        result completeWith Future(try ref.single.transformAndGet(f) finally updater.resume())
+      }
     })
     result.future
   }
 
+  private final def withinTransaction(run: Runnable): Unit = {
+    def dispatch = updater.execute(run)
+    Txn.findCurrent match {
+      case Some(txn) ⇒ Txn.afterCommit(status ⇒ dispatch)(txn)
+      case _         ⇒ dispatch
+    }
+  }
+
   /**
    * A future to the current value that will be completed after any currently
    * queued updates.
    */
-  def future(implicit timeout: Timeout): Future[T] = (updater ? Get).asInstanceOf[Future[T]] //Known to be safe
-
-  /**
-   * Gets this agent's value after all currently queued updates have completed.
-   */
-  def await(implicit timeout: Timeout): T = Await.result(future, timeout.duration)
+  def future(): Future[T] = Future(ref.single.get)(updater)
 
   /**
    * Map this agent to a new agent, applying the function to the internal state.
    * Does not change the value of this agent.
+   * In Java, pass in an instance of `akka.dispatch.Mapper`.
    */
-  def map[B](f: T ⇒ B): Agent[B] = Agent(f(get))(system)
+  def map[B](f: T ⇒ B): Agent[B] = Agent(f(get))(updater)
 
   /**
    * Flatmap this agent to a new agent, applying the function to the internal state.
    * Does not change the value of this agent.
+   * In Java, pass in an instance of `akka.dispatch.Mapper`.
    */
   def flatMap[B](f: T ⇒ Agent[B]): Agent[B] = f(get)
 
   /**
    * Applies the function to the internal state. Does not change the value of this agent.
+   * In Java, pass in an instance of `akka.dispatch.Foreach`.
    */
   def foreach[U](f: T ⇒ U): Unit = f(get)
-
-  /**
-   * Suspends processing of `send` actions for the agent.
-   */
-  def suspend(): Unit = updater.suspend()
-
-  /**
-   * Resumes processing of `send` actions for the agent.
-   */
-  def resume(): Unit = updater.resume(causedByFailure = null)
-
-  /**
-   * Closes the agents and makes it eligible for garbage collection.
-   * A closed agent cannot accept any `send` actions.
-   */
-  def close(): Unit = updater.stop()
-
-  // ---------------------------------------------
-  // Support for Java API Functions and Procedures
-  // ---------------------------------------------
-
-  /**
-   * Java API:
-   * Dispatch a function to update the internal state.
-   */
-  def send(f: JFunc[T, T]): Unit = send(x ⇒ f(x))
-
-  /**
-   * Java API
-   * Dispatch a function to update the internal state, and return a Future where that new state can be obtained
-   * within the given timeout
-   */
-  def alter(f: JFunc[T, T], timeout: FiniteDuration): Future[T] = alter(x ⇒ f(x))(timeout)
-
-  /**
-   * Java API:
-   * Dispatch a function to update the internal state but on its own thread.
-   * This does not use the reactive thread pool and can be used for long-running
-   * or blocking operations. Dispatches using either `sendOff` or `send` will
-   * still be executed in order.
-   */
-  def sendOff(f: JFunc[T, T], ec: ExecutionContext): Unit = sendOff(x ⇒ f(x))(ec)
-
-  /**
-   * Java API:
-   * Dispatch a function to update the internal state but on its own thread,
-   * and return a Future where that new state can be obtained within the given timeout.
-   * This does not use the reactive thread pool and can be used for long-running
-   * or blocking operations. Dispatches using either `alterOff` or `alter` will
-   * still be executed in order.
-   */
-  def alterOff(f: JFunc[T, T], timeout: FiniteDuration, ec: ExecutionContext): Unit = alterOff(x ⇒ f(x))(Timeout(timeout), ec)
-
-  /**
-   * Java API:
-   * Map this agent to a new agent, applying the function to the internal state.
-   * Does not change the value of this agent.
-   */
-  def map[B](f: JFunc[T, B]): Agent[B] = Agent(f(get))(system)
-
-  /**
-   * Java API:
-   * Flatmap this agent to a new agent, applying the function to the internal state.
-   * Does not change the value of this agent.
-   */
-  def flatMap[B](f: JFunc[T, Agent[B]]): Agent[B] = f(get)
-
-  /**
-   * Java API:
-   * Applies the function to the internal state. Does not change the value of this agent.
-   */
-  def foreach(f: JProc[T]): Unit = f(get)
-}
-
-/**
- * Agent updater actor. Used internally for `send` actions.
- *
- * INTERNAL API
- */
-private[akka] class AgentUpdater[T](agent: Agent[T], ref: Ref[T]) extends Actor {
-  def receive = {
-    case u: Update[_] ⇒ update(u.function.asInstanceOf[T ⇒ T])
-    case a: Alter[_]  ⇒ sender ! update(a.function.asInstanceOf[T ⇒ T])
-    case Get          ⇒ sender ! agent.get
-    case _            ⇒
-  }
-
-  def update(function: T ⇒ T): T = ref.single.transformAndGet(function)
-}
+}
\ No newline at end of file
diff --git a/akka-agent/src/test/scala/akka/agent/AgentSpec.scala b/akka-agent/src/test/scala/akka/agent/AgentSpec.scala
index e6fb305151..926720600c 100644
--- a/akka-agent/src/test/scala/akka/agent/AgentSpec.scala
+++ b/akka-agent/src/test/scala/akka/agent/AgentSpec.scala
@@ -18,7 +18,7 @@ class CountDownFunction[A](num: Int = 1) extends Function1[A, A] {
 class AgentSpec extends AkkaSpec {
 
   implicit val timeout = Timeout(5.seconds.dilated)
-
+  import system.dispatcher
   "Agent" must {
     "update with send dispatches in order sent" in {
       val countDown = new CountDownFunction[String]
@@ -31,36 +31,29 @@ class AgentSpec extends AkkaSpec {
 
       countDown.await(5 seconds)
       agent() must be("abcd")
-
-      agent.close()
     }
 
     "maintain order between send and sendOff" in {
       val countDown = new CountDownFunction[String]
-      val l1, l2 = new CountDownLatch(1)
-      import system.dispatcher
-
+      val l1, l2 = new TestLatch(1)
       val agent = Agent("a")
       agent send (_ + "b")
-      agent.sendOff((s: String) ⇒ { l1.countDown; l2.await(5, TimeUnit.SECONDS); s + "c" })
-      l1.await(5, TimeUnit.SECONDS)
+      agent.sendOff((s: String) ⇒ { l1.countDown; Await.ready(l2, timeout.duration); s + "c" })
+      Await.ready(l1, timeout.duration)
       agent send (_ + "d")
       agent send countDown
       l2.countDown
       countDown.await(5 seconds)
       agent() must be("abcd")
-
-      agent.close()
     }
 
     "maintain order between alter and alterOff" in {
-      import system.dispatcher
-      val l1, l2 = new CountDownLatch(1)
+      val l1, l2 = new TestLatch(1)
       val agent = Agent("a")
 
       val r1 = agent.alter(_ + "b")
-      val r2 = agent.alterOff((s: String) ⇒ { l1.countDown; l2.await(5, TimeUnit.SECONDS); s + "c" })
-      l1.await(5, TimeUnit.SECONDS)
+      val r2 = agent.alterOff(s ⇒ { l1.countDown; Await.ready(l2, timeout.duration); s + "c" })
+      Await.ready(l1, timeout.duration)
       val r3 = agent.alter(_ + "d")
       val result = Future.sequence(Seq(r1, r2, r3)).map(_.mkString(":"))
       l2.countDown
@@ -68,18 +61,16 @@ class AgentSpec extends AkkaSpec {
       Await.result(result, 5 seconds) must be === "ab:abc:abcd"
 
       agent() must be("abcd")
-
-      agent.close()
     }
 
     "be immediately readable" in {
       val countDown = new CountDownFunction[Int]
-      val readLatch = new CountDownLatch(1)
+      val readLatch = new TestLatch(1)
       val readTimeout = 5 seconds
 
       val agent = Agent(5)
       val f1 = (i: Int) ⇒ {
-        readLatch.await(readTimeout.length, readTimeout.unit)
+        Await.ready(readLatch, readTimeout)
         i + 5
       }
       agent send f1
@@ -90,15 +81,12 @@ class AgentSpec extends AkkaSpec {
       countDown.await(5 seconds)
       read must be(5)
       agent() must be(10)
-
-      agent.close()
     }
 
     "be readable within a transaction" in {
       val agent = Agent(5)
       val value = atomic { t ⇒ agent() }
       value must be(5)
-      agent.close()
     }
 
     "dispatch sends in successful transactions" in {
@@ -112,8 +100,6 @@ class AgentSpec extends AkkaSpec {
 
       countDown.await(5 seconds)
       agent() must be(10)
-
-      agent.close()
     }
 
     "not dispatch sends in aborted transactions" in {
@@ -132,8 +118,6 @@ class AgentSpec extends AkkaSpec {
 
       countDown.await(5 seconds)
       agent() must be(5)
-
-      agent.close()
     }
 
     "be able to return a 'queued' future" in {
@@ -142,8 +126,6 @@ class AgentSpec extends AkkaSpec {
       agent send (_ + "c")
 
       Await.result(agent.future, timeout.duration) must be("abc")
-
-      agent.close()
     }
 
     "be able to await the value after updates have completed" in {
@@ -151,9 +133,7 @@ class AgentSpec extends AkkaSpec {
       agent send (_ + "b")
       agent send (_ + "c")
 
-      agent.await must be("abc")
-
-      agent.close()
+      Await.result(agent.future, timeout.duration) must be("abc")
     }
 
     "be able to be mapped" in {
@@ -162,9 +142,6 @@ class AgentSpec extends AkkaSpec {
 
       agent1() must be(5)
       agent2() must be(10)
-
-      agent1.close()
-      agent2.close()
     }
 
     "be able to be used in a 'foreach' for comprehension" in {
@@ -176,8 +153,6 @@ class AgentSpec extends AkkaSpec {
       }
 
       result must be(3)
-
-      agent.close()
     }
 
     "be able to be used in a 'map' for comprehension" in {
@@ -186,9 +161,6 @@ class AgentSpec extends AkkaSpec {
 
       agent1() must be(5)
       agent2() must be(10)
-
-      agent1.close()
-      agent2.close()
     }
 
     "be able to be used in a 'flatMap' for comprehension" in {
@@ -203,10 +175,6 @@ class AgentSpec extends AkkaSpec {
       agent1() must be(1)
       agent2() must be(2)
       agent3() must be(3)
-
-      agent1.close()
-      agent2.close()
-      agent3.close()
     }
   }
 }
diff --git a/akka-docs/rst/java/agents.rst b/akka-docs/rst/java/agents.rst
index 0ba7dd90ce..d54b18e20f 100644
--- a/akka-docs/rst/java/agents.rst
+++ b/akka-docs/rst/java/agents.rst
@@ -15,77 +15,35 @@ functions that are asynchronously applied to the Agent's state and whose return
 value becomes the Agent's new state. The state of an Agent should be immutable.
 
 While updates to Agents are asynchronous, the state of an Agent is always
-immediately available for reading by any thread (using ``get``) without any
-messages.
+immediately available for reading by any thread (using ``get``) without any messages.
 
 Agents are reactive. The update actions of all Agents get interleaved amongst
-threads in a thread pool. At any point in time, at most one ``send`` action for
+threads in an ``ExecutionContext``. At any point in time, at most one ``send`` action for
 each Agent is being executed. Actions dispatched to an agent from another thread
 will occur in the order they were sent, potentially interleaved with actions
-dispatched to the same agent from other sources.
+dispatched to the same agent from other threads.
 
 If an Agent is used within an enclosing transaction, then it will participate in
-that transaction. Agents are integrated with the STM - any dispatches made in
+that transaction. Agents are integrated with Scala STM - any dispatches made in
 a transaction are held until that transaction commits, and are discarded if it
 is retried or aborted.
 
 
-Creating and stopping Agents
+Creating Agents
 ============================
 
-Agents are created by invoking ``new Agent(value, system)`` passing in the
-Agent's initial value and a reference to the ``ActorSystem`` for your
-application. An ``ActorSystem`` is required to create the underlying Actors. See
-:ref:`actor-systems` for more information about actor systems.
-
-Here is an example of creating an Agent:
+Agents are created by invoking ``new Agent<ValueType>(value, executionContext)`` – passing in the Agent's initial
+value and providing an ``ExecutionContext`` to be used for it:
 
 .. includecode:: code/docs/agent/AgentDocTest.java
-   :include: import-system,import-agent
+   :include: import-agent,create
    :language: java
 
-.. includecode:: code/docs/agent/AgentDocTest.java#create
-   :language: java
-
-An Agent will be running until you invoke ``close`` on it. Then it will be
-eligible for garbage collection (unless you hold on to it in some way).
-
-.. includecode:: code/docs/agent/AgentDocTest.java#close
-   :language: java
-
-
-Updating Agents
-===============
-
-You update an Agent by sending a function that transforms the current value or
-by sending just a new value. The Agent will apply the new value or function
-atomically and asynchronously. The update is done in a fire-forget manner and
-you are only guaranteed that it will be applied. There is no guarantee of when
-the update will be applied but dispatches to an Agent from a single thread will
-occur in order. You apply a value or a function by invoking the ``send``
-function.
-
-.. includecode:: code/docs/agent/AgentDocTest.java#import-function
-   :language: java
-
-.. includecode:: code/docs/agent/AgentDocTest.java#send
-   :language: java
-
-You can also dispatch a function to update the internal state but on its own
-thread. This does not use the reactive thread pool and can be used for
-long-running or blocking operations. You do this with the ``sendOff``
-method. Dispatches using either ``sendOff`` or ``send`` will still be executed
-in order.
-
-.. includecode:: code/docs/agent/AgentDocTest.java#send-off
-   :language: java
-
-
 Reading an Agent's value
 ========================
 
-Agents can be dereferenced (you can get an Agent's value) by calling the get
-method:
+Agents can be dereferenced (you can get an Agent's value) by invoking the Agent
+with ``get()`` like this:
 
 .. includecode:: code/docs/agent/AgentDocTest.java#read-get
    :language: java
@@ -94,15 +52,58 @@ Reading an Agent's current value does not involve any message passing and
 happens immediately. So while updates to an Agent are asynchronous, reading the
 state of an Agent is synchronous.
 
+You can also get a ``Future`` to the Agents value, that will be completed after the
+currently queued updates have completed:
 
-Awaiting an Agent's value
-=========================
-
-It is also possible to read the value after all currently queued sends have
-completed. You can do this with ``await``:
-
-.. includecode:: code/docs/agent/AgentDocTest.java#import-timeout
+.. includecode:: code/docs/agent/AgentDocTest.java
+   :include: import-future,read-future
    :language: java
 
-.. includecode:: code/docs/agent/AgentDocTest.java#read-await
+See :ref:`futures-java` for more information on ``Futures``.
+
+Updating Agents (send & alter)
+==============================
+
+You update an Agent by sending a function (``akka.dispatch.Mapper``) that transforms the current value or
+by sending just a new value. The Agent will apply the new value or function
+atomically and asynchronously. The update is done in a fire-forget manner and
+you are only guaranteed that it will be applied. There is no guarantee of when
+the update will be applied but dispatches to an Agent from a single thread will
+occur in order. You apply a value or a function by invoking the ``send``
+function.
+
+.. includecode:: code/docs/agent/AgentDocTest.java
+   :include: import-function,send
    :language: java
+
+You can also dispatch a function to update the internal state but on its own
+thread. This does not use the reactive thread pool and can be used for
+long-running or blocking operations. You do this with the ``sendOff``
+method. Dispatches using either ``sendOff`` or ``send`` will still be executed
+in order.
+
+.. includecode:: code/docs/agent/AgentDocTest.java
+   :include: import-function,send-off
+   :language: java
+
+All ``send`` methods also have a corresponding ``alter`` method that returns a ``Future``.
+See :ref:`futures-java` for more information on ``Futures``.
+
+.. includecode:: code/docs/agent/AgentDocTest.java
+   :include: import-future,import-function,alter
+   :language: java
+
+.. includecode:: code/docs/agent/AgentDocTest.java
+   :include: import-future,import-function,alter-off
+   :language: java
+
+Transactional Agents
+====================
+
+If an Agent is used within an enclosing transaction, then it will participate in
+that transaction. If you send to an Agent within a transaction then the dispatch
+to the Agent will be held until that transaction commits, and discarded if the
+transaction is aborted. Here's an example:
+
+.. includecode:: code/docs/agent/AgentDocTest.java#transfer-example
+   :language: java
\ No newline at end of file
diff --git a/akka-docs/rst/java/code/docs/agent/AgentDocTest.java b/akka-docs/rst/java/code/docs/agent/AgentDocTest.java
index 6d7345b52a..afe671ca6d 100644
--- a/akka-docs/rst/java/code/docs/agent/AgentDocTest.java
+++ b/akka-docs/rst/java/code/docs/agent/AgentDocTest.java
@@ -5,107 +5,112 @@ package docs.agent;
 
 import static org.junit.Assert.*;
 
-import scala.concurrent.ExecutionContext;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import akka.testkit.AkkaSpec;
 
-//#import-system
-import akka.actor.ActorSystem;
-//#import-system
+import scala.concurrent.Await;
+import scala.concurrent.duration.Duration;
 
 //#import-agent
-import akka.agent.Agent;
+    import scala.concurrent.ExecutionContext;
+    import akka.agent.Agent;
+    import akka.dispatch.ExecutionContexts;
 //#import-agent
 
 //#import-function
-import akka.japi.Function;
+    import akka.dispatch.Mapper;
 //#import-function
 
-//#import-timeout
-import akka.util.Timeout;
-import static java.util.concurrent.TimeUnit.SECONDS;
-//#import-timeout
+//#import-future
+    import scala.concurrent.Future;
+//#import-future
 
 public class AgentDocTest {
 
-  private static ActorSystem testSystem;
-  private static ExecutionContext ec;
-
-  @BeforeClass
-  public static void beforeAll() {
-    testSystem = ActorSystem.create("AgentDocTest", AkkaSpec.testConf());
-    ec = testSystem.dispatcher();
-  }
-
-  @AfterClass
-  public static void afterAll() {
-    testSystem.shutdown();
-    testSystem = null;
-  }
+  private static ExecutionContext ec = ExecutionContexts.global();
 
   @Test
-  public void createAndClose() {
-        //#create
-    ActorSystem system = ActorSystem.create("app");
-
-    Agent<Integer> agent = new Agent<Integer>(5, system);
+  public void createAndRead() throws Exception {
+    //#create
+    ExecutionContext ec = ExecutionContexts.global();
+    Agent<Integer> agent = new Agent<Integer>(5, ec);
     //#create
 
-    //#close
-    agent.close();
-    //#close
+    //#read-get
+    Integer result = agent.get();
+    //#read-get
 
-    system.shutdown();
+    //#read-future
+    Future<Integer> future = agent.future();
+    //#read-future
+
+    assertEquals(result, new Integer(5));
+    assertEquals(Await.result(future, Duration.create(5,"s")), new Integer(5));
   }
 
   @Test
-  public void sendAndSendOffAndReadAwait() {
-    Agent<Integer> agent = new Agent<Integer>(5, testSystem);
+  public void sendAndSendOffAndReadAwait() throws Exception {
+    Agent<Integer> agent = new Agent<Integer>(5, ec);
 
     //#send
     // send a value
     agent.send(7);
 
     // send a function
-    agent.send(new Function<Integer, Integer>() {
+    agent.send(new Mapper<Integer, Integer>() {
       public Integer apply(Integer i) {
         return i * 2;
       }
     });
     //#send
 
-    Function<Integer, Integer> longRunningOrBlockingFunction = new Function<Integer, Integer>() {
+      Mapper<Integer, Integer> longRunningOrBlockingFunction = new Mapper<Integer, Integer>() {
       public Integer apply(Integer i) {
         return i * 1;
       }
     };
 
+    ExecutionContext theExecutionContextToExecuteItIn = ec;
     //#send-off
     // sendOff a function
-    agent.sendOff(longRunningOrBlockingFunction, ec);
+    agent.sendOff(longRunningOrBlockingFunction,
+                  theExecutionContextToExecuteItIn);
     //#send-off
 
-    //#read-await
-    Integer result = agent.await(new Timeout(5, SECONDS));
-    //#read-await
-
-    assertEquals(result, new Integer(14));
-
-    agent.close();
+    assertEquals(Await.result(agent.future(), Duration.create(5,"s")), new Integer(14));
   }
 
-  @Test
-  public void readWithGet() {
-    Agent<Integer> agent = new Agent<Integer>(5, testSystem);
+    @Test
+    public void alterAndAlterOff() throws Exception {
+    Agent<Integer> agent = new Agent<Integer>(5, ec);
 
-    //#read-get
-    Integer result = agent.get();
-    //#read-get
+    //#alter
+    // alter a value
+    Future<Integer> f1 = agent.alter(7);
 
-    assertEquals(result, new Integer(5));
+    // alter a function (Mapper)
+    Future<Integer> f2 = agent.alter(new Mapper<Integer, Integer>() {
+        public Integer apply(Integer i) {
+            return i * 2;
+        }
+    });
+    //#alter
 
-    agent.close();
-  }
+    Mapper<Integer, Integer> longRunningOrBlockingFunction = new Mapper<Integer, Integer>() {
+        public Integer apply(Integer i) {
+            return i * 1;
+        }
+    };
+
+    ExecutionContext theExecutionContextToExecuteItIn = ec;
+    //#alter-off
+    // alterOff a function (Mapper)
+    Future<Integer> f3 = agent.alterOff(longRunningOrBlockingFunction,
+                                        theExecutionContextToExecuteItIn);
+    //#alter-off
+
+    assertEquals(Await.result(f3, Duration.create(5,"s")), new Integer(14));
+    }
 }
diff --git a/akka-docs/rst/scala/agents.rst b/akka-docs/rst/scala/agents.rst
index 5657986a88..e14b6e129c 100644
--- a/akka-docs/rst/scala/agents.rst
+++ b/akka-docs/rst/scala/agents.rst
@@ -19,10 +19,10 @@ immediately available for reading by any thread (using ``get`` or ``apply``)
 without any messages.
 
 Agents are reactive. The update actions of all Agents get interleaved amongst
-threads in a thread pool. At any point in time, at most one ``send`` action for
+threads in an ``ExecutionContext``. At any point in time, at most one ``send`` action for
 each Agent is being executed. Actions dispatched to an agent from another thread
 will occur in the order they were sent, potentially interleaved with actions
-dispatched to the same agent from other sources.
+dispatched to the same agent from other threads.
 
 If an Agent is used within an enclosing transaction, then it will participate in
 that transaction. Agents are integrated with Scala STM - any dispatches made in
@@ -30,32 +30,33 @@ a transaction are held until that transaction commits, and are discarded if it
 is retried or aborted.
 
 
-Creating and stopping Agents
+Creating Agents
 ============================
 
 Agents are created by invoking ``Agent(value)`` passing in the Agent's initial
-value:
+value and providing an implicit ``ExecutionContext`` to be used for it, for these
+examples we're going to use the default global one, but YMMV:
 
 .. includecode:: code/docs/agent/AgentDocSpec.scala#create
 
-Note that creating an Agent requires an implicit ``ActorSystem`` (for creating
-the underlying actors). See :ref:`actor-systems` for more information about
-actor systems. An ActorSystem can be in implicit scope when creating an Agent:
+Reading an Agent's value
+========================
 
-.. includecode:: code/docs/agent/AgentDocSpec.scala#create-implicit-system
+Agents can be dereferenced (you can get an Agent's value) by invoking the Agent
+with parentheses like this:
 
-Or the ActorSystem can be passed explicitly when creating an Agent:
+.. includecode:: code/docs/agent/AgentDocSpec.scala#read-apply
 
-.. includecode:: code/docs/agent/AgentDocSpec.scala#create-explicit-system
+Or by using the get method:
 
-An Agent will be running until you invoke ``close`` on it. Then it will be
-eligible for garbage collection (unless you hold on to it in some way).
+.. includecode:: code/docs/agent/AgentDocSpec.scala#read-get
 
-.. includecode:: code/docs/agent/AgentDocSpec.scala#close
+Reading an Agent's current value does not involve any message passing and
+happens immediately. So while updates to an Agent are asynchronous, reading the
+state of an Agent is synchronous.
 
-
-Updating Agents
-===============
+Updating Agents (send & alter)
+======================
 
 You update an Agent by sending a function that transforms the current value or
 by sending just a new value. The Agent will apply the new value or function
@@ -75,37 +76,22 @@ in order.
 
 .. includecode:: code/docs/agent/AgentDocSpec.scala#send-off
 
+All ``send`` methods also have a corresponding ``alter`` method that returns a ``Future``.
+See :ref:`futures-scala` for more information on ``Futures``.
 
-Reading an Agent's value
-========================
-
-Agents can be dereferenced (you can get an Agent's value) by invoking the Agent
-with parentheses like this:
-
-.. includecode:: code/docs/agent/AgentDocSpec.scala#read-apply
-
-Or by using the get method:
-
-.. includecode:: code/docs/agent/AgentDocSpec.scala#read-get
-
-Reading an Agent's current value does not involve any message passing and
-happens immediately. So while updates to an Agent are asynchronous, reading the
-state of an Agent is synchronous.
+.. includecode:: code/docs/agent/AgentDocSpec.scala#alter
 
+.. includecode:: code/docs/agent/AgentDocSpec.scala#alter-off
 
 Awaiting an Agent's value
 =========================
 
-It is also possible to read the value after all currently queued sends have
-completed. You can do this with ``await``:
-
-.. includecode:: code/docs/agent/AgentDocSpec.scala#read-await
-
-You can also get a ``Future`` to this value, that will be completed after the
+You can also get a ``Future`` to the Agents value, that will be completed after the
 currently queued updates have completed:
 
 .. includecode:: code/docs/agent/AgentDocSpec.scala#read-future
 
+See :ref:`futures-scala` for more information on ``Futures``.
 
 Transactional Agents
 ====================
diff --git a/akka-docs/rst/scala/code/docs/agent/AgentDocSpec.scala b/akka-docs/rst/scala/code/docs/agent/AgentDocSpec.scala
index 121d2d695f..9d4fd5c07b 100644
--- a/akka-docs/rst/scala/code/docs/agent/AgentDocSpec.scala
+++ b/akka-docs/rst/scala/code/docs/agent/AgentDocSpec.scala
@@ -7,54 +7,46 @@ 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
     agent send 7
@@ -64,70 +56,47 @@ class AgentDocSpec extends AkkaSpec {
     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 +114,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 +147,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()
   }
 }

From 8dea20a1f16b4dd169f7d1980ca3fd9b64b5aa4c Mon Sep 17 00:00:00 2001
From: Roland <rk@rkuhn.info>
Date: Mon, 14 Jan 2013 23:21:51 +0100
Subject: [PATCH 070/122] LightArrayRevolverScheduler, see #2904

- based on a wheel (AtomicReferenceArray) from which atomic
  single-linked lists dangle
- no locks
- deterministic tests due to overridable time source
- also bring docs up to date
---
 .../test/scala/akka/actor/SchedulerSpec.scala | 295 +++++++++--
 .../test/scala/akka/config/ConfigSpec.scala   |   4 +-
 .../java/akka/actor/AbstractScheduler.java    |  53 ++
 .../akka/util/internal/HashedWheelTimer.java  |   5 +-
 .../main/java/akka/util/internal/Timeout.java |   6 +-
 akka-actor/src/main/resources/reference.conf  |  24 +
 .../src/main/scala/akka/actor/ActorCell.scala |   4 +-
 .../main/scala/akka/actor/ActorSystem.scala   |  22 +-
 .../src/main/scala/akka/actor/Scheduler.scala | 498 +++++++++++++++---
 .../src/main/scala/akka/cluster/Cluster.scala |  35 +-
 .../code/docs/actor/SchedulerDocTestBase.java |   3 +-
 .../actor/japi/FaultHandlingDocSample.java    |   5 +-
 .../docs/pattern/SchedulerPatternTest.java    |   4 +-
 .../java/code/docs/pattern/SupervisedAsk.java |   3 +-
 akka-docs/rst/java/scheduler.rst              |  45 +-
 .../code/docs/actor/SchedulerDocSpec.scala    |   2 +-
 akka-docs/rst/scala/scheduler.rst             |  39 +-
 .../akka/osgi/OsgiActorSystemFactory.scala    |   4 +-
 .../main/java/akka/testkit/JavaTestKit.java   |  10 +-
 .../src/main/scala/akka/testkit/TestKit.scala |   4 +-
 20 files changed, 863 insertions(+), 202 deletions(-)
 create mode 100644 akka-actor/src/main/java/akka/actor/AbstractScheduler.java

diff --git a/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala
index 0710be6ad5..a2a7c645fa 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala
@@ -1,45 +1,37 @@
 package akka.actor
 
 import language.postfixOps
-
-import com.typesafe.config.ConfigFactory
-import org.scalatest.BeforeAndAfterEach
-import scala.concurrent.duration._
-import java.util.concurrent.{ CountDownLatch, ConcurrentLinkedQueue, TimeUnit }
-import akka.testkit._
-import scala.concurrent.Await
-import akka.pattern.ask
+import java.io.Closeable
+import java.util.concurrent._
 import java.util.concurrent.atomic.AtomicInteger
-import java.util.concurrent.TimeoutException
+import scala.concurrent.{ future, Await, ExecutionContext }
+import scala.concurrent.duration._
+import scala.util.Try
+import scala.util.control.NonFatal
+import org.scalatest.BeforeAndAfterEach
+import com.typesafe.config.{ Config, ConfigFactory }
+import akka.pattern.ask
+import akka.testkit._
 
 object SchedulerSpec {
   val testConf = ConfigFactory.parseString("""
+    akka.scheduler.class = akka.actor.DefaultScheduler
     akka.scheduler.ticks-per-wheel = 32
   """).withFallback(AkkaSpec.testConf)
+
+  val testConfRevolver = ConfigFactory.parseString("""
+    akka.scheduler.class = akka.actor.LightArrayRevolverScheduler
+  """).withFallback(testConf)
 }
 
-@org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner])
-class SchedulerSpec extends AkkaSpec(SchedulerSpec.testConf) with BeforeAndAfterEach with DefaultTimeout with ImplicitSender {
-  private val cancellables = new ConcurrentLinkedQueue[Cancellable]()
+trait SchedulerSpec extends BeforeAndAfterEach with DefaultTimeout with ImplicitSender { this: AkkaSpec ⇒
   import system.dispatcher
 
-  def collectCancellable(c: Cancellable): Cancellable = {
-    cancellables.add(c)
-    c
-  }
-
-  override def afterEach {
-    while (cancellables.peek() ne null) {
-      for (c ← Option(cancellables.poll())) {
-        c.cancel()
-        c.isCancelled must be === true
-      }
-    }
-  }
+  def collectCancellable(c: Cancellable): Cancellable
 
   "A Scheduler" must {
 
-    "schedule more than once" in {
+    "schedule more than once" taggedAs TimingTest in {
       case object Tick
       case object Tock
 
@@ -84,7 +76,7 @@ class SchedulerSpec extends AkkaSpec(SchedulerSpec.testConf) with BeforeAndAfter
       expectNoMsg(500 millis)
     }
 
-    "schedule once" in {
+    "schedule once" taggedAs TimingTest in {
       case object Tick
       val countDownLatch = new CountDownLatch(3)
       val tickActor = system.actorOf(Props(new Actor {
@@ -108,7 +100,7 @@ class SchedulerSpec extends AkkaSpec(SchedulerSpec.testConf) with BeforeAndAfter
     /**
      * ticket #372
      */
-    "be cancellable" in {
+    "be cancellable" taggedAs TimingTest in {
       for (_ ← 1 to 10) system.scheduler.scheduleOnce(1 second, testActor, "fail").cancel()
 
       expectNoMsg(2 seconds)
@@ -132,12 +124,12 @@ class SchedulerSpec extends AkkaSpec(SchedulerSpec.testConf) with BeforeAndAfter
     "be cancellable after initial delay" taggedAs TimingTest in {
       val ticks = new AtomicInteger
 
-      val initialDelay = 20.milliseconds.dilated
-      val delay = 200.milliseconds.dilated
+      val initialDelay = 90.milliseconds.dilated
+      val delay = 500.milliseconds.dilated
       val timeout = collectCancellable(system.scheduler.schedule(initialDelay, delay) {
         ticks.incrementAndGet()
       })
-      Thread.sleep((initialDelay + 100.milliseconds.dilated).toMillis)
+      Thread.sleep((initialDelay + 200.milliseconds.dilated).toMillis)
       timeout.cancel()
       Thread.sleep((delay + 100.milliseconds.dilated).toMillis)
 
@@ -147,7 +139,7 @@ class SchedulerSpec extends AkkaSpec(SchedulerSpec.testConf) with BeforeAndAfter
     /**
      * ticket #307
      */
-    "pick up schedule after actor restart" in {
+    "pick up schedule after actor restart" taggedAs TimingTest in {
 
       object Ping
       object Crash
@@ -177,7 +169,7 @@ class SchedulerSpec extends AkkaSpec(SchedulerSpec.testConf) with BeforeAndAfter
       Await.ready(pingLatch, 5 seconds)
     }
 
-    "never fire prematurely" in {
+    "never fire prematurely" taggedAs TimingTest in {
       val ticks = new TestLatch(300)
 
       case class Msg(ts: Long)
@@ -238,6 +230,28 @@ class SchedulerSpec extends AkkaSpec(SchedulerSpec.testConf) with BeforeAndAfter
       // Rate
       n * 1000.0 / (System.nanoTime - startTime).nanos.toMillis must be(4.4 plusOrMinus 0.3)
     }
+
+    "survive being stressed without cancellation" taggedAs TimingTest in {
+      val r = ThreadLocalRandom.current()
+      val N = 100000
+      for (_ ← 1 to N) {
+        val next = r.nextInt(3000)
+        val now = System.nanoTime
+        system.scheduler.scheduleOnce(next.millis) {
+          val stop = System.nanoTime
+          testActor ! (stop - now - next * 1000000L)
+        }
+      }
+      val latencies = within(5.seconds) {
+        for (i ← 1 to N) yield try expectMsgType[Long] catch {
+          case NonFatal(e) ⇒ throw new Exception(s"failed expecting the $i-th latency", e)
+        }
+      }
+      val histogram = latencies groupBy (_ / 100000000L)
+      for (k ← histogram.keys.toSeq.sorted) {
+        system.log.info(f"${k * 100}%3d: ${histogram(k).size}")
+      }
+    }
   }
 
   "A HashedWheelTimer" must {
@@ -267,3 +281,218 @@ class SchedulerSpec extends AkkaSpec(SchedulerSpec.testConf) with BeforeAndAfter
     }
   }
 }
+
+class DefaultSchedulerSpec extends AkkaSpec(SchedulerSpec.testConf) with SchedulerSpec {
+  private val cancellables = new ConcurrentLinkedQueue[Cancellable]()
+
+  def collectCancellable(c: Cancellable): Cancellable = {
+    cancellables.add(c)
+    c
+  }
+
+  override def afterEach {
+    while (cancellables.peek() ne null) {
+      for (c ← Option(cancellables.poll())) {
+        c.cancel()
+        c.isCancelled must be === true
+      }
+    }
+  }
+}
+
+class LightArrayRevolverSchedulerSpec extends AkkaSpec(SchedulerSpec.testConfRevolver) with SchedulerSpec {
+
+  def collectCancellable(c: Cancellable): Cancellable = c
+
+  "A LightArrayRevolverScheduler" must {
+
+    "survive being stressed with cancellation" taggedAs TimingTest in {
+      import system.dispatcher
+      val r = ThreadLocalRandom.current
+      val N = 1000000
+      val tasks = for (_ ← 1 to N) yield {
+        val next = r.nextInt(3000)
+        val now = System.nanoTime
+        system.scheduler.scheduleOnce(next.millis) {
+          val stop = System.nanoTime
+          testActor ! (stop - now - next * 1000000L)
+        }
+      }
+      // get somewhat into the middle of things
+      Thread.sleep(500)
+      val cancellations = for (t ← tasks) yield {
+        t.cancel()
+        if (t.isCancelled) 1 else 0
+      }
+      val cancelled = cancellations.sum
+      println(cancelled)
+      val latencies = within(5.seconds) {
+        for (i ← 1 to (N - cancelled)) yield try expectMsgType[Long] catch {
+          case NonFatal(e) ⇒ throw new Exception(s"failed expecting the $i-th latency", e)
+        }
+      }
+      val histogram = latencies groupBy (_ / 100000000L)
+      for (k ← histogram.keys.toSeq.sorted) {
+        system.log.info(f"${k * 100}%3d: ${histogram(k).size}")
+      }
+      expectNoMsg(1.second)
+    }
+
+    "survive vicious enqueueing" in {
+      withScheduler(config = ConfigFactory.parseString("akka.scheduler.ticks-per-wheel=2")) { (sched, driver) ⇒
+        import driver._
+        import system.dispatcher
+        val counter = new AtomicInteger
+        val terminated = future {
+          var rounds = 0
+          while (Try(sched.scheduleOnce(Duration.Zero)(())(localEC)).isSuccess) {
+            Thread.sleep(1)
+            driver.wakeUp(step)
+            rounds += 1
+          }
+          rounds
+        }
+        def delay = if (ThreadLocalRandom.current.nextBoolean) step * 2 else step
+        val N = 1000000
+        (1 to N) foreach (_ ⇒ sched.scheduleOnce(delay)(counter.incrementAndGet()))
+        sched.close()
+        Await.result(terminated, 3.seconds.dilated) must be > 10
+        awaitCond(counter.get == N)
+      }
+    }
+
+    "execute multiple jobs at once when expiring multiple buckets" in {
+      withScheduler() { (sched, driver) ⇒
+        implicit def ec = localEC
+        import driver._
+        val start = step / 2
+        (0 to 3) foreach (i ⇒ sched.scheduleOnce(start + step * i, testActor, "hello"))
+        expectNoMsg(step)
+        wakeUp(step)
+        expectWait(step)
+        wakeUp(step * 4 + step / 2)
+        expectWait(step / 2)
+        (0 to 3) foreach (_ ⇒ expectMsg(Duration.Zero, "hello"))
+      }
+    }
+
+    "correctly wrap around wheel rounds" in {
+      withScheduler(config = ConfigFactory.parseString("akka.scheduler.ticks-per-wheel=2")) { (sched, driver) ⇒
+        implicit def ec = localEC
+        import driver._
+        val start = step / 2
+        (0 to 3) foreach (i ⇒ sched.scheduleOnce(start + step * i, probe.ref, "hello"))
+        probe.expectNoMsg(step)
+        wakeUp(step)
+        expectWait(step)
+        // the following are no for-comp to see which iteration fails
+        wakeUp(step)
+        probe.expectMsg("hello")
+        expectWait(step)
+        wakeUp(step)
+        probe.expectMsg("hello")
+        expectWait(step)
+        wakeUp(step)
+        probe.expectMsg("hello")
+        expectWait(step)
+        wakeUp(step)
+        probe.expectMsg("hello")
+        expectWait(step)
+        wakeUp(step)
+        expectWait(step)
+      }
+    }
+
+    "correctly execute jobs when clock wraps around" in {
+      withScheduler(Long.MaxValue - 200000000L) { (sched, driver) ⇒
+        implicit def ec = localEC
+        import driver._
+        val start = step / 2
+        (0 to 3) foreach (i ⇒ sched.scheduleOnce(start + step * i, testActor, "hello"))
+        expectNoMsg(step)
+        wakeUp(step)
+        expectWait(step)
+        // the following are no for-comp to see which iteration fails
+        wakeUp(step)
+        expectMsg("hello")
+        expectWait(step)
+        wakeUp(step)
+        expectMsg("hello")
+        expectWait(step)
+        wakeUp(step)
+        expectMsg("hello")
+        expectWait(step)
+        wakeUp(step)
+        expectMsg("hello")
+        expectWait(step)
+        wakeUp(step)
+        expectWait(step)
+      }
+    }
+
+    "reliably reject jobs when shutting down" in {
+      withScheduler() { (sched, driver) ⇒
+        import system.dispatcher
+        val counter = new AtomicInteger
+        future { Thread.sleep(5); sched.close() }
+        val headroom = 200
+        var overrun = headroom
+        val cap = 1000000
+        val (success, failure) = Iterator
+          .continually(Try(sched.scheduleOnce(100.millis)(counter.incrementAndGet())))
+          .take(cap)
+          .takeWhile(_.isSuccess || { overrun -= 1; overrun >= 0 })
+          .partition(_.isSuccess)
+        val s = success.size
+        s must be < cap
+        awaitCond(s == counter.get, message = s"$s was not ${counter.get}")
+        failure.size must be === headroom
+      }
+    }
+  }
+
+  trait Driver {
+    def wakeUp(d: FiniteDuration): Unit
+    def expectWait(): FiniteDuration
+    def expectWait(d: FiniteDuration) { expectWait() must be(d) }
+    def probe: TestProbe
+    def step: FiniteDuration
+  }
+
+  val localEC = new ExecutionContext {
+    def execute(runnable: Runnable) { runnable.run() }
+    def reportFailure(t: Throwable) { t.printStackTrace() }
+  }
+
+  def withScheduler(start: Long = 0L, config: Config = ConfigFactory.empty)(thunk: (Scheduler with Closeable, Driver) ⇒ Unit): Unit = {
+    import akka.actor.{ LightArrayRevolverScheduler ⇒ LARS }
+    val lbq = new LinkedBlockingQueue[Long]
+    val prb = TestProbe()
+    val tf = system.asInstanceOf[ActorSystemImpl].threadFactory
+    val sched =
+      new { @volatile var time = start } with LARS(config.withFallback(system.settings.config), log, tf) {
+        override protected def clock(): Long = {
+          // println(s"clock=$time")
+          time
+        }
+        override protected def waitNanos(ns: Long): Unit = {
+          // println(s"waiting $ns")
+          prb.ref ! ns
+          try time += lbq.take()
+          catch {
+            case _: InterruptedException ⇒
+          }
+        }
+      }
+    val driver = new Driver {
+      def wakeUp(d: FiniteDuration) { lbq.offer(d.toNanos) }
+      def expectWait(): FiniteDuration = probe.expectMsgType[Long].nanos
+      def probe = prb
+      def step = sched.TickDuration
+    }
+    driver.expectWait()
+    try thunk(sched, driver)
+    finally sched.close()
+  }
+
+}
diff --git a/akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala b/akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala
index 9a43631894..0e080118b1 100644
--- a/akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala
@@ -32,10 +32,8 @@ class ConfigSpec extends AkkaSpec(ConfigFactory.defaultReference(ActorSystem.fin
         settings.SerializeAllMessages must equal(false)
 
         getInt("akka.scheduler.ticks-per-wheel") must equal(512)
-        settings.SchedulerTicksPerWheel must equal(512)
-
         getMilliseconds("akka.scheduler.tick-duration") must equal(100)
-        settings.SchedulerTickDuration must equal(100 millis)
+        getString("akka.scheduler.implementation") must equal("akka.actor.LightArrayRevolverScheduler")
 
         getBoolean("akka.daemonic") must be(false)
         settings.Daemonicity must be(false)
diff --git a/akka-actor/src/main/java/akka/actor/AbstractScheduler.java b/akka-actor/src/main/java/akka/actor/AbstractScheduler.java
new file mode 100644
index 0000000000..fdf5fe9001
--- /dev/null
+++ b/akka-actor/src/main/java/akka/actor/AbstractScheduler.java
@@ -0,0 +1,53 @@
+/**
+ *  Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ */
+
+package akka.actor;
+
+import scala.concurrent.ExecutionContext;
+import scala.concurrent.duration.FiniteDuration;
+
+//#scheduler
+/**
+ * An Akka scheduler service. This one needs one special behavior: if
+ * Closeable, it MUST execute all outstanding tasks upon .close() in order
+ * to properly shutdown all dispatchers.
+ *
+ * Furthermore, this timer service MUST throw IllegalStateException if it
+ * cannot schedule a task. Once scheduled, the task MUST be executed. If
+ * executed upon close(), the task may execute before its timeout.
+ *
+ * Scheduler implementation are loaded reflectively at ActorSystem start-up
+ * with the following constructor arguments:
+ *  1) the system’s com.typesafe.config.Config (from system.settings.config)
+ *  2) a akka.event.LoggingAdapter
+ *  3) a java.util.concurrent.ThreadFactory
+ */
+public abstract class AbstractScheduler extends AbstractSchedulerBase {
+
+  /**
+   * Schedules a function to be run repeatedly with an initial delay and
+   * a frequency. E.g. if you would like the function to be run after 2
+   * seconds and thereafter every 100ms you would set delay = Duration(2,
+   * TimeUnit.SECONDS) and interval = Duration(100, TimeUnit.MILLISECONDS)
+   */
+  @Override
+  public abstract Cancellable schedule(FiniteDuration initialDelay,
+      FiniteDuration interval, Runnable runnable, ExecutionContext executor);
+
+  /**
+   * Schedules a Runnable to be run once with a delay, i.e. a time period that
+   * has to pass before the runnable is executed.
+   */
+  @Override
+  public abstract Cancellable scheduleOnce(FiniteDuration delay, Runnable runnable,
+      ExecutionContext executor);
+
+  /**
+   * The maximum supported task frequency of this scheduler, i.e. the inverse
+   * of the minimum time interval between executions of a recurring task, in Hz.
+   */
+  @Override
+  public abstract double maxFrequency();
+}
+//#scheduler
diff --git a/akka-actor/src/main/java/akka/util/internal/HashedWheelTimer.java b/akka-actor/src/main/java/akka/util/internal/HashedWheelTimer.java
index fcdee4866f..e7addaa3d5 100644
--- a/akka-actor/src/main/java/akka/util/internal/HashedWheelTimer.java
+++ b/akka-actor/src/main/java/akka/util/internal/HashedWheelTimer.java
@@ -457,10 +457,11 @@ public class HashedWheelTimer implements Timer {
             return Unsafe.instance.compareAndSwapInt(this, _stateOffset, old, future);
         }
 
-        public void cancel() {
+        public boolean cancel() {
             if (updateState(ST_INIT, ST_CANCELLED)) {
               parent.wheel[stopIndex].remove(this);
-            }
+              return true;
+            } else return false;
         }
 
         public boolean isCancelled() {
diff --git a/akka-actor/src/main/java/akka/util/internal/Timeout.java b/akka-actor/src/main/java/akka/util/internal/Timeout.java
index a03534bb8d..b417796bfc 100644
--- a/akka-actor/src/main/java/akka/util/internal/Timeout.java
+++ b/akka-actor/src/main/java/akka/util/internal/Timeout.java
@@ -51,6 +51,10 @@ public interface Timeout {
      * Cancels the {@link TimerTask} associated with this handle.  It the
      * task has been executed or cancelled already, it will return with no
      * side effect.
+     * 
+     * @return whether the caller was the one who actually cancelled this
+     * timeout (there can be at most one; never returns true if the Timeout
+     * expired)
      */
-    void cancel();
+    boolean cancel();
 }
diff --git a/akka-actor/src/main/resources/reference.conf b/akka-actor/src/main/resources/reference.conf
index aeee89a65f..0039320631 100644
--- a/akka-actor/src/main/resources/reference.conf
+++ b/akka-actor/src/main/resources/reference.conf
@@ -364,7 +364,31 @@ akka {
     # ticks per wheel.
     # For more information see: http://www.jboss.org/netty/
     tick-duration = 100ms
+    
+    # The timer uses a circular wheel of buckets to store the timer tasks.
+    # This should be set such that the majority of scheduled timeouts (for high
+    # scheduling frequency) will be shorter than one rotation of the wheel
+    # (ticks-per-wheel * ticks-duration)
+    # THIS MUST BE A POWER OF TWO!
     ticks-per-wheel = 512
+    
+    # This setting selects the timer implementation which shall be loaded at
+    # system start-up. Built-in choices are:
+    #  - akka.actor.DefaultScheduler (HWT)
+    #  - akka.actor.LightArrayRevolverScheduler
+    # (to be benchmarked and evaluated)
+    # The class given here must implement the akka.actor.Scheduler interface
+    # and offer a constructor which takes three arguments:
+    #  1) com.typesafe.config.Config
+    #  2) akka.event.LoggingAdapter
+    #  3) java.util.concurrent.ThreadFactory
+    implementation = akka.actor.LightArrayRevolverScheduler
+    
+    # When shutting down the scheduler, there will typically be a thread which
+    # needs to be stopped, and this timeout determines how long to wait for 
+    # that to happen. In case of timeout the shutdown of the actor system will
+    # proceed without running possibly still enqueued tasks.
+    shutdown-timeout = 5s
   }
 
   io {
diff --git a/akka-actor/src/main/scala/akka/actor/ActorCell.scala b/akka-actor/src/main/scala/akka/actor/ActorCell.scala
index 51f11c044c..6f632dac45 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorCell.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorCell.scala
@@ -286,8 +286,8 @@ private[akka] object ActorCell {
   }
 
   final val emptyCancellable: Cancellable = new Cancellable {
-    def isCancelled = false
-    def cancel() {}
+    def isCancelled: Boolean = false
+    def cancel(): Boolean = false
   }
 
   final val emptyBehaviorStack: List[Actor.Receive] = Nil
diff --git a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala
index 45025f1887..4f4b29480e 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala
@@ -20,6 +20,7 @@ import akka.util.internal.{ HashedWheelTimer, ConcurrentIdentityHashMap }
 import java.util.concurrent.{ ThreadFactory, CountDownLatch, TimeoutException, RejectedExecutionException }
 import java.util.concurrent.TimeUnit.MILLISECONDS
 import akka.actor.dungeon.ChildrenContainer
+import scala.concurrent.ExecutionContext
 
 object ActorSystem {
 
@@ -161,8 +162,7 @@ object ActorSystem {
       case x  ⇒ Some(x)
     }
 
-    final val SchedulerTickDuration: FiniteDuration = Duration(getMilliseconds("akka.scheduler.tick-duration"), MILLISECONDS)
-    final val SchedulerTicksPerWheel: Int = getInt("akka.scheduler.ticks-per-wheel")
+    final val SchedulerClass: String = getString("akka.scheduler.implementation")
     final val Daemonicity: Boolean = getBoolean("akka.daemonic")
     final val JvmExitOnFatalError: Boolean = getBoolean("akka.jvm-exit-on-fatal-error")
 
@@ -601,6 +601,7 @@ private[akka] class ActorSystemImpl(val name: String, applicationConfig: Config,
 
   def shutdown(): Unit = guardian.stop()
 
+  //#create-scheduler
   /**
    * Create the scheduler service. This one needs one special behavior: if
    * Closeable, it MUST execute all outstanding tasks upon .close() in order
@@ -611,12 +612,11 @@ private[akka] class ActorSystemImpl(val name: String, applicationConfig: Config,
    * executed upon close(), the task may execute before its timeout.
    */
   protected def createScheduler(): Scheduler =
-    new DefaultScheduler(
-      new HashedWheelTimer(log,
-        threadFactory.withName(threadFactory.name + "-scheduler"),
-        settings.SchedulerTickDuration,
-        settings.SchedulerTicksPerWheel),
-      log)
+    dynamicAccess.createInstanceFor[Scheduler](settings.SchedulerClass, immutable.Seq(
+      classOf[Config] -> settings.config,
+      classOf[LoggingAdapter] -> log,
+      classOf[ThreadFactory] -> threadFactory.withName(threadFactory.name + "-scheduler"))).get
+  //#create-scheduler
 
   /*
    * This is called after the last actor has signaled its termination, i.e.
@@ -635,8 +635,10 @@ private[akka] class ActorSystemImpl(val name: String, applicationConfig: Config,
    */
   @tailrec
   private def findExtension[T <: Extension](ext: ExtensionId[T]): T = extensions.get(ext) match {
-    case c: CountDownLatch ⇒ c.await(); findExtension(ext) //Registration in process, await completion and retry
-    case other             ⇒ other.asInstanceOf[T] //could be a T or null, in which case we return the null as T
+    case c: CountDownLatch ⇒
+      c.await(); findExtension(ext) //Registration in process, await completion and retry
+    case other ⇒
+      other.asInstanceOf[T] //could be a T or null, in which case we return the null as T
   }
 
   @tailrec
diff --git a/akka-actor/src/main/scala/akka/actor/Scheduler.scala b/akka-actor/src/main/scala/akka/actor/Scheduler.scala
index bbb830110d..52efe7455b 100644
--- a/akka-actor/src/main/scala/akka/actor/Scheduler.scala
+++ b/akka-actor/src/main/scala/akka/actor/Scheduler.scala
@@ -4,16 +4,28 @@
 
 package akka.actor
 
-import scala.concurrent.duration.Duration
-import akka.util.internal.{ TimerTask, HashedWheelTimer, Timeout ⇒ HWTimeout, Timer }
-import akka.event.LoggingAdapter
-import akka.dispatch.MessageDispatcher
 import java.io.Closeable
-import java.util.concurrent.atomic.{ AtomicReference, AtomicLong }
+import java.util.concurrent.ThreadFactory
+import java.util.concurrent.atomic.{ AtomicLong, AtomicReference, AtomicReferenceArray }
+
 import scala.annotation.tailrec
-import akka.util.internal._
-import concurrent.ExecutionContext
-import scala.concurrent.duration.FiniteDuration
+import scala.collection.immutable
+import scala.concurrent.{ Await, ExecutionContext, Future, Promise }
+import scala.concurrent.duration._
+import scala.util.control.{ NoStackTrace, NonFatal }
+
+import com.typesafe.config.Config
+
+import akka.event.LoggingAdapter
+import akka.util.Helpers
+import akka.util.Unsafe.{ instance ⇒ unsafe }
+import akka.util.internal.{ HashedWheelTimer, Timeout ⇒ HWTimeout, Timer ⇒ HWTimer, TimerTask ⇒ HWTimerTask }
+
+/**
+ * This exception is thrown by Scheduler.schedule* when scheduling is not
+ * possible, e.g. after shutting down the Scheduler.
+ */
+private case class SchedulerException(msg: String) extends akka.AkkaException(msg) with NoStackTrace
 
 // The Scheduler trait is included in the documentation. KEEP THE LINES SHORT!!!
 //#scheduler
@@ -25,6 +37,12 @@ import scala.concurrent.duration.FiniteDuration
  * Furthermore, this timer service MUST throw IllegalStateException if it
  * cannot schedule a task. Once scheduled, the task MUST be executed. If
  * executed upon close(), the task may execute before its timeout.
+ *
+ * Scheduler implementation are loaded reflectively at ActorSystem start-up
+ * with the following constructor arguments:
+ *  1) the system’s com.typesafe.config.Config (from system.settings.config)
+ *  2) a akka.event.LoggingAdapter
+ *  3) a java.util.concurrent.ThreadFactory
  */
 trait Scheduler {
   /**
@@ -35,11 +53,19 @@ trait Scheduler {
    *
    * Java & Scala API
    */
-  def schedule(
+  final def schedule(
     initialDelay: FiniteDuration,
     interval: FiniteDuration,
     receiver: ActorRef,
-    message: Any)(implicit executor: ExecutionContext, sender: ActorRef = Actor.noSender): Cancellable
+    message: Any)(implicit executor: ExecutionContext,
+                  sender: ActorRef = Actor.noSender): Cancellable =
+    schedule(initialDelay, interval, new Runnable {
+      def run = {
+        receiver ! message
+        if (receiver.isTerminated)
+          throw new SchedulerException("timer active for terminated actor")
+      }
+    })
 
   /**
    * Schedules a function to be run repeatedly with an initial delay and a
@@ -49,10 +75,11 @@ trait Scheduler {
    *
    * Scala API
    */
-  def schedule(
+  final def schedule(
     initialDelay: FiniteDuration,
     interval: FiniteDuration)(f: ⇒ Unit)(
-      implicit executor: ExecutionContext): Cancellable
+      implicit executor: ExecutionContext): Cancellable =
+    schedule(initialDelay, interval, new Runnable { override def run = f })
 
   /**
    * Schedules a function to be run repeatedly with an initial delay and
@@ -67,6 +94,31 @@ trait Scheduler {
     interval: FiniteDuration,
     runnable: Runnable)(implicit executor: ExecutionContext): Cancellable
 
+  /**
+   * Schedules a message to be sent once with a delay, i.e. a time period that has
+   * to pass before the message is sent.
+   *
+   * Java & Scala API
+   */
+  final def scheduleOnce(
+    delay: FiniteDuration,
+    receiver: ActorRef,
+    message: Any)(implicit executor: ExecutionContext,
+                  sender: ActorRef = Actor.noSender): Cancellable =
+    scheduleOnce(delay, new Runnable {
+      override def run = receiver ! message
+    })
+
+  /**
+   * Schedules a function to be run once with a delay, i.e. a time period that has
+   * to pass before the function is run.
+   *
+   * Scala API
+   */
+  final def scheduleOnce(delay: FiniteDuration)(f: ⇒ Unit)(
+    implicit executor: ExecutionContext): Cancellable =
+    scheduleOnce(delay, new Runnable { override def run = f })
+
   /**
    * Schedules a Runnable to be run once with a delay, i.e. a time period that
    * has to pass before the runnable is executed.
@@ -78,28 +130,17 @@ trait Scheduler {
     runnable: Runnable)(implicit executor: ExecutionContext): Cancellable
 
   /**
-   * Schedules a message to be sent once with a delay, i.e. a time period that has
-   * to pass before the message is sent.
-   *
-   * Java & Scala API
+   * The maximum supported task frequency of this scheduler, i.e. the inverse
+   * of the minimum time interval between executions of a recurring task, in Hz.
    */
-  def scheduleOnce(
-    delay: FiniteDuration,
-    receiver: ActorRef,
-    message: Any)(implicit executor: ExecutionContext): Cancellable
+  def maxFrequency: Double
 
-  /**
-   * Schedules a function to be run once with a delay, i.e. a time period that has
-   * to pass before the function is run.
-   *
-   * Scala API
-   */
-  def scheduleOnce(
-    delay: FiniteDuration)(f: ⇒ Unit)(
-      implicit executor: ExecutionContext): Cancellable
 }
 //#scheduler
 
+// this one is just here so we can present a nice AbstractScheduler for Java
+abstract class AbstractSchedulerBase extends Scheduler
+
 //#cancellable
 /**
  * Signifies something that can be cancelled
@@ -108,14 +149,16 @@ trait Scheduler {
  */
 trait Cancellable {
   /**
-   * Cancels this Cancellable
+   * Cancels this Cancellable and returns true if that was successful.
+   * If this cancellable was (concurrently) cancelled already, then this method
+   * will return false although isCancelled will return true.
    *
    * Java & Scala API
    */
-  def cancel(): Unit
+  def cancel(): Boolean
 
   /**
-   * Returns whether this Cancellable has been cancelled
+   * Returns true if and only if this Cancellable has been successfully cancelled
    *
    * Java & Scala API
    */
@@ -123,6 +166,308 @@ trait Cancellable {
 }
 //#cancellable
 
+/**
+ * This scheduler implementation is based on a revolving wheel of buckets,
+ * like Netty’s HashedWheelTimer, which it advances at a fixed tick rate and
+ * dispatches tasks it finds in the current bucket to their respective
+ * ExecutionContexts. The tasks are held in TaskHolders, which upon
+ * cancellation null out their reference to the actual task, leaving only this
+ * shell to be cleaned up when the wheel reaches that bucket next time. This
+ * enables the use of a simple linked list to chain the TaskHolders off the
+ * wheel.
+ *
+ * Also noteworthy is that this scheduler does not obtain a current time stamp
+ * when scheduling single-shot tasks, instead it always rounds up the task
+ * delay to a full multiple of the TickDuration. This means that tasks are
+ * scheduled possibly one tick later than they could be (if checking that
+ * “now() + delay <= nextTick” were done).
+ */
+class LightArrayRevolverScheduler(config: Config,
+                                  log: LoggingAdapter,
+                                  threadFactory: ThreadFactory)
+  extends {
+    val WheelShift = {
+      val ticks = config.getInt("akka.scheduler.ticks-per-wheel")
+      val shift = 31 - Integer.numberOfLeadingZeros(ticks)
+      if ((ticks & (ticks - 1)) != 0) throw new akka.ConfigurationException("ticks-per-wheel must be a power of 2")
+      shift
+    }
+    val TickDuration = Duration(config.getMilliseconds("akka.scheduler.tick-duration"), MILLISECONDS)
+    val ShutdownTimeout = Duration(config.getMilliseconds("akka.scheduler.shutdown-timeout"), MILLISECONDS)
+  } with AtomicReferenceArray[LightArrayRevolverScheduler.TaskHolder](1 << WheelShift) with Scheduler with Closeable {
+
+  import LightArrayRevolverScheduler._
+
+  private val oneNs = Duration.fromNanos(1l)
+  private def roundUp(d: FiniteDuration): FiniteDuration =
+    try {
+      ((d + TickDuration - oneNs) / TickDuration).toLong * TickDuration
+    } catch {
+      case _: IllegalArgumentException ⇒ d // rouding up Long.MaxValue.nanos overflows
+    }
+
+  /**
+   * Clock implementation is replaceable (for testing); the implementation must
+   * return a monotonically increasing series of Long nanoseconds.
+   */
+  protected def clock(): Long = System.nanoTime
+
+  /**
+   * Overridable for tests
+   */
+  protected def waitNanos(nanos: Long): Unit = {
+    // see http://www.javamex.com/tutorials/threads/sleep_issues.shtml
+    val sleepMs = if (Helpers.isWindows) (nanos + 4999999) / 10000000 * 10 else (nanos + 999999) / 1000000
+    try Thread.sleep(sleepMs) catch {
+      case _: InterruptedException ⇒ Thread.currentThread.interrupt() // we got woken up
+    }
+  }
+
+  override def schedule(initialDelay: FiniteDuration,
+                        delay: FiniteDuration,
+                        runnable: Runnable)(implicit executor: ExecutionContext): Cancellable =
+    try new AtomicReference[Cancellable] with Cancellable { self ⇒
+      set(schedule(
+        new AtomicLong(clock() + initialDelay.toNanos) with Runnable {
+          override def run(): Unit = {
+            try {
+              runnable.run()
+              val driftNanos = clock() - getAndAdd(delay.toNanos)
+              if (self.get != null)
+                swap(schedule(this, Duration.fromNanos(Math.max(delay.toNanos - driftNanos, 1))))
+            } catch {
+              case _: SchedulerException ⇒ // ignore failure to enqueue or terminated target actor
+            }
+          }
+        }, roundUp(initialDelay)))
+
+      @tailrec private def swap(c: Cancellable): Unit = {
+        get match {
+          case null ⇒ if (c != null) c.cancel()
+          case old  ⇒ if (!compareAndSet(old, c)) swap(c)
+        }
+      }
+
+      @tailrec final def cancel(): Boolean = {
+        get match {
+          case null ⇒ false
+          case c ⇒
+            if (c.cancel()) compareAndSet(c, null)
+            else compareAndSet(c, null) || cancel()
+        }
+      }
+
+      override def isCancelled: Boolean = get == null
+    } catch {
+      case SchedulerException(msg) ⇒ throw new IllegalStateException(msg)
+    }
+
+  override def scheduleOnce(delay: FiniteDuration, runnable: Runnable)(implicit executor: ExecutionContext): Cancellable =
+    try schedule(runnable, roundUp(delay))
+    catch {
+      case SchedulerException(msg) ⇒ throw new IllegalStateException(msg)
+    }
+
+  private def execDirectly(t: TimerTask): Unit = {
+    try t.run() catch {
+      case e: InterruptedException ⇒ throw e
+      case _: SchedulerException   ⇒ // ignore terminated actors
+      case NonFatal(e)             ⇒ log.error(e, "exception while executing timer task")
+    }
+  }
+
+  override def close(): Unit = Await.result(stop(), ShutdownTimeout) foreach execDirectly
+
+  override val maxFrequency: Double = 1.second / TickDuration
+
+  /*
+   * BELOW IS THE ACTUAL TIMER IMPLEMENTATION
+   */
+
+  private val start = clock()
+  private val tickNanos = TickDuration.toNanos
+  private val wheelMask = length() - 1
+  @volatile private var currentBucket = 0
+
+  private def schedule(r: Runnable, delay: FiniteDuration)(implicit ec: ExecutionContext): TimerTask =
+    if (delay <= Duration.Zero) {
+      if (stopped.get != null) throw new SchedulerException("cannot enqueue after timer shutdown")
+      ec.execute(r)
+      NotCancellable
+    } else {
+      val ticks = (delay.toNanos / tickNanos).toInt
+      val rounds = (ticks >> WheelShift).toInt
+
+      /*
+       * works as follows:
+       * - ticks are calculated to be never “too early”
+       * - base off of currentBucket, even after that was moved in the meantime
+       * - timer thread will swap in Pause, increment currentBucket, swap in null
+       * - hence spin on Pause, else normal CAS
+       * - stopping will set all buckets to Pause (in clearAll), so we need only check there
+       */
+      @tailrec
+      def rec(t: TaskHolder): TimerTask = {
+        val bucket = (currentBucket + ticks) & wheelMask
+        get(bucket) match {
+          case Pause ⇒
+            if (stopped.get != null) throw new SchedulerException("cannot enqueue after timer shutdown")
+            rec(t)
+          case tail ⇒
+            t.next = tail
+            if (compareAndSet(bucket, tail, t)) t
+            else rec(t)
+        }
+      }
+
+      rec(new TaskHolder(r, null, rounds))
+    }
+
+  private val stopped = new AtomicReference[Promise[immutable.Seq[TimerTask]]]
+  def stop(): Future[immutable.Seq[TimerTask]] =
+    if (stopped.compareAndSet(null, Promise())) {
+      timerThread.interrupt()
+      stopped.get.future
+    } else Future.successful(Nil)
+
+  private def clearAll(): immutable.Seq[TimerTask] = {
+    def collect(curr: TaskHolder, acc: Vector[TimerTask]): Vector[TimerTask] = {
+      curr match {
+        case null ⇒ acc
+        case x    ⇒ collect(x.next, acc :+ x)
+      }
+    }
+    (0 until length()) flatMap (i ⇒ collect(getAndSet(i, Pause), Vector.empty))
+  }
+
+  @volatile private var timerThread: Thread = threadFactory.newThread(new Runnable {
+    var tick = 0
+    override final def run =
+      try nextTick()
+      catch {
+        case t: Throwable ⇒
+          val thread = threadFactory.newThread(this)
+          try thread.start()
+          finally timerThread = thread
+          throw t
+      }
+    @tailrec final def nextTick(): Unit = {
+      val sleepTime = start + tick * tickNanos - clock()
+
+      if (sleepTime > 0) {
+        waitNanos(sleepTime)
+      } else {
+        // first get the list of tasks out and turn the wheel
+        val bucket = currentBucket
+        val tasks = getAndSet(bucket, Pause)
+        val next = (bucket + 1) & wheelMask
+        currentBucket = next
+        set(bucket, if (tasks eq null) Empty else null)
+
+        // then process the tasks and keep the non-ripe ones in a list
+        var last: TaskHolder = null // the last element of the putBack list
+        @tailrec def rec1(task: TaskHolder, nonRipe: TaskHolder): TaskHolder = {
+          if ((task eq null) || (task eq Empty)) nonRipe
+          else if (task.isCancelled) rec1(task.next, nonRipe)
+          else if (task.rounds > 0) {
+            task.rounds -= 1
+
+            val next = task.next
+            task.next = nonRipe
+
+            if (last == null) last = task
+            rec1(next, task)
+          } else {
+            task.executeTask()
+            rec1(task.next, nonRipe)
+          }
+        }
+        val putBack = rec1(tasks, null)
+
+        // finally put back the non-ripe ones, who had their rounds decremented
+        @tailrec def rec2() {
+          val tail = get(bucket)
+          last.next = tail
+          if (!compareAndSet(bucket, tail, putBack)) rec2()
+        }
+        if (last != null) rec2()
+
+        // and off to the next tick
+        tick += 1
+      }
+      stopped.get match {
+        case null ⇒ nextTick()
+        case x    ⇒ x success clearAll()
+      }
+    }
+  })
+
+  timerThread.start()
+}
+
+object LightArrayRevolverScheduler {
+  private val taskOffset = unsafe.objectFieldOffset(classOf[TaskHolder].getDeclaredField("task"))
+
+  /**
+   * INTERNAL API
+   */
+  protected[actor] trait TimerTask extends Runnable with Cancellable
+
+  /**
+   * INTERNAL API
+   */
+  protected[actor] class TaskHolder(@volatile var task: Runnable,
+                           @volatile var next: TaskHolder,
+                           @volatile var rounds: Int)(
+                             implicit executionContext: ExecutionContext) extends TimerTask {
+    @tailrec
+    private final def extractTask(cancel: Boolean): Runnable = {
+      task match {
+        case null | CancelledTask ⇒ null // null means expired
+        case x ⇒
+          if (unsafe.compareAndSwapObject(this, taskOffset, x, if (cancel) CancelledTask else null)) x
+          else extractTask(cancel)
+      }
+    }
+
+    private[akka] final def executeTask(): Boolean = extractTask(cancel = false) match {
+      case null | CancelledTask ⇒ false
+      case other ⇒
+        try {
+          executionContext execute other
+          true
+        } catch {
+          case _: InterruptedException ⇒ { Thread.currentThread.interrupt(); false }
+          case NonFatal(e)             ⇒ { executionContext.reportFailure(e); false }
+        }
+    }
+
+    /**
+     * utility method to directly run the task, e.g. as clean-up action
+     */
+    def run(): Unit = extractTask(cancel = false) match {
+      case null ⇒
+      case r    ⇒ r.run()
+    }
+
+    override def cancel(): Boolean = extractTask(cancel = true) != null
+
+    override def isCancelled: Boolean = task eq CancelledTask
+  }
+
+  private val CancelledTask = new Runnable { def run = () }
+
+  private val NotCancellable = new TimerTask {
+    def cancel(): Boolean = false
+    def isCancelled: Boolean = false
+    def run(): Unit = ()
+  }
+  // marker object during wheel movement
+  private val Pause = new TaskHolder(null, null, 0)(null)
+  // we need two empty tokens so wheel passing can be detected in schedule()
+  private val Empty = new TaskHolder(null, null, 0)(null)
+}
+
 /**
  * Scheduled tasks (Runnable and functions) are executed with the supplied dispatcher.
  * Note that dispatcher is by-name parameter, because dispatcher might not be initialized
@@ -132,35 +477,19 @@ trait Cancellable {
  * if it does not enqueue a task. Once a task is queued, it MUST be executed or
  * returned from stop().
  */
-class DefaultScheduler(hashedWheelTimer: HashedWheelTimer, log: LoggingAdapter) extends Scheduler with Closeable {
-  override def schedule(initialDelay: FiniteDuration,
-                        delay: FiniteDuration,
-                        receiver: ActorRef,
-                        message: Any)(implicit executor: ExecutionContext, sender: ActorRef = Actor.noSender): Cancellable = {
-    val continuousCancellable = new ContinuousCancellable
-    continuousCancellable.init(
-      hashedWheelTimer.newTimeout(
-        new AtomicLong(System.nanoTime + initialDelay.toNanos) with TimerTask with ContinuousScheduling {
-          def run(timeout: HWTimeout) {
-            executor execute new Runnable {
-              override def run = {
-                receiver ! message
-                // Check if the receiver is still alive and kicking before reschedule the task
-                if (receiver.isTerminated) log.debug("Could not reschedule message to be sent because receiving actor {} has been terminated.", receiver)
-                else {
-                  val driftNanos = System.nanoTime - getAndAdd(delay.toNanos)
-                  scheduleNext(timeout, Duration.fromNanos(Math.max(delay.toNanos - driftNanos, 1)), continuousCancellable)
-                }
-              }
-            }
-          }
-        },
-        initialDelay))
-  }
+class DefaultScheduler(config: Config,
+                       log: LoggingAdapter,
+                       threadFactory: ThreadFactory) extends Scheduler with Closeable {
 
-  override def schedule(initialDelay: FiniteDuration,
-                        delay: FiniteDuration)(f: ⇒ Unit)(implicit executor: ExecutionContext): Cancellable =
-    schedule(initialDelay, delay, new Runnable { override def run = f })
+  val TicksPerWheel = {
+    val ticks = config.getInt("akka.scheduler.ticks-per-wheel")
+    val shift = 31 - Integer.numberOfLeadingZeros(ticks)
+    if ((ticks & (ticks - 1)) != 0) throw new akka.ConfigurationException("ticks-per-wheel must be a power of 2")
+    ticks
+  }
+  val TickDuration = Duration(config.getMilliseconds("akka.scheduler.tick-duration"), MILLISECONDS)
+
+  private val hashedWheelTimer = new HashedWheelTimer(log, threadFactory, TickDuration, TicksPerWheel)
 
   override def schedule(initialDelay: FiniteDuration,
                         delay: FiniteDuration,
@@ -168,14 +497,19 @@ class DefaultScheduler(hashedWheelTimer: HashedWheelTimer, log: LoggingAdapter)
     val continuousCancellable = new ContinuousCancellable
     continuousCancellable.init(
       hashedWheelTimer.newTimeout(
-        new AtomicLong(System.nanoTime + initialDelay.toNanos) with TimerTask with ContinuousScheduling {
-          override def run(timeout: HWTimeout): Unit = executor.execute(new Runnable {
-            override def run = {
-              runnable.run()
-              val driftNanos = System.nanoTime - getAndAdd(delay.toNanos)
-              scheduleNext(timeout, Duration.fromNanos(Math.max(delay.toNanos - driftNanos, 1)), continuousCancellable)
-            }
-          })
+        new AtomicLong(System.nanoTime + initialDelay.toNanos) with HWTimerTask with ContinuousScheduling {
+          override def run(timeout: HWTimeout): Unit =
+            executor.execute(new Runnable {
+              override def run = {
+                try {
+                  runnable.run()
+                  val driftNanos = System.nanoTime - getAndAdd(delay.toNanos)
+                  scheduleNext(timeout, Duration.fromNanos(Math.max(delay.toNanos - driftNanos, 1)), continuousCancellable)
+                } catch {
+                  case _: SchedulerException ⇒ // actor target terminated
+                }
+              }
+            })
         },
         initialDelay))
   }
@@ -183,16 +517,10 @@ class DefaultScheduler(hashedWheelTimer: HashedWheelTimer, log: LoggingAdapter)
   override def scheduleOnce(delay: FiniteDuration, runnable: Runnable)(implicit executor: ExecutionContext): Cancellable =
     new DefaultCancellable(
       hashedWheelTimer.newTimeout(
-        new TimerTask() { def run(timeout: HWTimeout): Unit = executor.execute(runnable) },
+        new HWTimerTask() { def run(timeout: HWTimeout): Unit = executor.execute(runnable) },
         delay))
 
-  override def scheduleOnce(delay: FiniteDuration, receiver: ActorRef, message: Any)(implicit executor: ExecutionContext): Cancellable =
-    scheduleOnce(delay, new Runnable { override def run = receiver ! message })
-
-  override def scheduleOnce(delay: FiniteDuration)(f: ⇒ Unit)(implicit executor: ExecutionContext): Cancellable =
-    scheduleOnce(delay, new Runnable { override def run = f })
-
-  private trait ContinuousScheduling { this: TimerTask ⇒
+  private trait ContinuousScheduling { this: HWTimerTask ⇒
     def scheduleNext(timeout: HWTimeout, delay: FiniteDuration, delegator: ContinuousCancellable) {
       try delegator.swap(timeout.getTimer.newTimeout(this, delay)) catch { case _: IllegalStateException ⇒ } // stop recurring if timer is stopped
     }
@@ -209,23 +537,25 @@ class DefaultScheduler(hashedWheelTimer: HashedWheelTimer, log: LoggingAdapter)
     val i = hashedWheelTimer.stop().iterator()
     while (i.hasNext) execDirectly(i.next())
   }
+
+  override def maxFrequency: Double = 1.second / TickDuration
 }
 
 private[akka] object ContinuousCancellable {
   val initial: HWTimeout = new HWTimeout {
-    override def getTimer: Timer = null
-    override def getTask: TimerTask = null
+    override def getTimer: HWTimer = null
+    override def getTask: HWTimerTask = null
     override def isExpired: Boolean = false
     override def isCancelled: Boolean = false
-    override def cancel: Unit = ()
+    override def cancel: Boolean = true
   }
 
   val cancelled: HWTimeout = new HWTimeout {
-    override def getTimer: Timer = null
-    override def getTask: TimerTask = null
+    override def getTimer: HWTimer = null
+    override def getTask: HWTimerTask = null
     override def isExpired: Boolean = false
     override def isCancelled: Boolean = true
-    override def cancel: Unit = ()
+    override def cancel: Boolean = false
   }
 }
 /**
@@ -245,10 +575,10 @@ private[akka] class ContinuousCancellable extends AtomicReference[HWTimeout](Con
   }
 
   def isCancelled(): Boolean = get().isCancelled()
-  def cancel(): Unit = getAndSet(ContinuousCancellable.cancelled).cancel()
+  def cancel(): Boolean = getAndSet(ContinuousCancellable.cancelled).cancel()
 }
 
 private[akka] class DefaultCancellable(timeout: HWTimeout) extends AtomicReference[HWTimeout](timeout) with Cancellable {
-  override def cancel(): Unit = getAndSet(ContinuousCancellable.cancelled).cancel()
+  override def cancel(): Boolean = getAndSet(ContinuousCancellable.cancelled).cancel()
   override def isCancelled: Boolean = get().isCancelled
 }
diff --git a/akka-cluster/src/main/scala/akka/cluster/Cluster.scala b/akka-cluster/src/main/scala/akka/cluster/Cluster.scala
index 54d3e6bfa3..cc2e67e7e3 100644
--- a/akka-cluster/src/main/scala/akka/cluster/Cluster.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/Cluster.scala
@@ -23,6 +23,7 @@ import java.util.concurrent.atomic.AtomicBoolean
 import java.util.concurrent.atomic.AtomicReference
 import akka.util.internal.HashedWheelTimer
 import concurrent.{ ExecutionContext, Await }
+import com.typesafe.config.ConfigFactory
 
 /**
  * Cluster Extension Id and factory for creating Cluster extension.
@@ -88,31 +89,26 @@ class Cluster(val system: ExtendedActorSystem) extends Extension {
    * INTERNAL API
    */
   private[cluster] val scheduler: Scheduler with Closeable = {
-    if (system.settings.SchedulerTickDuration > SchedulerTickDuration) {
+    if (system.scheduler.maxFrequency < 1.second / SchedulerTickDuration) {
+      import scala.collection.JavaConverters._
       log.info("Using a dedicated scheduler for cluster. Default scheduler can be used if configured " +
         "with 'akka.scheduler.tick-duration' [{} ms] <=  'akka.cluster.scheduler.tick-duration' [{} ms].",
-        system.settings.SchedulerTickDuration.toMillis, SchedulerTickDuration.toMillis)
+        1000 / system.scheduler.maxFrequency, SchedulerTickDuration.toMillis)
       new DefaultScheduler(
-        new HashedWheelTimer(log,
-          system.threadFactory match {
-            case tf: MonitorableThreadFactory ⇒ tf.withName(tf.name + "-cluster-scheduler")
-            case tf                           ⇒ tf
-          },
-          SchedulerTickDuration,
-          SchedulerTicksPerWheel),
-        log)
+        ConfigFactory.parseString(s"akka.scheduler.tick-duration=${SchedulerTickDuration.toMillis}ms").withFallback(
+          system.settings.config),
+        log,
+        system.threadFactory match {
+          case tf: MonitorableThreadFactory ⇒ tf.withName(tf.name + "-cluster-scheduler")
+          case tf                           ⇒ tf
+        })
     } else {
       // delegate to system.scheduler, but don't close over system
       val systemScheduler = system.scheduler
       new Scheduler with Closeable {
         override def close(): Unit = () // we are using system.scheduler, which we are not responsible for closing
 
-        override def schedule(initialDelay: FiniteDuration, interval: FiniteDuration,
-                              receiver: ActorRef, message: Any)(implicit executor: ExecutionContext, sender: ActorRef = Actor.noSender): Cancellable =
-          systemScheduler.schedule(initialDelay, interval, receiver, message)
-
-        override def schedule(initialDelay: FiniteDuration, interval: FiniteDuration)(f: ⇒ Unit)(implicit executor: ExecutionContext): Cancellable =
-          systemScheduler.schedule(initialDelay, interval)(f)
+        override def maxFrequency: Double = systemScheduler.maxFrequency
 
         override def schedule(initialDelay: FiniteDuration, interval: FiniteDuration,
                               runnable: Runnable)(implicit executor: ExecutionContext): Cancellable =
@@ -121,13 +117,6 @@ class Cluster(val system: ExtendedActorSystem) extends Extension {
         override def scheduleOnce(delay: FiniteDuration,
                                   runnable: Runnable)(implicit executor: ExecutionContext): Cancellable =
           systemScheduler.scheduleOnce(delay, runnable)
-
-        override def scheduleOnce(delay: FiniteDuration, receiver: ActorRef,
-                                  message: Any)(implicit executor: ExecutionContext): Cancellable =
-          systemScheduler.scheduleOnce(delay, receiver, message)
-
-        override def scheduleOnce(delay: FiniteDuration)(f: ⇒ Unit)(implicit executor: ExecutionContext): Cancellable =
-          systemScheduler.scheduleOnce(delay)(f)
       }
     }
   }
diff --git a/akka-docs/rst/java/code/docs/actor/SchedulerDocTestBase.java b/akka-docs/rst/java/code/docs/actor/SchedulerDocTestBase.java
index 66b5181ba8..d49ddda85e 100644
--- a/akka-docs/rst/java/code/docs/actor/SchedulerDocTestBase.java
+++ b/akka-docs/rst/java/code/docs/actor/SchedulerDocTestBase.java
@@ -10,6 +10,7 @@ import java.util.concurrent.TimeUnit;
 //#imports1
 
 //#imports2
+import akka.actor.Actor;
 import akka.actor.UntypedActor;
 import akka.actor.UntypedActorFactory;
 import akka.actor.Cancellable;
@@ -43,7 +44,7 @@ public class SchedulerDocTestBase {
   public void scheduleOneOffTask() {
     //#schedule-one-off-message
     system.scheduler().scheduleOnce(Duration.create(50, TimeUnit.MILLISECONDS),
-      testActor, "foo", system.dispatcher());
+      testActor, "foo", system.dispatcher(), null);
     //#schedule-one-off-message
 
     //#schedule-one-off-thunk
diff --git a/akka-docs/rst/java/code/docs/actor/japi/FaultHandlingDocSample.java b/akka-docs/rst/java/code/docs/actor/japi/FaultHandlingDocSample.java
index 37d1da703a..74c7035fe6 100644
--- a/akka-docs/rst/java/code/docs/actor/japi/FaultHandlingDocSample.java
+++ b/akka-docs/rst/java/code/docs/actor/japi/FaultHandlingDocSample.java
@@ -311,9 +311,8 @@ public class FaultHandlingDocSample {
         counter.tell(new UseStorage(null), getSelf());
         // Try to re-establish storage after while
         getContext().system().scheduler().scheduleOnce(
-                Duration.create(10, "seconds"), getSelf(), Reconnect,
-          getContext().dispatcher()
-        );
+            Duration.create(10, "seconds"), getSelf(), Reconnect,
+            getContext().dispatcher(), null);
       } else if (msg.equals(Reconnect)) {
         // Re-establish storage after the scheduled delay
         initStorage();
diff --git a/akka-docs/rst/java/code/docs/pattern/SchedulerPatternTest.java b/akka-docs/rst/java/code/docs/pattern/SchedulerPatternTest.java
index bb3eb8b777..16080e948a 100644
--- a/akka-docs/rst/java/code/docs/pattern/SchedulerPatternTest.java
+++ b/akka-docs/rst/java/code/docs/pattern/SchedulerPatternTest.java
@@ -84,7 +84,7 @@ public class SchedulerPatternTest {
     public void preStart() {
       getContext().system().scheduler().scheduleOnce(
         Duration.create(500, TimeUnit.MILLISECONDS),
-        getSelf(), "tick", getContext().dispatcher());
+        getSelf(), "tick", getContext().dispatcher(), null);
     }
 
     // override postRestart so we don't call preStart and schedule a new message
@@ -98,7 +98,7 @@ public class SchedulerPatternTest {
         // send another periodic tick after the specified delay
         getContext().system().scheduler().scheduleOnce(
           Duration.create(1000, TimeUnit.MILLISECONDS),
-          getSelf(), "tick", getContext().dispatcher());
+          getSelf(), "tick", getContext().dispatcher(), null);
         // do something useful here
         //#schedule-receive
         target.tell(message, getSelf());
diff --git a/akka-docs/rst/java/code/docs/pattern/SupervisedAsk.java b/akka-docs/rst/java/code/docs/pattern/SupervisedAsk.java
index 248b8acd42..1c8d92166c 100644
--- a/akka-docs/rst/java/code/docs/pattern/SupervisedAsk.java
+++ b/akka-docs/rst/java/code/docs/pattern/SupervisedAsk.java
@@ -5,6 +5,7 @@ import java.util.concurrent.TimeoutException;
 import scala.concurrent.Future;
 import scala.concurrent.duration.Duration;
 
+import akka.actor.Actor;
 import akka.actor.ActorKilledException;
 import akka.actor.ActorRef;
 import akka.actor.ActorRefFactory;
@@ -79,7 +80,7 @@ public class SupervisedAsk {
         targetActor.forward(askParam.message, getContext());
         Scheduler scheduler = getContext().system().scheduler();
         timeoutMessage = scheduler.scheduleOnce(askParam.timeout.duration(),
-            self(), new AskTimeout(), context().dispatcher());
+            self(), new AskTimeout(), context().dispatcher(), null);
       } else if (message instanceof Terminated) {
         Throwable ex = new ActorKilledException("Target actor terminated.");
         caller.tell(new Status.Failure(ex), self());
diff --git a/akka-docs/rst/java/scheduler.rst b/akka-docs/rst/java/scheduler.rst
index 6676dcc6f0..42c44443f4 100644
--- a/akka-docs/rst/java/scheduler.rst
+++ b/akka-docs/rst/java/scheduler.rst
@@ -5,22 +5,23 @@
  Scheduler (Java)
 ##################
 
-Sometimes the need for making things happen in the future arises, and where do you go look then?
-Look no further than ``ActorSystem``! There you find the :meth:`scheduler` method that returns an instance
-of akka.actor.Scheduler, this instance is unique per ActorSystem and is used internally for scheduling things
-to happen at specific points in time. Please note that the scheduled tasks are executed by the default
-``MessageDispatcher`` of the ``ActorSystem``.
+Sometimes the need for making things happen in the future arises, and where do
+you go look then?  Look no further than ``ActorSystem``! There you find the
+:meth:`scheduler` method that returns an instance of
+:class:`akka.actor.Scheduler`, this instance is unique per ActorSystem and is
+used internally for scheduling things to happen at specific points in time.
 
-You can schedule sending of messages to actors and execution of tasks (functions or Runnable).
-You will get a ``Cancellable`` back that you can call :meth:`cancel` on to cancel the execution of the
-scheduled operation.
+You can schedule sending of messages to actors and execution of tasks
+(functions or Runnable).  You will get a ``Cancellable`` back that you can call
+:meth:`cancel` on to cancel the execution of the scheduled operation.
 
 .. warning::
 
-    The default implementation of ``Scheduler`` used by Akka is based on the Netty ``HashedWheelTimer``.
-    It does not execute tasks at the exact time, but on every tick, it will run everything that is overdue.
-    The accuracy of the default Scheduler can be modified by the "ticks-per-wheel" and "tick-duration" configuration
-    properties. For more information, see: `HashedWheelTimers <http://www.cse.wustl.edu/~cdgill/courses/cs6874/TimingWheels.ppt>`_.
+    The default implementation of ``Scheduler`` used by Akka is based on job
+    buckets which are emptied according to a fixed schedule.  It does not
+    execute tasks at the exact time, but on every tick, it will run everything
+    that is (over)due.  The accuracy of the default Scheduler can be modified
+    by the ``akka.scheduler.tick-duration`` configuration property.
 
 Some examples
 -------------
@@ -53,19 +54,29 @@ From ``akka.actor.ActorSystem``
    :include: scheduler
 
 
-The Scheduler interface
------------------------
+The Scheduler Interface for Implementors
+----------------------------------------
 
-.. includecode:: ../../../akka-actor/src/main/scala/akka/actor/Scheduler.scala
+The actual scheduler implementation is loaded reflectively upon
+:class:`ActorSystem` start-up, which means that it is possible to provide a
+different one using the ``akka.scheduler.implementation`` configuration
+property. The referenced class must implement the following interface:
+
+.. includecode:: ../../../akka-actor/src/main/java/akka/actor/AbstractScheduler.java
    :include: scheduler
 
 The Cancellable interface
 -------------------------
 
-This allows you to ``cancel`` something that has been scheduled for execution.
+Scheduling a task will result in a :class:`Cancellable` (or throw an
+:class:`IllegalStateException` if attempted after the scheduler’s shutdown).
+This allows you to cancel something that has been scheduled for execution.
 
 .. warning::
-  This does not abort the execution of the task, if it had already been started.
+
+  This does not abort the execution of the task, if it had already been
+  started.  Check the return value of ``cancel`` to detect whether the
+  scheduled task was canceled or will (eventually) have run.
 
 .. includecode:: ../../../akka-actor/src/main/scala/akka/actor/Scheduler.scala
    :include: cancellable
diff --git a/akka-docs/rst/scala/code/docs/actor/SchedulerDocSpec.scala b/akka-docs/rst/scala/code/docs/actor/SchedulerDocSpec.scala
index 5b46d94298..d1344f1c72 100644
--- a/akka-docs/rst/scala/code/docs/actor/SchedulerDocSpec.scala
+++ b/akka-docs/rst/scala/code/docs/actor/SchedulerDocSpec.scala
@@ -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
     }
diff --git a/akka-docs/rst/scala/scheduler.rst b/akka-docs/rst/scala/scheduler.rst
index e221752fac..b67a9a7de5 100644
--- a/akka-docs/rst/scala/scheduler.rst
+++ b/akka-docs/rst/scala/scheduler.rst
@@ -5,22 +5,23 @@
  Scheduler (Scala)
 ###################
 
-Sometimes the need for making things happen in the future arises, and where do you go look then?
-Look no further than ``ActorSystem``! There you find the :meth:`scheduler` method that returns an instance
-of akka.actor.Scheduler, this instance is unique per ActorSystem and is used internally for scheduling things
-to happen at specific points in time. Please note that the scheduled tasks are executed by the default
-``MessageDispatcher`` of the ``ActorSystem``.
+Sometimes the need for making things happen in the future arises, and where do
+you go look then?  Look no further than ``ActorSystem``! There you find the
+:meth:`scheduler` method that returns an instance of
+:class:`akka.actor.Scheduler`, this instance is unique per ActorSystem and is
+used internally for scheduling things to happen at specific points in time.
 
-You can schedule sending of messages to actors and execution of tasks (functions or Runnable).
-You will get a ``Cancellable`` back that you can call :meth:`cancel` on to cancel the execution of the
-scheduled operation.
+You can schedule sending of messages to actors and execution of tasks
+(functions or Runnable).  You will get a ``Cancellable`` back that you can call
+:meth:`cancel` on to cancel the execution of the scheduled operation.
 
 .. warning::
 
-    The default implementation of ``Scheduler`` used by Akka is based on the Netty ``HashedWheelTimer``.
-    It does not execute tasks at the exact time, but on every tick, it will run everything that is overdue.
-    The accuracy of the default Scheduler can be modified by the "ticks-per-wheel" and "tick-duration" configuration
-    properties. For more information, see: `HashedWheelTimers <http://www.cse.wustl.edu/~cdgill/courses/cs6874/TimingWheels.ppt>`_.
+    The default implementation of ``Scheduler`` used by Akka is based on job
+    buckets which are emptied according to a fixed schedule.  It does not
+    execute tasks at the exact time, but on every tick, it will run everything
+    that is (over)due.  The accuracy of the default Scheduler can be modified
+    by the ``akka.scheduler.tick-duration`` configuration property.
 
 Some examples
 -------------
@@ -44,16 +45,26 @@ From ``akka.actor.ActorSystem``
 The Scheduler interface
 -----------------------
 
+The actual scheduler implementation is loaded reflectively upon
+:class:`ActorSystem` start-up, which means that it is possible to provide a
+different one using the ``akka.scheduler.implementation`` configuration
+property. The referenced class must implement the following interface:
+
 .. includecode:: ../../../akka-actor/src/main/scala/akka/actor/Scheduler.scala
    :include: scheduler
 
 The Cancellable interface
 -------------------------
 
-This allows you to ``cancel`` something that has been scheduled for execution.
+Scheduling a task will result in a :class:`Cancellable` (or throw an
+:class:`IllegalStateException` if attempted after the scheduler’s shutdown).
+This allows you to cancel something that has been scheduled for execution.
 
 .. warning::
-  This does not abort the execution of the task, if it had already been started.
+
+  This does not abort the execution of the task, if it had already been
+  started.  Check the return value of ``cancel`` to detect whether the
+  scheduled task was canceled or will (eventually) have run.
 
 .. includecode:: ../../../akka-actor/src/main/scala/akka/actor/Scheduler.scala
    :include: cancellable
diff --git a/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala b/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala
index 620e4bfc5a..b0732559a2 100644
--- a/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala
+++ b/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala
@@ -44,8 +44,8 @@ class OsgiActorSystemFactory(val context: BundleContext, val fallbackClassLoader
   def actorSystemConfig(context: BundleContext): Config = {
     val bundleSymbolicName = context.getBundle.getSymbolicName
     val bundleId = context.getBundle.getBundleId
-    val acceptedFilePath = List(s"bundle-$bundleSymbolicName", s"bundle-$bundleId", "akka").map(x =>  s"etc/$x")
-    val applicationConfiguration = acceptedFilePath.foldLeft(ConfigFactory.empty())((x, y) => x.withFallback(ConfigFactory.parseFileAnySyntax(new File(y))))
+    val acceptedFilePath = List(s"bundle-$bundleSymbolicName", s"bundle-$bundleId", "akka").map(x ⇒ s"etc/$x")
+    val applicationConfiguration = acceptedFilePath.foldLeft(ConfigFactory.empty())((x, y) ⇒ x.withFallback(ConfigFactory.parseFileAnySyntax(new File(y))))
     applicationConfiguration.withFallback(ConfigFactory.load(classloader).withFallback(ConfigFactory.defaultReference(OsgiActorSystemFactory.akkaActorClassLoader)))
   }
 
diff --git a/akka-testkit/src/main/java/akka/testkit/JavaTestKit.java b/akka-testkit/src/main/java/akka/testkit/JavaTestKit.java
index 835fd1939a..46d819edd1 100644
--- a/akka-testkit/src/main/java/akka/testkit/JavaTestKit.java
+++ b/akka-testkit/src/main/java/akka/testkit/JavaTestKit.java
@@ -135,7 +135,15 @@ public class JavaTestKit {
         public Object apply() {
           return cond();
         }
-      }, max, interval);
+      }, max, interval, p.awaitCond$default$4());
+    }
+    
+    public AwaitCond(Duration max, Duration interval, String message) {
+      p.awaitCond(new AbstractFunction0<Object>() {
+        public Object apply() {
+          return cond();
+        }
+      }, max, interval, message);
     }
   }
 
diff --git a/akka-testkit/src/main/scala/akka/testkit/TestKit.scala b/akka-testkit/src/main/scala/akka/testkit/TestKit.scala
index e81acb23a3..45ccdbb8c7 100644
--- a/akka-testkit/src/main/scala/akka/testkit/TestKit.scala
+++ b/akka-testkit/src/main/scala/akka/testkit/TestKit.scala
@@ -215,14 +215,14 @@ trait TestKitBase {
    * Note that the timeout is scaled using Duration.dilated,
    * which uses the configuration entry "akka.test.timefactor".
    */
-  def awaitCond(p: ⇒ Boolean, max: Duration = Duration.Undefined, interval: Duration = 100.millis) {
+  def awaitCond(p: ⇒ Boolean, max: Duration = Duration.Undefined, interval: Duration = 100.millis, message: String = "") {
     val _max = remainingOrDilated(max)
     val stop = now + _max
 
     @tailrec
     def poll(t: Duration) {
       if (!p) {
-        assert(now < stop, "timeout " + _max + " expired")
+        assert(now < stop, "timeout " + _max + " expired: " + message)
         Thread.sleep(t.toMillis)
         poll((stop - now) min interval)
       }

From b9c0e98d3dc745e03168ef1e3e21efe8cdfb16ba Mon Sep 17 00:00:00 2001
From: Roland <rk@rkuhn.info>
Date: Wed, 23 Jan 2013 21:02:41 +0100
Subject: [PATCH 071/122] Java 6 again; plus forgot one copyright header

---
 .../src/test/scala/akka/actor/SchedulerSpec.scala           | 5 +++++
 akka-actor/src/main/scala/akka/actor/Scheduler.scala        | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala
index a2a7c645fa..ece91ff115 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala
@@ -1,3 +1,7 @@
+/**
+ *  Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
+ */
+
 package akka.actor
 
 import language.postfixOps
@@ -6,6 +10,7 @@ import java.util.concurrent._
 import java.util.concurrent.atomic.AtomicInteger
 import scala.concurrent.{ future, Await, ExecutionContext }
 import scala.concurrent.duration._
+import scala.concurrent.forkjoin.ThreadLocalRandom
 import scala.util.Try
 import scala.util.control.NonFatal
 import org.scalatest.BeforeAndAfterEach
diff --git a/akka-actor/src/main/scala/akka/actor/Scheduler.scala b/akka-actor/src/main/scala/akka/actor/Scheduler.scala
index 6b822f870d..e64d0e18e6 100644
--- a/akka-actor/src/main/scala/akka/actor/Scheduler.scala
+++ b/akka-actor/src/main/scala/akka/actor/Scheduler.scala
@@ -417,9 +417,9 @@ object LightArrayRevolverScheduler {
    * INTERNAL API
    */
   protected[actor] class TaskHolder(@volatile var task: Runnable,
-                           @volatile var next: TaskHolder,
-                           @volatile var rounds: Int)(
-                             implicit executionContext: ExecutionContext) extends TimerTask {
+                                    @volatile var next: TaskHolder,
+                                    @volatile var rounds: Int)(
+                                      implicit executionContext: ExecutionContext) extends TimerTask {
     @tailrec
     private final def extractTask(cancel: Boolean): Runnable = {
       task match {

From 40a67a40977f4d8e82a34a2dbf050f5dcda15be6 Mon Sep 17 00:00:00 2001
From: Roland <rk@rkuhn.info>
Date: Wed, 23 Jan 2013 21:57:28 +0100
Subject: [PATCH 072/122] disable EPUB build until sbt-site is fixed, see #2938

---
 project/AkkaBuild.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index 3cd93db911..1f633929cd 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -382,7 +382,7 @@ object AkkaBuild extends Build {
         orig
       },
       enableOutput in generatePdf in Sphinx := true,
-      enableOutput in generateEpub in Sphinx := true,
+      enableOutput in generateEpub in Sphinx := false,
       unmanagedSourceDirectories in Test <<= sourceDirectory in Sphinx apply { _ ** "code" get },
       libraryDependencies ++= Dependencies.docs,
       unmanagedSourceDirectories in ScalariformKeys.format in Test <<= unmanagedSourceDirectories in Test,

From bb7a4b7d40f92db441f5f2901bea146f692f61d7 Mon Sep 17 00:00:00 2001
From: Roland <rk@rkuhn.info>
Date: Wed, 23 Jan 2013 23:38:22 +0100
Subject: [PATCH 073/122] document deadlock risk of
 TestProbe.watch(TestActorRef), see #2916

---
 .../java/code/docs/testkit/TestKitDocTest.java  | 14 ++++++++++++++
 akka-docs/rst/java/testing.rst                  | 17 +++++++++++++++++
 .../code/docs/testkit/TestkitDocSpec.scala      | 10 ++++++++++
 akka-docs/rst/scala/testing.rst                 | 17 +++++++++++++++++
 4 files changed, 58 insertions(+)

diff --git a/akka-docs/rst/java/code/docs/testkit/TestKitDocTest.java b/akka-docs/rst/java/code/docs/testkit/TestKitDocTest.java
index 1310ac2a8c..987c70604c 100644
--- a/akka-docs/rst/java/code/docs/testkit/TestKitDocTest.java
+++ b/akka-docs/rst/java/code/docs/testkit/TestKitDocTest.java
@@ -17,6 +17,7 @@ import akka.actor.ActorRef;
 import akka.actor.ActorSystem;
 import akka.actor.Kill;
 import akka.actor.Props;
+import akka.actor.Terminated;
 import akka.actor.UntypedActor;
 import akka.actor.UntypedActorFactory;
 import scala.concurrent.Await;
@@ -300,6 +301,19 @@ public class TestKitDocTest {
     //#test-special-probe
   }
   
+  @Test
+  public void demonstrateWatch() {
+    final ActorRef target = system.actorFor("/buh");
+    //#test-probe-watch
+    new JavaTestKit(system) {{
+      final JavaTestKit probe = new JavaTestKit(system);
+      probe.watch(target);
+      final Terminated msg = probe.expectMsgClass(Terminated.class);
+      assertEquals(msg.getActor(), target);
+    }};
+    //#test-probe-watch
+  }
+  
   @Test
   public void demonstrateReply() {
     //#test-probe-reply
diff --git a/akka-docs/rst/java/testing.rst b/akka-docs/rst/java/testing.rst
index 21692c23de..07f0cbf60a 100644
--- a/akka-docs/rst/java/testing.rst
+++ b/akka-docs/rst/java/testing.rst
@@ -387,6 +387,23 @@ You have complete flexibility here in mixing and matching the
 name for it. In real life your code will probably be a bit more complicated
 than the example given above; just use the power!
 
+.. warning::
+
+  Any message send from a ``TestProbe`` to another actor which runs on the
+  CallingThreadDispatcher runs the risk of dead-lock, if that other actor might
+  also send to this probe. The implementation of :meth:`TestProbe.watch` and
+  :meth:`TestProbe.unwatch` will also send a message to the watchee, which
+  means that it is dangerous to try watching e.g. :class:`TestActorRef` from a
+  :meth:`TestProbe`.
+
+Watching Other Actors from Probes
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+A :class:`JavaTestKit` can register itself for DeathWatch of any other actor:
+
+.. includecode:: code/docs/testkit/TestKitDocTest.java
+   :include: test-probe-watch
+
 Replying to Messages Received by Probes
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/akka-docs/rst/scala/code/docs/testkit/TestkitDocSpec.scala b/akka-docs/rst/scala/code/docs/testkit/TestkitDocSpec.scala
index 18f583f034..3ac53c960e 100644
--- a/akka-docs/rst/scala/code/docs/testkit/TestkitDocSpec.scala
+++ b/akka-docs/rst/scala/code/docs/testkit/TestkitDocSpec.scala
@@ -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._
diff --git a/akka-docs/rst/scala/testing.rst b/akka-docs/rst/scala/testing.rst
index a57305ce30..ad9bf330f7 100644
--- a/akka-docs/rst/scala/testing.rst
+++ b/akka-docs/rst/scala/testing.rst
@@ -446,6 +446,23 @@ facilities with your own checks and choosing an intuitive name for it. In real
 life your code will probably be a bit more complicated than the example given
 above; just use the power!
 
+.. warning::
+
+  Any message send from a ``TestProbe`` to another actor which runs on the
+  CallingThreadDispatcher runs the risk of dead-lock, if that other actor might
+  also send to this probe. The implementation of :meth:`TestProbe.watch` and
+  :meth:`TestProbe.unwatch` will also send a message to the watchee, which
+  means that it is dangerous to try watching e.g. :class:`TestActorRef` from a
+  :meth:`TestProbe`.
+
+Watching Other Actors from Probes
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+A :class:`TestKit` can register itself for DeathWatch of any other actor:
+
+.. includecode:: code/docs/testkit/TestkitDocSpec.scala
+   :include: test-probe-watch
+
 Replying to Messages Received by Probes
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 

From a80b5269e6c0dc1191edbc8746fb914650364fe2 Mon Sep 17 00:00:00 2001
From: Roland <rk@rkuhn.info>
Date: Wed, 23 Jan 2013 23:47:15 +0100
Subject: [PATCH 074/122] log failures in postStop, see #2928

---
 .../src/test/scala/akka/actor/ActorLifeCycleSpec.scala | 10 ++++++++++
 .../main/scala/akka/actor/dungeon/FaultHandling.scala  |  4 +++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorLifeCycleSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorLifeCycleSpec.scala
index ec99f97180..bcfc9fa0e8 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/ActorLifeCycleSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/ActorLifeCycleSpec.scala
@@ -119,6 +119,16 @@ class ActorLifeCycleSpec extends AkkaSpec with BeforeAndAfterEach with ImplicitS
       system.stop(supervisor)
     }
 
+    "log failues in postStop" in {
+      val a = system.actorOf(Props(new Actor {
+        def receive = Actor.emptyBehavior
+        override def postStop { throw new Exception("hurrah") }
+      }))
+      EventFilter[Exception]("hurrah", occurrences = 1) intercept {
+        a ! PoisonPill
+      }
+    }
+
     "clear the behavior stack upon restart" in {
       case class Become(recv: ActorContext ⇒ Receive)
       val a = system.actorOf(Props(new Actor {
diff --git a/akka-actor/src/main/scala/akka/actor/dungeon/FaultHandling.scala b/akka-actor/src/main/scala/akka/actor/dungeon/FaultHandling.scala
index 7ff93e9e53..b97313d794 100644
--- a/akka-actor/src/main/scala/akka/actor/dungeon/FaultHandling.scala
+++ b/akka-actor/src/main/scala/akka/actor/dungeon/FaultHandling.scala
@@ -199,7 +199,9 @@ private[akka] trait FaultHandling { this: ActorCell ⇒
      * specific order.
      */
     try if (a ne null) a.postStop()
-    finally try dispatcher.detach(this)
+    catch {
+      case NonFatal(e) ⇒ publish(Error(e, self.path.toString, clazz(a), e.getMessage))
+    } finally try dispatcher.detach(this)
     finally try parent.sendSystemMessage(ChildTerminated(self))
     finally try parent ! NullMessage // read ScalaDoc of NullMessage to see why
     finally try tellWatchersWeDied(a)

From 65d86ba5201b94812c01d8f2cb13f332334e04a0 Mon Sep 17 00:00:00 2001
From: Roland Kuhn <rk@rkuhn.info>
Date: Wed, 23 Jan 2013 23:59:33 +0100
Subject: [PATCH 075/122] relax too tight timing in FSMTransitionSpec

---
 .../src/test/scala/akka/actor/FSMTransitionSpec.scala           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/akka-actor-tests/src/test/scala/akka/actor/FSMTransitionSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/FSMTransitionSpec.scala
index 899fc932a2..783efc8f1f 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/FSMTransitionSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/FSMTransitionSpec.scala
@@ -87,7 +87,7 @@ class FSMTransitionSpec extends AkkaSpec with ImplicitSender {
 
     "make previous and next state data available in onTransition" in {
       val fsm = system.actorOf(Props(new OtherFSM(testActor)))
-      within(300 millis) {
+      within(1 second) {
         fsm ! "tick"
         expectMsg((0, 1))
       }

From 9bfbf10ceacedcbd544592806def0dbceb8510a6 Mon Sep 17 00:00:00 2001
From: Rich Dougherty <rich@rd.gen.nz>
Date: Tue, 22 Jan 2013 22:54:09 +1300
Subject: [PATCH 076/122] Add 'requiring': like 'ensuring' but with 'require'
 semantics. Fixes #2798

---
 .../src/main/scala/akka/util/Helpers.scala    | 44 ++++++++++++
 .../scala/akka/cluster/ClusterSettings.scala  | 67 ++++++++-----------
 2 files changed, 71 insertions(+), 40 deletions(-)

diff --git a/akka-actor/src/main/scala/akka/util/Helpers.scala b/akka-actor/src/main/scala/akka/util/Helpers.scala
index d071829148..c0963b30fa 100644
--- a/akka-actor/src/main/scala/akka/util/Helpers.scala
+++ b/akka-actor/src/main/scala/akka/util/Helpers.scala
@@ -46,4 +46,48 @@ object Helpers {
     if (next == 0) sb.toString
     else base64(next, sb)
   }
+
+  /**
+   * Implicit class providing `requiring` methods. This class is based on
+   * `Predef.ensuring` in the Scala standard library. The difference is that
+   * this class's methods throw `IllegalArgumentException`s rather than
+   * `AssertionError`s.
+   *
+   * An example adapted from `Predef`'s documentation:
+   * {{{
+   * import akka.util.Helpers.Requiring
+   *
+   * def addNaturals(nats: List[Int]): Int = {
+   *   require(nats forall (_ >= 0), "List contains negative numbers")
+   *   nats.foldLeft(0)(_ + _)
+   * } requiring(_ >= 0)
+   * }}}
+   *
+   * @param value The value to check.
+   */
+  @inline final implicit class Requiring[A](val value: A) extends AnyVal {
+    /**
+     * Check that a condition is true. If true, return `value`, otherwise throw
+     * an `IllegalArgumentException` with the given message.
+     *
+     * @param cond The condition to check.
+     * @param msg The message to report if the condition isn't met.
+     */
+    @inline def requiring(cond: Boolean, msg: ⇒ Any): A = {
+      require(cond, msg)
+      value
+    }
+
+    /**
+     * Check that a condition is true for the `value`. If true, return `value`,
+     * otherwise throw an `IllegalArgumentException` with the given message.
+     *
+     * @param cond The function used to check the `value`.
+     * @param msg The message to report if the condition isn't met.
+     */
+    @inline def requiring(cond: A ⇒ Boolean, msg: ⇒ Any): A = {
+      require(cond(value), msg)
+      value
+    }
+  }
 }
diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterSettings.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterSettings.scala
index 7ccf7e48a8..eced8bae97 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterSettings.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/ClusterSettings.scala
@@ -11,6 +11,7 @@ import akka.ConfigurationException
 import akka.actor.Address
 import akka.actor.AddressFromURIString
 import akka.dispatch.Dispatchers
+import akka.util.Helpers.Requiring
 import scala.concurrent.duration.FiniteDuration
 import akka.japi.Util.immutableSeq
 
@@ -18,47 +19,36 @@ class ClusterSettings(val config: Config, val systemName: String) {
   import config._
 
   final val FailureDetectorThreshold: Double = {
-    val x = getDouble("akka.cluster.failure-detector.threshold")
-    require(x > 0.0, "failure-detector.threshold must be > 0")
-    x
-  }
+    getDouble("akka.cluster.failure-detector.threshold")
+  } requiring (_ > 0.0, "failure-detector.threshold must be > 0")
   final val FailureDetectorMaxSampleSize: Int = {
-    val n = getInt("akka.cluster.failure-detector.max-sample-size")
-    require(n > 0, "failure-detector.max-sample-size must be > 0"); n
-  }
+    getInt("akka.cluster.failure-detector.max-sample-size")
+  } requiring (_ > 0, "failure-detector.max-sample-size must be > 0")
   final val FailureDetectorImplementationClass: String = getString("akka.cluster.failure-detector.implementation-class")
   final val FailureDetectorMinStdDeviation: FiniteDuration = {
-    val d = Duration(getMilliseconds("akka.cluster.failure-detector.min-std-deviation"), MILLISECONDS)
-    require(d > Duration.Zero, "failure-detector.min-std-deviation must be > 0"); d
-  }
+    Duration(getMilliseconds("akka.cluster.failure-detector.min-std-deviation"), MILLISECONDS)
+  } requiring (_ > Duration.Zero, "failure-detector.min-std-deviation must be > 0")
   final val FailureDetectorAcceptableHeartbeatPause: FiniteDuration = {
-    val d = Duration(getMilliseconds("akka.cluster.failure-detector.acceptable-heartbeat-pause"), MILLISECONDS)
-    require(d >= Duration.Zero, "failure-detector.acceptable-heartbeat-pause must be >= 0"); d
-  }
+    Duration(getMilliseconds("akka.cluster.failure-detector.acceptable-heartbeat-pause"), MILLISECONDS)
+  } requiring (_ >= Duration.Zero, "failure-detector.acceptable-heartbeat-pause must be >= 0")
   final val HeartbeatInterval: FiniteDuration = {
-    val d = Duration(getMilliseconds("akka.cluster.failure-detector.heartbeat-interval"), MILLISECONDS)
-    require(d > Duration.Zero, "failure-detector.heartbeat-interval must be > 0"); d
-  }
+    Duration(getMilliseconds("akka.cluster.failure-detector.heartbeat-interval"), MILLISECONDS)
+  } requiring (_ > Duration.Zero, "failure-detector.heartbeat-interval must be > 0")
   final val HeartbeatRequestDelay: FiniteDuration = {
-    val d = Duration(getMilliseconds("akka.cluster.failure-detector.heartbeat-request.grace-period"), MILLISECONDS)
-    require(d > Duration.Zero, "failure-detector.heartbeat-request.grace-period must be > 0"); d
-  }
+    Duration(getMilliseconds("akka.cluster.failure-detector.heartbeat-request.grace-period"), MILLISECONDS)
+  } requiring (_ > Duration.Zero, "failure-detector.heartbeat-request.grace-period must be > 0")
   final val HeartbeatExpectedResponseAfter: FiniteDuration = {
-    val d = Duration(getMilliseconds("akka.cluster.failure-detector.heartbeat-request.expected-response-after"), MILLISECONDS)
-    require(d > Duration.Zero, "failure-detector.heartbeat-request.expected-response-after > 0"); d
-  }
+    Duration(getMilliseconds("akka.cluster.failure-detector.heartbeat-request.expected-response-after"), MILLISECONDS)
+  } requiring (_ > Duration.Zero, "failure-detector.heartbeat-request.expected-response-after > 0")
   final val HeartbeatRequestTimeToLive: FiniteDuration = {
-    val d = Duration(getMilliseconds("akka.cluster.failure-detector.heartbeat-request.time-to-live"), MILLISECONDS)
-    require(d > Duration.Zero, "failure-detector.heartbeat-request.time-to-live > 0"); d
-  }
+    Duration(getMilliseconds("akka.cluster.failure-detector.heartbeat-request.time-to-live"), MILLISECONDS)
+  } requiring (_ > Duration.Zero, "failure-detector.heartbeat-request.time-to-live > 0")
   final val NumberOfEndHeartbeats: Int = {
-    val n = getInt("akka.cluster.failure-detector.nr-of-end-heartbeats")
-    require(n > 0, "failure-detector.nr-of-end-heartbeats must be > 0"); n
-  }
+    getInt("akka.cluster.failure-detector.nr-of-end-heartbeats")
+  } requiring (_ > 0, "failure-detector.nr-of-end-heartbeats must be > 0")
   final val MonitoredByNrOfMembers: Int = {
-    val n = getInt("akka.cluster.failure-detector.monitored-by-nr-of-members")
-    require(n > 0, "failure-detector.monitored-by-nr-of-members must be > 0"); n
-  }
+    getInt("akka.cluster.failure-detector.monitored-by-nr-of-members")
+  } requiring (_ > 0, "failure-detector.monitored-by-nr-of-members must be > 0")
 
   final val SeedNodes: immutable.IndexedSeq[Address] =
     immutableSeq(getStringList("akka.cluster.seed-nodes")).map { case AddressFromURIString(addr) ⇒ addr }.toVector
@@ -71,9 +61,8 @@ class ClusterSettings(val config: Config, val systemName: String) {
   final val AutoJoin: Boolean = getBoolean("akka.cluster.auto-join")
   final val AutoDown: Boolean = getBoolean("akka.cluster.auto-down")
   final val MinNrOfMembers: Int = {
-    val n = getInt("akka.cluster.min-nr-of-members")
-    require(n > 0, "min-nr-of-members must be > 0"); n
-  }
+    getInt("akka.cluster.min-nr-of-members")
+  } requiring (_ > 0, "min-nr-of-members must be > 0")
   final val JmxEnabled: Boolean = getBoolean("akka.cluster.jmx.enabled")
   final val UseDispatcher: String = getString("akka.cluster.use-dispatcher") match {
     case "" ⇒ Dispatchers.DefaultDispatcherId
@@ -90,14 +79,12 @@ class ClusterSettings(val config: Config, val systemName: String) {
   final val MetricsEnabled: Boolean = getBoolean("akka.cluster.metrics.enabled")
   final val MetricsCollectorClass: String = getString("akka.cluster.metrics.collector-class")
   final val MetricsInterval: FiniteDuration = {
-    val d = Duration(getMilliseconds("akka.cluster.metrics.collect-interval"), MILLISECONDS)
-    require(d > Duration.Zero, "metrics.collect-interval must be > 0"); d
-  }
+    Duration(getMilliseconds("akka.cluster.metrics.collect-interval"), MILLISECONDS)
+  } requiring (_ > Duration.Zero, "metrics.collect-interval must be > 0")
   final val MetricsGossipInterval: FiniteDuration = Duration(getMilliseconds("akka.cluster.metrics.gossip-interval"), MILLISECONDS)
   final val MetricsMovingAverageHalfLife: FiniteDuration = {
-    val d = Duration(getMilliseconds("akka.cluster.metrics.moving-average-half-life"), MILLISECONDS)
-    require(d > Duration.Zero, "metrics.moving-average-half-life must be > 0"); d
-  }
+    Duration(getMilliseconds("akka.cluster.metrics.moving-average-half-life"), MILLISECONDS)
+  } requiring (_ > Duration.Zero, "metrics.moving-average-half-life must be > 0")
 }
 
 case class CircuitBreakerSettings(maxFailures: Int, callTimeout: FiniteDuration, resetTimeout: FiniteDuration)

From 4a5695f9d82d3be00c4b315515374b58807b4650 Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Thu, 24 Jan 2013 09:53:18 +0100
Subject: [PATCH 077/122] Change wrong netty port conf in tests

---
 .../src/test/scala/akka/cluster/ClusterDeployerSpec.scala   | 2 +-
 akka-cluster/src/test/scala/akka/cluster/ClusterSpec.scala  | 2 +-
 .../scala/akka/cluster/routing/WeightedRouteesSpec.scala    | 2 +-
 .../src/test/scala/akka/remote/RemoteConfigSpec.scala       | 6 ++----
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterDeployerSpec.scala b/akka-cluster/src/test/scala/akka/cluster/ClusterDeployerSpec.scala
index 0bd481ac31..b2a71a66c9 100644
--- a/akka-cluster/src/test/scala/akka/cluster/ClusterDeployerSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/ClusterDeployerSpec.scala
@@ -29,7 +29,7 @@ object ClusterDeployerSpec {
           cluster.routees-path = "/user/myservice"
         }
       }
-      akka.remote.netty.port = 0
+      akka.remoting.transports.tcp.port = 0
       """, ConfigParseOptions.defaults)
 
   class RecipeActor extends Actor {
diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterSpec.scala b/akka-cluster/src/test/scala/akka/cluster/ClusterSpec.scala
index 55c35ea6e3..1b8b6b29fe 100644
--- a/akka-cluster/src/test/scala/akka/cluster/ClusterSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/ClusterSpec.scala
@@ -27,7 +27,7 @@ object ClusterSpec {
     }
     akka.actor.provider = "akka.cluster.ClusterActorRefProvider"
     akka.remote.log-remote-lifecycle-events = off
-    akka.remote.netty.port = 0
+    akka.remoting.transports.tcp.port = 0
     # akka.loglevel = DEBUG
     """
 
diff --git a/akka-cluster/src/test/scala/akka/cluster/routing/WeightedRouteesSpec.scala b/akka-cluster/src/test/scala/akka/cluster/routing/WeightedRouteesSpec.scala
index 95e5bd0d54..cffb41250c 100644
--- a/akka-cluster/src/test/scala/akka/cluster/routing/WeightedRouteesSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/routing/WeightedRouteesSpec.scala
@@ -13,7 +13,7 @@ import akka.testkit.AkkaSpec
 @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner])
 class WeightedRouteesSpec extends AkkaSpec(ConfigFactory.parseString("""
       akka.actor.provider = "akka.cluster.ClusterActorRefProvider"
-      akka.remote.netty.port = 0
+      akka.remoting.transports.tcp.port = 0
       """)) {
 
   val a1 = Address("tcp.akka", "sys", "a1", 2551)
diff --git a/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala
index 2cd9f3dda6..42373f09cc 100644
--- a/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala
@@ -13,10 +13,8 @@ import akka.util.Helpers
 @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner])
 class RemoteConfigSpec extends AkkaSpec(
   """
-  akka {
-    actor.provider = "akka.remote.RemoteActorRefProvider"
-    remote.netty.port = 0
-  }
+    akka.actor.provider = "akka.remote.RemoteActorRefProvider"
+    akka.remoting.transports.tcp.port = 0
   """) {
 
   // FIXME: These tests are ignored as it tests configuration specific to the old remoting.

From 580a2484a96115e8bcef36dd45e9f37fcba41d7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Endre=20S=C3=A1ndor=20Varga?= <vendre@hit.bme.hu>
Date: Mon, 21 Jan 2013 12:40:42 +0100
Subject: [PATCH 078/122] Added blocking handshake for outbound SSL connections
 #2833

 - Eliminated "Promise passing style" and using future composition wherever possible
---
 .../transport/netty/NettyTransport.scala      | 81 ++++++++++---------
 .../remote/transport/netty/TcpSupport.scala   | 18 ++---
 .../remote/transport/netty/UdpSupport.scala   |  3 +-
 3 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala b/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
index 3a09a1275e..92e3b48fcd 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
@@ -23,8 +23,8 @@ import org.jboss.netty.channel.socket.nio.{ NioDatagramChannelFactory, NioServer
 import org.jboss.netty.handler.codec.frame.{ LengthFieldBasedFrameDecoder, LengthFieldPrepender }
 import org.jboss.netty.handler.ssl.SslHandler
 import scala.concurrent.duration.{ Duration, FiniteDuration, MILLISECONDS }
-import scala.concurrent.{ ExecutionContext, Promise, Future }
-import scala.util.Try
+import scala.concurrent.{ ExecutionContext, Promise, Future, blocking }
+import scala.util.{ Failure, Success, Try }
 import util.control.{ NoStackTrace, NonFatal }
 
 object NettyTransportSettings {
@@ -167,12 +167,12 @@ abstract class ServerHandler(protected final val transport: NettyTransport,
 
 }
 
-abstract class ClientHandler(protected final val transport: NettyTransport,
-                             private final val statusPromise: Promise[AssociationHandle])
+abstract class ClientHandler(protected final val transport: NettyTransport)
   extends NettyClientHelpers with CommonHandlers {
+  final protected val statusPromise = Promise[AssociationHandle]()
+  def statusFuture = statusPromise.future
 
   final protected def initOutbound(channel: Channel, remoteSocketAddress: SocketAddress, msg: ChannelBuffer): Unit = {
-    channel.setReadable(false)
     init(channel, remoteSocketAddress, msg)(statusPromise.success)
   }
 
@@ -256,7 +256,7 @@ class NettyTransport(private val settings: NettyTransportSettings, private val s
 
   private def sslHandler(isClient: Boolean): SslHandler = {
     val handler = NettySSLSupport(settings.SslSettings.get, log, isClient)
-    if (isClient) handler.setIssueHandshake(true)
+    handler.setCloseOnSSLException(true)
     handler
   }
 
@@ -271,16 +271,17 @@ class NettyTransport(private val settings: NettyTransportSettings, private val s
     }
   }
 
-  private def clientPipelineFactory(statusPromise: Promise[AssociationHandle]): ChannelPipelineFactory = new ChannelPipelineFactory {
-    override def getPipeline: ChannelPipeline = {
-      val pipeline = newPipeline
-      if (EnableSsl) pipeline.addFirst("SslHandler", sslHandler(isClient = true))
-      val handler = if (isDatagram) new UdpClientHandler(NettyTransport.this, statusPromise)
-      else new TcpClientHandler(NettyTransport.this, statusPromise)
-      pipeline.addLast("clienthandler", handler)
-      pipeline
+  private val clientPipelineFactory: ChannelPipelineFactory =
+    new ChannelPipelineFactory {
+      override def getPipeline: ChannelPipeline = {
+        val pipeline = newPipeline
+        if (EnableSsl) pipeline.addFirst("SslHandler", sslHandler(isClient = true))
+        val handler = if (isDatagram) new UdpClientHandler(NettyTransport.this)
+        else new TcpClientHandler(NettyTransport.this)
+        pipeline.addLast("clienthandler", handler)
+        pipeline
+      }
     }
-  }
 
   private def setupBootstrap[B <: Bootstrap](bootstrap: B, pipelineFactory: ChannelPipelineFactory): B = {
     // FIXME: Expose these settings in configuration
@@ -302,8 +303,8 @@ class NettyTransport(private val settings: NettyTransportSettings, private val s
     case Udp ⇒ setupBootstrap(new ConnectionlessBootstrap(serverChannelFactory), serverPipelineFactory)
   }
 
-  private def outboundBootstrap(statusPromise: Promise[AssociationHandle]): ClientBootstrap = {
-    val bootstrap = setupBootstrap(new ClientBootstrap(clientChannelFactory), clientPipelineFactory(statusPromise))
+  private def outboundBootstrap: ClientBootstrap = {
+    val bootstrap = setupBootstrap(new ClientBootstrap(clientChannelFactory), clientPipelineFactory)
     bootstrap.setOption("connectTimeoutMillis", settings.ConnectionTimeout.toMillis)
     bootstrap
   }
@@ -346,34 +347,36 @@ class NettyTransport(private val settings: NettyTransportSettings, private val s
   override def associate(remoteAddress: Address): Future[AssociationHandle] = {
     if (!serverChannel.isBound) Future.failed(new NettyTransportException("Transport is not bound"))
     else {
-      val statusPromise = Promise[AssociationHandle]()
-      (try {
-        val f = NettyFutureBridge(outboundBootstrap(statusPromise).connect(addressToSocketAddress(remoteAddress))) recover {
-          case c: CancellationException ⇒ throw new NettyTransportException("Connection was cancelled")
-        }
+      val bootstrap: ClientBootstrap = outboundBootstrap
 
-        if (isDatagram)
-          f map { channel ⇒
-            channel.getRemoteAddress match {
+      (for {
+        readyChannel ← NettyFutureBridge(bootstrap.connect(addressToSocketAddress(remoteAddress))) map {
+          channel ⇒
+            if (EnableSsl)
+              blocking {
+                channel.getPipeline.get[SslHandler](classOf[SslHandler]).handshake().awaitUninterruptibly()
+              }
+            if (!isDatagram) channel.setReadable(false)
+            channel
+        }
+        handle ← if (isDatagram)
+          Future {
+            readyChannel.getRemoteAddress match {
               case addr: InetSocketAddress ⇒
-                val handle = new UdpAssociationHandle(localAddress, remoteAddress, channel, NettyTransport.this)
-                statusPromise.success(handle)
-                handle.readHandlerPromise.future.onSuccess { case listener ⇒ udpConnectionTable.put(addr, listener) }
+                val handle = new UdpAssociationHandle(localAddress, remoteAddress, readyChannel, NettyTransport.this)
+                handle.readHandlerPromise.future.onSuccess {
+                  case listener ⇒ udpConnectionTable.put(addr, listener)
+                }
+                handle
               case unknown ⇒ throw new NettyTransportException(s"Unknown remote address type ${unknown.getClass}")
             }
           }
-        else f
-      } catch {
-        case e @ (_: UnknownHostException | _: SecurityException | _: IllegalArgumentException) ⇒
-          Future.failed(InvalidAssociationException("Invalid association ", e))
-        case NonFatal(e) ⇒
-          Future.failed(e)
-      }) onFailure {
-        case t: ConnectException ⇒ statusPromise failure new NettyTransportException(t.getMessage, t.getCause) with NoStackTrace
-        case t                   ⇒ statusPromise failure t
+        else
+          readyChannel.getPipeline.get[ClientHandler](classOf[ClientHandler]).statusFuture
+      } yield handle) recover {
+        case c: CancellationException ⇒ throw new NettyTransportException("Connection was cancelled") with NoStackTrace
+        case NonFatal(t)              ⇒ throw new NettyTransportException(t.getMessage, t.getCause) with NoStackTrace
       }
-
-      statusPromise.future
     }
   }
 
diff --git a/akka-remote/src/main/scala/akka/remote/transport/netty/TcpSupport.scala b/akka-remote/src/main/scala/akka/remote/transport/netty/TcpSupport.scala
index fc02383337..4cded02003 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/netty/TcpSupport.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/netty/TcpSupport.scala
@@ -12,6 +12,7 @@ import java.net.InetSocketAddress
 import org.jboss.netty.buffer.{ ChannelBuffers, ChannelBuffer }
 import org.jboss.netty.channel._
 import scala.concurrent.{ Future, Promise }
+import scala.util.{ Success, Failure }
 
 private[remote] object ChannelLocalActor extends ChannelLocal[Option[HandleEventListener]] {
   override def initialValue(channel: Channel): Option[HandleEventListener] = None
@@ -30,16 +31,15 @@ private[remote] trait TcpHandlers extends CommonHandlers {
   override def createHandle(channel: Channel, localAddress: Address, remoteAddress: Address): AssociationHandle =
     new TcpAssociationHandle(localAddress, remoteAddress, channel)
 
-  override def onDisconnect(ctx: ChannelHandlerContext, e: ChannelStateEvent) {
+  override def onDisconnect(ctx: ChannelHandlerContext, e: ChannelStateEvent): Unit =
     notifyListener(e.getChannel, Disassociated)
-  }
 
-  override def onMessage(ctx: ChannelHandlerContext, e: MessageEvent) {
+  override def onMessage(ctx: ChannelHandlerContext, e: MessageEvent): Unit = {
     val bytes: Array[Byte] = e.getMessage.asInstanceOf[ChannelBuffer].array()
     if (bytes.length > 0) notifyListener(e.getChannel, InboundPayload(ByteString(bytes)))
   }
 
-  override def onException(ctx: ChannelHandlerContext, e: ExceptionEvent) {
+  override def onException(ctx: ChannelHandlerContext, e: ExceptionEvent): Unit = {
     notifyListener(e.getChannel, Disassociated)
     e.getChannel.close() // No graceful close here
   }
@@ -48,18 +48,16 @@ private[remote] trait TcpHandlers extends CommonHandlers {
 private[remote] class TcpServerHandler(_transport: NettyTransport, _associationListenerFuture: Future[AssociationEventListener])
   extends ServerHandler(_transport, _associationListenerFuture) with TcpHandlers {
 
-  override def onConnect(ctx: ChannelHandlerContext, e: ChannelStateEvent) {
+  override def onConnect(ctx: ChannelHandlerContext, e: ChannelStateEvent): Unit =
     initInbound(e.getChannel, e.getChannel.getRemoteAddress, null)
-  }
 
 }
 
-private[remote] class TcpClientHandler(_transport: NettyTransport, _statusPromise: Promise[AssociationHandle])
-  extends ClientHandler(_transport, _statusPromise) with TcpHandlers {
+private[remote] class TcpClientHandler(_transport: NettyTransport)
+  extends ClientHandler(_transport) with TcpHandlers {
 
-  override def onConnect(ctx: ChannelHandlerContext, e: ChannelStateEvent) {
+  override def onConnect(ctx: ChannelHandlerContext, e: ChannelStateEvent): Unit =
     initOutbound(e.getChannel, e.getChannel.getRemoteAddress, null)
-  }
 
 }
 
diff --git a/akka-remote/src/main/scala/akka/remote/transport/netty/UdpSupport.scala b/akka-remote/src/main/scala/akka/remote/transport/netty/UdpSupport.scala
index 0b20b25fb7..b00724e430 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/netty/UdpSupport.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/netty/UdpSupport.scala
@@ -53,8 +53,7 @@ private[remote] class UdpServerHandler(_transport: NettyTransport, _associationL
     initInbound(channel, remoteSocketAddress, msg)
 }
 
-private[remote] class UdpClientHandler(_transport: NettyTransport, _statusPromise: Promise[AssociationHandle])
-  extends ClientHandler(_transport, _statusPromise) with UdpHandlers {
+private[remote] class UdpClientHandler(_transport: NettyTransport) extends ClientHandler(_transport) with UdpHandlers {
 
   override def initUdp(channel: Channel, remoteSocketAddress: SocketAddress, msg: ChannelBuffer): Unit =
     initOutbound(channel, remoteSocketAddress, msg)

From 99adbdfab42021b9cd81cf2f3f8cfc279eaed2e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Endre=20S=C3=A1ndor=20Varga?= <vendre@hit.bme.hu>
Date: Thu, 17 Jan 2013 16:19:31 +0100
Subject: [PATCH 079/122] Changed and documented new remoting configuration
 #2593

---
 .../scala/akka/cluster/SplitBrainSpec.scala   |   2 +-
 .../UnreachableNodeRejoinsClusterSpec.scala   |   2 +-
 .../akka/cluster/ClusterDeployerSpec.scala    |   2 +-
 .../test/scala/akka/cluster/ClusterSpec.scala |   2 +-
 .../cluster/routing/WeightedRouteesSpec.scala |   2 +-
 .../remoting/RemoteDeploymentDocSpec.scala    |   2 +-
 .../akka/remote/testkit/MultiNodeSpec.scala   |  10 +-
 .../akka/remote/NewRemoteActorSpec.scala      |   2 +-
 akka-remote/src/main/resources/reference.conf | 412 +++++++-----------
 .../src/main/scala/akka/remote/Endpoint.scala |   4 +-
 .../akka/remote/RemoteActorRefProvider.scala  |  15 +-
 .../scala/akka/remote/RemoteSettings.scala    |  53 ++-
 .../src/main/scala/akka/remote/Remoting.scala |  68 +--
 .../transport/AbstractTransportAdapter.scala  |   4 +-
 .../transport/AkkaProtocolTransport.scala     |  16 +-
 .../scala/akka/remote/RemoteConfigSpec.scala  |  44 +-
 .../akka/remote/RemoteDeathWatchSpec.scala    |   4 +-
 .../akka/remote/RemoteDeployerSpec.scala      |   2 +-
 .../scala/akka/remote/RemoteRouterSpec.scala  |   4 +-
 .../test/scala/akka/remote/RemotingSpec.scala |  25 +-
 .../remote/Ticket1978CommunicationSpec.scala  |   8 +-
 .../scala/akka/remote/UntrustedSpec.scala     |   4 +-
 .../remote/transport/AkkaProtocolSpec.scala   |  18 +-
 .../transport/AkkaProtocolStressTest.scala    |  12 +-
 .../ThrottlerTransportAdapterSpec.scala       |   8 +-
 25 files changed, 319 insertions(+), 406 deletions(-)

diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/SplitBrainSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/SplitBrainSpec.scala
index d1c48565d5..36b727cc1c 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/SplitBrainSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/SplitBrainSpec.scala
@@ -24,7 +24,7 @@ case class SplitBrainMultiNodeConfig(failureDetectorPuppet: Boolean) extends Mul
 
   commonConfig(debugConfig(on = false).
     withFallback(ConfigFactory.parseString("""
-        akka.remoting.retry-latch-closed-for = 3 s
+        akka.remote.retry-latch-closed-for = 3 s
         akka.cluster {
           auto-down = on
           failure-detector.threshold = 4
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/UnreachableNodeRejoinsClusterSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/UnreachableNodeRejoinsClusterSpec.scala
index afe20e1614..c7666ba395 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/UnreachableNodeRejoinsClusterSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/UnreachableNodeRejoinsClusterSpec.scala
@@ -25,7 +25,7 @@ case class UnreachableNodeRejoinsClusterMultiNodeConfig(failureDetectorPuppet: B
 
   commonConfig(ConfigFactory.parseString(
     """
-      akka.remoting.log-remote-lifecycle-events = off
+      akka.remote.log-remote-lifecycle-events = off
       akka.cluster.publish-stats-interval = 0s
       akka.loglevel = INFO
     """).withFallback(debugConfig(on = false).withFallback(MultiNodeClusterSpec.clusterConfig)))
diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterDeployerSpec.scala b/akka-cluster/src/test/scala/akka/cluster/ClusterDeployerSpec.scala
index b2a71a66c9..7aa7b81047 100644
--- a/akka-cluster/src/test/scala/akka/cluster/ClusterDeployerSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/ClusterDeployerSpec.scala
@@ -29,7 +29,7 @@ object ClusterDeployerSpec {
           cluster.routees-path = "/user/myservice"
         }
       }
-      akka.remoting.transports.tcp.port = 0
+      akka.remote.netty.tcp.port = 0
       """, ConfigParseOptions.defaults)
 
   class RecipeActor extends Actor {
diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterSpec.scala b/akka-cluster/src/test/scala/akka/cluster/ClusterSpec.scala
index 1b8b6b29fe..242775fb40 100644
--- a/akka-cluster/src/test/scala/akka/cluster/ClusterSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/ClusterSpec.scala
@@ -27,7 +27,7 @@ object ClusterSpec {
     }
     akka.actor.provider = "akka.cluster.ClusterActorRefProvider"
     akka.remote.log-remote-lifecycle-events = off
-    akka.remoting.transports.tcp.port = 0
+    akka.remote.netty.tcp.port = 0
     # akka.loglevel = DEBUG
     """
 
diff --git a/akka-cluster/src/test/scala/akka/cluster/routing/WeightedRouteesSpec.scala b/akka-cluster/src/test/scala/akka/cluster/routing/WeightedRouteesSpec.scala
index cffb41250c..5877d91e7a 100644
--- a/akka-cluster/src/test/scala/akka/cluster/routing/WeightedRouteesSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/routing/WeightedRouteesSpec.scala
@@ -13,7 +13,7 @@ import akka.testkit.AkkaSpec
 @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner])
 class WeightedRouteesSpec extends AkkaSpec(ConfigFactory.parseString("""
       akka.actor.provider = "akka.cluster.ClusterActorRefProvider"
-      akka.remoting.transports.tcp.port = 0
+      akka.remote.netty.tcp.port = 0
       """)) {
 
   val a1 = Address("tcp.akka", "sys", "a1", 2551)
diff --git a/akka-docs/rst/scala/code/docs/remoting/RemoteDeploymentDocSpec.scala b/akka-docs/rst/scala/code/docs/remoting/RemoteDeploymentDocSpec.scala
index 6284b4ca8e..74964fb823 100644
--- a/akka-docs/rst/scala/code/docs/remoting/RemoteDeploymentDocSpec.scala
+++ b/akka-docs/rst/scala/code/docs/remoting/RemoteDeploymentDocSpec.scala
@@ -20,7 +20,7 @@ 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._
diff --git a/akka-remote-tests/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala b/akka-remote-tests/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala
index 1d00e30c51..7e8a900993 100644
--- a/akka-remote-tests/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala
+++ b/akka-remote-tests/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala
@@ -63,7 +63,7 @@ abstract class MultiNodeConfig {
           receive = on
           fsm = on
         }
-        akka.remoting.log-remote-lifecycle-events = on
+        akka.remote.log-remote-lifecycle-events = on
         """)
     else
       ConfigFactory.empty
@@ -101,8 +101,8 @@ abstract class MultiNodeConfig {
     val transportConfig =
       if (_testTransport) ConfigFactory.parseString(
         """
-           akka.remoting.transports.tcp.applied-adapters = [gremlin, trttl]
-           akka.remoting.retry-gate-closed-for = 1 s
+           akka.remote.netty.tcp.applied-adapters = [gremlin, trttl]
+           akka.remote.retry-gate-closed-for = 1 s
         """)
       else ConfigFactory.empty
 
@@ -194,8 +194,8 @@ object MultiNodeSpec {
 
   private[testkit] val nodeConfig = mapToConfig(Map(
     "akka.actor.provider" -> "akka.remote.RemoteActorRefProvider",
-    "akka.remoting.transports.tcp.hostname" -> selfName,
-    "akka.remoting.transports.tcp.port" -> selfPort))
+    "akka.remote.netty.tcp.hostname" -> selfName,
+    "akka.remote.netty.tcp.port" -> selfPort))
 
   private[testkit] val baseConfig: Config = ConfigFactory.parseString("""
       akka {
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/NewRemoteActorSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/NewRemoteActorSpec.scala
index d34d4e94f6..85fd42dffb 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/NewRemoteActorSpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/NewRemoteActorSpec.scala
@@ -24,7 +24,7 @@ object NewRemoteActorMultiJvmSpec extends MultiNodeConfig {
   }
 
   commonConfig(debugConfig(on = false).withFallback(
-    ConfigFactory.parseString("akka.remoting.log-remote-lifecycle-events = off")))
+    ConfigFactory.parseString("akka.remote.log-remote-lifecycle-events = off")))
 
   val master = role("master")
   val slave = role("slave")
diff --git a/akka-remote/src/main/resources/reference.conf b/akka-remote/src/main/resources/reference.conf
index 505ee2a030..eb9e4f4108 100644
--- a/akka-remote/src/main/resources/reference.conf
+++ b/akka-remote/src/main/resources/reference.conf
@@ -53,128 +53,67 @@ akka {
     }
   }
 
-  remoting {
+  remote {
 
-    # FIXME document
-    failure-detector {
-      threshold = 7.0
-      max-sample-size = 100
-      min-std-deviation = 100 ms
-      acceptable-heartbeat-pause = 3 s
-    }
+    ### General settings
 
-    # FIXME document
+    # Timeout after which the startup of the remoting subsystem is considered to be failed.
+    # Increase this value if your transport drivers (see the enabled-transports section)
+    # need longer time to be loaded.
+    startup-timeout = 5 s
+
+    # Timout after which the graceful shutdown of the remoting subsystem is considered to be failed.
+    # After the timeout the remoting system is forcefully shut down.
+    # Increase this value if your transport drivers (see the enabled-transports section)
+    # need longer time to stop properly.
+    shutdown-timeout = 5 s
+
+    # Before shutting down the drivers, the remoting subsystem attempts to flush all pending
+    # writes. This setting controls the maximum time the remoting is willing to wait before
+    # moving on to shut down the drivers.
+    flush-wait-on-shutdown = 2 s
+
+    # Reuse inbound connections for outbound messages
+    use-passive-connections = on
+
+    # Dispatcher that the actors responsible to write to a connection will use.
+    # The mailbox type must be always a DequeBasedMailbox.
     writer-dispatcher {
       mailbox-type = "akka.dispatch.UnboundedDequeBasedMailbox"
     }
 
-    # If this is "on", Akka will log all RemoteLifeCycleEvents at the level
-    # defined for each, if off then they are not logged. Failures to deserialize
-    # received messages also fall under this flag.
-    log-remote-lifecycle-events = off
-
-    # FIXME document
-    heartbeat-interval = 1 s
-
-    # FIXME document
+    # If enabled, an inbound connection is only considered to be live after the remote
+    # system sent an explicit acknowledgement.
+    # It is recommended to leave this setting on when connectionless transports (e.g. UDP)
+    # are used.
     wait-activity-enabled = on
 
-    # FIXME document
+    # Controls the backoff interval after a refused write is reattempted. (Transports may
+    # refuse writes if their internal buffer is full)
     backoff-interval = 0.01 s
 
-    # FIXME document
-    secure-cookie = ""
-
-    # FIXME document
-    require-cookie = off
-
-    # FIXME document
-    flush-wait-on-shutdown = 2 s
-
-    # FIXME document
-    shutdown-timeout = 5 s
-
-    # FIXME document
-    startup-timeout = 5 s
-
-    # FIXME document
-    retry-gate-closed-for = 0 s
-
-    # FIXME document
-    retry-window = 3 s
-
-    # FIXME document
-    maximum-retries-in-window = 5
-
-    # FIXME document
-    use-passive-connections = on
-
-    # Acknowledgment timeout for commands
+    # Acknowledgment timeout of management commands sent to the transport stack.
     command-ack-timeout = 30 s
 
-    adapters {
-      gremlin = "akka.remote.transport.FailureInjectorProvider"
-      trttl = "akka.remote.transport.ThrottlerProvider"
-    }
-
-    enabled-transports = ["tcp"]
-
-    transports.tcp {
-      transport-class = "akka.remote.transport.netty.NettyTransport"
-      applied-adapters = []
-
-      transport-protocol = tcp
-      port = 2552
-      hostname = "localhost" #FIXME Empty string should default to localhost
-      enable-ssl = false
-      log-transport-events = true
-      connection-timeout = 120s
-      use-dispatcher-for-io = ""
-      write-buffer-high-water-mark = 0b
-      write-buffer-low-water-mark = 0b
-      send-buffer-size = 32000b
-      receive-buffer-size = 32000b
-      backlog = 4096
-
-      server-socket-worker-pool {
-        pool-size-min = 2
-        pool-size-factor = 1.0
-        pool-size-max = 8
-      }
-
-      client-socket-worker-pool {
-        pool-size-min = 2
-        pool-size-factor = 1.0
-        pool-size-max = 8
-      }
-    }
-
-    transports.udp = ${akka.remoting.transports.tcp}
-    transports.udp {
-      transport-protocol = udp
-    }
-
-    transports.ssl = ${akka.remoting.transports.tcp}
-    transports.ssl = {
-      enable-ssl = true
-    }
-
-  }
-
-  remote {
-
-    # Which implementation of akka.remote.RemoteTransport to use
-    # default is a TCP-based remote transport based on Netty
-    transport = "akka.remote.Remoting"
-
+    ### Security settings
 
     # Enable untrusted mode for full security of server managed actors, prevents
     # system messages to be send by clients, e.g. messages like 'Create',
     # 'Suspend', 'Resume', 'Terminate', 'Supervise', 'Link' etc.
     untrusted-mode = off
 
-    # Timeout for ACK of cluster operations, like checking actor out etc.
-    remote-daemon-ack-timeout = 30s
+    # Should the remote server require that its peers share the same
+    # secure-cookie (defined in the 'remote' section)? Secure cookies are passed
+    # between during the initial handshake. Connections are refused if the initial
+    # message contains a mismatching cookie or the cookie is missing.
+    require-cookie = off
+
+    # Generate your own with the script availbale in
+    # '$AKKA_HOME/scripts/generate_config_with_secure_cookie.sh' or using
+    # 'akka.util.Crypt.generateSecureCookie'
+    secure-cookie = ""
+
+    ### Logging
 
     # If this is "on", Akka will log all inbound messages at DEBUG level,
     # if off then they are not logged
@@ -185,189 +124,134 @@ akka {
     log-sent-messages = off
 
     # If this is "on", Akka will log all RemoteLifeCycleEvents at the level
-    # defined for each, if off then they are not logged Failures to deserialize
+    # defined for each, if off then they are not logged. Failures to deserialize
     # received messages also fall under this flag.
-    log-remote-lifecycle-events = on
+    log-remote-lifecycle-events = off
 
-    # Each property is annotated with (I) or (O) or (I&O), where I stands for
-    # “inbound” and O for “outbound” connections. The NettyRemoteTransport always
-    # starts the server role to allow inbound connections, and it starts active
-    # client connections whenever sending to a destination which is not yet
-    # connected; if configured it reuses inbound connections for replies, which
-    # is called a passive client connection (i.e. from server to client).
-    netty {
+    ### Failure detection and recovery
 
-      # (O) In case of increased latency / overflow how long should we wait
-      # (blocking the sender) until we deem the send to be cancelled?
-      # 0 means "never backoff", any positive number will indicate the time to
-      # block at most.
-      backoff-timeout = 0ms
+    # how often should keep-alive heartbeat messages sent to connections.
+    heartbeat-interval = 1 s
 
-      # (I&O) Generate your own with the script availbale in
-      # '$AKKA_HOME/scripts/generate_config_with_secure_cookie.sh' or using
-      # 'akka.util.Crypt.generateSecureCookie'
-      secure-cookie = ""
+    # Settings for the Phi accrual failure detector (http://ddg.jaist.ac.jp/pub/HDY+04.pdf
+    # [Hayashibara et al]) used by the remoting subsystem to detect failed connections.
+    failure-detector {
+      # defines the failure detector threshold
+      # A low threshold is prone to generate many wrong suspicions but ensures
+      # a quick detection in the event of a real crash. Conversely, a high
+      # threshold generates fewer mistakes but needs more time to detect
+      # actual crashes
+      threshold = 7.0
 
-      # (I) Should the remote server require that its peers share the same
-      # secure-cookie (defined in the 'remote' section)?
-      require-cookie = off
+      # Number of the samples of inter-heartbeat arrival times to adaptively
+      # calculate the failure timeout for connections.
+      max-sample-size = 100
 
-      # (I) Reuse inbound connections for outbound messages
-      use-passive-connections = on
+      # Minimum standard deviation to use for the normal distribution in
+      # AccrualFailureDetector. Too low standard deviation might result in
+      # too much sensitivity for sudden, but normal, deviations in heartbeat
+      # inter arrival times.
+      min-std-deviation = 100 ms
 
-      # (I) EXPERIMENTAL If "<id.of.dispatcher>" then the specified dispatcher
-      # will be used to accept inbound connections, and perform IO. If "" then
-      # dedicated threads will be used.
-      #
-      # CAUTION: This might lead to the used dispatcher not shutting down properly!
-      #          - may prevent the JVM from shutting down normally
-      #          - may leak threads when shutting down an ActorSystem
-      #
-      use-dispatcher-for-io = ""
+      # Number of potentially lost/delayed heartbeats that will be
+      # accepted before considering it to be an anomaly.
+      # It is a factor of heartbeat-interval.
+      # This margin is important to be able to survive sudden, occasional,
+      # pauses in heartbeat arrivals, due to for example garbage collect or
+      # network drop.
+      acceptable-heartbeat-pause = 3 s
+    }
 
-      # (I) The hostname or ip to bind the remoting to,
-      # InetAddress.getLocalHost.getHostAddress is used if empty
-      hostname = ""
+    # After failed to establish an outbound connection, the remoting will mark the
+    # address as failed. This configuration option controls how much time should
+    # be elapsed before reattempting a new connection. While the address is
+    # gated, all messages sent to the address are delivered to dead-letters.
+    # If this setting is 0, the remoting will always immediately reattempt
+    # to establish a failed outbound connection and will buffer writes until
+    # it succeeds.
+    retry-gate-closed-for = 0 s
 
-      # (I) The default remote server port clients should connect to.
+    # If the retry gate function is disabled (see retry-gate-closed-for) the
+    # remoting subsystem will always attempt to reestablish failed outbound
+    # connections. The settings below together control the maximum number of
+    # reattempts in a given time window. The number of reattempts during
+    # a window of "retry-window" will be maximum "maximum-retries-in-window".
+    retry-window = 3 s
+    maximum-retries-in-window = 5
+
+    ### Transports and adapters
+
+    # List of the transport drivers that will be loaded by the remoting.
+    # A list of fully qualified config paths must be provided where
+    # the given configuration path contains a transport-class key
+    # pointing to an implementation class of the Transport interface.
+    # If multiple transports are provided, the address of the first
+    # one will be used as a default address.
+    enabled-transports = ["akka.remote.netty.tcp"]
+
+    # Transport drivers can be augmented with adapters by adding their
+    # name to the applied-adapters setting in the configuration of a
+    # transport. The available adapters should be configured in this
+    # section by providing a name, and the fully qualified name of
+    # their corresponding implementation
+    adapters {
+      gremlin = "akka.remote.transport.FailureInjectorProvider"
+      trttl = "akka.remote.transport.ThrottlerProvider"
+    }
+
+    ### Default configuration for the Netty based transport drivers
+
+    netty.tcp {
+      transport-class = "akka.remote.transport.netty.NettyTransport"
+
+      # Transport drivers can be augmented with adapters by adding their
+      # name to the applied-adapters list. The adapters will be applied
+      # in the order they are provided.
+      applied-adapters = []
+
+      transport-protocol = tcp
+
+      # The default remote server port clients should connect to.
       # Default is 2552 (AKKA), use 0 if you want a random available port
       # This port needs to be unique for each actor system on the same machine.
       port = 2552
 
-      # (O) The address of a local network interface (IP Address) to bind to when
-      # creating outbound connections. Set to "" or "auto" for automatic selection
-      # of local address.
-      outbound-local-address = "auto"
+      # The hostname or ip to bind the remoting to,
+      # InetAddress.getLocalHost.getHostAddress is used if empty
+      hostname = ""
 
-      # (I&O) Increase this if you want to be able to send messages with large
-      # payloads
-      message-frame-size = 1 MiB
+      # Enables SSL support on this transport
+      enable-ssl = false
 
-      # (O) Sets the connectTimeoutMillis of all outbound connections,
+      # Sets the connectTimeoutMillis of all outbound connections,
       # i.e. how long a connect may take until it is timed out
       connection-timeout = 120s
 
-      # (I) Sets the size of the connection backlog
-      backlog = 4096
+      # If set to "<id.of.dispatcher>" then the specified dispatcher
+      # will be used to accept inbound connections, and perform IO. If "" then
+      # dedicated threads will be used.
+      use-dispatcher-for-io = ""
 
-      # (I) Sets the SO_REUSE_ADDR flag, valid values are "on", "off" and "off-for-windows"
-      # due to the following Windows bug: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4476378
-      # "off-for-windows" of course means that it's "on" for all other platforms
-      reuse-address = off-for-windows
-
-      # (I) Length in akka.time-unit how long core threads will be kept alive if
-      # idling
-      execution-pool-keepalive = 60s
-
-      # (I) Size in number of threads of the core pool of the remote execution
-      # unit.
-      # A value of 0 will turn this off, which is can lead to deadlocks under
-      # some configurations!
-      execution-pool-size = 4
-
-      # (I) Maximum channel size, 0 for off
-      max-channel-memory-size = 0b
-
-      # (I) Maximum total size of all channels, 0 for off
-      max-total-memory-size = 0b
-
-      # (I&O) Sets the high water mark for the in and outbound sockets,
+      # Sets the high water mark for the in and outbound sockets,
       # set to 0b for platform default
       write-buffer-high-water-mark = 0b
 
-      # (I&O) Sets the low water mark for the in and outbound sockets,
+      # Sets the low water mark for the in and outbound sockets,
       # set to 0b for platform default
       write-buffer-low-water-mark = 0b
 
-      # (I&O) Sets the send buffer size of the Sockets,
+      # Sets the send buffer size of the Sockets,
       # set to 0b for platform default
-      send-buffer-size = 0b
+      send-buffer-size = 32000b
 
-      # (I&O) Sets the receive buffer size of the Sockets,
+      # Sets the receive buffer size of the Sockets,
       # set to 0b for platform default
-      receive-buffer-size = 0b
+      receive-buffer-size = 32000b
 
-      # (O) Time between reconnect attempts for active clients
-      reconnect-delay = 5s
+      # Sets the size of the connection backlog
+      backlog = 4096
 
-      # (O) Client read inactivity period  (finest resolution is seconds)
-      # after which active client connection is shutdown;
-      # Connection will be re-established in case of new communication requests.
-      # A value of 0 will turn this feature off
-      # This value should be left to be 0 when use-passive-connections is off, or if
-      # no traffic is expected from the server side (i.e. it is a sink).
-      read-timeout = 0s
-
-      # (O) Write inactivity period (lowest resolution is seconds)
-      # after which a heartbeat is sent across the wire.
-      # A value of 0 will turn this feature off
-      write-timeout = 10s
-
-      # (O) Inactivity period of both reads and writes (lowest resolution is
-      # seconds) after which active client connection is shutdown; will be
-      # re-established in case of new communication requests.
-      # A value of 0 will turn this feature off
-      all-timeout = 0s
-
-      # (O) Maximum time window that a client should try to reconnect for
-      reconnection-time-window = 600s
-
-      ssl {
-        # (I&O) Enable SSL/TLS encryption.
-        # This must be enabled on both the client and server to work.
-        enable = off
-
-        # (I) This is the Java Key Store used by the server connection
-        key-store = "keystore"
-
-        # This password is used for decrypting the key store
-        key-store-password = "changeme"
-
-        # (O) This is the Java Key Store used by the client connection
-        trust-store = "truststore"
-
-        # This password is used for decrypting the trust store
-        trust-store-password = "changeme"
-
-        # (I&O) Protocol to use for SSL encryption, choose from:
-        # Java 6 & 7:
-        #   'SSLv3', 'TLSv1'
-        # Java 7:
-        #   'TLSv1.1', 'TLSv1.2'
-        protocol = "TLSv1"
-
-        # Example: ["TLS_RSA_WITH_AES_128_CBC_SHA", "TLS_RSA_WITH_AES_256_CBC_SHA"]
-        # You need to install the JCE Unlimited Strength Jurisdiction Policy
-        # Files to use AES 256.
-        # More info here:
-        # http://docs.oracle.com/javase/7/docs/technotes/guides/security/SunProviders.html#SunJCEProvider
-        enabled-algorithms = ["TLS_RSA_WITH_AES_128_CBC_SHA"]
-
-        # Using /dev/./urandom is only necessary when using SHA1PRNG on Linux to
-        # prevent blocking. It is NOT as secure because it reuses the seed.
-        # '' => defaults to /dev/random or whatever is set in java.security for
-        #    example: securerandom.source=file:/dev/random
-        # '/dev/./urandom' => NOT '/dev/urandom' as that doesn't work according
-        #    to: http://bugs.sun.com/view_bug.do?bug_id=6202721
-        sha1prng-random-source = ""
-
-        # There are three options, in increasing order of security:
-        # "" or SecureRandom => (default)
-        # "SHA1PRNG" => Can be slow because of blocking issues on Linux
-        # "AES128CounterSecureRNG" => fastest startup and based on AES encryption
-        # algorithm
-        # "AES256CounterSecureRNG"
-        # The following use one of 3 possible seed sources, depending on
-        # availability: /dev/random, random.org and SecureRandom (provided by Java)
-        # "AES128CounterInetRNG"
-        # "AES256CounterInetRNG" (Install JCE Unlimited Strength Jurisdiction
-        # Policy Files first)
-        # Setting a value here may require you to supply the appropriate cipher
-        # suite (see enabled-algorithms section above)
-        random-number-generator = ""
-      }
-
-      # (I&O) Used to configure the number of I/O worker threads on server sockets
+      # Used to configure the number of I/O worker threads on server sockets
       server-socket-worker-pool {
         # Min number of threads to cap factor-based number to
         pool-size-min = 2
@@ -382,7 +266,7 @@ akka {
         pool-size-max = 8
       }
 
-      # (I&O) Used to configure the number of I/O worker threads on client sockets
+      # Used to configure the number of I/O worker threads on client sockets
       client-socket-worker-pool {
         # Min number of threads to cap factor-based number to
         pool-size-min = 2
@@ -397,5 +281,17 @@ akka {
         pool-size-max = 8
       }
     }
+
+    netty.udp = ${akka.remote.netty.tcp}
+    netty.udp {
+      transport-protocol = udp
+    }
+
+    netty.ssl = ${akka.remote.netty.tcp}
+    netty.ssl = {
+      enable-ssl = true
+    }
+
   }
+
 }
diff --git a/akka-remote/src/main/scala/akka/remote/Endpoint.scala b/akka-remote/src/main/scala/akka/remote/Endpoint.scala
index 3e33633daa..e678fa9551 100644
--- a/akka-remote/src/main/scala/akka/remote/Endpoint.scala
+++ b/akka-remote/src/main/scala/akka/remote/Endpoint.scala
@@ -123,14 +123,14 @@ private[remote] class EndpointWriter(
   val localAddress: Address,
   val remoteAddress: Address,
   val transport: Transport,
-  val settings: RemotingSettings,
+  val settings: RemoteSettings,
   val codec: AkkaPduCodec) extends Actor with Stash with FSM[EndpointWriter.State, Unit] {
 
   import EndpointWriter._
   import context.dispatcher
 
   val extendedSystem: ExtendedActorSystem = context.system.asInstanceOf[ExtendedActorSystem]
-  val eventPublisher = new EventPublisher(context.system, log, settings.LogLifecycleEvents)
+  val eventPublisher = new EventPublisher(context.system, log, settings.LogRemoteLifecycleEvents)
 
   var reader: Option[ActorRef] = None
   var handle: Option[AssociationHandle] = handleOrActive // FIXME: refactor into state data
diff --git a/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala b/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
index b576ff68a3..d70dc96d2e 100644
--- a/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
+++ b/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
@@ -76,7 +76,7 @@ class RemoteActorRefProvider(
   val dynamicAccess: DynamicAccess) extends ActorRefProvider {
   import RemoteActorRefProvider._
 
-  val remoteSettings: RemoteSettings = new RemoteSettings(settings.config, systemName)
+  val remoteSettings: RemoteSettings = new RemoteSettings(settings.config)
 
   override val deployer: Deployer = createDeployer
 
@@ -134,19 +134,8 @@ class RemoteActorRefProvider(
         local.registerExtraNames(Map(("remote", d)))
         d
       },
-
       serialization = SerializationExtension(system),
-
-      transport = {
-        val fqn = remoteSettings.RemoteTransport
-        val args = List(
-          classOf[ExtendedActorSystem] -> system,
-          classOf[RemoteActorRefProvider] -> this)
-
-        system.dynamicAccess.createInstanceFor[RemoteTransport](fqn, args).recover({
-          case problem ⇒ throw new RemoteTransportException("Could not load remote transport layer " + fqn, problem)
-        }).get
-      })
+      transport = new Remoting(system, this))
 
     _internals = internals
     remotingTerminator ! internals
diff --git a/akka-remote/src/main/scala/akka/remote/RemoteSettings.scala b/akka-remote/src/main/scala/akka/remote/RemoteSettings.scala
index 3d60667435..92daf70f83 100644
--- a/akka-remote/src/main/scala/akka/remote/RemoteSettings.scala
+++ b/akka-remote/src/main/scala/akka/remote/RemoteSettings.scala
@@ -4,15 +4,58 @@
 package akka.remote
 
 import com.typesafe.config.Config
-import scala.concurrent.duration.Duration
+import scala.concurrent.duration._
 import java.util.concurrent.TimeUnit.MILLISECONDS
+import akka.util.Timeout
+import scala.collection.immutable.Seq
+import akka.japi.Util._
 
-class RemoteSettings(val config: Config, val systemName: String) {
+class RemoteSettings(val config: Config) {
   import config._
-  val RemoteTransport: String = getString("akka.remote.transport")
+  import scala.collection.JavaConverters._
+
   val LogReceive: Boolean = getBoolean("akka.remote.log-received-messages")
+
   val LogSend: Boolean = getBoolean("akka.remote.log-sent-messages")
-  val RemoteSystemDaemonAckTimeout: Duration = Duration(getMilliseconds("akka.remote.remote-daemon-ack-timeout"), MILLISECONDS)
+
   val UntrustedMode: Boolean = getBoolean("akka.remote.untrusted-mode")
-  val LogRemoteLifeCycleEvents: Boolean = getBoolean("akka.remote.log-remote-lifecycle-events")
+
+  val LogRemoteLifecycleEvents: Boolean = getBoolean("akka.remote.log-remote-lifecycle-events")
+
+  val ShutdownTimeout: Timeout =
+    Duration(getMilliseconds("akka.remote.shutdown-timeout"), MILLISECONDS)
+
+  val FlushWait: FiniteDuration = Duration(getMilliseconds("akka.remote.flush-wait-on-shutdown"), MILLISECONDS)
+
+  val StartupTimeout: Timeout = Timeout(Duration(getMilliseconds("akka.remote.startup-timeout"), MILLISECONDS))
+
+  val RetryGateClosedFor: FiniteDuration = Duration(getMilliseconds("akka.remote.retry-gate-closed-for"), MILLISECONDS)
+
+  val UsePassiveConnections: Boolean = getBoolean("akka.remote.use-passive-connections")
+
+  val MaximumRetriesInWindow: Int = getInt("akka.remote.maximum-retries-in-window")
+
+  val RetryWindow: FiniteDuration = Duration(getMilliseconds("akka.remote.retry-window"), MILLISECONDS)
+
+  val BackoffPeriod: FiniteDuration = Duration(getMilliseconds("akka.remote.backoff-interval"), MILLISECONDS)
+
+  val CommandAckTimeout: Timeout =
+    Timeout(Duration(getMilliseconds("akka.remote.command-ack-timeout"), MILLISECONDS))
+
+  val Transports: Seq[(String, Seq[String], Config)] = transportNames.map { name ⇒
+    val transportConfig = transportConfigFor(name)
+    (transportConfig.getString("transport-class"),
+      immutableSeq(transportConfig.getStringList("applied-adapters")),
+      transportConfig)
+  }
+
+  val Adapters: Map[String, String] = configToMap(getConfig("akka.remote.adapters"))
+
+  private def transportNames: Seq[String] = immutableSeq(getStringList("akka.remote.enabled-transports"))
+
+  private def transportConfigFor(transportName: String): Config = getConfig(transportName)
+
+  private def configToMap(cfg: Config): Map[String, String] =
+    cfg.root.unwrapped.asScala.toMap.map { case (k, v) ⇒ (k, v.toString) }
+
 }
diff --git a/akka-remote/src/main/scala/akka/remote/Remoting.scala b/akka-remote/src/main/scala/akka/remote/Remoting.scala
index f0e4f61043..adad076911 100644
--- a/akka-remote/src/main/scala/akka/remote/Remoting.scala
+++ b/akka-remote/src/main/scala/akka/remote/Remoting.scala
@@ -23,50 +23,6 @@ import scala.concurrent.{ Promise, Await, Future }
 import scala.util.control.NonFatal
 import scala.util.{ Failure, Success }
 
-class RemotingSettings(val config: Config) {
-
-  import config._
-  import scala.collection.JavaConverters._
-
-  val LogLifecycleEvents: Boolean = getBoolean("akka.remoting.log-remote-lifecycle-events")
-
-  val ShutdownTimeout: Timeout =
-    Duration(getMilliseconds("akka.remoting.shutdown-timeout"), MILLISECONDS)
-
-  val FlushWait: FiniteDuration = Duration(getMilliseconds("akka.remoting.flush-wait-on-shutdown"), MILLISECONDS)
-
-  val StartupTimeout: Timeout = Timeout(Duration(getMilliseconds("akka.remoting.startup-timeout"), MILLISECONDS))
-
-  val RetryGateClosedFor: FiniteDuration = Duration(getMilliseconds("akka.remoting.retry-gate-closed-for"), MILLISECONDS)
-
-  val UsePassiveConnections: Boolean = getBoolean("akka.remoting.use-passive-connections")
-
-  val MaximumRetriesInWindow: Int = getInt("akka.remoting.maximum-retries-in-window")
-
-  val RetryWindow: FiniteDuration = Duration(getMilliseconds("akka.remoting.retry-window"), MILLISECONDS)
-
-  val BackoffPeriod: FiniteDuration = Duration(getMilliseconds("akka.remoting.backoff-interval"), MILLISECONDS)
-
-  val CommandAckTimeout: Timeout =
-    Timeout(Duration(getMilliseconds("akka.remoting.command-ack-timeout"), MILLISECONDS))
-
-  val Transports: Seq[(String, Seq[String], Config)] = transportNames.map { name ⇒
-    val transportConfig = transportConfigFor(name)
-    (transportConfig.getString("transport-class"),
-      immutableSeq(transportConfig.getStringList("applied-adapters")),
-      transportConfig)
-  }
-
-  val Adapters: Map[String, String] = configToMap(getConfig("akka.remoting.adapters"))
-
-  private def transportNames: Seq[String] = immutableSeq(getStringList("akka.remoting.enabled-transports"))
-
-  private def transportConfigFor(transportName: String): Config = getConfig("akka.remoting.transports." + transportName)
-
-  private def configToMap(cfg: Config): Map[String, String] =
-    cfg.root.unwrapped.asScala.toMap.map { case (k, v) ⇒ (k, v.toString) }
-}
-
 private[remote] object AddressUrlEncoder {
   def apply(address: Address): String = URLEncoder.encode(address.toString, "utf-8")
 }
@@ -136,14 +92,14 @@ private[remote] class Remoting(_system: ExtendedActorSystem, _provider: RemoteAc
   // a lazy val
   @volatile var defaultAddress: Address = _
 
-  private val settings = new RemotingSettings(provider.remoteSettings.config)
+  import provider.remoteSettings._
 
   val transportSupervisor = system.asInstanceOf[ActorSystemImpl].systemActorOf(Props[TransportSupervisor], "transports")
 
   override def localAddressForRemote(remote: Address): Address = Remoting.localAddressForRemote(transportMapping, remote)
 
   val log: LoggingAdapter = Logging(system.eventStream, "Remoting")
-  val eventPublisher = new EventPublisher(system, log, settings.LogLifecycleEvents)
+  val eventPublisher = new EventPublisher(system, log, LogRemoteLifecycleEvents)
 
   private def notifyError(msg: String, cause: Throwable): Unit =
     eventPublisher.notifyListeners(RemotingErrorEvent(new RemoteTransportException(msg, cause)))
@@ -152,7 +108,7 @@ private[remote] class Remoting(_system: ExtendedActorSystem, _provider: RemoteAc
     import scala.concurrent.ExecutionContext.Implicits.global
     endpointManager match {
       case Some(manager) ⇒
-        implicit val timeout = settings.ShutdownTimeout
+        implicit val timeout = ShutdownTimeout
         val stopped: Future[Boolean] = (manager ? ShutdownAndFlush).mapTo[Boolean]
 
         def finalize(): Unit = {
@@ -164,7 +120,7 @@ private[remote] class Remoting(_system: ExtendedActorSystem, _provider: RemoteAc
           case Success(flushSuccessful) ⇒
             if (!flushSuccessful)
               log.warning("Shutdown finished, but flushing timed out. Some messages might not have been sent. " +
-                "Increase akka.remoting.flush-wait-on-shutdown to a larger value to avoid this.")
+                "Increase akka.remote.flush-wait-on-shutdown to a larger value to avoid this.")
             finalize()
 
           case Failure(e) ⇒
@@ -193,7 +149,7 @@ private[remote] class Remoting(_system: ExtendedActorSystem, _provider: RemoteAc
           manager ! Listen(addressesPromise)
 
           val transports: Seq[(Transport, Address)] = Await.result(addressesPromise.future,
-            settings.StartupTimeout.duration)
+            StartupTimeout.duration)
           if (transports.isEmpty) throw new RemoteTransportException("No transport drivers were loaded.", null)
 
           transportMapping = transports.groupBy {
@@ -203,6 +159,8 @@ private[remote] class Remoting(_system: ExtendedActorSystem, _provider: RemoteAc
           defaultAddress = transports.head._2
           addresses = transports.map { _._2 }.toSet
 
+          log.info("Remoting started; listening on addresses :" + addresses.mkString("[", ", ", "]"))
+
           manager ! StartupFinished
           eventPublisher.notifyListeners(RemotingListenEvent(addresses))
 
@@ -228,7 +186,7 @@ private[remote] class Remoting(_system: ExtendedActorSystem, _provider: RemoteAc
   override def managementCommand(cmd: Any): Future[Boolean] = endpointManager match {
     case Some(manager) ⇒
       import system.dispatcher
-      implicit val timeout = settings.CommandAckTimeout
+      implicit val timeout = CommandAckTimeout
       manager ? ManagementCommand(cmd) map { case ManagementCommandAck(status) ⇒ status }
     case None ⇒ throw new IllegalStateException("Attempted to send management command but Remoting is not running.")
   }
@@ -237,7 +195,7 @@ private[remote] class Remoting(_system: ExtendedActorSystem, _provider: RemoteAc
   protected def useUntrustedMode: Boolean = provider.remoteSettings.UntrustedMode
 
   // Not used anywhere only to keep compatibility with RemoteTransport interface
-  protected def logRemoteLifeCycleEvents: Boolean = provider.remoteSettings.LogRemoteLifeCycleEvents
+  protected def logRemoteLifeCycleEvents: Boolean = LogRemoteLifecycleEvents
 
 }
 
@@ -356,11 +314,11 @@ private[remote] class EndpointManager(conf: Config, log: LoggingAdapter) extends
   import EndpointManager._
   import context.dispatcher
 
-  val settings = new RemotingSettings(conf)
+  val settings = new RemoteSettings(conf)
   val extendedSystem = context.system.asInstanceOf[ExtendedActorSystem]
   val endpointId: Iterator[Int] = Iterator from 0
 
-  val eventPublisher = new EventPublisher(context.system, log, settings.LogLifecycleEvents)
+  val eventPublisher = new EventPublisher(context.system, log, settings.LogRemoteLifecycleEvents)
 
   // Mapping between addresses and endpoint actors. If passive connections are turned off, incoming connections
   // will be not part of this map!
@@ -540,7 +498,7 @@ private[remote] class EndpointManager(conf: Config, log: LoggingAdapter) extends
   private def createEndpoint(remoteAddress: Address,
                              localAddress: Address,
                              transport: Transport,
-                             endpointSettings: RemotingSettings,
+                             endpointSettings: RemoteSettings,
                              handleOption: Option[AssociationHandle]): ActorRef = {
     assert(transportMapping contains localAddress)
 
@@ -552,7 +510,7 @@ private[remote] class EndpointManager(conf: Config, log: LoggingAdapter) extends
         transport,
         endpointSettings,
         AkkaPduProtobufCodec))
-      .withDispatcher("akka.remoting.writer-dispatcher"),
+      .withDispatcher("akka.remote.writer-dispatcher"),
       "endpointWriter-" + AddressUrlEncoder(remoteAddress) + "-" + endpointId.next()))
   }
 
diff --git a/akka-remote/src/main/scala/akka/remote/transport/AbstractTransportAdapter.scala b/akka-remote/src/main/scala/akka/remote/transport/AbstractTransportAdapter.scala
index e6fad8dd30..674517fb61 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/AbstractTransportAdapter.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/AbstractTransportAdapter.scala
@@ -10,7 +10,7 @@ import akka.remote.Remoting.RegisterTransportActor
 import akka.remote.transport.ActorTransportAdapter.ListenUnderlying
 import akka.remote.transport.ActorTransportAdapter.ListenerRegistered
 import akka.remote.transport.Transport._
-import akka.remote.{ RARP, RemotingSettings }
+import akka.remote.RARP
 import akka.util.Timeout
 import scala.collection.immutable
 import scala.concurrent.duration._
@@ -20,7 +20,7 @@ import scala.util.Success
 trait TransportAdapterProvider extends ((Transport, ExtendedActorSystem) ⇒ Transport)
 
 class TransportAdapters(system: ExtendedActorSystem) extends Extension {
-  val settings = new RemotingSettings(RARP(system).provider.remoteSettings.config)
+  val settings = RARP(system).provider.remoteSettings
 
   private val adaptersTable: Map[String, TransportAdapterProvider] = for ((name, fqn) ← settings.Adapters) yield {
     name -> system.dynamicAccess.createInstanceFor[TransportAdapterProvider](fqn, immutable.Seq.empty).recover({
diff --git a/akka-remote/src/main/scala/akka/remote/transport/AkkaProtocolTransport.scala b/akka-remote/src/main/scala/akka/remote/transport/AkkaProtocolTransport.scala
index 921c88a83d..85cb870727 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/AkkaProtocolTransport.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/AkkaProtocolTransport.scala
@@ -30,24 +30,24 @@ private[remote] class AkkaProtocolSettings(config: Config) {
 
   import config._
 
-  val FailureDetectorThreshold: Double = getDouble("akka.remoting.failure-detector.threshold")
+  val FailureDetectorThreshold: Double = getDouble("akka.remote.failure-detector.threshold")
 
-  val FailureDetectorMaxSampleSize: Int = getInt("akka.remoting.failure-detector.max-sample-size")
+  val FailureDetectorMaxSampleSize: Int = getInt("akka.remote.failure-detector.max-sample-size")
 
   val FailureDetectorStdDeviation: FiniteDuration =
-    Duration(getMilliseconds("akka.remoting.failure-detector.min-std-deviation"), MILLISECONDS)
+    Duration(getMilliseconds("akka.remote.failure-detector.min-std-deviation"), MILLISECONDS)
 
   val AcceptableHeartBeatPause: FiniteDuration =
-    Duration(getMilliseconds("akka.remoting.failure-detector.acceptable-heartbeat-pause"), MILLISECONDS)
+    Duration(getMilliseconds("akka.remote.failure-detector.acceptable-heartbeat-pause"), MILLISECONDS)
 
   val HeartBeatInterval: FiniteDuration =
-    Duration(getMilliseconds("akka.remoting.heartbeat-interval"), MILLISECONDS)
+    Duration(getMilliseconds("akka.remote.heartbeat-interval"), MILLISECONDS)
 
-  val WaitActivityEnabled: Boolean = getBoolean("akka.remoting.wait-activity-enabled")
+  val WaitActivityEnabled: Boolean = getBoolean("akka.remote.wait-activity-enabled")
 
-  val RequireCookie: Boolean = getBoolean("akka.remoting.require-cookie")
+  val RequireCookie: Boolean = getBoolean("akka.remote.require-cookie")
 
-  val SecureCookie: String = getString("akka.remoting.secure-cookie")
+  val SecureCookie: String = getString("akka.remote.secure-cookie")
 }
 
 private[remote] object AkkaProtocolTransport { //Couldn't these go into the Remoting Extension/ RemoteSettings instead?
diff --git a/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala
index 42373f09cc..cfdc8b1915 100644
--- a/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala
@@ -8,32 +8,54 @@ import language.postfixOps
 import akka.testkit.AkkaSpec
 import akka.actor.ExtendedActorSystem
 import scala.concurrent.duration._
-import akka.util.Helpers
+import akka.remote.transport.AkkaProtocolSettings
+import akka.util.{ Timeout, Helpers }
 
 @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner])
 class RemoteConfigSpec extends AkkaSpec(
   """
     akka.actor.provider = "akka.remote.RemoteActorRefProvider"
-    akka.remoting.transports.tcp.port = 0
+    akka.remote.netty.tcp.port = 0
   """) {
 
   // FIXME: These tests are ignored as it tests configuration specific to the old remoting.
   "Remoting" must {
 
-    "be able to parse generic remote config elements" ignore {
-      val settings = system.asInstanceOf[ExtendedActorSystem].provider.asInstanceOf[RemoteActorRefProvider].remoteSettings
+    "be able to parse generic remote config elements" in {
+      val settings = RARP(system).provider.remoteSettings
       import settings._
 
-      RemoteTransport must be("akka.remote.netty.NettyRemoteTransport")
+      StartupTimeout must be === Timeout(5.seconds)
+      ShutdownTimeout must be === Timeout(5.seconds)
+      FlushWait must be === 2.seconds
+      UsePassiveConnections must be(true)
       UntrustedMode must be(false)
-      RemoteSystemDaemonAckTimeout must be(30 seconds)
-      LogRemoteLifeCycleEvents must be(true)
+      LogRemoteLifecycleEvents must be(false)
+      LogReceive must be(false)
+      LogSend must be(false)
+      MaximumRetriesInWindow must be === 5
+      RetryWindow must be === 3.seconds
+      BackoffPeriod must be === 10.milliseconds
+      CommandAckTimeout must be === Timeout(30.seconds)
+
     }
 
-    "contain correct configuration values in reference.conf" in {
-      val c = system.asInstanceOf[ExtendedActorSystem].
-        provider.asInstanceOf[RemoteActorRefProvider].
-        remoteSettings.config.getConfig("akka.remote.netty")
+    "be able to parse AkkaProtocol related config elements" in {
+      val settings = new AkkaProtocolSettings(RARP(system).provider.remoteSettings.config)
+      import settings._
+
+      WaitActivityEnabled must be(true)
+      FailureDetectorThreshold must be === 7
+      FailureDetectorMaxSampleSize must be === 100
+      FailureDetectorStdDeviation must be === 100.milliseconds
+      AcceptableHeartBeatPause must be === 3.seconds
+      HeartBeatInterval must be === 1.seconds
+      RequireCookie must be(false)
+      SecureCookie must be === ""
+    }
+
+    "contain correct configuration values in reference.conf" ignore {
+      val c = RARP(system).provider.remoteSettings.config.getConfig("akka.remote.netty.tcp")
 
       // server-socket-worker-pool
       {
diff --git a/akka-remote/src/test/scala/akka/remote/RemoteDeathWatchSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteDeathWatchSpec.scala
index 533f8745b7..b62a26ad5a 100644
--- a/akka-remote/src/test/scala/akka/remote/RemoteDeathWatchSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/RemoteDeathWatchSpec.scala
@@ -16,14 +16,14 @@ akka {
             /watchers.remote = "tcp.akka://other@localhost:2666"
         }
     }
-    remoting.tcp {
+    remote.netty.tcp {
         hostname = "localhost"
         port = 0
     }
 }
                                                                       """)) with ImplicitSender with DefaultTimeout with DeathWatchSpec {
 
-  val other = ActorSystem("other", ConfigFactory.parseString("akka.remoting.transports.tcp.port=2666")
+  val other = ActorSystem("other", ConfigFactory.parseString("akka.remote.netty.tcp.port=2666")
     .withFallback(system.settings.config))
 
   override def beforeTermination() {
diff --git a/akka-remote/src/test/scala/akka/remote/RemoteDeployerSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteDeployerSpec.scala
index 369d1232db..609621dfc2 100644
--- a/akka-remote/src/test/scala/akka/remote/RemoteDeployerSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/RemoteDeployerSpec.scala
@@ -18,7 +18,7 @@ object RemoteDeployerSpec {
           remote = "akka://sys@wallace:2552"
         }
       }
-      akka.remoting.transports.tcp.port = 0
+      akka.remote.netty.tcp.port = 0
       """, ConfigParseOptions.defaults)
 
   class RecipeActor extends Actor {
diff --git a/akka-remote/src/test/scala/akka/remote/RemoteRouterSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteRouterSpec.scala
index 9f88ea8b19..01e38566bd 100644
--- a/akka-remote/src/test/scala/akka/remote/RemoteRouterSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/RemoteRouterSpec.scala
@@ -21,7 +21,7 @@ object RemoteRouterSpec {
 class RemoteRouterSpec extends AkkaSpec("""
 akka {
   actor.provider = "akka.remote.RemoteActorRefProvider"
-  remoting.transports.tcp {
+  remote.netty.tcp {
     hostname = localhost
     port = 0
   }
@@ -61,7 +61,7 @@ akka {
 
   import RemoteRouterSpec._
 
-  val conf = ConfigFactory.parseString("""akka.remoting.transports.tcp.port=12347
+  val conf = ConfigFactory.parseString("""akka.remote.netty.tcp.port=12347
 akka.actor.deployment {
   /remote-override {
     router = round-robin
diff --git a/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala b/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala
index c68fdda63d..67bbad5f41 100644
--- a/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala
@@ -49,16 +49,21 @@ object RemotingSpec {
       actor.provider = "akka.remote.RemoteActorRefProvider"
       remote.transport = "akka.remote.Remoting"
 
-      remoting.retry-latch-closed-for = 1 s
-      remoting.log-remote-lifecycle-events = on
-      remoting.enabled-transports = [test, tcp, udp, ssl]
+      remote.retry-latch-closed-for = 1 s
+      remote.log-remote-lifecycle-events = on
+      remote.enabled-transports = [
+        "akka.remote.test",
+        "akka.remote.netty.tcp",
+        "akka.remote.netty.udp",
+        "akka.remote.netty.ssl"
+      ]
 
-      remoting.transports.tcp.port = 0
-      remoting.transports.udp.port = 0
-      remoting.transports.ssl.port = 0
-      remoting.transports.ssl.ssl = ${common-ssl-settings}
+      remote.netty.tcp.port = 0
+      remote.netty.udp.port = 0
+      remote.netty.ssl.port = 0
+      remote.netty.ssl.ssl = ${common-ssl-settings}
 
-      remoting.transports.test {
+      remote.test {
           transport-class = "akka.remote.transport.TestTransport"
           applied-adapters = []
           registry-key = aX33k0jWKg
@@ -73,7 +78,7 @@ object RemotingSpec {
         /looker/child/grandchild.remote = "test.akka://RemotingSpec@localhost:12345"
       }
     }
-""".format(
+                                               """.format(
     getClass.getClassLoader.getResource("keystore").getPath,
     getClass.getClassLoader.getResource("truststore").getPath))
 
@@ -86,7 +91,7 @@ class RemotingSpec extends AkkaSpec(RemotingSpec.cfg) with ImplicitSender with D
 
   val conf = ConfigFactory.parseString(
     """
-      akka.remoting.transports {
+      akka.remote {
         test.local-address = "test://remote-sys@localhost:12346"
       }
     """).withFallback(system.settings.config).resolve()
diff --git a/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala b/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala
index c7e2224efc..c157a1894e 100644
--- a/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala
@@ -34,9 +34,9 @@ object Configuration {
         default-timeout = 10s
       }
 
-      remoting.enabled-transports = ["ssl"]
+      remote.enabled-transports = ["akka.remote.netty.ssl"]
 
-      remoting.transports.ssl {
+      remote.netty.ssl {
         hostname = localhost
         port = %d
         ssl {
@@ -62,7 +62,7 @@ object Configuration {
       //if (true) throw new IllegalArgumentException("Ticket1978*Spec isn't enabled")
 
       val config = ConfigFactory.parseString(conf.format(localPort, trustStore, keyStore, cipher, enabled.mkString(", ")))
-      val fullConfig = config.withFallback(AkkaSpec.testConf).withFallback(ConfigFactory.load).getConfig("akka.remoting.transports.ssl.ssl")
+      val fullConfig = config.withFallback(AkkaSpec.testConf).withFallback(ConfigFactory.load).getConfig("akka.remote.netty.ssl.ssl")
       val settings = new SSLSettings(fullConfig)
 
       val rng = NettySSLSupport.initializeCustomSecureRandom(settings.SSLRandomNumberGenerator,
@@ -126,7 +126,7 @@ abstract class Ticket1978CommunicationSpec(val cipherConfig: CipherConfig) exten
 
   lazy val other: ActorSystem = ActorSystem(
     "remote-sys",
-    ConfigFactory.parseString("akka.remoting.transports.ssl.port = " + cipherConfig.remotePort).withFallback(system.settings.config))
+    ConfigFactory.parseString("akka.remote.netty.ssl.port = " + cipherConfig.remotePort).withFallback(system.settings.config))
 
   override def afterTermination() {
     if (cipherConfig.runTest) {
diff --git a/akka-remote/src/test/scala/akka/remote/UntrustedSpec.scala b/akka-remote/src/test/scala/akka/remote/UntrustedSpec.scala
index 2bc84a9763..9124aad9c5 100644
--- a/akka-remote/src/test/scala/akka/remote/UntrustedSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/UntrustedSpec.scala
@@ -25,13 +25,13 @@ import akka.actor.PoisonPill
 class UntrustedSpec extends AkkaSpec("""
 akka.actor.provider = akka.remote.RemoteActorRefProvider
 akka.remote.untrusted-mode = on
-akka.remoting.transports.tcp.port = 0
+akka.remote.netty.tcp.port = 0
 akka.loglevel = DEBUG
 """) with ImplicitSender {
 
   val other = ActorSystem("UntrustedSpec-client", ConfigFactory.parseString("""
       akka.actor.provider = akka.remote.RemoteActorRefProvider
-      akka.remoting.transports.tcp.port = 0
+      akka.remote.netty.tcp.port = 0
   """))
   val addr = system.asInstanceOf[ExtendedActorSystem].provider.asInstanceOf[RemoteActorRefProvider].transport.addresses.head
   val target1 = other.actorFor(RootActorPath(addr) / "remote")
diff --git a/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolSpec.scala b/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolSpec.scala
index af4614aa6e..b22632a10d 100644
--- a/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolSpec.scala
@@ -33,7 +33,7 @@ class AkkaProtocolSpec extends AkkaSpec("""akka.actor.provider = "akka.remote.Re
 
   val conf = ConfigFactory.parseString(
     """
-      akka.remoting {
+      akka.remote {
 
         failure-detector {
           threshold = 7.0
@@ -203,7 +203,7 @@ class AkkaProtocolSpec extends AkkaSpec("""akka.actor.provider = "akka.remote.Re
         remoteAddress,
         statusPromise,
         transport,
-        new AkkaProtocolSettings(ConfigFactory.parseString("akka.remoting.wait-activity-enabled = off").withFallback(conf)),
+        new AkkaProtocolSettings(ConfigFactory.parseString("akka.remote.wait-activity-enabled = off").withFallback(conf)),
         codec,
         failureDetector)))
 
@@ -263,7 +263,7 @@ class AkkaProtocolSpec extends AkkaSpec("""akka.actor.provider = "akka.remote.Re
         localAddress,
         handle,
         ActorAssociationEventListener(testActor),
-        new AkkaProtocolSettings(ConfigFactory.parseString("akka.remoting.require-cookie = on").withFallback(conf)),
+        new AkkaProtocolSettings(ConfigFactory.parseString("akka.remote.require-cookie = on").withFallback(conf)),
         codec,
         failureDetector)))
 
@@ -282,7 +282,7 @@ class AkkaProtocolSpec extends AkkaSpec("""akka.actor.provider = "akka.remote.Re
         localAddress,
         handle,
         ActorAssociationEventListener(testActor),
-        new AkkaProtocolSettings(ConfigFactory.parseString("akka.remoting.require-cookie = on").withFallback(conf)),
+        new AkkaProtocolSettings(ConfigFactory.parseString("akka.remote.require-cookie = on").withFallback(conf)),
         codec,
         failureDetector)))
 
@@ -314,8 +314,8 @@ class AkkaProtocolSpec extends AkkaSpec("""akka.actor.provider = "akka.remote.Re
         transport,
         new AkkaProtocolSettings(ConfigFactory.parseString(
           """
-             akka.remoting.require-cookie = on
-             akka.remoting.wait-activity-enabled = off
+             akka.remote.require-cookie = on
+             akka.remote.wait-activity-enabled = off
           """).withFallback(conf)),
         codec,
         failureDetector)))
@@ -342,7 +342,7 @@ class AkkaProtocolSpec extends AkkaSpec("""akka.actor.provider = "akka.remote.Re
         remoteAddress,
         statusPromise,
         transport,
-        new AkkaProtocolSettings(ConfigFactory.parseString("akka.remoting.wait-activity-enabled = off").withFallback(conf)),
+        new AkkaProtocolSettings(ConfigFactory.parseString("akka.remote.wait-activity-enabled = off").withFallback(conf)),
         codec,
         failureDetector)))
 
@@ -413,7 +413,7 @@ class AkkaProtocolSpec extends AkkaSpec("""akka.actor.provider = "akka.remote.Re
         remoteAddress,
         statusPromise,
         transport,
-        new AkkaProtocolSettings(ConfigFactory.parseString("akka.remoting.wait-activity-enabled = off").withFallback(conf)),
+        new AkkaProtocolSettings(ConfigFactory.parseString("akka.remote.wait-activity-enabled = off").withFallback(conf)),
         codec,
         failureDetector)))
 
@@ -449,7 +449,7 @@ class AkkaProtocolSpec extends AkkaSpec("""akka.actor.provider = "akka.remote.Re
         remoteAddress,
         statusPromise,
         transport,
-        new AkkaProtocolSettings(ConfigFactory.parseString("akka.remoting.wait-activity-enabled = off").withFallback(conf)),
+        new AkkaProtocolSettings(ConfigFactory.parseString("akka.remote.wait-activity-enabled = off").withFallback(conf)),
         codec,
         failureDetector)))
 
diff --git a/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala b/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala
index aa6625ecc0..7d78f053a4 100644
--- a/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala
+++ b/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala
@@ -16,19 +16,19 @@ object AkkaProtocolStressTest {
       #loglevel = DEBUG
       actor.provider = "akka.remote.RemoteActorRefProvider"
 
-      remoting.retry-latch-closed-for = 0 s
-      remoting.log-remote-lifecycle-events = on
+      remote.retry-latch-closed-for = 0 s
+      remote.log-remote-lifecycle-events = on
 
-      remoting.failure-detector {
+      remote.failure-detector {
         threshold = 1.0
         max-sample-size = 2
         min-std-deviation = 1 ms
         acceptable-heartbeat-pause = 0.01 s
       }
-      remoting.retry-window = 1 s
-      remoting.maximum-retries-in-window = 1000
+      remote.retry-window = 1 s
+      remote.maximum-retries-in-window = 1000
 
-      remoting.transports.tcp {
+      remote.netty.tcp {
         applied-adapters = ["gremlin"]
         port = 0
       }
diff --git a/akka-remote/src/test/scala/akka/remote/transport/ThrottlerTransportAdapterSpec.scala b/akka-remote/src/test/scala/akka/remote/transport/ThrottlerTransportAdapterSpec.scala
index 134f58ee09..dd38d2e4a4 100644
--- a/akka-remote/src/test/scala/akka/remote/transport/ThrottlerTransportAdapterSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/transport/ThrottlerTransportAdapterSpec.scala
@@ -18,11 +18,11 @@ object ThrottlerTransportAdapterSpec {
       #loglevel = DEBUG
       actor.provider = "akka.remote.RemoteActorRefProvider"
 
-      remoting.retry-latch-closed-for = 0 s
-      remoting.log-remote-lifecycle-events = on
+      remote.retry-latch-closed-for = 0 s
+      remote.log-remote-lifecycle-events = on
 
-      remoting.transports.tcp.applied-adapters = ["trttl"]
-      remoting.transports.tcp.port = 0
+      remote.netty.tcp.applied-adapters = ["trttl"]
+      remote.netty.tcp.port = 0
     }
                                                    """)
 

From 5dacfaeb383fd283ff18133a9eadb70db94bfc18 Mon Sep 17 00:00:00 2001
From: Roland <rk@rkuhn.info>
Date: Thu, 24 Jan 2013 13:43:40 +0100
Subject: [PATCH 080/122] =?UTF-8?q?fix-up=20Cluster=E2=80=99s=20complaint?=
 =?UTF-8?q?=20for=20too=20slow=20Scheduler,=20see=20#2904?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 akka-cluster/src/main/scala/akka/cluster/Cluster.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/akka-cluster/src/main/scala/akka/cluster/Cluster.scala b/akka-cluster/src/main/scala/akka/cluster/Cluster.scala
index 4b0a1053dc..11d0a0e2ec 100644
--- a/akka-cluster/src/main/scala/akka/cluster/Cluster.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/Cluster.scala
@@ -93,7 +93,7 @@ class Cluster(val system: ExtendedActorSystem) extends Extension {
       import scala.collection.JavaConverters._
       log.info("Using a dedicated scheduler for cluster. Default scheduler can be used if configured " +
         "with 'akka.scheduler.tick-duration' [{} ms] <=  'akka.cluster.scheduler.tick-duration' [{} ms].",
-        1000 / system.scheduler.maxFrequency, SchedulerTickDuration.toMillis)
+        (1000 / system.scheduler.maxFrequency).toInt, SchedulerTickDuration.toMillis)
       new DefaultScheduler(
         ConfigFactory.parseString(s"akka.scheduler.tick-duration=${SchedulerTickDuration.toMillis}ms").withFallback(
           system.settings.config),

From 405174d4c36b47257094d81b788a0b96408032de Mon Sep 17 00:00:00 2001
From: Roland <rk@rkuhn.info>
Date: Wed, 23 Jan 2013 23:05:32 +0100
Subject: [PATCH 081/122] =?UTF-8?q?don=E2=80=99t=20use=20the=20testActor.q?=
 =?UTF-8?q?ueue=20for=20probe.watch(),=20see=20#2915?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/scala/akka/actor/ActorRef.scala  |  5 ++++-
 .../src/main/scala/akka/testkit/TestKit.scala | 20 ++++++++-----------
 .../scala/akka/testkit/TestProbeSpec.scala    |  9 +++++++++
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/akka-actor/src/main/scala/akka/actor/ActorRef.scala b/akka-actor/src/main/scala/akka/actor/ActorRef.scala
index df8948a03d..82bf2c34ff 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorRef.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorRef.scala
@@ -446,7 +446,10 @@ private[akka] class EmptyLocalActorRef(override val provider: ActorRefProvider,
 
   override def isTerminated(): Boolean = true
 
-  override def sendSystemMessage(message: SystemMessage): Unit = specialHandle(message)
+  override def sendSystemMessage(message: SystemMessage): Unit = {
+    if (Mailbox.debug) println(s"ELAR $path having enqueued $message")
+    specialHandle(message)
+  }
 
   override def !(message: Any)(implicit sender: ActorRef = Actor.noSender): Unit = message match {
     case d: DeadLetter ⇒
diff --git a/akka-testkit/src/main/scala/akka/testkit/TestKit.scala b/akka-testkit/src/main/scala/akka/testkit/TestKit.scala
index df3f8a9f53..6dcd6450ef 100644
--- a/akka-testkit/src/main/scala/akka/testkit/TestKit.scala
+++ b/akka-testkit/src/main/scala/akka/testkit/TestKit.scala
@@ -62,8 +62,8 @@ class TestActor(queue: BlockingDeque[TestActor.Message]) extends Actor {
 
   def receive = {
     case SetIgnore(ign)      ⇒ ignore = ign
-    case x @ Watch(ref)      ⇒ context.watch(ref); queue.offerLast(RealMessage(x, self))
-    case x @ UnWatch(ref)    ⇒ context.unwatch(ref); queue.offerLast(RealMessage(x, self))
+    case Watch(ref)          ⇒ context.watch(ref)
+    case UnWatch(ref)        ⇒ context.unwatch(ref)
     case SetAutoPilot(pilot) ⇒ autopilot = pilot
     case x: AnyRef ⇒
       autopilot = autopilot.run(sender, x) match {
@@ -146,23 +146,19 @@ trait TestKitBase {
   def ignoreNoMsg() { testActor ! TestActor.SetIgnore(None) }
 
   /**
-   * Have the testActor watch someone (i.e. `context.watch(...)`). Waits until
-   * the Watch message is received back using expectMsg.
+   * Have the testActor watch someone (i.e. `context.watch(...)`).
    */
   def watch(ref: ActorRef): ActorRef = {
-    val msg = TestActor.Watch(ref)
-    testActor ! msg
-    expectMsg(msg).ref
+    testActor ! TestActor.Watch(ref)
+    ref
   }
 
   /**
-   * Have the testActor stop watching someone (i.e. `context.unwatch(...)`). Waits until
-   * the Watch message is received back using expectMsg.
+   * Have the testActor stop watching someone (i.e. `context.unwatch(...)`).
    */
   def unwatch(ref: ActorRef): ActorRef = {
-    val msg = TestActor.UnWatch(ref)
-    testActor ! msg
-    expectMsg(msg).ref
+    testActor ! TestActor.UnWatch(ref)
+    ref
   }
 
   /**
diff --git a/akka-testkit/src/test/scala/akka/testkit/TestProbeSpec.scala b/akka-testkit/src/test/scala/akka/testkit/TestProbeSpec.scala
index 72e5b3a8c0..c653938fb9 100644
--- a/akka-testkit/src/test/scala/akka/testkit/TestProbeSpec.scala
+++ b/akka-testkit/src/test/scala/akka/testkit/TestProbeSpec.scala
@@ -85,6 +85,15 @@ class TestProbeSpec extends AkkaSpec with DefaultTimeout {
       expectMsg("pigdog")
     }
 
+    "watch actors when queue non-empty" in {
+      val probe = TestProbe()
+      val target = system.actorFor("/nonexistent") // deadLetters does not send Terminated
+      probe.ref ! "hello"
+      probe watch target
+      probe.expectMsg(1.seconds, "hello")
+      probe.expectMsg(1.seconds, Terminated(target)(false, false))
+    }
+
   }
 
 }

From 4848e82a9c9f362c9886562af7cf5ce39bdbfdcf Mon Sep 17 00:00:00 2001
From: Derek Mahar <derek.mahar@gmail.com>
Date: Tue, 22 Jan 2013 15:24:15 -0500
Subject: [PATCH 082/122] various doc fixes (spelling, wrong words, clarity)

---
 akka-docs/rst/general/actors.rst      |  2 +-
 akka-docs/rst/general/addressing.rst  | 50 +++++++++++++--------------
 akka-docs/rst/general/supervision.rst | 19 +++++-----
 3 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/akka-docs/rst/general/actors.rst b/akka-docs/rst/general/actors.rst
index b6fe3d19d4..ae247dcd5b 100644
--- a/akka-docs/rst/general/actors.rst
+++ b/akka-docs/rst/general/actors.rst
@@ -6,7 +6,7 @@ What is an Actor?
 The previous section about :ref:`actor-systems` explained how actors form
 hierarchies and are the smallest unit when building an application. This
 section looks at one such actor in isolation, explaining the concepts you
-encounter while implementing it. For more an in depth reference with all the
+encounter while implementing it. For a more in depth reference with all the
 details please refer to :ref:`actors-scala` and :ref:`untyped-actors-java`.
 
 An actor is a container for `State`_, `Behavior`_, a `Mailbox`_, `Children`_
diff --git a/akka-docs/rst/general/addressing.rst b/akka-docs/rst/general/addressing.rst
index 5aae2a9b02..15c814e511 100644
--- a/akka-docs/rst/general/addressing.rst
+++ b/akka-docs/rst/general/addressing.rst
@@ -29,11 +29,11 @@ There are several different types of actor references that are supported
 depending on the configuration of the actor system:
 
 - Purely local actor references are used by actor systems which are not
-  configured to support networking functions. These actor references cannot
-  ever be sent across a network connection while retaining their functionality.
+  configured to support networking functions. These actor references will not
+  function if sent across a network connection to a remote JVM.
 - Local actor references when remoting is enabled are used by actor systems
   which support networking functions for those references which represent
-  actors within the same JVM. In order to be recognizable also when sent to
+  actors within the same JVM. In order to also be reachable when sent to
   other network nodes, these references include protocol and remote addressing
   information.
 - There is a subtype of local actor references which is used for routers (i.e.
@@ -42,21 +42,21 @@ depending on the configuration of the actor system:
   them dispatches to one of their children directly instead.
 - Remote actor references represent actors which are reachable using remote
   communication, i.e. sending messages to them will serialize the messages
-  transparently and send them to the other JVM.
+  transparently and send them to the remote JVM.
 - There are several special types of actor references which behave like local
   actor references for all practical purposes:
 
-  - :class:`PromiseActorRef` is the special representation of a :meth:`Promise` for
-    the purpose of being completed by the response from an actor; it is created
-    by the :meth:`ActorRef.ask` invocation.
+  - :class:`PromiseActorRef` is the special representation of a :meth:`Promise`
+    for the purpose of being completed by the response from an actor.
+    :meth:`akka.pattern.ask` creates this actor reference.
   - :class:`DeadLetterActorRef` is the default implementation of the dead
-    letters service, where all messages are re-routed whose routees are shut
-    down or non-existent.
-  - :class:`EmptyLocalActorRef` is what is returned when looking up a
-    non-existing local actor path: it is equivalent to a
-    :class:`DeadLetterActorRef`, but it retains its path so that it can be sent
-    over the network and compared to other existing actor refs for that path,
-    some of which might have been obtained before the actor stopped existing.
+    letters service to which Akka routes all messages whose destinations
+    are shut down or non-existent.
+  - :class:`EmptyLocalActorRef` is what Akka returns when looking up a
+    non-existent local actor path: it is equivalent to a
+    :class:`DeadLetterActorRef`, but it retains its path so that Akka can send
+    it over the network and compare it to other existing actor references for
+    that path, some of which might have been obtained before the actor died.
 
 - And then there are some one-off internal implementations which you should
   never really see:
@@ -103,7 +103,7 @@ actors in the hierarchy from the root up. Examples are::
   "cluster://my-cluster/service-c"                     // clustered (Future Extension)
 
 Here, ``akka`` is the default remote protocol for the 2.0 release, and others
-are pluggable. The interpretation of the host & port part (i.e.
+are pluggable. The interpretation of the host and port part (i.e.
 ``serv.example.com:5678`` in the example) depends on the transport mechanism
 used, but it must abide by the URI structural rules.
 
@@ -174,16 +174,16 @@ Looking up Actors by Concrete Path
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 In addition, actor references may be looked up using the
-:meth:`ActorSystem.actorFor` method, which returns an (unverified) local,
-remote or clustered actor reference. Sending messages to such a reference or
-attempting to observe its liveness will traverse the actor hierarchy of the
-actor system from top to bottom by passing messages from parent to child until
-either the target is reached or failure is certain, i.e. a name in the path
-does not exist (in practice this process will be optimized using caches, but it
-still has added cost compared to using the physical actor path, which can for
-example be obtained from the sender reference included in replies from that
-actor). The messages passed are handled automatically by Akka, so this process
-is not visible to client code.
+:meth:`ActorSystem.actorFor` method, which returns an (unverified) local, remote
+or clustered actor reference. Sending messages to such a reference or attempting
+to observe its liveness will traverse the actor hierarchy of the actor system
+from top to bottom by passing messages from parent to child until either the
+target is reached or failure is certain, i.e. a name in the path does not exist
+(in practice this process will be optimized using caches, but it still has added
+cost compared to using the physical actor path, which can for example be
+obtained from the sender reference included in replies from that actor). Akka
+handles message passing automatically, so this process is not visible to client
+code.
 
 Absolute vs. Relative Paths
 ```````````````````````````
diff --git a/akka-docs/rst/general/supervision.rst b/akka-docs/rst/general/supervision.rst
index 9659d3f5cd..470079639a 100644
--- a/akka-docs/rst/general/supervision.rst
+++ b/akka-docs/rst/general/supervision.rst
@@ -172,12 +172,13 @@ reacts to failure.
 
 Lifecycle monitoring is implemented using a :class:`Terminated` message to be
 received by the monitoring actor, where the default behavior is to throw a
-special :class:`DeathPactException` if not otherwise handled. In order to
-start listening for :class:`Terminated` messages is to use ``ActorContext.watch(targetActorRef)``
-and then ``ActorContext.unwatch(targetActorRef)`` to stop listening for that.
-One important property is that the message will be delivered irrespective of the order in
-which the monitoring request and target’s termination occur, i.e. you still get
-the message even if at the time of registration the target is already dead.
+special :class:`DeathPactException` if not otherwise handled. In order to start
+listening for :class:`Terminated` messages, invoke
+``ActorContext.watch(targetActorRef)``.  To stop listening, invoke
+``ActorContext.unwatch(targetActorRef)``.  One important property is that the
+message will be delivered irrespective of the order in which the monitoring
+request and target’s termination occur, i.e. you still get the message even if
+at the time of registration the target is already dead.
 
 Monitoring is particularly useful if a supervisor cannot simply restart its
 children and has to terminate them, e.g. in case of errors during actor
@@ -210,8 +211,8 @@ to all siblings as well. Normally, you should use the
 explicitly.
 
 The :class:`AllForOneStrategy` is applicable in cases where the ensemble of
-children has so tight dependencies among them, that a failure of one child
-affects the function of the others, i.e. they are intricably linked. Since a
+children has such tight dependencies among them, that a failure of one child
+affects the function of the others, i.e. they are inextricably linked. Since a
 restart does not clear out the mailbox, it often is best to terminate the children
 upon failure and re-create them explicitly from the supervisor (by watching the
 children’s lifecycle); otherwise you have to make sure that it is no problem
@@ -219,7 +220,7 @@ for any of the actors to receive a message which was queued before the restart
 but processed afterwards.
 
 Normally stopping a child (i.e. not in response to a failure) will not
-automatically terminate the other children in an all-for-one strategy, that can
+automatically terminate the other children in an all-for-one strategy; this can
 easily be done by watching their lifecycle: if the :class:`Terminated` message
 is not handled by the supervisor, it will throw a :class:`DeathPactException`
 which (depending on its supervisor) will restart it, and the default

From f338acb3fbe35d3b92f850f28fcba2038c8dbe5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Endre=20S=C3=A1ndor=20Varga?= <vendre@hit.bme.hu>
Date: Thu, 24 Jan 2013 14:30:37 +0100
Subject: [PATCH 083/122] Fixed missing hostname setting in RemotingSpec

---
 akka-remote/src/test/scala/akka/remote/RemotingSpec.scala | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala b/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala
index 67bbad5f41..db6878c58e 100644
--- a/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala
@@ -51,6 +51,7 @@ object RemotingSpec {
 
       remote.retry-latch-closed-for = 1 s
       remote.log-remote-lifecycle-events = on
+
       remote.enabled-transports = [
         "akka.remote.test",
         "akka.remote.netty.tcp",
@@ -59,8 +60,11 @@ object RemotingSpec {
       ]
 
       remote.netty.tcp.port = 0
+      remote.netty.tcp.hostname = "localhost"
       remote.netty.udp.port = 0
+      remote.netty.udp.hostname = "localhost"
       remote.netty.ssl.port = 0
+      remote.netty.ssl.hostname = "localhost"
       remote.netty.ssl.ssl = ${common-ssl-settings}
 
       remote.test {

From 2df179ab490461625a6921c77ff16010d3b1f40a Mon Sep 17 00:00:00 2001
From: Roland <rk@rkuhn.info>
Date: Thu, 24 Jan 2013 15:06:14 +0100
Subject: [PATCH 084/122] reenable EPUB on sbt-site 0.6.2, see #2938

---
 project/AkkaBuild.scala | 2 +-
 project/plugins.sbt     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index 1f633929cd..3cd93db911 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -382,7 +382,7 @@ object AkkaBuild extends Build {
         orig
       },
       enableOutput in generatePdf in Sphinx := true,
-      enableOutput in generateEpub in Sphinx := false,
+      enableOutput in generateEpub in Sphinx := true,
       unmanagedSourceDirectories in Test <<= sourceDirectory in Sphinx apply { _ ** "code" get },
       libraryDependencies ++= Dependencies.docs,
       unmanagedSourceDirectories in ScalariformKeys.format in Test <<= unmanagedSourceDirectories in Test,
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 0467eff156..ba3f4b7f33 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -8,7 +8,7 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-multi-jvm" % "0.3.5")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.0.0")
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "0.6.1")
+addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "0.6.2")
 
 addSbtPlugin("com.typesafe.sbtosgi" % "sbtosgi" % "0.3.0")
 

From b6ad46e88c47fc7831a769f93bcfc93b6f70d59a Mon Sep 17 00:00:00 2001
From: Roland <rk@rkuhn.info>
Date: Thu, 24 Jan 2013 16:13:06 +0100
Subject: [PATCH 085/122] fix SchedulerSpec config, see #2941

---
 .../src/test/scala/akka/actor/SchedulerSpec.scala             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala
index ece91ff115..108973ae21 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala
@@ -20,12 +20,12 @@ import akka.testkit._
 
 object SchedulerSpec {
   val testConf = ConfigFactory.parseString("""
-    akka.scheduler.class = akka.actor.DefaultScheduler
+    akka.scheduler.implementation = akka.actor.DefaultScheduler
     akka.scheduler.ticks-per-wheel = 32
   """).withFallback(AkkaSpec.testConf)
 
   val testConfRevolver = ConfigFactory.parseString("""
-    akka.scheduler.class = akka.actor.LightArrayRevolverScheduler
+    akka.scheduler.implementation = akka.actor.LightArrayRevolverScheduler
   """).withFallback(testConf)
 }
 

From fe22c7515f59790f874e98f0600fb5baf70a3178 Mon Sep 17 00:00:00 2001
From: drewhk <endre.varga@typesafe.com>
Date: Thu, 24 Jan 2013 04:28:21 -0800
Subject: [PATCH 086/122] Reversed protocol scheme order in Addresses

---
 .../cluster/AccrualFailureDetectorSpec.scala  |  4 +-
 .../ClusterDomainEventPublisherSpec.scala     | 10 ++--
 .../akka/cluster/ClusterDomainEventSpec.scala | 26 +++++-----
 .../ClusterHeartbeatSenderStateSpec.scala     | 12 ++---
 .../test/scala/akka/cluster/GossipSpec.scala  | 22 ++++-----
 .../akka/cluster/HeartbeatNodeRingSpec.scala  | 10 ++--
 .../akka/cluster/MemberOrderingSpec.scala     | 20 ++++----
 .../scala/akka/cluster/MetricValuesSpec.scala |  4 +-
 .../akka/cluster/MetricsGossipSpec.scala      | 24 +++++-----
 .../scala/akka/cluster/NodeMetricsSpec.scala  |  4 +-
 .../cluster/routing/MetricsSelectorSpec.scala |  8 ++--
 .../cluster/routing/WeightedRouteesSpec.scala |  8 ++--
 .../remoting/RemoteDeploymentDocSpec.scala    |  6 +--
 .../akka/remote/testconductor/Conductor.scala |  2 +-
 .../transport/AbstractTransportAdapter.scala  |  6 +--
 .../transport/netty/NettyTransport.scala      |  2 +-
 .../akka/remote/RemoteDeathWatchSpec.scala    |  2 +-
 .../scala/akka/remote/RemoteRouterSpec.scala  | 48 +++++++++----------
 .../test/scala/akka/remote/RemotingSpec.scala | 24 +++++-----
 .../remote/transport/AkkaProtocolSpec.scala   |  4 +-
 .../transport/GenericTransportSpec.scala      |  6 +--
 .../ThrottlerTransportAdapterSpec.scala       |  2 +-
 22 files changed, 127 insertions(+), 127 deletions(-)

diff --git a/akka-cluster/src/test/scala/akka/cluster/AccrualFailureDetectorSpec.scala b/akka-cluster/src/test/scala/akka/cluster/AccrualFailureDetectorSpec.scala
index ee140dec1a..7f0b5bea14 100644
--- a/akka-cluster/src/test/scala/akka/cluster/AccrualFailureDetectorSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/AccrualFailureDetectorSpec.scala
@@ -24,8 +24,8 @@ class AccrualFailureDetectorSpec extends AkkaSpec("""
   }
 
   "An AccrualFailureDetector" must {
-    val conn = Address("tcp.akka", "", "localhost", 2552)
-    val conn2 = Address("tcp.akka", "", "localhost", 2553)
+    val conn = Address("akka.tcp", "", "localhost", 2552)
+    val conn2 = Address("akka.tcp", "", "localhost", 2553)
 
     def fakeTimeGenerator(timeIntervals: immutable.Seq[Long]): () ⇒ Long = {
       var times = timeIntervals.tail.foldLeft(List[Long](timeIntervals.head))((acc, c) ⇒ acc ::: List[Long](acc.last + c))
diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterDomainEventPublisherSpec.scala b/akka-cluster/src/test/scala/akka/cluster/ClusterDomainEventPublisherSpec.scala
index 2323dd4620..fe6fbdb8f0 100644
--- a/akka-cluster/src/test/scala/akka/cluster/ClusterDomainEventPublisherSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/ClusterDomainEventPublisherSpec.scala
@@ -23,11 +23,11 @@ class ClusterDomainEventPublisherSpec extends AkkaSpec
   with BeforeAndAfterEach with ImplicitSender {
 
   var publisher: ActorRef = _
-  val a1 = Member(Address("tcp.akka", "sys", "a", 2552), Up)
-  val b1 = Member(Address("tcp.akka", "sys", "b", 2552), Up)
-  val c1 = Member(Address("tcp.akka", "sys", "c", 2552), Joining)
-  val c2 = Member(Address("tcp.akka", "sys", "c", 2552), Up)
-  val d1 = Member(Address("tcp.akka", "sys", "a", 2551), Up)
+  val a1 = Member(Address("akka.tcp", "sys", "a", 2552), Up)
+  val b1 = Member(Address("akka.tcp", "sys", "b", 2552), Up)
+  val c1 = Member(Address("akka.tcp", "sys", "c", 2552), Joining)
+  val c2 = Member(Address("akka.tcp", "sys", "c", 2552), Up)
+  val d1 = Member(Address("akka.tcp", "sys", "a", 2551), Up)
 
   val g0 = Gossip(members = SortedSet(a1)).seen(a1.address)
   val g1 = Gossip(members = SortedSet(a1, b1, c1)).seen(a1.address).seen(b1.address).seen(c1.address)
diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterDomainEventSpec.scala b/akka-cluster/src/test/scala/akka/cluster/ClusterDomainEventSpec.scala
index 590f0b7a76..76f0838a96 100644
--- a/akka-cluster/src/test/scala/akka/cluster/ClusterDomainEventSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/ClusterDomainEventSpec.scala
@@ -15,19 +15,19 @@ class ClusterDomainEventSpec extends WordSpec with MustMatchers {
   import MemberStatus._
   import ClusterEvent._
 
-  val a1 = Member(Address("tcp.akka", "sys", "a", 2552), Up)
-  val a2 = Member(Address("tcp.akka", "sys", "a", 2552), Joining)
-  val a3 = Member(Address("tcp.akka", "sys", "a", 2552), Removed)
-  val b1 = Member(Address("tcp.akka", "sys", "b", 2552), Up)
-  val b2 = Member(Address("tcp.akka", "sys", "b", 2552), Removed)
-  val b3 = Member(Address("tcp.akka", "sys", "b", 2552), Down)
-  val c1 = Member(Address("tcp.akka", "sys", "c", 2552), Leaving)
-  val c2 = Member(Address("tcp.akka", "sys", "c", 2552), Up)
-  val d1 = Member(Address("tcp.akka", "sys", "d", 2552), Leaving)
-  val d2 = Member(Address("tcp.akka", "sys", "d", 2552), Removed)
-  val e1 = Member(Address("tcp.akka", "sys", "e", 2552), Joining)
-  val e2 = Member(Address("tcp.akka", "sys", "e", 2552), Up)
-  val e3 = Member(Address("tcp.akka", "sys", "e", 2552), Down)
+  val a1 = Member(Address("akka.tcp", "sys", "a", 2552), Up)
+  val a2 = Member(Address("akka.tcp", "sys", "a", 2552), Joining)
+  val a3 = Member(Address("akka.tcp", "sys", "a", 2552), Removed)
+  val b1 = Member(Address("akka.tcp", "sys", "b", 2552), Up)
+  val b2 = Member(Address("akka.tcp", "sys", "b", 2552), Removed)
+  val b3 = Member(Address("akka.tcp", "sys", "b", 2552), Down)
+  val c1 = Member(Address("akka.tcp", "sys", "c", 2552), Leaving)
+  val c2 = Member(Address("akka.tcp", "sys", "c", 2552), Up)
+  val d1 = Member(Address("akka.tcp", "sys", "d", 2552), Leaving)
+  val d2 = Member(Address("akka.tcp", "sys", "d", 2552), Removed)
+  val e1 = Member(Address("akka.tcp", "sys", "e", 2552), Joining)
+  val e2 = Member(Address("akka.tcp", "sys", "e", 2552), Up)
+  val e3 = Member(Address("akka.tcp", "sys", "e", 2552), Down)
 
   def converge(gossip: Gossip): (Gossip, Set[Address]) =
     ((gossip, Set.empty[Address]) /: gossip.members) { (gs, m) ⇒ (gs._1.seen(m.address), gs._2 + m.address) }
diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterHeartbeatSenderStateSpec.scala b/akka-cluster/src/test/scala/akka/cluster/ClusterHeartbeatSenderStateSpec.scala
index c3176208c5..d3a12d165d 100644
--- a/akka-cluster/src/test/scala/akka/cluster/ClusterHeartbeatSenderStateSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/ClusterHeartbeatSenderStateSpec.scala
@@ -14,12 +14,12 @@ import scala.collection.immutable
 @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner])
 class ClusterHeartbeatSenderStateSpec extends WordSpec with MustMatchers {
 
-  val selfAddress = Address("tcp.akka", "sys", "myself", 2552)
-  val aa = Address("tcp.akka", "sys", "aa", 2552)
-  val bb = Address("tcp.akka", "sys", "bb", 2552)
-  val cc = Address("tcp.akka", "sys", "cc", 2552)
-  val dd = Address("tcp.akka", "sys", "dd", 2552)
-  val ee = Address("tcp.akka", "sys", "ee", 2552)
+  val selfAddress = Address("akka.tcp", "sys", "myself", 2552)
+  val aa = Address("akka.tcp", "sys", "aa", 2552)
+  val bb = Address("akka.tcp", "sys", "bb", 2552)
+  val cc = Address("akka.tcp", "sys", "cc", 2552)
+  val dd = Address("akka.tcp", "sys", "dd", 2552)
+  val ee = Address("akka.tcp", "sys", "ee", 2552)
 
   val emptyState = ClusterHeartbeatSenderState.empty(selfAddress, 3)
 
diff --git a/akka-cluster/src/test/scala/akka/cluster/GossipSpec.scala b/akka-cluster/src/test/scala/akka/cluster/GossipSpec.scala
index 84ecd79605..ca20858743 100644
--- a/akka-cluster/src/test/scala/akka/cluster/GossipSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/GossipSpec.scala
@@ -14,17 +14,17 @@ class GossipSpec extends WordSpec with MustMatchers {
 
   import MemberStatus._
 
-  val a1 = Member(Address("tcp.akka", "sys", "a", 2552), Up)
-  val a2 = Member(Address("tcp.akka", "sys", "a", 2552), Joining)
-  val b1 = Member(Address("tcp.akka", "sys", "b", 2552), Up)
-  val b2 = Member(Address("tcp.akka", "sys", "b", 2552), Removed)
-  val c1 = Member(Address("tcp.akka", "sys", "c", 2552), Leaving)
-  val c2 = Member(Address("tcp.akka", "sys", "c", 2552), Up)
-  val c3 = Member(Address("tcp.akka", "sys", "c", 2552), Exiting)
-  val d1 = Member(Address("tcp.akka", "sys", "d", 2552), Leaving)
-  val d2 = Member(Address("tcp.akka", "sys", "d", 2552), Removed)
-  val e1 = Member(Address("tcp.akka", "sys", "e", 2552), Joining)
-  val e2 = Member(Address("tcp.akka", "sys", "e", 2552), Up)
+  val a1 = Member(Address("akka.tcp", "sys", "a", 2552), Up)
+  val a2 = Member(Address("akka.tcp", "sys", "a", 2552), Joining)
+  val b1 = Member(Address("akka.tcp", "sys", "b", 2552), Up)
+  val b2 = Member(Address("akka.tcp", "sys", "b", 2552), Removed)
+  val c1 = Member(Address("akka.tcp", "sys", "c", 2552), Leaving)
+  val c2 = Member(Address("akka.tcp", "sys", "c", 2552), Up)
+  val c3 = Member(Address("akka.tcp", "sys", "c", 2552), Exiting)
+  val d1 = Member(Address("akka.tcp", "sys", "d", 2552), Leaving)
+  val d2 = Member(Address("akka.tcp", "sys", "d", 2552), Removed)
+  val e1 = Member(Address("akka.tcp", "sys", "e", 2552), Joining)
+  val e2 = Member(Address("akka.tcp", "sys", "e", 2552), Up)
 
   "A Gossip" must {
 
diff --git a/akka-cluster/src/test/scala/akka/cluster/HeartbeatNodeRingSpec.scala b/akka-cluster/src/test/scala/akka/cluster/HeartbeatNodeRingSpec.scala
index 8f47cc6613..619ae0a630 100644
--- a/akka-cluster/src/test/scala/akka/cluster/HeartbeatNodeRingSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/HeartbeatNodeRingSpec.scala
@@ -14,11 +14,11 @@ import scala.collection.immutable
 @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner])
 class HeartbeatNodeRingSpec extends WordSpec with MustMatchers {
 
-  val aa = Address("tcp.akka", "sys", "aa", 2552)
-  val bb = Address("tcp.akka", "sys", "bb", 2552)
-  val cc = Address("tcp.akka", "sys", "cc", 2552)
-  val dd = Address("tcp.akka", "sys", "dd", 2552)
-  val ee = Address("tcp.akka", "sys", "ee", 2552)
+  val aa = Address("akka.tcp", "sys", "aa", 2552)
+  val bb = Address("akka.tcp", "sys", "bb", 2552)
+  val cc = Address("akka.tcp", "sys", "cc", 2552)
+  val dd = Address("akka.tcp", "sys", "dd", 2552)
+  val ee = Address("akka.tcp", "sys", "ee", 2552)
 
   val nodes = Set(aa, bb, cc, dd, ee)
 
diff --git a/akka-cluster/src/test/scala/akka/cluster/MemberOrderingSpec.scala b/akka-cluster/src/test/scala/akka/cluster/MemberOrderingSpec.scala
index a9ae44e160..2442dd0e46 100644
--- a/akka-cluster/src/test/scala/akka/cluster/MemberOrderingSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/MemberOrderingSpec.scala
@@ -35,8 +35,8 @@ class MemberOrderingSpec extends WordSpec with MustMatchers {
     "be sorted by address correctly" in {
       import Member.ordering
       // sorting should be done on host and port, only
-      val m1 = Member(Address("tcp.akka", "sys1", "host1", 9000), MemberStatus.Up)
-      val m2 = Member(Address("tcp.akka", "sys1", "host1", 10000), MemberStatus.Up)
+      val m1 = Member(Address("akka.tcp", "sys1", "host1", 9000), MemberStatus.Up)
+      val m2 = Member(Address("akka.tcp", "sys1", "host1", 10000), MemberStatus.Up)
       val m3 = Member(Address("cluster", "sys2", "host2", 8000), MemberStatus.Up)
       val m4 = Member(Address("cluster", "sys2", "host2", 9000), MemberStatus.Up)
       val m5 = Member(Address("cluster", "sys1", "host2", 10000), MemberStatus.Up)
@@ -48,9 +48,9 @@ class MemberOrderingSpec extends WordSpec with MustMatchers {
     }
 
     "have stable equals and hashCode" in {
-      val m1 = Member(Address("tcp.akka", "sys1", "host1", 9000), MemberStatus.Joining)
-      val m2 = Member(Address("tcp.akka", "sys1", "host1", 9000), MemberStatus.Up)
-      val m3 = Member(Address("tcp.akka", "sys1", "host1", 10000), MemberStatus.Up)
+      val m1 = Member(Address("akka.tcp", "sys1", "host1", 9000), MemberStatus.Joining)
+      val m2 = Member(Address("akka.tcp", "sys1", "host1", 9000), MemberStatus.Up)
+      val m3 = Member(Address("akka.tcp", "sys1", "host1", 10000), MemberStatus.Up)
 
       m1 must be(m2)
       m1.hashCode must be(m2.hashCode)
@@ -60,8 +60,8 @@ class MemberOrderingSpec extends WordSpec with MustMatchers {
     }
 
     "have consistent ordering and equals" in {
-      val address1 = Address("tcp.akka", "sys1", "host1", 9001)
-      val address2 = Address("tcp.akka", "sys1", "host1", 9002)
+      val address1 = Address("akka.tcp", "sys1", "host1", 9001)
+      val address2 = Address("akka.tcp", "sys1", "host1", 9002)
 
       val x = Member(address1, Exiting)
       val y = Member(address1, Removed)
@@ -71,9 +71,9 @@ class MemberOrderingSpec extends WordSpec with MustMatchers {
     }
 
     "work with SortedSet" in {
-      val address1 = Address("tcp.akka", "sys1", "host1", 9001)
-      val address2 = Address("tcp.akka", "sys1", "host1", 9002)
-      val address3 = Address("tcp.akka", "sys1", "host1", 9003)
+      val address1 = Address("akka.tcp", "sys1", "host1", 9001)
+      val address2 = Address("akka.tcp", "sys1", "host1", 9002)
+      val address3 = Address("akka.tcp", "sys1", "host1", 9003)
 
       (SortedSet(Member(address1, MemberStatus.Joining)) - Member(address1, MemberStatus.Up)) must be(SortedSet.empty[Member])
       (SortedSet(Member(address1, MemberStatus.Exiting)) - Member(address1, MemberStatus.Removed)) must be(SortedSet.empty[Member])
diff --git a/akka-cluster/src/test/scala/akka/cluster/MetricValuesSpec.scala b/akka-cluster/src/test/scala/akka/cluster/MetricValuesSpec.scala
index 1fdf0ff60b..9358ad0e91 100644
--- a/akka-cluster/src/test/scala/akka/cluster/MetricValuesSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/MetricValuesSpec.scala
@@ -14,8 +14,8 @@ class MetricValuesSpec extends AkkaSpec(MetricsEnabledSpec.config) with MetricsC
 
   val collector = createMetricsCollector
 
-  val node1 = NodeMetrics(Address("tcp.akka", "sys", "a", 2554), 1, collector.sample.metrics)
-  val node2 = NodeMetrics(Address("tcp.akka", "sys", "a", 2555), 1, collector.sample.metrics)
+  val node1 = NodeMetrics(Address("akka.tcp", "sys", "a", 2554), 1, collector.sample.metrics)
+  val node2 = NodeMetrics(Address("akka.tcp", "sys", "a", 2555), 1, collector.sample.metrics)
 
   val nodes: Seq[NodeMetrics] = {
     (1 to 100).foldLeft(List(node1, node2)) { (nodes, _) ⇒
diff --git a/akka-cluster/src/test/scala/akka/cluster/MetricsGossipSpec.scala b/akka-cluster/src/test/scala/akka/cluster/MetricsGossipSpec.scala
index 9c54703409..a0d9733479 100644
--- a/akka-cluster/src/test/scala/akka/cluster/MetricsGossipSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/MetricsGossipSpec.scala
@@ -18,8 +18,8 @@ class MetricsGossipSpec extends AkkaSpec(MetricsEnabledSpec.config) with Implici
 
   "A MetricsGossip" must {
     "add new NodeMetrics" in {
-      val m1 = NodeMetrics(Address("tcp.akka", "sys", "a", 2554), newTimestamp, collector.sample.metrics)
-      val m2 = NodeMetrics(Address("tcp.akka", "sys", "a", 2555), newTimestamp, collector.sample.metrics)
+      val m1 = NodeMetrics(Address("akka.tcp", "sys", "a", 2554), newTimestamp, collector.sample.metrics)
+      val m2 = NodeMetrics(Address("akka.tcp", "sys", "a", 2555), newTimestamp, collector.sample.metrics)
 
       m1.metrics.size must be > (3)
       m2.metrics.size must be > (3)
@@ -35,8 +35,8 @@ class MetricsGossipSpec extends AkkaSpec(MetricsEnabledSpec.config) with Implici
     }
 
     "merge peer metrics" in {
-      val m1 = NodeMetrics(Address("tcp.akka", "sys", "a", 2554), newTimestamp, collector.sample.metrics)
-      val m2 = NodeMetrics(Address("tcp.akka", "sys", "a", 2555), newTimestamp, collector.sample.metrics)
+      val m1 = NodeMetrics(Address("akka.tcp", "sys", "a", 2554), newTimestamp, collector.sample.metrics)
+      val m2 = NodeMetrics(Address("akka.tcp", "sys", "a", 2555), newTimestamp, collector.sample.metrics)
 
       val g1 = MetricsGossip.empty :+ m1 :+ m2
       g1.nodes.size must be(2)
@@ -51,9 +51,9 @@ class MetricsGossipSpec extends AkkaSpec(MetricsEnabledSpec.config) with Implici
     }
 
     "merge an existing metric set for a node and update node ring" in {
-      val m1 = NodeMetrics(Address("tcp.akka", "sys", "a", 2554), newTimestamp, collector.sample.metrics)
-      val m2 = NodeMetrics(Address("tcp.akka", "sys", "a", 2555), newTimestamp, collector.sample.metrics)
-      val m3 = NodeMetrics(Address("tcp.akka", "sys", "a", 2556), newTimestamp, collector.sample.metrics)
+      val m1 = NodeMetrics(Address("akka.tcp", "sys", "a", 2554), newTimestamp, collector.sample.metrics)
+      val m2 = NodeMetrics(Address("akka.tcp", "sys", "a", 2555), newTimestamp, collector.sample.metrics)
+      val m3 = NodeMetrics(Address("akka.tcp", "sys", "a", 2556), newTimestamp, collector.sample.metrics)
       val m2Updated = m2 copy (metrics = collector.sample.metrics, timestamp = m2.timestamp + 1000)
 
       val g1 = MetricsGossip.empty :+ m1 :+ m2
@@ -72,14 +72,14 @@ class MetricsGossipSpec extends AkkaSpec(MetricsEnabledSpec.config) with Implici
     }
 
     "get the current NodeMetrics if it exists in the local nodes" in {
-      val m1 = NodeMetrics(Address("tcp.akka", "sys", "a", 2554), newTimestamp, collector.sample.metrics)
+      val m1 = NodeMetrics(Address("akka.tcp", "sys", "a", 2554), newTimestamp, collector.sample.metrics)
       val g1 = MetricsGossip.empty :+ m1
       g1.nodeMetricsFor(m1.address).map(_.metrics) must be(Some(m1.metrics))
     }
 
     "remove a node if it is no longer Up" in {
-      val m1 = NodeMetrics(Address("tcp.akka", "sys", "a", 2554), newTimestamp, collector.sample.metrics)
-      val m2 = NodeMetrics(Address("tcp.akka", "sys", "a", 2555), newTimestamp, collector.sample.metrics)
+      val m1 = NodeMetrics(Address("akka.tcp", "sys", "a", 2554), newTimestamp, collector.sample.metrics)
+      val m2 = NodeMetrics(Address("akka.tcp", "sys", "a", 2555), newTimestamp, collector.sample.metrics)
 
       val g1 = MetricsGossip.empty :+ m1 :+ m2
       g1.nodes.size must be(2)
@@ -91,8 +91,8 @@ class MetricsGossipSpec extends AkkaSpec(MetricsEnabledSpec.config) with Implici
     }
 
     "filter nodes" in {
-      val m1 = NodeMetrics(Address("tcp.akka", "sys", "a", 2554), newTimestamp, collector.sample.metrics)
-      val m2 = NodeMetrics(Address("tcp.akka", "sys", "a", 2555), newTimestamp, collector.sample.metrics)
+      val m1 = NodeMetrics(Address("akka.tcp", "sys", "a", 2554), newTimestamp, collector.sample.metrics)
+      val m2 = NodeMetrics(Address("akka.tcp", "sys", "a", 2555), newTimestamp, collector.sample.metrics)
 
       val g1 = MetricsGossip.empty :+ m1 :+ m2
       g1.nodes.size must be(2)
diff --git a/akka-cluster/src/test/scala/akka/cluster/NodeMetricsSpec.scala b/akka-cluster/src/test/scala/akka/cluster/NodeMetricsSpec.scala
index 8ab39e78aa..43b1aaf503 100644
--- a/akka-cluster/src/test/scala/akka/cluster/NodeMetricsSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/NodeMetricsSpec.scala
@@ -11,8 +11,8 @@ import akka.actor.Address
 @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner])
 class NodeMetricsSpec extends WordSpec with MustMatchers {
 
-  val node1 = Address("tcp.akka", "sys", "a", 2554)
-  val node2 = Address("tcp.akka", "sys", "a", 2555)
+  val node1 = Address("akka.tcp", "sys", "a", 2554)
+  val node2 = Address("akka.tcp", "sys", "a", 2555)
 
   "NodeMetrics must" must {
 
diff --git a/akka-cluster/src/test/scala/akka/cluster/routing/MetricsSelectorSpec.scala b/akka-cluster/src/test/scala/akka/cluster/routing/MetricsSelectorSpec.scala
index 605cf0253b..f0443d4f61 100644
--- a/akka-cluster/src/test/scala/akka/cluster/routing/MetricsSelectorSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/routing/MetricsSelectorSpec.scala
@@ -19,10 +19,10 @@ class MetricsSelectorSpec extends WordSpec with MustMatchers {
     override def capacity(nodeMetrics: Set[NodeMetrics]): Map[Address, Double] = Map.empty
   }
 
-  val a1 = Address("tcp.akka", "sys", "a1", 2551)
-  val b1 = Address("tcp.akka", "sys", "b1", 2551)
-  val c1 = Address("tcp.akka", "sys", "c1", 2551)
-  val d1 = Address("tcp.akka", "sys", "d1", 2551)
+  val a1 = Address("akka.tcp", "sys", "a1", 2551)
+  val b1 = Address("akka.tcp", "sys", "b1", 2551)
+  val c1 = Address("akka.tcp", "sys", "c1", 2551)
+  val d1 = Address("akka.tcp", "sys", "d1", 2551)
 
   val decayFactor = Some(0.18)
 
diff --git a/akka-cluster/src/test/scala/akka/cluster/routing/WeightedRouteesSpec.scala b/akka-cluster/src/test/scala/akka/cluster/routing/WeightedRouteesSpec.scala
index 5877d91e7a..9a7023ee6c 100644
--- a/akka-cluster/src/test/scala/akka/cluster/routing/WeightedRouteesSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/routing/WeightedRouteesSpec.scala
@@ -16,10 +16,10 @@ class WeightedRouteesSpec extends AkkaSpec(ConfigFactory.parseString("""
       akka.remote.netty.tcp.port = 0
       """)) {
 
-  val a1 = Address("tcp.akka", "sys", "a1", 2551)
-  val b1 = Address("tcp.akka", "sys", "b1", 2551)
-  val c1 = Address("tcp.akka", "sys", "c1", 2551)
-  val d1 = Address("tcp.akka", "sys", "d1", 2551)
+  val a1 = Address("akka.tcp", "sys", "a1", 2551)
+  val b1 = Address("akka.tcp", "sys", "b1", 2551)
+  val c1 = Address("akka.tcp", "sys", "c1", 2551)
+  val d1 = Address("akka.tcp", "sys", "d1", 2551)
 
   val refA = system.actorFor(RootActorPath(a1) / "user" / "a")
   val refB = system.actorFor(RootActorPath(b1) / "user" / "b")
diff --git a/akka-docs/rst/scala/code/docs/remoting/RemoteDeploymentDocSpec.scala b/akka-docs/rst/scala/code/docs/remoting/RemoteDeploymentDocSpec.scala
index 74964fb823..737fde572d 100644
--- a/akka-docs/rst/scala/code/docs/remoting/RemoteDeploymentDocSpec.scala
+++ b/akka-docs/rst/scala/code/docs/remoting/RemoteDeploymentDocSpec.scala
@@ -26,7 +26,7 @@ class RemoteDeploymentDocSpec extends AkkaSpec("""
   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 afterTermination() { other.shutdown() }
 
@@ -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
   }
diff --git a/akka-remote-tests/src/main/scala/akka/remote/testconductor/Conductor.scala b/akka-remote-tests/src/main/scala/akka/remote/testconductor/Conductor.scala
index 8794504616..7f843676b6 100644
--- a/akka-remote-tests/src/main/scala/akka/remote/testconductor/Conductor.scala
+++ b/akka-remote-tests/src/main/scala/akka/remote/testconductor/Conductor.scala
@@ -126,7 +126,7 @@ trait Conductor { this: TestConductorExt ⇒
     throttle(node, target, direction, 0f)
 
   private def requireTestConductorTranport(): Unit =
-    if (!transport.defaultAddress.protocol.contains(".gremlin.trttl."))
+    if (!transport.defaultAddress.protocol.contains(".trttl.gremlin."))
       throw new ConfigurationException("To use this feature you must activate the failure injector adapters " +
         "(gremlin, trttl) by specifying `testTransport(on = true)` in your MultiNodeConfig.")
 
diff --git a/akka-remote/src/main/scala/akka/remote/transport/AbstractTransportAdapter.scala b/akka-remote/src/main/scala/akka/remote/transport/AbstractTransportAdapter.scala
index 674517fb61..c00492d109 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/AbstractTransportAdapter.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/AbstractTransportAdapter.scala
@@ -44,13 +44,13 @@ object TransportAdaptersExtension extends ExtensionId[TransportAdapters] with Ex
 trait SchemeAugmenter {
   protected def addedSchemeIdentifier: String
 
-  protected def augmentScheme(originalScheme: String): String = s"$originalScheme.$addedSchemeIdentifier"
+  protected def augmentScheme(originalScheme: String): String = s"$addedSchemeIdentifier.$originalScheme"
 
   protected def augmentScheme(address: Address): Address = address.copy(protocol = augmentScheme(address.protocol))
 
   protected def removeScheme(scheme: String): String =
-    if (scheme.endsWith(s".$addedSchemeIdentifier"))
-      scheme.take(scheme.length - addedSchemeIdentifier.length - 1)
+    if (scheme.startsWith(s"$addedSchemeIdentifier."))
+      scheme.drop(addedSchemeIdentifier.length + 1)
     else scheme
 
   protected def removeScheme(address: Address): Address = address.copy(protocol = removeScheme(address.protocol))
diff --git a/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala b/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
index 92e3b48fcd..a7b31042cf 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
@@ -196,7 +196,7 @@ class NettyTransport(private val settings: NettyTransportSettings, private val s
 
   implicit val executionContext: ExecutionContext = system.dispatcher
 
-  override val schemeIdentifier: String = TransportMode + (if (EnableSsl) ".ssl" else "")
+  override val schemeIdentifier: String = (if (EnableSsl) "ssl." else "") + TransportMode
   override val maximumPayloadBytes: Int = 32000 // The number of octets required by the remoting specification
 
   private final val isDatagram: Boolean = TransportMode == Udp
diff --git a/akka-remote/src/test/scala/akka/remote/RemoteDeathWatchSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteDeathWatchSpec.scala
index b62a26ad5a..ca440806c7 100644
--- a/akka-remote/src/test/scala/akka/remote/RemoteDeathWatchSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/RemoteDeathWatchSpec.scala
@@ -13,7 +13,7 @@ akka {
     actor {
         provider = "akka.remote.RemoteActorRefProvider"
         deployment {
-            /watchers.remote = "tcp.akka://other@localhost:2666"
+            /watchers.remote = "akka.tcp://other@localhost:2666"
         }
     }
     remote.netty.tcp {
diff --git a/akka-remote/src/test/scala/akka/remote/RemoteRouterSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteRouterSpec.scala
index 01e38566bd..7b029d3b4f 100644
--- a/akka-remote/src/test/scala/akka/remote/RemoteRouterSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/RemoteRouterSpec.scala
@@ -29,7 +29,7 @@ akka {
     /blub {
       router = round-robin
       nr-of-instances = 2
-      target.nodes = ["tcp.akka://remote-sys@localhost:12347"]
+      target.nodes = ["akka.tcp://remote-sys@localhost:12347"]
     }
     /elastic-blub {
       router = round-robin
@@ -37,10 +37,10 @@ akka {
         lower-bound = 2
         upper-bound = 3
       }
-      target.nodes = ["tcp.akka://remote-sys@localhost:12347"]
+      target.nodes = ["akka.tcp://remote-sys@localhost:12347"]
     }
     /remote-blub {
-      remote = "tcp.akka://remote-sys@localhost:12347"
+      remote = "akka.tcp://remote-sys@localhost:12347"
       router = round-robin
       nr-of-instances = 2
     }
@@ -48,12 +48,12 @@ akka {
       remote = "akka://RemoteRouterSpec"
       router = round-robin
       nr-of-instances = 2
-      target.nodes = ["tcp.akka://remote-sys@localhost:12347"]
+      target.nodes = ["akka.tcp://remote-sys@localhost:12347"]
     }
     /local-blub2 {
       router = round-robin
       nr-of-instances = 4
-      target.nodes = ["tcp.akka://remote-sys@localhost:12347"]
+      target.nodes = ["akka.tcp://remote-sys@localhost:12347"]
     }
   }
 }
@@ -85,13 +85,13 @@ akka.actor.deployment {
       val children = replies.toSet
       children must have size 2
       children.map(_.parent) must have size 1
-      children foreach (_.address.toString must be === "tcp.akka://remote-sys@localhost:12347")
+      children foreach (_.address.toString must be === "akka.tcp://remote-sys@localhost:12347")
       system.stop(router)
     }
 
     "deploy its children on remote host driven by programatic definition" in {
       val router = system.actorOf(Props[Echo].withRouter(new RemoteRouterConfig(RoundRobinRouter(2),
-        Seq(Address("tcp.akka", "remote-sys", "localhost", 12347)))), "blub2")
+        Seq(Address("akka.tcp", "remote-sys", "localhost", 12347)))), "blub2")
       val replies = for (i ← 1 to 5) yield {
         router ! ""
         expectMsgType[ActorRef].path
@@ -99,7 +99,7 @@ akka.actor.deployment {
       val children = replies.toSet
       children must have size 2
       children.map(_.parent) must have size 1
-      children foreach (_.address.toString must be === "tcp.akka://remote-sys@localhost:12347")
+      children foreach (_.address.toString must be === "akka.tcp://remote-sys@localhost:12347")
       system.stop(router)
     }
 
@@ -112,13 +112,13 @@ akka.actor.deployment {
       val children = replies.toSet
       children.size must be >= 2
       children.map(_.parent) must have size 1
-      children foreach (_.address.toString must be === "tcp.akka://remote-sys@localhost:12347")
+      children foreach (_.address.toString must be === "akka.tcp://remote-sys@localhost:12347")
       system.stop(router)
     }
 
     "deploy remote routers based on configuration" in {
       val router = system.actorOf(Props[Echo].withRouter(FromConfig), "remote-blub")
-      router.path.address.toString must be("tcp.akka://remote-sys@localhost:12347")
+      router.path.address.toString must be("akka.tcp://remote-sys@localhost:12347")
       val replies = for (i ← 1 to 5) yield {
         router ! ""
         expectMsgType[ActorRef].path
@@ -128,14 +128,14 @@ akka.actor.deployment {
       val parents = children.map(_.parent)
       parents must have size 1
       parents.head must be(router.path)
-      children foreach (_.address.toString must be === "tcp.akka://remote-sys@localhost:12347")
+      children foreach (_.address.toString must be === "akka.tcp://remote-sys@localhost:12347")
       system.stop(router)
     }
 
     "deploy remote routers based on explicit deployment" in {
       val router = system.actorOf(Props[Echo].withRouter(RoundRobinRouter(2))
-        .withDeploy(Deploy(scope = RemoteScope(AddressFromURIString("tcp.akka://remote-sys@localhost:12347")))), "remote-blub2")
-      router.path.address.toString must be("tcp.akka://remote-sys@localhost:12347")
+        .withDeploy(Deploy(scope = RemoteScope(AddressFromURIString("akka.tcp://remote-sys@localhost:12347")))), "remote-blub2")
+      router.path.address.toString must be("akka.tcp://remote-sys@localhost:12347")
       val replies = for (i ← 1 to 5) yield {
         router ! ""
         expectMsgType[ActorRef].path
@@ -145,13 +145,13 @@ akka.actor.deployment {
       val parents = children.map(_.parent)
       parents must have size 1
       parents.head must be(router.path)
-      children foreach (_.address.toString must be === "tcp.akka://remote-sys@localhost:12347")
+      children foreach (_.address.toString must be === "akka.tcp://remote-sys@localhost:12347")
       system.stop(router)
     }
 
     "let remote deployment be overridden by local configuration" in {
       val router = system.actorOf(Props[Echo].withRouter(RoundRobinRouter(2))
-        .withDeploy(Deploy(scope = RemoteScope(AddressFromURIString("tcp.akka://remote-sys@localhost:12347")))), "local-blub")
+        .withDeploy(Deploy(scope = RemoteScope(AddressFromURIString("akka.tcp://remote-sys@localhost:12347")))), "local-blub")
       router.path.address.toString must be("akka://RemoteRouterSpec")
       val replies = for (i ← 1 to 5) yield {
         router ! ""
@@ -161,15 +161,15 @@ akka.actor.deployment {
       children must have size 2
       val parents = children.map(_.parent)
       parents must have size 1
-      parents.head.address must be(Address("tcp.akka", "remote-sys", "localhost", 12347))
-      children foreach (_.address.toString must be === "tcp.akka://remote-sys@localhost:12347")
+      parents.head.address must be(Address("akka.tcp", "remote-sys", "localhost", 12347))
+      children foreach (_.address.toString must be === "akka.tcp://remote-sys@localhost:12347")
       system.stop(router)
     }
 
     "let remote deployment router be overridden by local configuration" in {
       val router = system.actorOf(Props[Echo].withRouter(RoundRobinRouter(2))
-        .withDeploy(Deploy(scope = RemoteScope(AddressFromURIString("tcp.akka://remote-sys@localhost:12347")))), "local-blub2")
-      router.path.address.toString must be("tcp.akka://remote-sys@localhost:12347")
+        .withDeploy(Deploy(scope = RemoteScope(AddressFromURIString("akka.tcp://remote-sys@localhost:12347")))), "local-blub2")
+      router.path.address.toString must be("akka.tcp://remote-sys@localhost:12347")
       val replies = for (i ← 1 to 5) yield {
         router ! ""
         expectMsgType[ActorRef].path
@@ -179,14 +179,14 @@ akka.actor.deployment {
       val parents = children.map(_.parent)
       parents must have size 1
       parents.head must be(router.path)
-      children foreach (_.address.toString must be === "tcp.akka://remote-sys@localhost:12347")
+      children foreach (_.address.toString must be === "akka.tcp://remote-sys@localhost:12347")
       system.stop(router)
     }
 
     "let remote deployment be overridden by remote configuration" in {
       val router = system.actorOf(Props[Echo].withRouter(RoundRobinRouter(2))
-        .withDeploy(Deploy(scope = RemoteScope(AddressFromURIString("tcp.akka://remote-sys@localhost:12347")))), "remote-override")
-      router.path.address.toString must be("tcp.akka://remote-sys@localhost:12347")
+        .withDeploy(Deploy(scope = RemoteScope(AddressFromURIString("akka.tcp://remote-sys@localhost:12347")))), "remote-override")
+      router.path.address.toString must be("akka.tcp://remote-sys@localhost:12347")
       val replies = for (i ← 1 to 5) yield {
         router ! ""
         expectMsgType[ActorRef].path
@@ -196,7 +196,7 @@ akka.actor.deployment {
       val parents = children.map(_.parent)
       parents must have size 1
       parents.head must be(router.path)
-      children foreach (_.address.toString must be === "tcp.akka://remote-sys@localhost:12347")
+      children foreach (_.address.toString must be === "akka.tcp://remote-sys@localhost:12347")
       system.stop(router)
     }
 
@@ -206,7 +206,7 @@ akka.actor.deployment {
       }
       val router = system.actorOf(Props.empty.withRouter(new RemoteRouterConfig(
         RoundRobinRouter(1, supervisorStrategy = escalator),
-        Seq(Address("tcp.akka", "remote-sys", "localhost", 12347)))), "blub3")
+        Seq(Address("akka.tcp", "remote-sys", "localhost", 12347)))), "blub3")
 
       router ! CurrentRoutees
       EventFilter[ActorKilledException](occurrences = 1) intercept {
diff --git a/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala b/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala
index db6878c58e..71f70129fa 100644
--- a/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala
@@ -77,9 +77,9 @@ object RemotingSpec {
       }
 
       actor.deployment {
-        /blub.remote = "test.akka://remote-sys@localhost:12346"
-        /looker/child.remote = "test.akka://remote-sys@localhost:12346"
-        /looker/child/grandchild.remote = "test.akka://RemotingSpec@localhost:12345"
+        /blub.remote = "akka.test://remote-sys@localhost:12346"
+        /looker/child.remote = "akka.test://remote-sys@localhost:12346"
+        /looker/child/grandchild.remote = "akka.test://RemotingSpec@localhost:12345"
       }
     }
                                                """.format(
@@ -105,11 +105,11 @@ class RemotingSpec extends AkkaSpec(RemotingSpec.cfg) with ImplicitSender with D
     (name, proto) ← Seq(
       "/gonk" -> "tcp",
       "/zagzag" -> "udp",
-      "/roghtaar" -> "tcp.ssl")
+      "/roghtaar" -> "ssl.tcp")
   ) deploy(system, Deploy(name, scope = RemoteScope(addr(other, proto))))
 
   def addr(sys: ActorSystem, proto: String) =
-    sys.asInstanceOf[ExtendedActorSystem].provider.getExternalAddressFor(Address(s"$proto.akka", "", "", 0)).get
+    sys.asInstanceOf[ExtendedActorSystem].provider.getExternalAddressFor(Address(s"akka.$proto", "", "", 0)).get
   def port(sys: ActorSystem, proto: String) = addr(sys, proto).port.get
   def deploy(sys: ActorSystem, d: Deploy) {
     sys.asInstanceOf[ExtendedActorSystem].provider.asInstanceOf[RemoteActorRefProvider].deployer.deploy(d)
@@ -121,7 +121,7 @@ class RemotingSpec extends AkkaSpec(RemotingSpec.cfg) with ImplicitSender with D
     }
   }), "echo")
 
-  val here = system.actorFor("test.akka://remote-sys@localhost:12346/user/echo")
+  val here = system.actorFor("akka.test://remote-sys@localhost:12346/user/echo")
 
   override def afterTermination() {
     other.shutdown()
@@ -137,7 +137,7 @@ class RemotingSpec extends AkkaSpec(RemotingSpec.cfg) with ImplicitSender with D
 
     "send error message for wrong address" in {
       filterEvents(EventFilter[EndpointException](occurrences = 6), EventFilter.error(start = "Association", occurrences = 6)) {
-        system.actorFor("test.akka://nonexistingsystem@localhost:12346/user/echo") ! "ping"
+        system.actorFor("akka.test://nonexistingsystem@localhost:12346/user/echo") ! "ping"
       }
     }
 
@@ -150,13 +150,13 @@ class RemotingSpec extends AkkaSpec(RemotingSpec.cfg) with ImplicitSender with D
 
     "send dead letters on remote if actor does not exist" in {
       EventFilter.warning(pattern = "dead.*buh", occurrences = 1).intercept {
-        system.actorFor("test.akka://remote-sys@localhost:12346/does/not/exist") ! "buh"
+        system.actorFor("akka.test://remote-sys@localhost:12346/does/not/exist") ! "buh"
       }(other)
     }
 
     "create and supervise children on remote node" in {
       val r = system.actorOf(Props[Echo], "blub")
-      r.path.toString must be === "test.akka://remote-sys@localhost:12346/remote/test.akka/RemotingSpec@localhost:12345/user/blub"
+      r.path.toString must be === "akka.test://remote-sys@localhost:12346/remote/akka.test/RemotingSpec@localhost:12345/user/blub"
       r ! 42
       expectMsg(42)
       EventFilter[Exception]("crash", occurrences = 1).intercept {
@@ -201,7 +201,7 @@ class RemotingSpec extends AkkaSpec(RemotingSpec.cfg) with ImplicitSender with D
     "be able to use multiple transports and use the appropriate one (TCP)" in {
       val r = system.actorOf(Props[Echo], "gonk")
       r.path.toString must be ===
-        s"tcp.akka://remote-sys@localhost:${port(other, "tcp")}/remote/tcp.akka/RemotingSpec@localhost:${port(system, "tcp")}/user/gonk"
+        s"akka.tcp://remote-sys@localhost:${port(other, "tcp")}/remote/akka.tcp/RemotingSpec@localhost:${port(system, "tcp")}/user/gonk"
       r ! 42
       expectMsg(42)
       EventFilter[Exception]("crash", occurrences = 1).intercept {
@@ -217,7 +217,7 @@ class RemotingSpec extends AkkaSpec(RemotingSpec.cfg) with ImplicitSender with D
     "be able to use multiple transports and use the appropriate one (UDP)" in {
       val r = system.actorOf(Props[Echo], "zagzag")
       r.path.toString must be ===
-        s"udp.akka://remote-sys@localhost:${port(other, "udp")}/remote/udp.akka/RemotingSpec@localhost:${port(system, "udp")}/user/zagzag"
+        s"akka.udp://remote-sys@localhost:${port(other, "udp")}/remote/akka.udp/RemotingSpec@localhost:${port(system, "udp")}/user/zagzag"
       r ! 42
       expectMsg(10.seconds, 42)
       EventFilter[Exception]("crash", occurrences = 1).intercept {
@@ -233,7 +233,7 @@ class RemotingSpec extends AkkaSpec(RemotingSpec.cfg) with ImplicitSender with D
     "be able to use multiple transports and use the appropriate one (SSL)" in {
       val r = system.actorOf(Props[Echo], "roghtaar")
       r.path.toString must be ===
-        s"tcp.ssl.akka://remote-sys@localhost:${port(other, "tcp.ssl")}/remote/tcp.ssl.akka/RemotingSpec@localhost:${port(system, "tcp.ssl")}/user/roghtaar"
+        s"akka.ssl.tcp://remote-sys@localhost:${port(other, "ssl.tcp")}/remote/akka.ssl.tcp/RemotingSpec@localhost:${port(system, "ssl.tcp")}/user/roghtaar"
       r ! 42
       expectMsg(10.seconds, 42)
       EventFilter[Exception]("crash", occurrences = 1).intercept {
diff --git a/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolSpec.scala b/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolSpec.scala
index b22632a10d..6c382e5e10 100644
--- a/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolSpec.scala
@@ -63,10 +63,10 @@ class AkkaProtocolSpec extends AkkaSpec("""akka.actor.provider = "akka.remote.Re
   """)
 
   val localAddress = Address("test", "testsystem", "testhost", 1234)
-  val localAkkaAddress = Address("test.akka", "testsystem", "testhost", 1234)
+  val localAkkaAddress = Address("akka.test", "testsystem", "testhost", 1234)
 
   val remoteAddress = Address("test", "testsystem2", "testhost2", 1234)
-  val remoteAkkaAddress = Address("test.akka", "testsystem2", "testhost2", 1234)
+  val remoteAkkaAddress = Address("akka.test", "testsystem2", "testhost2", 1234)
 
   val codec = AkkaPduProtobufCodec
 
diff --git a/akka-remote/src/test/scala/akka/remote/transport/GenericTransportSpec.scala b/akka-remote/src/test/scala/akka/remote/transport/GenericTransportSpec.scala
index de1b825ee1..c551ce9f1e 100644
--- a/akka-remote/src/test/scala/akka/remote/transport/GenericTransportSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/transport/GenericTransportSpec.scala
@@ -20,9 +20,9 @@ abstract class GenericTransportSpec(withAkkaProtocol: Boolean = false)
   val addressATest: Address = Address("test", "testsytemA", "testhostA", 4321)
   val addressBTest: Address = Address("test", "testsytemB", "testhostB", 5432)
 
-  val addressA: Address = addressATest.copy(protocol = s"${addressATest.protocol}.$schemeIdentifier")
-  val addressB: Address = addressBTest.copy(protocol = s"${addressBTest.protocol}.$schemeIdentifier")
-  val nonExistingAddress = Address("test." + schemeIdentifier, "nosystem", "nohost", 0)
+  val addressA: Address = addressATest.copy(protocol = s"$schemeIdentifier.${addressATest.protocol}")
+  val addressB: Address = addressBTest.copy(protocol = s"$schemeIdentifier.${addressATest.protocol}")
+  val nonExistingAddress = Address(schemeIdentifier + ".test", "nosystem", "nohost", 0)
 
   def freshTransport(testTransport: TestTransport): Transport
   def wrapTransport(transport: Transport): Transport =
diff --git a/akka-remote/src/test/scala/akka/remote/transport/ThrottlerTransportAdapterSpec.scala b/akka-remote/src/test/scala/akka/remote/transport/ThrottlerTransportAdapterSpec.scala
index dd38d2e4a4..f7f364d1be 100644
--- a/akka-remote/src/test/scala/akka/remote/transport/ThrottlerTransportAdapterSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/transport/ThrottlerTransportAdapterSpec.scala
@@ -95,7 +95,7 @@ class ThrottlerTransportAdapterSpec extends AkkaSpec(configA) with ImplicitSende
 class ThrottlerTransportAdapterGenericSpec extends GenericTransportSpec(withAkkaProtocol = true) {
 
   def transportName = "ThrottlerTransportAdapter"
-  def schemeIdentifier = "trttl.akka"
+  def schemeIdentifier = "akka.trttl"
   def freshTransport(testTransport: TestTransport) =
     new ThrottlerTransportAdapter(testTransport, system.asInstanceOf[ExtendedActorSystem])
 

From c5e10ad2df36033a2c62bd6aa37b4f36d89430e5 Mon Sep 17 00:00:00 2001
From: Roland <rk@rkuhn.info>
Date: Thu, 24 Jan 2013 21:11:07 +0100
Subject: [PATCH 087/122] add logging to LARS so bugs can actually be found,
 see #2950

---
 .../test/scala/akka/actor/SchedulerSpec.scala | 33 ++++++++++---------
 .../src/main/scala/akka/actor/Scheduler.scala | 15 +++++++--
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala
index 108973ae21..416eff3078 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala
@@ -236,6 +236,18 @@ trait SchedulerSpec extends BeforeAndAfterEach with DefaultTimeout with Implicit
       n * 1000.0 / (System.nanoTime - startTime).nanos.toMillis must be(4.4 plusOrMinus 0.3)
     }
 
+    "handle timeouts equal to multiple of wheel period" taggedAs TimingTest in {
+      val timeout = 3200 milliseconds
+      val barrier = TestLatch()
+      import system.dispatcher
+      val job = system.scheduler.scheduleOnce(timeout)(barrier.countDown())
+      try {
+        Await.ready(barrier, 5000 milliseconds)
+      } finally {
+        job.cancel()
+      }
+    }
+
     "survive being stressed without cancellation" taggedAs TimingTest in {
       val r = ThreadLocalRandom.current()
       val N = 100000
@@ -258,6 +270,10 @@ trait SchedulerSpec extends BeforeAndAfterEach with DefaultTimeout with Implicit
       }
     }
   }
+}
+
+class DefaultSchedulerSpec extends AkkaSpec(SchedulerSpec.testConf) with SchedulerSpec {
+  private val cancellables = new ConcurrentLinkedQueue[Cancellable]()
 
   "A HashedWheelTimer" must {
 
@@ -273,22 +289,7 @@ trait SchedulerSpec extends BeforeAndAfterEach with DefaultTimeout with Implicit
       job.cancel()
     }
 
-    "handle timeouts equal to multiple of wheel period" taggedAs TimingTest in {
-      val timeout = 3200 milliseconds
-      val barrier = TestLatch()
-      import system.dispatcher
-      val job = system.scheduler.scheduleOnce(timeout)(barrier.countDown())
-      try {
-        Await.ready(barrier, 5000 milliseconds)
-      } finally {
-        job.cancel()
-      }
-    }
   }
-}
-
-class DefaultSchedulerSpec extends AkkaSpec(SchedulerSpec.testConf) with SchedulerSpec {
-  private val cancellables = new ConcurrentLinkedQueue[Cancellable]()
 
   def collectCancellable(c: Cancellable): Cancellable = {
     cancellables.add(c)
@@ -485,7 +486,7 @@ class LightArrayRevolverSchedulerSpec extends AkkaSpec(SchedulerSpec.testConfRev
           prb.ref ! ns
           try time += lbq.take()
           catch {
-            case _: InterruptedException ⇒
+            case _: InterruptedException ⇒ Thread.currentThread.interrupt()
           }
         }
       }
diff --git a/akka-actor/src/main/scala/akka/actor/Scheduler.scala b/akka-actor/src/main/scala/akka/actor/Scheduler.scala
index e64d0e18e6..e3be799fb2 100644
--- a/akka-actor/src/main/scala/akka/actor/Scheduler.scala
+++ b/akka-actor/src/main/scala/akka/actor/Scheduler.scala
@@ -346,9 +346,18 @@ class LightArrayRevolverScheduler(config: Config,
       try nextTick()
       catch {
         case t: Throwable ⇒
-          val thread = threadFactory.newThread(this)
-          try thread.start()
-          finally timerThread = thread
+          log.error(t, "exception on LARS’ timer thread")
+          stopped.get match {
+            case null ⇒
+              val thread = threadFactory.newThread(this)
+              log.info("starting new LARS thread")
+              try thread.start()
+              catch {
+                case e: Throwable ⇒ log.error(e, "LARS cannot start new thread, ship’s going down!")
+              }
+              timerThread = thread
+            case x ⇒ x success clearAll()
+          }
           throw t
       }
     @tailrec final def nextTick(): Unit = {

From 359aab07f324a85785e51e679f1f37304d953b30 Mon Sep 17 00:00:00 2001
From: Roland <rk@rkuhn.info>
Date: Thu, 24 Jan 2013 21:11:07 +0100
Subject: [PATCH 088/122] show real error cause, not LARS shutdown failure, see
 #2950

---
 .../src/test/scala/akka/actor/SchedulerSpec.scala         | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala
index 416eff3078..d5a2f9a027 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala
@@ -498,7 +498,13 @@ class LightArrayRevolverSchedulerSpec extends AkkaSpec(SchedulerSpec.testConfRev
     }
     driver.expectWait()
     try thunk(sched, driver)
-    finally sched.close()
+    catch {
+      case NonFatal(ex) ⇒
+        try sched.close()
+        catch { case _: Exception ⇒ }
+        throw ex
+    }
+    sched.close()
   }
 
 }

From 213b1cd3bbfcb848e4b936303dfb1eadf402c737 Mon Sep 17 00:00:00 2001
From: Roland <rk@rkuhn.info>
Date: Thu, 24 Jan 2013 22:39:55 +0100
Subject: [PATCH 089/122] enable EPUB output also in online build

---
 project/AkkaBuild.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index 3cd93db911..606262e897 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -70,8 +70,8 @@ object AkkaBuild extends Build {
       // generate online version of docs
       sphinxInputs in Sphinx <<= sphinxInputs in Sphinx in LocalProject(docs.id) map { inputs => inputs.copy(tags = inputs.tags :+ "online") },
       // don't regenerate the pdf, just reuse the akka-docs version
-      generatedPdf in Sphinx <<= generatedPdf in Sphinx in LocalProject(docs.id) map identity
-
+      generatedPdf in Sphinx <<= generatedPdf in Sphinx in LocalProject(docs.id) map identity,
+      generatedEpub in Sphinx <<= generatedEpub in Sphinx in LocalProject(docs.id) map identity
     ),
     aggregate = Seq(actor, testkit, actorTests, dataflow, remote, remoteTests, camel, cluster, slf4j, agent, transactor, mailboxes, zeroMQ, kernel, akkaSbtPlugin, osgi, osgiAries, docs, contrib, samples)
   )

From c0e85c71ce92c1eafa24f873913a984b416d928a Mon Sep 17 00:00:00 2001
From: Roland <rk@rkuhn.info>
Date: Thu, 24 Jan 2013 16:36:26 +0100
Subject: [PATCH 090/122] fix CallingThreadDispatcherModelSpec, see #2821
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The problem was that the “waves of actors” test leaves behind lots of
garbage for the CTD to clean up, and its own
CallingThreadDispatcherQueues.gc() then happens to run when the guardian
creates the top-level actor in the following test case, which takes
longer than 3 seconds to run. Fix it by making the GC interval 100ms
instead of 1sec so that the amount of garbage is limited.

Also, replacing .mapValues(...).filter(...) with
.foldLeft(.newBuilder)(...) makes it twice as fast.

And even more so: unregistering mailboxes upon actor termination removes
the cost nearly completely for the “waves of actors” case.
---
 .../testkit/CallingThreadDispatcher.scala     | 32 +++++++++++++++----
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/akka-testkit/src/main/scala/akka/testkit/CallingThreadDispatcher.scala b/akka-testkit/src/main/scala/akka/testkit/CallingThreadDispatcher.scala
index 6b8ea3b5df..5ecdcf3948 100644
--- a/akka-testkit/src/main/scala/akka/testkit/CallingThreadDispatcher.scala
+++ b/akka-testkit/src/main/scala/akka/testkit/CallingThreadDispatcher.scala
@@ -50,7 +50,11 @@ private[testkit] class CallingThreadDispatcherQueues extends Extension {
 
   // we have to forget about long-gone threads sometime
   private def gc {
-    queues = queues mapValues (_ filter (_.get ne null)) filter (!_._2.isEmpty)
+    queues = (Map.newBuilder[CallingThreadMailbox, Set[WeakReference[NestingQueue]]] /: queues) {
+      case (m, (k, v)) ⇒
+        val nv = v filter (_.get ne null)
+        if (nv.isEmpty) m else m += (k -> nv)
+    }.result
   }
 
   protected[akka] def registerQueue(mbox: CallingThreadMailbox, q: NestingQueue): Unit = synchronized {
@@ -67,6 +71,10 @@ private[testkit] class CallingThreadDispatcherQueues extends Extension {
     }
   }
 
+  protected[akka] def unregisterQueues(mbox: CallingThreadMailbox): Unit = synchronized {
+    queues -= mbox
+  }
+
   /*
    * This method must be called with "own" being this thread's queue for the
    * given mailbox. When this method returns, the queue will be entered
@@ -151,10 +159,21 @@ class CallingThreadDispatcher(
     }
   }
 
+  protected[akka] override def unregister(actor: ActorCell): Unit = {
+    val mbox = actor.mailbox match {
+      case m: CallingThreadMailbox ⇒ Some(m)
+      case _                       ⇒ None
+    }
+    super.unregister(actor)
+    mbox foreach CallingThreadDispatcherQueues(actor.system).unregisterQueues
+  }
+
   override def suspend(actor: ActorCell) {
     actor.mailbox match {
-      case m: CallingThreadMailbox ⇒ m.suspendSwitch.switchOn; m.suspend()
-      case m                       ⇒ m.systemEnqueue(actor.self, Suspend())
+      case m: CallingThreadMailbox ⇒
+        m.suspendSwitch.switchOn; m.suspend()
+      case m ⇒
+        m.systemEnqueue(actor.self, Suspend())
     }
   }
 
@@ -319,10 +338,11 @@ class CallingThreadMailbox(_receiver: akka.actor.Cell, val mailboxType: MailboxT
      * the gather operation, tough luck: no guaranteed delivery to deadLetters.
      */
     suspendSwitch.locked {
-      val q = queue
-      CallingThreadDispatcherQueues(actor.system).gatherFromAllOtherQueues(this, q)
+      val qq = queue
+      CallingThreadDispatcherQueues(actor.system).gatherFromAllOtherQueues(this, qq)
       super.cleanUp()
-      q.q.cleanUp(actor.self, actor.systemImpl.deadLetterQueue)
+      qq.q.cleanUp(actor.self, actor.systemImpl.deadLetterQueue)
+      q.remove()
     }
   }
 }

From e6b1a280cd4b9c0b7bd0f2692774a56c7e85c1b2 Mon Sep 17 00:00:00 2001
From: Christophe Pache <christophe.pache@crossing-tech.com>
Date: Thu, 10 Jan 2013 11:28:08 +0100
Subject: [PATCH 091/122]     akka-actor and akka-osgi wrapped into one bundle
 (akka-osgi) taking care of the ActorSystem creation     The akka modules
 reference.conf are copied inside this bundle.     Every other akka module is
 imported optionnaly,       the same for com.google.protobuf (already imported
 in akka-remote)

---
 project/AkkaBuild.scala | 73 ++++++++++++++++++++++++++++++++++++-----
 1 file changed, 65 insertions(+), 8 deletions(-)

diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index 2674e1c111..c5b0a81411 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -21,7 +21,7 @@ import ls.Plugin.{ lsSettings, LsKeys }
 import java.lang.Boolean.getBoolean
 import sbt.Tests
 import LsKeys.{ lsync, docsUrl => lsDocsUrl, tags => lsTags }
-import java.io.{BufferedReader, InputStreamReader, FileInputStream, File}
+import java.io.{PrintWriter, InputStreamReader, FileInputStream, File}
 import java.nio.charset.Charset
 import java.util.Properties
 
@@ -79,7 +79,7 @@ object AkkaBuild extends Build {
   lazy val actor = Project(
     id = "akka-actor",
     base = file("akka-actor"),
-    settings = defaultSettings ++ OSGi.actor ++ Seq(
+    settings = defaultSettings ++ Seq(
       autoCompilerPlugins := true,
       // to fix scaladoc generation
       fullClasspath in doc in Compile <<= fullClasspath in Compile,
@@ -252,12 +252,38 @@ object AkkaBuild extends Build {
      )
   )
 
+  val ActorReferenceCopyTask = TaskKey[Int]("hello", "Copy reference.conf from akka modules to akka-osgi")
+
+  val ActorReferenceCopyAction = (streams)  map { (s) =>
+    s.log.debug("Copying of the akka-actor reference.conf in akka-osgi")
+    (file("akka-osgi/src/main/resources")).mkdir()
+    if ((file("akka-osgi/src/main/resources/reference.conf")).exists){(file("akka-osgi/src/main/resources/reference.conf")).delete()}
+    val projectReferencesToCopy = for (project <- projects.filter(p => !p.id.contains("test") && !p.id.contains("sample"))
+      if (file(project.base+"/src/main/resources/reference.conf")).exists())  yield project
+
+    val referencesFileToInclude = projectReferencesToCopy.map(project => {
+      copyFile(project.base+"/src/main/resources/reference.conf", "akka-osgi/src/main/resources/"+project.id+".conf")
+      "include \""+ project.id +".conf\""
+      })
+
+    val writer = new PrintWriter(file("akka-osgi/src/main/resources/reference.conf" ))
+    writer.write(referencesFileToInclude.mkString("\n"))
+    writer.close()
+    s.log.info("Akka module reference.conf copied in akka-osgi")
+    projects.size
+  }
+
+
+
   lazy val osgi = Project(
     id = "akka-osgi",
     base = file("akka-osgi"),
     dependencies = Seq(actor),
     settings = defaultSettings ++ OSGi.osgi ++ Seq(
       libraryDependencies ++= Dependencies.osgi,
+      ActorReferenceCopyTask in Compile <<= ActorReferenceCopyAction ,
+      cleanFiles <+= baseDirectory { base => base / "src/main/resources" } ,
+      compile in Compile <<= compile in Compile dependsOn (ActorReferenceCopyTask in Compile),
       parallelExecution in Test := false
     )
   )
@@ -637,12 +663,18 @@ object AkkaBuild extends Build {
     }
   }
 
+  def copyFile(source: String, sink: String){
+    val src = new java.io.File(source)
+    val dest = new java.io.File(sink)
+    new java.io.FileOutputStream(dest) getChannel() transferFrom(
+      new java.io.FileInputStream(src) getChannel, 0, Long.MaxValue )
+  }
+
   // OSGi settings
 
   object OSGi {
 
-    val actor = exports(Seq("akka*"), imports = Seq("akka.remote.*;resolution:=optional", "akka.cluster.*;resolution:=optional"))
-
+    //akka-actor is wrapped into akka-osgi to simplify OSGi deployement.
 
     val agent = exports(Seq("akka.agent.*"))
 
@@ -654,7 +686,11 @@ object AkkaBuild extends Build {
 
     val mailboxesCommon = exports(Seq("akka.actor.mailbox.*"), imports = Seq(protobufImport()))
 
-    val osgi = exports(Seq("akka.osgi")) ++ Seq(OsgiKeys.privatePackage := Seq("akka.osgi.impl"))
+    val osgi = osgiSettings ++ Seq(
+      OsgiKeys.exportPackage := Seq("akka*"), //exporting (and not importing) akka packages enforces bnd to aggregate akka-actor in the bundle
+      OsgiKeys.privatePackage := Seq("akka.osgi.impl"),
+      OsgiKeys.importPackage := (osgiOptionalImports map optionalResolution) ++ Seq(scalaImport(),configImport(), "org.osgi.framework")
+     )
 
     val osgiAries = exports() ++ Seq(OsgiKeys.privatePackage := Seq("akka.osgi.aries.*"))
 
@@ -670,16 +706,36 @@ object AkkaBuild extends Build {
 
     val zeroMQ = exports(Seq("akka.zeromq.*"), imports = Seq(protobufImport()) )
 
+    val osgiOptionalImports = Seq("akka.remote",
+      "akka.remote.transport.netty",
+      "akka.remote.security.provider",
+      "akka.remote.netty",
+      "akka.remote.routing",
+      "akka.remote.transport",
+      "akka.remote.serialization",
+      "akka.cluster",
+      "akka.cluster.routing",
+      "akka.transactor",
+      "akka.agent",
+      "akka.dataflow",
+      "akka.actor.mailbox",
+      "akka.camel.internal",
+      "akka.camel.javaapi",
+      "akka.camel",
+      "akka.camel.internal.component",
+      "akka.zeromq",
+      "com.google.protobuf")
+
     def exports(packages: Seq[String] = Seq(), imports: Seq[String] = Nil) = osgiSettings ++ Seq(
       OsgiKeys.importPackage := imports ++ defaultImports,
       OsgiKeys.exportPackage := packages
     )
-
     def defaultImports = Seq("!sun.misc", akkaImport(), configImport(), scalaImport(), "*")
-    def akkaImport(packageName: String = "akka.*") = "%s;version=\"[2.1,2.2)\"".format(packageName)
+    def akkaImport(packageName: String = "akka.*") = "%s;version=\"[2.2,2.3)\"".format(packageName)
     def configImport(packageName: String = "com.typesafe.config.*") = "%s;version=\"[0.4.1,1.1.0)\"".format(packageName)
     def protobufImport(packageName: String = "com.google.protobuf.*") = "%s;version=\"[2.4.0,2.5.0)\"".format(packageName)
     def scalaImport(packageName: String = "scala.*") = "%s;version=\"[2.10,2.11)\"".format(packageName)
+    def optionalResolution(packageName: String) = "%s;resolution:=optional".format(packageName)
   }
 }
 
@@ -701,6 +757,7 @@ object Dependencies {
     val uncommonsMath = "org.uncommons.maths"         % "uncommons-maths"              % "1.2.2a" exclude("jfree", "jcommon") exclude("jfree", "jfreechart")      // ApacheV2
     val ariesBlueprint = "org.apache.aries.blueprint" % "org.apache.aries.blueprint"   % "0.3.2"       // ApacheV2
     val osgiCore      = "org.osgi"                    % "org.osgi.core"                % "4.2.0"       // ApacheV2
+    val osgiCompendium= "org.osgi"                    % "org.osgi.compendium"          % "4.2.0"       // ApacheV2
 
 
     // Camel Sample
@@ -758,7 +815,7 @@ object Dependencies {
 
   val camelSample = Seq(camelJetty)
 
-  val osgi = Seq(osgiCore,Test.logback, Test.commonsIo, Test.pojosr, Test.tinybundles, Test.scalatest, Test.junit)
+  val osgi = Seq(osgiCore, osgiCompendium, Test.logback, Test.commonsIo, Test.pojosr, Test.tinybundles, Test.scalatest, Test.junit)
 
   val osgiAries = Seq(osgiCore, ariesBlueprint, Test.ariesProxy)
 

From 8795c8dd3cd564b9a52db0c579435866f6b2260a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Endre=20S=C3=A1ndor=20Varga?= <vendre@hit.bme.hu>
Date: Fri, 25 Jan 2013 11:42:57 +0100
Subject: [PATCH 092/122] Reversed order in which adapters are applied from
 config

Needed to be aligned with the new scheme format
---
 .../main/scala/akka/remote/testconductor/Conductor.scala    | 2 +-
 .../src/main/scala/akka/remote/testkit/MultiNodeSpec.scala  | 2 +-
 akka-remote/src/main/resources/reference.conf               | 6 ++++--
 akka-remote/src/main/scala/akka/remote/RemoteSettings.scala | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/akka-remote-tests/src/main/scala/akka/remote/testconductor/Conductor.scala b/akka-remote-tests/src/main/scala/akka/remote/testconductor/Conductor.scala
index 7f843676b6..512881a4fd 100644
--- a/akka-remote-tests/src/main/scala/akka/remote/testconductor/Conductor.scala
+++ b/akka-remote-tests/src/main/scala/akka/remote/testconductor/Conductor.scala
@@ -128,7 +128,7 @@ trait Conductor { this: TestConductorExt ⇒
   private def requireTestConductorTranport(): Unit =
     if (!transport.defaultAddress.protocol.contains(".trttl.gremlin."))
       throw new ConfigurationException("To use this feature you must activate the failure injector adapters " +
-        "(gremlin, trttl) by specifying `testTransport(on = true)` in your MultiNodeConfig.")
+        "(trttl, gremlin) by specifying `testTransport(on = true)` in your MultiNodeConfig.")
 
   /**
    * Switch the Netty pipeline of the remote support into pass through mode for
diff --git a/akka-remote-tests/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala b/akka-remote-tests/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala
index 7e8a900993..d4829781a5 100644
--- a/akka-remote-tests/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala
+++ b/akka-remote-tests/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala
@@ -101,7 +101,7 @@ abstract class MultiNodeConfig {
     val transportConfig =
       if (_testTransport) ConfigFactory.parseString(
         """
-           akka.remote.netty.tcp.applied-adapters = [gremlin, trttl]
+           akka.remote.netty.tcp.applied-adapters = [trttl, gremlin]
            akka.remote.retry-gate-closed-for = 1 s
         """)
       else ConfigFactory.empty
diff --git a/akka-remote/src/main/resources/reference.conf b/akka-remote/src/main/resources/reference.conf
index eb9e4f4108..8cf1adccc7 100644
--- a/akka-remote/src/main/resources/reference.conf
+++ b/akka-remote/src/main/resources/reference.conf
@@ -205,8 +205,10 @@ akka {
       transport-class = "akka.remote.transport.netty.NettyTransport"
 
       # Transport drivers can be augmented with adapters by adding their
-      # name to the applied-adapters list. The adapters will be applied
-      # in the order they are provided.
+      # name to the applied-adapters list. The last adapter in the
+      # list is the adapter immediately above the driver, while
+      # the first one is the top of the stack below the standard
+      # Akka protocol
       applied-adapters = []
 
       transport-protocol = tcp
diff --git a/akka-remote/src/main/scala/akka/remote/RemoteSettings.scala b/akka-remote/src/main/scala/akka/remote/RemoteSettings.scala
index 92daf70f83..9b57579304 100644
--- a/akka-remote/src/main/scala/akka/remote/RemoteSettings.scala
+++ b/akka-remote/src/main/scala/akka/remote/RemoteSettings.scala
@@ -45,7 +45,7 @@ class RemoteSettings(val config: Config) {
   val Transports: Seq[(String, Seq[String], Config)] = transportNames.map { name ⇒
     val transportConfig = transportConfigFor(name)
     (transportConfig.getString("transport-class"),
-      immutableSeq(transportConfig.getStringList("applied-adapters")),
+      immutableSeq(transportConfig.getStringList("applied-adapters")).reverse,
       transportConfig)
   }
 

From 0c38a76c3748ba3acf9f9741fdc79bca61368ae6 Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Mon, 14 Jan 2013 14:09:53 +0100
Subject: [PATCH 093/122] Cluster singleton actor pattern, see #2895

* ClusterSingletonManager
* ClusterSingletonManagerSpec multi-node test
* Use in cluster router with single master sample
* Extensive logging to be able to understand what is
  going on
* Java api
* Add cluster dependency to contrib
* Add contrib dependency to sample
* Scaladoc
* rst docs in contrib area, ref from cluster docs
---
 akka-contrib/docs/cluster-singleton.rst       |  80 +++
 akka-contrib/docs/index.rst                   |   1 +
 .../pattern/ClusterSingletonManager.scala     | 596 ++++++++++++++++++
 .../pattern/ClusterSingletonManagerSpec.scala | 326 ++++++++++
 .../contrib/pattern/ReliableProxySpec.scala   |   2 +-
 akka-docs/rst/cluster/cluster-usage-java.rst  |  41 +-
 akka-docs/rst/cluster/cluster-usage-scala.rst |  37 +-
 akka-samples/akka-sample-cluster/pom.xml      |   9 +-
 .../factorial/japi/FactorialBackendMain.java  |   2 +-
 .../cluster/simple/japi/SimpleClusterApp.java |   2 +-
 .../cluster/stats/japi/StatsFacade.java       |  50 +-
 .../cluster/stats/japi/StatsSampleMain.java   |   2 +-
 .../japi/StatsSampleOneMasterClientMain.java  |  18 +
 .../stats/japi/StatsSampleOneMasterMain.java  |  28 +-
 .../japi/TransformationBackendMain.java       |   2 +-
 .../japi/TransformationFrontendMain.java      |   2 +-
 .../src/main/resources/application.conf       |  11 +-
 .../cluster/factorial/FactorialSample.scala   |   2 +-
 .../cluster/simple/SimpleClusterApp.scala     |   2 +-
 .../sample/cluster/stats/StatsSample.scala    |  52 +-
 .../transformation/TransformationSample.scala |   4 +-
 .../stats/StatsSampleSingleMasterSpec.scala   |  15 +-
 .../StatsSampleSingleMasterJapiSpec.scala     |  17 +-
 project/AkkaBuild.scala                       |   4 +-
 24 files changed, 1184 insertions(+), 121 deletions(-)
 create mode 100644 akka-contrib/docs/cluster-singleton.rst
 create mode 100644 akka-contrib/src/main/scala/akka/contrib/pattern/ClusterSingletonManager.scala
 create mode 100644 akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ClusterSingletonManagerSpec.scala

diff --git a/akka-contrib/docs/cluster-singleton.rst b/akka-contrib/docs/cluster-singleton.rst
new file mode 100644
index 0000000000..943b72e9b4
--- /dev/null
+++ b/akka-contrib/docs/cluster-singleton.rst
@@ -0,0 +1,80 @@
+.. _cluster-singleton:
+
+Cluster Singleton Pattern
+=========================
+
+For some use cases it is convenient and sometimes also mandatory to ensure that
+you have exactly one actor of a certain type running somewhere in the cluster.
+
+Some examples:
+
+* single point of responsibility for certain cluster-wide consistent decisions, or
+  coordination of actions across the cluster system
+* single entry point to an external system
+* single master, many workers
+* centralized naming service, or routing logic
+
+Using a singleton should not be the first design choice. It has several drawbacks, 
+such as single-point of bottleneck. Single-point of failure is also a relevant concern, 
+but for some cases this feature takes care of that by making sure that another singleton 
+instance will eventually be started.
+
+The cluster singleton pattern is implemented by ``akka.contrib.pattern.ClusterSingletonManager``,
+which is an actor that is supposed to be started on all nodes in the cluster.
+The actual singleton actor is started by the ``ClusterSingletonManager`` on the 
+leader node of the cluster by creating a child actor from supplied ``Props``.
+``ClusterSingletonManager`` makes sure that at most one singleton instance is 
+running at any point in time.
+
+The singleton actor is always running on the leader member, which is nothing more than 
+the address currently sorted first in the member ring. This can change when adding 
+or removing members. A graceful hand over can normally be performed when joining a new 
+node that becomes leader or removing current leader node. Be aware that there is a short 
+time period when there is no active singleton during the hand over process.
+
+The cluster failure detector will notice when a leader node becomes unreachable due to 
+things like JVM crash, hard shutdown, or network failure. Then a new leader node will 
+take over and a new singleton actor is created. For these failure scenarios there will 
+not be a graceful hand over, but more than one active singletons is prevented by all 
+reasonable means. Some corner cases are eventually resolved by configurable timeouts.
+
+You access the singleton actor with ``actorFor`` using the names you have specified when 
+creating the ClusterSingletonManager. You can subscribe to cluster ``LeaderChanged`` events
+to keep track of which node it is supposed to be running on. Alternatively the singleton 
+actor may broadcast its existence when it is started.
+
+An Example
+----------
+
+Assume that we need one single entry point to an external system. An actor that 
+receives messages from a JMS queue with the strict requirement that only one 
+JMS consumer must exist to be make sure that the messages are processed in order.
+That is perhaps not how one would like to design things, but a typical real-world
+scenario when integrating with external systems.
+
+On each node in the cluster you need to start the ``ClusterSingletonManager`` and 
+supply the ``Props`` of the singleton actor, in this case the JMS queue consumer.
+
+.. includecode:: @contribSrc@/src/multi-jvm/scala/akka/contrib/pattern/ClusterSingletonManagerSpec.scala#create-singleton-manager
+
+The corresponding Java API for the ``singeltonProps`` function is ``akka.contrib.pattern.ClusterSingletonPropsFactory``.
+
+Here we use an application specific ``terminationMessage`` to be able to close the
+resources before actually stopping the singleton actor. Note that ``PoisonPill`` is a 
+perfectly fine ``terminationMessage`` if you only need to stop the actor.
+
+Here is how the singleton actor handles the ``terminationMessage`` in this example.
+
+.. includecode:: @contribSrc@/src/multi-jvm/scala/akka/contrib/pattern/ClusterSingletonManagerSpec.scala#consumer-end
+
+Note that you can send back current state to the ``ClusterSingletonManager`` before terminating.
+This message will be sent over to the ``ClusterSingletonManager`` at the new leader node and it
+will be passed to the ``singletonProps`` factory when creating the new singleton instance.
+
+With the names given above the singleton actor can be looked up by subscribing to 
+``LeaderChanged`` cluster event and using ``actorFor``:
+
+.. includecode:: @contribSrc@/src/multi-jvm/scala/akka/contrib/pattern/ClusterSingletonManagerSpec.scala#singleton-actorFor
+
+
+.. note:: The singleton pattern will be simplified, perhaps provided out-of-the-box, when the cluster handles automatic actor partitioning.
diff --git a/akka-contrib/docs/index.rst b/akka-contrib/docs/index.rst
index f0d3245187..e6701d5f35 100644
--- a/akka-contrib/docs/index.rst
+++ b/akka-contrib/docs/index.rst
@@ -32,6 +32,7 @@ The Current List of Modules
    throttle
    jul
    peek-mailbox
+   cluster-singleton
 
 Suggested Way of Using these Contributions
 ------------------------------------------
diff --git a/akka-contrib/src/main/scala/akka/contrib/pattern/ClusterSingletonManager.scala b/akka-contrib/src/main/scala/akka/contrib/pattern/ClusterSingletonManager.scala
new file mode 100644
index 0000000000..cc4b989328
--- /dev/null
+++ b/akka-contrib/src/main/scala/akka/contrib/pattern/ClusterSingletonManager.scala
@@ -0,0 +1,596 @@
+/**
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
+ */
+
+package akka.contrib.pattern
+
+import scala.concurrent.duration._
+import akka.actor.Actor
+import akka.actor.Actor.Receive
+import akka.actor.ActorLogging
+import akka.actor.ActorRef
+import akka.actor.Address
+import akka.actor.FSM
+import akka.actor.Props
+import akka.actor.Terminated
+import akka.cluster.Cluster
+import akka.cluster.ClusterEvent._
+import akka.AkkaException
+
+object ClusterSingletonManager {
+
+  /**
+   * Internal API
+   * public due to the `with FSM` type parameters
+   */
+  sealed trait State
+  /**
+   * Internal API
+   * public due to the `with FSM` type parameters
+   */
+  sealed trait Data
+
+  /**
+   * Internal API
+   */
+  private object Internal {
+    /**
+     * Sent from new leader to previous leader to initate the
+     * hand over process. `HandOverInProgress` and `HandOverDone`
+     * are expected replies.
+     */
+    case object HandOverToMe
+    /**
+     * Confirmation by the previous leader that the hand
+     * over process, shutdown of the singleton actor, has
+     * started.
+     */
+    case object HandOverInProgress
+    /**
+     * Confirmation by the previous leader that the singleton
+     * actor has been terminated and the hand over process is
+     * completed. The `handOverData` holds the message, if any,
+     * sent from the singleton actor to its parent ClusterSingletonManager
+     * when shutting down. It is passed to the `singletonProps`
+     * factory on the new leader node.
+     */
+    case class HandOverDone(handOverData: Option[Any])
+    /**
+     * Sent from from previous leader to new leader to
+     * initiate the normal hand over process.
+     * Especially useful when new node joins and becomes
+     * leader immediately, without knowing who was previous
+     * leader.
+     */
+    case object TakeOverFromMe
+
+    case class HandOverRetry(count: Int)
+    case class TakeOverRetry(leaderPeer: ActorRef, count: Int)
+    case object Cleanup
+    case object StartLeaderChangedBuffer
+
+    case object Start extends State
+    case object Leader extends State
+    case object NonLeader extends State
+    case object BecomingLeader extends State
+    case object WasLeader extends State
+    case object HandingOver extends State
+    case object TakeOver extends State
+
+    case object Uninitialized extends Data
+    case class NonLeaderData(leaderOption: Option[Address]) extends Data
+    case class BecomingLeaderData(previousLeaderOption: Option[Address]) extends Data
+    case class LeaderData(singleton: ActorRef, singletonTerminated: Boolean = false,
+                          handOverData: Option[Any] = None) extends Data
+    case class WasLeaderData(singleton: ActorRef, singletonTerminated: Boolean, handOverData: Option[Any],
+                             newLeader: Address) extends Data
+    case class HandingOverData(singleton: ActorRef, handOverTo: Option[ActorRef], handOverData: Option[Any]) extends Data
+
+    val HandOverRetryTimer = "hand-over-retry"
+    val TakeOverRetryTimer = "take-over-retry"
+    val CleanupTimer = "cleanup"
+
+    object LeaderChangedBuffer {
+      /**
+       * Request to deliver one more event.
+       */
+      case object GetNext
+      /**
+       * The first event, corresponding to CurrentClusterState.
+       */
+      case class InitialLeaderState(leader: Option[Address], memberCount: Int)
+    }
+
+    /**
+     * Notifications of [[akka.cluster.ClusterEvent.LeaderChanged]] is tunneled
+     * via this actor (child of ClusterSingletonManager) to be able to deliver
+     * one change at a time. Avoiding simultaneous leader changes simplifies
+     * the process in ClusterSingletonManager. ClusterSingletonManager requests
+     * next event with `GetNext` when it is ready for it. Only one outstanding
+     * `GetNext` request is allowed. Incoming events are buffered and delivered
+     * upon `GetNext` request.
+     */
+    class LeaderChangedBuffer extends Actor {
+      import LeaderChangedBuffer._
+      import context.dispatcher
+
+      val cluster = Cluster(context.system)
+      var changes = Vector.empty[AnyRef]
+      var memberCount = 0
+
+      // subscribe to LeaderChanged, re-subscribe when restart
+      override def preStart(): Unit = cluster.subscribe(self, classOf[LeaderChanged])
+      override def postStop(): Unit = cluster.unsubscribe(self)
+
+      def receive = {
+        case state: CurrentClusterState ⇒
+          changes :+= InitialLeaderState(state.leader, state.members.size)
+        case event: LeaderChanged ⇒
+          changes :+= event
+        case GetNext if changes.isEmpty ⇒
+          context.become(deliverNext, discardOld = false)
+        case GetNext ⇒
+          val event = changes.head
+          changes = changes.tail
+          context.parent ! event
+      }
+
+      // the buffer was empty when GetNext was received, deliver next event immediately
+      def deliverNext: Actor.Receive = {
+        case state: CurrentClusterState ⇒
+          context.parent ! InitialLeaderState(state.leader, state.members.size)
+          context.unbecome()
+        case event: LeaderChanged ⇒
+          context.parent ! event
+          context.unbecome()
+      }
+
+    }
+
+  }
+}
+
+/**
+ * Java API. Factory for the [[akka.actor.Props]] of the singleton
+ * actor instance. Used in constructor of
+ * [[akka.contrib.pattern.ClusterSingletonManager]]
+ */
+@SerialVersionUID(1L)
+trait ClusterSingletonPropsFactory extends Serializable {
+  /**
+   * Create the `Props` from the `handOverData` sent from
+   * previous singleton. `handOverData` might be null
+   * when no hand over took place, or when the there is no need
+   * for sending data to the new singleton.
+   */
+  def create(handOverData: Any): Props
+}
+
+/**
+ * Thrown when a consistent state can't be determined within the
+ * defined retry limits. Eventually it will reach a stable state and
+ * can continue, and that is simplified by starting over with a clean
+ * state. Parent supervisor should typically restart the actor, i.e.
+ * default decision.
+ */
+class ClusterSingletonManagerIsStuck(message: String) extends AkkaException(message, null)
+
+/**
+ * Manages a cluster wide singleton actor instance, i.e.
+ * at most one singleton instance is running at any point in time.
+ * The ClusterSingletonManager is supposed to be started on all
+ * nodes in the cluster with `actorOf`. The actual singleton is
+ * started on the leader node of the cluster by creating a child
+ * actor from the supplied `singletonProps`.
+ *
+ * The singleton actor is always running on the leader member, which is
+ * nothing more than the address currently sorted first in the member
+ * ring. This can change when adding or removing members. A graceful hand
+ * over can normally be performed when joining a new node that becomes
+ * leader or removing current leader node. Be aware that there is a
+ * short time period when there is no active singleton during the
+ * hand over process.
+ *
+ * The singleton actor can at any time send a message to its parent
+ * ClusterSingletonManager and this message will be passed to the
+ * `singletonProps` factory on the new leader node when a graceful
+ * hand over is performed.
+ *
+ * The cluster failure detector will notice when a leader node
+ * becomes unreachable due to things like JVM crash, hard shutdown,
+ * or network failure. Then a new leader node will take over and a
+ * new singleton actor is created. For these failure scenarios there
+ * will not be a graceful hand over, but more than one active singletons
+ * is prevented by all reasonable means. Some corner cases are eventually
+ * resolved by configurable timeouts.
+ *
+ * You access the singleton actor with `actorFor` using the names you have
+ * specified when creating the ClusterSingletonManager. You can subscribe to
+ * [[akka.cluster.ClusterEvent.LeaderChanged]] to keep track of which node
+ * it is supposed to be running on. Alternatively the singleton actor may
+ * broadcast its existence when it is started.
+ *
+ * ==Arguments==
+ *
+ * '''''singletonProps''''' Factory for [[akka.actor.Props]] of the
+ *   singleton actor instance. The `Option` parameter is the the
+ *   `handOverData` sent from previous singleton. `handOverData`
+ *    might be None when no hand over took place, or when the there
+ *    is no need for sending data to the new singleton. The `handOverData`
+ *    is typically passed as parameter to the constructor of the
+ *    singleton actor.
+ *
+ * '''''singletonName''''' The actor name of the child singleton actor.
+ *
+ * '''''terminationMessage''''' When handing over to a new leader node
+ *   this `terminationMessage` is sent to the singleton actor to tell
+ *   it to finish its work, close resources, and stop. It can sending
+ *   a message back to the parent ClusterSingletonManager, which will
+ *   passed to the `singletonProps` factory on the new leader node.
+ *   The hand over to the new leader node is completed when the
+ *   singleton actor is terminated.
+ *   Note that [[akka.actor.PoisonPill]] is a perfectly fine
+ *   `terminationMessage` if you only need to stop the actor.
+ *
+ * '''''maxHandOverRetries''''' When a node is becoming leader it sends
+ *   hand over request to previous leader. This is retried with the
+ *   `retryInterval` until the previous leader confirms that the hand
+ *   over has started, or this `maxHandOverRetries` limit has been
+ *   reached. If the retry limit is reached it takes the decision to be
+ *   the new leader if previous leader is unknown (typically removed or
+ *   downed), otherwise it initiates a new round by throwing
+ *   [[akka.contrib.pattern.ClusterSingletonManagerIsStuck]] and expecting
+ *   restart with fresh state. For a cluster with many members you might
+ *   need to increase this retry limit because it takes longer time to
+ *   propagate changes across all nodes.
+ *
+ * '''''maxTakeOverRetries''''' When a leader node is not leader any more
+ *   it sends take over request to the new leader to initiate the normal
+ *   hand over process. This is especially useful when new node joins and becomes
+ *   leader immediately, without knowing who was previous leader. This is retried
+ *   with the `retryInterval` until this retry limit has been reached. If the retry
+ *   limit is reached it initiates a new round by throwing
+ *   [[akka.contrib.pattern.ClusterSingletonManagerIsStuck]] and expecting
+ *   restart with fresh state. This will also cause the singleton actor to be
+ *   stopped. `maxTakeOverRetries` must be less than `maxHandOverRetries` to
+ *   ensure that new leader doesn't start singleton actor before previous is
+ *   stopped for certain corner cases.
+ *
+ * '''''loggingEnabled''''' Logging of what is going on at info log level.
+ */
+class ClusterSingletonManager(
+  singletonProps: Option[Any] ⇒ Props,
+  singletonName: String,
+  terminationMessage: Any,
+  maxHandOverRetries: Int = 20,
+  maxTakeOverRetries: Int = 15,
+  retryInterval: FiniteDuration = 1.second,
+  loggingEnabled: Boolean = true)
+  extends Actor with FSM[ClusterSingletonManager.State, ClusterSingletonManager.Data] {
+
+  // to ensure that new leader doesn't start singleton actor before previous is stopped for certain corner cases
+  require(maxTakeOverRetries < maxHandOverRetries,
+    s"maxTakeOverRetries [${maxTakeOverRetries}]must be < maxHandOverRetries [${maxHandOverRetries}]")
+
+  /**
+   * Full Java API constructor.
+   */
+  def this(
+    singletonName: String,
+    terminationMessage: Any,
+    maxHandOverRetries: Int,
+    maxTakeOverRetries: Int,
+    retryInterval: FiniteDuration,
+    loggingEnabled: Boolean,
+    singletonPropsFactory: ClusterSingletonPropsFactory) =
+    this(handOverData ⇒ singletonPropsFactory.create(handOverData.orNull), singletonName, terminationMessage,
+      maxHandOverRetries, maxTakeOverRetries, retryInterval)
+
+  /**
+   * Java API constructor with default values.
+   */
+  def this(
+    singletonName: String,
+    terminationMessage: Any,
+    singletonPropsFactory: ClusterSingletonPropsFactory) =
+    this(handOverData ⇒ singletonPropsFactory.create(handOverData.orNull), singletonName, terminationMessage)
+
+  import ClusterSingletonManager._
+  import ClusterSingletonManager.Internal._
+  import ClusterSingletonManager.Internal.LeaderChangedBuffer._
+
+  val cluster = Cluster(context.system)
+  val selfAddressOption = Some(cluster.selfAddress)
+  // started when when self member is Up
+  var leaderChangedBuffer: ActorRef = _
+  // Previous GetNext request delivered event and new GetNext is to be sent
+  var leaderChangedReceived = true
+
+  // keep track of previously downed members
+  var downed = Map.empty[Address, Deadline]
+  // keep track of previously removed members
+  var removed = Map.empty[Address, Deadline]
+
+  def addDowned(address: Address): Unit =
+    downed += address -> (Deadline.now + 15.minutes)
+
+  def addRemoved(address: Address): Unit =
+    removed += address -> (Deadline.now + 15.minutes)
+
+  def cleanupOverdueNotMemberAnyMore(): Unit = {
+    downed = downed filter { case (address, deadline) ⇒ deadline.hasTimeLeft }
+    removed = removed filter { case (address, deadline) ⇒ deadline.hasTimeLeft }
+  }
+
+  def logInfo(message: String): Unit =
+    if (loggingEnabled) log.info(message)
+
+  def logInfo(template: String, arg1: Any): Unit =
+    if (loggingEnabled) log.info(template, arg1)
+
+  def logInfo(template: String, arg1: Any, arg2: Any): Unit =
+    if (loggingEnabled) log.info(template, arg1, arg2)
+
+  override def preStart(): Unit = {
+    super.preStart()
+    require(!cluster.isTerminated, "Cluster node must not be terminated")
+
+    // subscribe to cluster changes, re-subscribe when restart
+    cluster.subscribe(self, classOf[MemberDowned])
+    cluster.subscribe(self, classOf[MemberRemoved])
+
+    setTimer(CleanupTimer, Cleanup, 1.minute, repeat = true)
+
+    // defer subscription to LeaderChanged to avoid some jitter when
+    // starting/joining several nodes at the same time
+    cluster.registerOnMemberUp(self ! StartLeaderChangedBuffer)
+  }
+
+  override def postStop(): Unit = {
+    cancelTimer(CleanupTimer)
+    cluster.unsubscribe(self)
+    super.postStop()
+  }
+
+  def peer(at: Address): ActorRef = context.actorFor(self.path.toStringWithAddress(at))
+
+  def getNextLeaderChanged(): Unit =
+    if (leaderChangedReceived) {
+      leaderChangedReceived = false
+      leaderChangedBuffer ! GetNext
+    }
+
+  startWith(Start, Uninitialized)
+
+  when(Start) {
+    case Event(StartLeaderChangedBuffer, _) ⇒
+      leaderChangedBuffer = context.actorOf(Props[LeaderChangedBuffer].withDispatcher(context.props.dispatcher))
+      getNextLeaderChanged()
+      stay
+
+    case Event(InitialLeaderState(leaderOption, memberCount), _) ⇒
+      leaderChangedReceived = true
+      if (leaderOption == selfAddressOption && memberCount == 1)
+        // alone, leader immediately
+        gotoLeader(None)
+      else if (leaderOption == selfAddressOption)
+        goto(BecomingLeader) using BecomingLeaderData(None)
+      else
+        goto(NonLeader) using NonLeaderData(leaderOption)
+  }
+
+  when(NonLeader) {
+    case Event(LeaderChanged(leaderOption), NonLeaderData(previousLeaderOption)) ⇒
+      leaderChangedReceived = true
+      if (leaderOption == selfAddressOption) {
+        logInfo("NonLeader observed LeaderChanged: [{} -> myself]", previousLeaderOption)
+        previousLeaderOption match {
+          case None                                ⇒ gotoLeader(None)
+          case Some(prev) if downed.contains(prev) ⇒ gotoLeader(None)
+          case Some(prev) ⇒
+            peer(prev) ! HandOverToMe
+            goto(BecomingLeader) using BecomingLeaderData(previousLeaderOption)
+        }
+      } else {
+        logInfo("NonLeader observed LeaderChanged: [{} -> {}]", previousLeaderOption, leaderOption)
+        getNextLeaderChanged()
+        stay using NonLeaderData(leaderOption)
+      }
+
+    case Event(MemberDowned(m), NonLeaderData(Some(previousLeader))) if m.address == previousLeader ⇒
+      logInfo("Previous leader downed [{}]", m.address)
+      addDowned(m.address)
+      // transition when LeaderChanged
+      stay using NonLeaderData(None)
+
+    case Event(MemberRemoved(m), _) if m.address == cluster.selfAddress ⇒
+      logInfo("Self removed, stopping ClusterSingletonManager")
+      stop()
+
+  }
+
+  when(BecomingLeader) {
+
+    case Event(HandOverInProgress, _) ⇒
+      // confirmation that the hand over process has started
+      logInfo("Hand over in progress at [{}]", sender.path.address)
+      cancelTimer(HandOverRetryTimer)
+      stay
+
+    case Event(HandOverDone(handOverData), BecomingLeaderData(Some(previousLeader))) ⇒
+      if (sender.path.address == previousLeader)
+        gotoLeader(handOverData)
+      else {
+        logInfo("Ignoring HandOverDone in BecomingLeader from [{}]. Expected previous leader [{}]",
+          sender.path.address, previousLeader)
+        stay
+      }
+
+    case Event(MemberDowned(m), BecomingLeaderData(Some(previousLeader))) if m.address == previousLeader ⇒
+      logInfo("Previous leader [{}] downed", previousLeader)
+      addDowned(m.address)
+      gotoLeader(None)
+
+    case Event(TakeOverFromMe, BecomingLeaderData(None)) ⇒
+      sender ! HandOverToMe
+      stay using BecomingLeaderData(Some(sender.path.address))
+
+    case Event(TakeOverFromMe, BecomingLeaderData(Some(previousLeader))) ⇒
+      if (previousLeader == sender.path.address) sender ! HandOverToMe
+      else logInfo("Ignoring TakeOver request in BecomingLeader from [{}]. Expected previous leader [{}]",
+        sender.path.address, previousLeader)
+      stay
+
+    case Event(HandOverRetry(count), BecomingLeaderData(previousLeaderOption)) ⇒
+      if (count <= maxHandOverRetries) {
+        logInfo("Retry [{}], sending HandOverToMe to [{}]", count, previousLeaderOption)
+        previousLeaderOption foreach { peer(_) ! HandOverToMe }
+        setTimer(HandOverRetryTimer, HandOverRetry(count + 1), retryInterval, repeat = false)
+      } else if (previousLeaderOption.isEmpty) {
+        // can't send HandOverToMe, previousLeader unknown for new node (or restart)
+        // previous leader might be down or removed, so no TakeOverFromMe message is received
+        logInfo("Timeout in BecomingLeader. Previous leader unknown and no TakeOver request.")
+        gotoLeader(None)
+      } else
+        throw new ClusterSingletonManagerIsStuck(
+          s"Becoming singleton leader was stuck because previous leader [${previousLeaderOption}] is unresponsive")
+
+  }
+
+  def gotoLeader(handOverData: Option[Any]): State = {
+    logInfo("Singleton manager [{}] starting singleton actor", cluster.selfAddress)
+    val singleton = context watch context.actorOf(singletonProps(handOverData), singletonName)
+    goto(Leader) using LeaderData(singleton)
+  }
+
+  when(Leader) {
+    case Event(LeaderChanged(leaderOption), LeaderData(singleton, singletonTerminated, handOverData)) ⇒
+      leaderChangedReceived = true
+      logInfo("Leader observed LeaderChanged: [{} -> {}]", cluster.selfAddress, leaderOption)
+      leaderOption match {
+        case Some(a) if a == cluster.selfAddress ⇒
+          // already leader
+          stay
+        case Some(a) if downed.contains(a) || removed.contains(a) ⇒
+          gotoHandingOver(singleton, singletonTerminated, handOverData, None)
+        case Some(a) ⇒
+          // send TakeOver request in case the new leader doesn't know previous leader
+          val leaderPeer = peer(a)
+          leaderPeer ! TakeOverFromMe
+          setTimer(TakeOverRetryTimer, TakeOverRetry(leaderPeer, 1), retryInterval, repeat = false)
+          goto(WasLeader) using WasLeaderData(singleton, singletonTerminated, handOverData, newLeader = a)
+        case _ ⇒
+          // new leader will initiate the hand over
+          stay
+      }
+
+    case Event(HandOverToMe, LeaderData(singleton, singletonTerminated, handOverData)) ⇒
+      gotoHandingOver(singleton, singletonTerminated, handOverData, Some(sender))
+
+    case Event(singletonHandOverMessage, d @ LeaderData(singleton, _, _)) if sender == singleton ⇒
+      stay using d.copy(handOverData = Some(singletonHandOverMessage))
+
+    case Event(Terminated(ref), d @ LeaderData(singleton, _, _)) if ref == singleton ⇒
+      stay using d.copy(singletonTerminated = true)
+  }
+
+  when(WasLeader) {
+    case Event(TakeOverRetry(leaderPeer, count), _) ⇒
+      val newLeader = leaderPeer.path.address
+      if (count <= maxTakeOverRetries) {
+        logInfo("Retry [{}], sending TakeOverFromMe to [{}]", count, newLeader)
+        leaderPeer ! TakeOverFromMe
+        setTimer(TakeOverRetryTimer, TakeOverRetry(leaderPeer, count + 1), retryInterval, repeat = false)
+        stay
+      } else
+        throw new ClusterSingletonManagerIsStuck(s"Expected hand over to [${newLeader}] never occured")
+
+    case Event(HandOverToMe, WasLeaderData(singleton, singletonTerminated, handOverData, _)) ⇒
+      gotoHandingOver(singleton, singletonTerminated, handOverData, Some(sender))
+
+    case Event(MemberDowned(m), WasLeaderData(singleton, singletonTerminated, handOverData, newLeader)) if m.address == newLeader ⇒
+      addDowned(m.address)
+      gotoHandingOver(singleton, singletonTerminated, handOverData, None)
+
+    case Event(singletonHandOverMessage, d @ WasLeaderData(singleton, _, _, _)) if sender == singleton ⇒
+      stay using d.copy(handOverData = Some(singletonHandOverMessage))
+
+    case Event(Terminated(ref), d @ WasLeaderData(singleton, _, _, _)) if ref == singleton ⇒
+      stay using d.copy(singletonTerminated = true)
+
+  }
+
+  def gotoHandingOver(singleton: ActorRef, singletonTerminated: Boolean, handOverData: Option[Any], handOverTo: Option[ActorRef]): State = {
+    if (singletonTerminated) {
+      handOverDone(handOverTo, handOverData)
+    } else {
+      handOverTo foreach { _ ! HandOverInProgress }
+      singleton ! terminationMessage
+      goto(HandingOver) using HandingOverData(singleton, handOverTo, handOverData)
+    }
+  }
+
+  when(HandingOver) {
+    case (Event(Terminated(ref), HandingOverData(singleton, handOverTo, handOverData))) if ref == singleton ⇒
+      handOverDone(handOverTo, handOverData)
+
+    case Event(HandOverToMe, d @ HandingOverData(singleton, handOverTo, _)) if handOverTo == Some(sender) ⇒
+      // retry
+      sender ! HandOverInProgress
+      stay
+
+    case Event(singletonHandOverMessage, d @ HandingOverData(singleton, _, _)) if sender == singleton ⇒
+      stay using d.copy(handOverData = Some(singletonHandOverMessage))
+
+  }
+
+  def handOverDone(handOverTo: Option[ActorRef], handOverData: Option[Any]): State = {
+    val newLeader = handOverTo.map(_.path.address)
+    logInfo("Singleton terminated, hand over done [{} -> {}]", cluster.selfAddress, newLeader)
+    handOverTo foreach { _ ! HandOverDone(handOverData) }
+    goto(NonLeader) using NonLeaderData(newLeader)
+  }
+
+  whenUnhandled {
+    case Event(_: CurrentClusterState, _) ⇒ stay
+    case Event(MemberRemoved(m), _) ⇒
+      logInfo("Member removed [{}]", m.address)
+      // if self removed, it will be stopped onTranstion to NonLeader
+      addRemoved(m.address)
+      stay
+    case Event(MemberDowned(m), _) ⇒
+      logInfo("Member downed [{}]", m.address)
+      addDowned(m.address)
+      stay
+    case Event(TakeOverFromMe, _) ⇒
+      logInfo("Ignoring TakeOver request in [{}] from [{}].", stateName, sender.path.address)
+      stay
+    case Event(Cleanup, _) ⇒
+      cleanupOverdueNotMemberAnyMore()
+      stay
+  }
+
+  onTransition {
+    case from -> to ⇒ logInfo("ClusterSingletonManager state change [{} -> {}]", from, to)
+  }
+
+  onTransition {
+    case _ -> BecomingLeader ⇒ setTimer(HandOverRetryTimer, HandOverRetry(1), retryInterval, repeat = false)
+  }
+
+  onTransition {
+    case BecomingLeader -> _ ⇒ cancelTimer(HandOverRetryTimer)
+    case WasLeader -> _      ⇒ cancelTimer(TakeOverRetryTimer)
+  }
+
+  onTransition {
+    case _ -> (NonLeader | Leader) ⇒ getNextLeaderChanged()
+  }
+
+  onTransition {
+    case _ -> NonLeader if removed.contains(cluster.selfAddress) || downed.contains(cluster.selfAddress) ⇒
+      logInfo("Self removed, stopping ClusterSingletonManager")
+      stop()
+  }
+
+}
\ No newline at end of file
diff --git a/akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ClusterSingletonManagerSpec.scala b/akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ClusterSingletonManagerSpec.scala
new file mode 100644
index 0000000000..83f9d4de92
--- /dev/null
+++ b/akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ClusterSingletonManagerSpec.scala
@@ -0,0 +1,326 @@
+/**
+ *  Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ */
+
+package akka.contrib.pattern
+
+import language.postfixOps
+import scala.collection.immutable
+import scala.concurrent.duration._
+import com.typesafe.config.ConfigFactory
+import akka.actor.Actor
+import akka.actor.ActorLogging
+import akka.actor.ActorRef
+import akka.actor.Props
+import akka.actor.RootActorPath
+import akka.cluster.Cluster
+import akka.cluster.ClusterEvent._
+import akka.cluster.Member
+import akka.remote.testconductor.RoleName
+import akka.remote.testkit.MultiNodeConfig
+import akka.remote.testkit.MultiNodeSpec
+import akka.remote.testkit.STMultiNodeSpec
+import akka.testkit._
+import akka.testkit.ImplicitSender
+import akka.testkit.TestEvent._
+import akka.actor.Terminated
+
+object ClusterSingletonManagerSpec extends MultiNodeConfig {
+  val controller = role("controller")
+  val first = role("first")
+  val second = role("second")
+  val third = role("third")
+  val fourth = role("fourth")
+  val fifth = role("fifth")
+  val sixth = role("sixth")
+
+  commonConfig(ConfigFactory.parseString("""
+    akka.loglevel = INFO
+    akka.actor.provider = "akka.cluster.ClusterActorRefProvider"
+    akka.remote.log-remote-lifecycle-events = off
+    akka.cluster.auto-join = off
+    akka.cluster.auto-down = on
+    """))
+
+  testTransport(on = true)
+
+  object PointToPointChannel {
+    case object RegisterConsumer
+    case object UnregisterConsumer
+    case object RegistrationOk
+    case object UnexpectedRegistration
+    case object UnregistrationOk
+    case object UnexpectedUnregistration
+    case object Reset
+    case object ResetOk
+  }
+
+  /**
+   * This channel is extremly strict with regards to
+   * registration and unregistration of consumer to
+   * be able to detect misbehaviour (e.g. two active
+   * singleton instances).
+   */
+  class PointToPointChannel extends Actor with ActorLogging {
+    import PointToPointChannel._
+
+    def receive = idle
+
+    def idle: Receive = {
+      case RegisterConsumer ⇒
+        log.info("RegisterConsumer: [{}]", sender.path)
+        sender ! RegistrationOk
+        context.become(active(sender))
+      case UnregisterConsumer ⇒
+        log.info("UnexpectedUnregistration: [{}]", sender.path)
+        sender ! UnexpectedUnregistration
+        context stop self
+      case Reset ⇒ sender ! ResetOk
+      case msg   ⇒ // no consumer, drop
+    }
+
+    def active(consumer: ActorRef): Receive = {
+      case UnregisterConsumer if sender == consumer ⇒
+        log.info("UnregistrationOk: [{}]", sender.path)
+        sender ! UnregistrationOk
+        context.become(idle)
+      case UnregisterConsumer ⇒
+        log.info("UnexpectedUnregistration: [{}], expected [{}]", sender.path, consumer.path)
+        sender ! UnexpectedUnregistration
+        context stop self
+      case RegisterConsumer ⇒
+        log.info("Unexpected RegisterConsumer [{}], active consumer [{}]", sender.path, consumer.path)
+        sender ! UnexpectedRegistration
+        context stop self
+      case Reset ⇒
+        context.become(idle)
+        sender ! ResetOk
+      case msg ⇒ consumer ! msg
+    }
+  }
+
+  object Consumer {
+    case object End
+    case object GetCurrent
+  }
+
+  /**
+   * The Singleton actor
+   */
+  class Consumer(handOverData: Option[Any], queue: ActorRef, delegateTo: ActorRef) extends Actor {
+    import Consumer._
+    import PointToPointChannel._
+
+    var current: Int = handOverData match {
+      case Some(x: Int) ⇒ x
+      case Some(x)      ⇒ throw new IllegalArgumentException(s"handOverData must be an Int, got [${x}]")
+      case None         ⇒ 0
+    }
+
+    override def preStart(): Unit = queue ! RegisterConsumer
+
+    def receive = {
+      case n: Int if n <= current ⇒
+        context.stop(self)
+      case n: Int ⇒
+        current = n
+        delegateTo ! n
+      case x @ (RegistrationOk | UnexpectedRegistration) ⇒
+        delegateTo ! x
+      case GetCurrent ⇒
+        sender ! current
+      //#consumer-end
+      case End ⇒
+        queue ! UnregisterConsumer
+      case UnregistrationOk ⇒
+        // reply to ClusterSingletonManager with hand over data,
+        // which will be passed as parameter to new leader consumer
+        context.parent ! current
+        context stop self
+      //#consumer-end
+    }
+  }
+
+}
+
+class ClusterSingletonManagerMultiJvmNode1 extends ClusterSingletonManagerSpec
+class ClusterSingletonManagerMultiJvmNode2 extends ClusterSingletonManagerSpec
+class ClusterSingletonManagerMultiJvmNode3 extends ClusterSingletonManagerSpec
+class ClusterSingletonManagerMultiJvmNode4 extends ClusterSingletonManagerSpec
+class ClusterSingletonManagerMultiJvmNode5 extends ClusterSingletonManagerSpec
+class ClusterSingletonManagerMultiJvmNode6 extends ClusterSingletonManagerSpec
+class ClusterSingletonManagerMultiJvmNode7 extends ClusterSingletonManagerSpec
+
+class ClusterSingletonManagerSpec extends MultiNodeSpec(ClusterSingletonManagerSpec) with STMultiNodeSpec with ImplicitSender {
+  import ClusterSingletonManagerSpec._
+  import ClusterSingletonManagerSpec.PointToPointChannel._
+  import ClusterSingletonManagerSpec.Consumer._
+
+  override def initialParticipants = roles.size
+
+  // Sort the roles in the order used by the cluster.
+  lazy val sortedClusterRoles: immutable.IndexedSeq[RoleName] = {
+    implicit val clusterOrdering: Ordering[RoleName] = new Ordering[RoleName] {
+      import Member.addressOrdering
+      def compare(x: RoleName, y: RoleName) = addressOrdering.compare(node(x).address, node(y).address)
+    }
+    roles.filterNot(_ == controller).toVector.sorted
+  }
+
+  def queue: ActorRef = system.actorFor(node(controller) / "user" / "queue")
+
+  def createSingleton(): ActorRef = {
+    //#create-singleton-manager
+    system.actorOf(Props(new ClusterSingletonManager(
+      singletonProps = handOverData ⇒
+        Props(new Consumer(handOverData, queue, testActor)),
+      singletonName = "consumer",
+      terminationMessage = End)),
+      name = "singleton")
+    //#create-singleton-manager
+  }
+
+  def consumer(leader: RoleName): ActorRef = {
+    // the reason for this complicated way of creating the path is to illustrate
+    // in documentation how it's typically done in user land
+    LeaderChanged(Some(node(leader).address)) match {
+      //#singleton-actorFor
+      case LeaderChanged(Some(leaderAddress)) ⇒
+        val path = RootActorPath(leaderAddress) / "user" / "singleton" / "consumer"
+        val consumer = system.actorFor(path)
+        //#singleton-actorFor
+        consumer
+    }
+  }
+
+  def verify(leader: RoleName, msg: Int, expectedCurrent: Int): Unit = {
+    enterBarrier("before-" + leader.name + "-verified")
+    runOn(leader) {
+      expectMsg(RegistrationOk)
+      consumer(leader) ! GetCurrent
+      expectMsg(expectedCurrent)
+    }
+    enterBarrier(leader.name + "-active")
+
+    runOn(controller) {
+      queue ! msg
+      // make sure it's not terminated, which would be wrong
+      expectNoMsg(1 second)
+    }
+    runOn(leader) {
+      expectMsg(msg)
+    }
+    runOn(sortedClusterRoles.filterNot(_ == leader): _*) {
+      expectNoMsg(1 second)
+    }
+    enterBarrier(leader.name + "-verified")
+  }
+
+  def crash(roles: RoleName*): Unit = {
+    runOn(controller) {
+      queue ! Reset
+      expectMsg(ResetOk)
+      roles foreach { r ⇒
+        log.info("Shutdown [{}]", node(r).address)
+        testConductor.shutdown(r, 0).await
+      }
+    }
+  }
+
+  "A ClusterSingletonManager" must {
+
+    "startup in single member cluster" in within(10 seconds) {
+      log.info("Sorted cluster nodes [{}]", sortedClusterRoles.map(node(_).address).mkString(", "))
+
+      runOn(controller) {
+        // watch that it is not terminated, which would indicate misbehaviour
+        watch(system.actorOf(Props[PointToPointChannel], "queue"))
+      }
+      enterBarrier("queue-started")
+
+      runOn(sortedClusterRoles(5)) {
+        Cluster(system) join node(sortedClusterRoles(5)).address
+        createSingleton()
+      }
+
+      verify(sortedClusterRoles.last, msg = 1, expectedCurrent = 0)
+    }
+
+    "hand over when new leader joins to 1 node cluster" in within(15 seconds) {
+      val newLeaderRole = sortedClusterRoles(4)
+      runOn(newLeaderRole) {
+        Cluster(system) join node(sortedClusterRoles.last).address
+        createSingleton()
+      }
+
+      verify(newLeaderRole, msg = 2, expectedCurrent = 1)
+    }
+
+    "hand over when new leader joins to 2 nodes cluster" in within(15 seconds) {
+      val newLeaderRole = sortedClusterRoles(3)
+      runOn(newLeaderRole) {
+        Cluster(system) join node(sortedClusterRoles.last).address
+        createSingleton()
+      }
+
+      verify(newLeaderRole, msg = 3, expectedCurrent = 2)
+    }
+
+    "hand over when adding three new potential leaders to 3 nodes cluster" in within(30 seconds) {
+      runOn(sortedClusterRoles(2)) {
+        Cluster(system) join node(sortedClusterRoles(3)).address
+        createSingleton()
+      }
+      runOn(sortedClusterRoles(1)) {
+        Cluster(system) join node(sortedClusterRoles(4)).address
+        createSingleton()
+      }
+      runOn(sortedClusterRoles(0)) {
+        Cluster(system) join node(sortedClusterRoles(5)).address
+        createSingleton()
+      }
+
+      verify(sortedClusterRoles(0), msg = 4, expectedCurrent = 3)
+    }
+
+    "hand over when leader leaves in 6 nodes cluster " in within(20 seconds) {
+      val leaveRole = sortedClusterRoles(0)
+      val newLeaderRole = sortedClusterRoles(1)
+
+      runOn(leaveRole) {
+        Cluster(system) leave node(leaveRole).address
+      }
+
+      verify(newLeaderRole, msg = 5, expectedCurrent = 4)
+
+      runOn(leaveRole) {
+        val singleton = system.actorFor("/user/singleton")
+        watch(singleton)
+        expectMsgType[Terminated].actor must be(singleton)
+      }
+
+      enterBarrier("after-leave")
+    }
+
+    "take over when leader crashes in 5 nodes cluster" in within(35 seconds) {
+      system.eventStream.publish(Mute(EventFilter.warning(pattern = ".*received dead letter from.*")))
+      system.eventStream.publish(Mute(EventFilter.error(pattern = ".*Disassociated.*")))
+      system.eventStream.publish(Mute(EventFilter.error(pattern = ".*Association failed.*")))
+      enterBarrier("logs-muted")
+
+      crash(sortedClusterRoles(1))
+      verify(sortedClusterRoles(2), msg = 6, expectedCurrent = 0)
+    }
+
+    "take over when two leaders crash in 3 nodes cluster" in within(45 seconds) {
+      crash(sortedClusterRoles(2), sortedClusterRoles(3))
+      verify(sortedClusterRoles(4), msg = 7, expectedCurrent = 0)
+    }
+
+    "take over when leader crashes in 2 nodes cluster" in within(25 seconds) {
+      crash(sortedClusterRoles(4))
+      verify(sortedClusterRoles(5), msg = 6, expectedCurrent = 0)
+    }
+
+  }
+}
diff --git a/akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ReliableProxySpec.scala b/akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ReliableProxySpec.scala
index 934d437ed7..9ddf5f4cde 100644
--- a/akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ReliableProxySpec.scala
+++ b/akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ReliableProxySpec.scala
@@ -33,7 +33,7 @@ class ReliableProxySpec extends MultiNodeSpec(ReliableProxySpec) with STMultiNod
   import ReliableProxySpec._
   import ReliableProxy._
 
-  override def initialParticipants = 2
+  override def initialParticipants = roles.size
 
   override def afterEach {
     runOn(local) {
diff --git a/akka-docs/rst/cluster/cluster-usage-java.rst b/akka-docs/rst/cluster/cluster-usage-java.rst
index c9c158cc03..518b371f38 100644
--- a/akka-docs/rst/cluster/cluster-usage-java.rst
+++ b/akka-docs/rst/cluster/cluster-usage-java.rst
@@ -258,6 +258,17 @@ has at least the defined number of members.
 
 This callback can be used for other things than starting actors.
 
+Cluster Singleton Pattern
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
+For some use cases it is convenient and sometimes also mandatory to ensure that
+you have exactly one actor of a certain type running somewhere in the cluster.
+
+This can be implemented by subscribing to ``LeaderChanged`` events, but there are
+several corner cases to consider. Therefore, this specific use case is made easily 
+accessible by the :ref:`cluster-singleton` in the contrib module. You can use it as is, 
+or adjust to fit your specific needs. 
+
 Failure Detector
 ^^^^^^^^^^^^^^^^
 
@@ -351,8 +362,8 @@ The same type of router could also have been defined in code:
 See :ref:`cluster_configuration_java` section for further descriptions of the settings.
 
 
-Router Example
---------------
+Router Example with Remote Deployed Routees
+-------------------------------------------
 
 Let's take a look at how to use cluster aware routers.
 
@@ -416,25 +427,35 @@ service nodes and 1 client::
     -Dexec.mainClass="run-main sample.cluster.stats.japi.StatsSampleMain"
 
 
+Router Example with Lookup of Routees
+-------------------------------------
+
 The above setup is nice for this example, but we will also take a look at how to use
 a single master node that creates and deploys workers. To keep track of a single
-master we need one additional actor:
+master we use the :ref:`cluster-singleton` in the contrib module. The ``ClusterSingletonManager``
+is started on each node.
+
+.. includecode:: ../../../akka-samples/akka-sample-cluster/src/main/java/sample/cluster/stats/japi/StatsSampleOneMasterMain.java#create-singleton-manager
+
+We also need an actor on each node that keeps track of where current single master exists and
+delegates jobs to the ``StatsService``.
 
 .. includecode:: ../../../akka-samples/akka-sample-cluster/src/main/java/sample/cluster/stats/japi/StatsFacade.java#facade
 
 The ``StatsFacade`` receives text from users and delegates to the current ``StatsService``, the single
-master. It listens to cluster events to create or lookup the ``StatsService`` depending on if
-it is on the same same node or on another node. We run the master on the same node as the leader of
-the cluster members, which is nothing more than the address currently sorted first in the member ring,
-i.e. it can change when new nodes join or when current leader leaves.
+master. It listens to cluster events to lookup the ``StatsService`` on the leader node. The master runs 
+on the same node as the leader of the cluster members, which is nothing more than the address currently 
+sorted first in the member ring, i.e. it can change when new nodes join or when current leader leaves.
 
-All nodes start ``StatsFacade`` and the router is now configured like this:
+All nodes start ``StatsFacade`` and the ``ClusterSingletonManager``. The router is now configured like this:
 
 .. includecode:: ../../../akka-samples/akka-sample-cluster/src/main/java/sample/cluster/stats/japi/StatsSampleOneMasterMain.java#start-router-deploy
 
 This example is included in ``akka-samples/akka-sample-cluster`` and you can try it by copying the 
 `source <@github@/akka-samples/akka-sample-cluster>`_ to your
-maven project, defined as in :ref:`cluster_simple_example_java`.
+maven project, defined as in :ref:`cluster_simple_example_java`. Also add the `akka-contrib` dependency
+to your pom.xml.
+
 Run it by starting nodes in different terminal windows. For example, starting 3
 service nodes and 1 client::
 
@@ -453,7 +474,7 @@ service nodes and 1 client::
     -Dexec.mainClass="sample.cluster.stats.japi.StatsSampleOneMasterMain"
 
 
-.. note:: The above example, especially the last part, will be simplified when the cluster handles automatic actor partitioning.
+.. note:: The above example will be simplified when the cluster handles automatic actor partitioning.
 
 Cluster Metrics
 ^^^^^^^^^^^^^^^
diff --git a/akka-docs/rst/cluster/cluster-usage-scala.rst b/akka-docs/rst/cluster/cluster-usage-scala.rst
index 717d084d96..70d96da22d 100644
--- a/akka-docs/rst/cluster/cluster-usage-scala.rst
+++ b/akka-docs/rst/cluster/cluster-usage-scala.rst
@@ -231,6 +231,17 @@ has at least the defined number of members.
 
 This callback can be used for other things than starting actors.
 
+Cluster Singleton Pattern
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
+For some use cases it is convenient and sometimes also mandatory to ensure that
+you have exactly one actor of a certain type running somewhere in the cluster.
+
+This can be implemented by subscribing to ``LeaderChanged`` events, but there are
+several corner cases to consider. Therefore, this specific use case is made easily 
+accessible by the :ref:`cluster-singleton` in the contrib module. You can use it as is, 
+or adjust to fit your specific needs. 
+
 Failure Detector
 ^^^^^^^^^^^^^^^^
 
@@ -326,8 +337,8 @@ The same type of router could also have been defined in code:
 See :ref:`cluster_configuration_scala` section for further descriptions of the settings.
 
 
-Router Example
---------------
+Router Example with Remote Deployed Routees
+-------------------------------------------
 
 Let's take a look at how to use cluster aware routers.
 
@@ -384,19 +395,27 @@ service nodes and 1 client::
 
   run-main sample.cluster.stats.StatsSample
 
+Router Example with Lookup of Routees
+-------------------------------------
+
 The above setup is nice for this example, but we will also take a look at how to use
 a single master node that creates and deploys workers. To keep track of a single
-master we need one additional actor:
+master we use the :ref:`cluster-singleton` in the contrib module. The ``ClusterSingletonManager``
+is started on each node.
+
+.. includecode:: ../../../akka-samples/akka-sample-cluster/src/main/scala/sample/cluster/stats/StatsSample.scala#create-singleton-manager
+
+We also need an actor on each node that keeps track of where current single master exists and
+delegates jobs to the ``StatsService``.
 
 .. includecode:: ../../../akka-samples/akka-sample-cluster/src/main/scala/sample/cluster/stats/StatsSample.scala#facade
 
 The ``StatsFacade`` receives text from users and delegates to the current ``StatsService``, the single
-master. It listens to cluster events to create or lookup the ``StatsService`` depending on if
-it is on the same same node or on another node. We run the master on the same node as the leader of
-the cluster members, which is nothing more than the address currently sorted first in the member ring,
-i.e. it can change when new nodes join or when current leader leaves.
+master. It listens to cluster events to lookup the ``StatsService`` on the leader node. The master runs 
+on the same node as the leader of the cluster members, which is nothing more than the address currently 
+sorted first in the member ring, i.e. it can change when new nodes join or when current leader leaves.
 
-All nodes start ``StatsFacade`` and the router is now configured like this:
+All nodes start ``StatsFacade`` and the ``ClusterSingletonManager``. The router is now configured like this:
 
 .. includecode:: ../../../akka-samples/akka-sample-cluster/src/main/scala/sample/cluster/stats/StatsSample.scala#start-router-deploy
 
@@ -413,7 +432,7 @@ service nodes and 1 client::
 
   run-main sample.cluster.stats.StatsSampleOneMaster
 
-.. note:: The above example, especially the last part, will be simplified when the cluster handles automatic actor partitioning.
+.. note:: The above example will be simplified when the cluster handles automatic actor partitioning.
 
 
 Cluster Metrics
diff --git a/akka-samples/akka-sample-cluster/pom.xml b/akka-samples/akka-sample-cluster/pom.xml
index 78cdd9ca2b..22f43b33b8 100644
--- a/akka-samples/akka-sample-cluster/pom.xml
+++ b/akka-samples/akka-sample-cluster/pom.xml
@@ -15,8 +15,13 @@
   <dependencies>
     <dependency>
       <groupId>com.typesafe.akka</groupId>
-      <artifactId>akka-cluster-experimental_2.10.0-RC1</artifactId>
-      <version>2.1-20121016-001042</version>
+      <artifactId>akka-cluster-experimental_2.10.0</artifactId>
+      <version>2.2-20130122-001107</version>
+    </dependency>
+    <dependency>
+      <groupId>com.typesafe.akka</groupId>
+      <artifactId>akka-contrib_2.10.0</artifactId>
+      <version>2.2-20130122-001107</version>
     </dependency>
   </dependencies>
   <repositories>
diff --git a/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/factorial/japi/FactorialBackendMain.java b/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/factorial/japi/FactorialBackendMain.java
index 8acb6aad26..7989432a1d 100644
--- a/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/factorial/japi/FactorialBackendMain.java
+++ b/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/factorial/japi/FactorialBackendMain.java
@@ -10,7 +10,7 @@ public class FactorialBackendMain {
     // Override the configuration of the port
     // when specified as program argument
     if (args.length > 0)
-      System.setProperty("akka.remote.netty.port", args[0]);
+      System.setProperty("akka.remoting.transports.tcp.port", args[0]);
 
     ActorSystem system = ActorSystem.create("ClusterSystem", ConfigFactory.load("factorial"));
 
diff --git a/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/simple/japi/SimpleClusterApp.java b/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/simple/japi/SimpleClusterApp.java
index b216e174fa..6d76dcfe5c 100644
--- a/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/simple/japi/SimpleClusterApp.java
+++ b/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/simple/japi/SimpleClusterApp.java
@@ -12,7 +12,7 @@ public class SimpleClusterApp {
     // Override the configuration of the port
     // when specified as program argument
     if (args.length > 0)
-      System.setProperty("akka.remote.netty.port", args[0]);
+      System.setProperty("akka.remoting.transports.tcp.port", args[0]);
 
     // Create an Akka system
     ActorSystem system = ActorSystem.create("ClusterSystem");
diff --git a/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/stats/japi/StatsFacade.java b/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/stats/japi/StatsFacade.java
index 15a271027c..9b311835d3 100644
--- a/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/stats/japi/StatsFacade.java
+++ b/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/stats/japi/StatsFacade.java
@@ -5,13 +5,11 @@ import sample.cluster.stats.japi.StatsMessages.JobFailed;
 import sample.cluster.stats.japi.StatsMessages.StatsJob;
 import akka.actor.ActorRef;
 import akka.actor.Address;
-import akka.actor.Props;
 import akka.actor.UntypedActor;
 import akka.dispatch.Recover;
 import akka.cluster.Cluster;
 import akka.cluster.ClusterEvent.CurrentClusterState;
 import akka.cluster.ClusterEvent.LeaderChanged;
-import akka.cluster.ClusterEvent.MemberEvent;
 import akka.event.Logging;
 import akka.event.LoggingAdapter;
 import akka.util.Timeout;
@@ -25,8 +23,7 @@ public class StatsFacade extends UntypedActor {
   LoggingAdapter log = Logging.getLogger(getContext().system(), this);
   Cluster cluster = Cluster.get(getContext().system());
 
-  ActorRef currentMaster = null;
-  boolean currentMasterCreatedByMe = false;
+  Address currentMaster = null;
 
   //subscribe to cluster changes, MemberEvent
   @Override
@@ -43,54 +40,33 @@ public class StatsFacade extends UntypedActor {
   @Override
   public void onReceive(Object message) {
     if (message instanceof StatsJob && currentMaster == null) {
-      getSender()
-          .tell(new JobFailed("Service unavailable, try again later"),
-              getSelf());
+      getSender().tell(new JobFailed("Service unavailable, try again later"),
+          getSelf());
 
     } else if (message instanceof StatsJob) {
       StatsJob job = (StatsJob) message;
-      Future<Object> f = ask(currentMaster, job, new Timeout(5, SECONDS)).
-        recover(new Recover<Object>() {
-          public Object recover(Throwable t) {
-            return new JobFailed("Service unavailable, try again later");
-          }
-        }, getContext().dispatcher());
+      ActorRef service = getContext().actorFor(currentMaster +
+          "/user/singleton/statsService");
+      Future<Object> f = ask(service, job, new Timeout(5, SECONDS)).recover(
+          new Recover<Object>() {
+            public Object recover(Throwable t) {
+              return new JobFailed("Service unavailable, try again later");
+            }
+          }, getContext().dispatcher());
       pipe(f, getContext().dispatcher()).to(getSender());
 
     } else if (message instanceof CurrentClusterState) {
       CurrentClusterState state = (CurrentClusterState) message;
-      updateCurrentMaster(state.getLeader());
+      currentMaster = state.getLeader();
 
     } else if (message instanceof LeaderChanged) {
       LeaderChanged leaderChanged = (LeaderChanged) message;
-      updateCurrentMaster(leaderChanged.getLeader());
+      currentMaster = leaderChanged.getLeader();
 
     } else {
       unhandled(message);
     }
   }
 
-  void updateCurrentMaster(Address leaderAddress) {
-    if (leaderAddress == null)
-      return;
-
-    if (leaderAddress.equals(cluster.selfAddress())) {
-      if (!currentMasterCreatedByMe) {
-        log.info("Creating new statsService master at [{}]", leaderAddress);
-        currentMaster = getContext().actorOf(
-            new Props(StatsService.class), "statsService");
-        currentMasterCreatedByMe = true;
-      }
-    } else {
-      if (currentMasterCreatedByMe) {
-        getContext().stop(currentMaster);
-      }
-      log.info("Using statsService master at [{}]", leaderAddress);
-      currentMaster = getContext().actorFor(
-          getSelf().path().toStringWithAddress(leaderAddress)
-              + "/statsService");
-      currentMasterCreatedByMe = false;
-    }
-  }
 }
 //#facade
diff --git a/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/stats/japi/StatsSampleMain.java b/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/stats/japi/StatsSampleMain.java
index cf7387b6fd..d5f2a8c4c3 100644
--- a/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/stats/japi/StatsSampleMain.java
+++ b/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/stats/japi/StatsSampleMain.java
@@ -11,7 +11,7 @@ public class StatsSampleMain {
     // Override the configuration of the port
     // when specified as program argument
     if (args.length > 0)
-      System.setProperty("akka.remote.netty.port", args[0]);
+      System.setProperty("akka.remoting.transports.tcp.port", args[0]);
 
     //#start-router-lookup
     ActorSystem system = ActorSystem.create("ClusterSystem",
diff --git a/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/stats/japi/StatsSampleOneMasterClientMain.java b/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/stats/japi/StatsSampleOneMasterClientMain.java
index 7971d357d8..3c0101fbb6 100644
--- a/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/stats/japi/StatsSampleOneMasterClientMain.java
+++ b/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/stats/japi/StatsSampleOneMasterClientMain.java
@@ -1,14 +1,32 @@
 package sample.cluster.stats.japi;
 
 import akka.actor.ActorSystem;
+import akka.actor.PoisonPill;
 import akka.actor.Props;
 import akka.actor.UntypedActor;
 import akka.actor.UntypedActorFactory;
+import akka.contrib.pattern.ClusterSingletonManager;
+import akka.contrib.pattern.ClusterSingletonPropsFactory;
 
 public class StatsSampleOneMasterClientMain {
 
   public static void main(String[] args) throws Exception {
     ActorSystem system = ActorSystem.create("ClusterSystem");
+
+    // the client is also part of the cluster
+    system.actorOf(new Props(new UntypedActorFactory() {
+      @Override
+      public ClusterSingletonManager create() {
+        return new ClusterSingletonManager("statsService", PoisonPill.getInstance(),
+            new ClusterSingletonPropsFactory() {
+              @Override
+              public Props create(Object handOverData) {
+                return new Props(StatsService.class);
+              }
+            });
+      }
+    }), "singleton");
+
     system.actorOf(new Props(new UntypedActorFactory() {
       @Override
       public UntypedActor create() {
diff --git a/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/stats/japi/StatsSampleOneMasterMain.java b/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/stats/japi/StatsSampleOneMasterMain.java
index 9a85c58cb5..2a496770ae 100644
--- a/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/stats/japi/StatsSampleOneMasterMain.java
+++ b/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/stats/japi/StatsSampleOneMasterMain.java
@@ -1,7 +1,11 @@
 package sample.cluster.stats.japi;
 
 import akka.actor.ActorSystem;
+import akka.actor.PoisonPill;
 import akka.actor.Props;
+import akka.actor.UntypedActorFactory;
+import akka.contrib.pattern.ClusterSingletonManager;
+import akka.contrib.pattern.ClusterSingletonPropsFactory;
 
 import com.typesafe.config.ConfigFactory;
 
@@ -11,13 +15,13 @@ public class StatsSampleOneMasterMain {
     // Override the configuration of the port
     // when specified as program argument
     if (args.length > 0)
-      System.setProperty("akka.remote.netty.port", args[0]);
+      System.setProperty("akka.remoting.transports.tcp.port", args[0]);
 
     //#start-router-deploy
     ActorSystem system = ActorSystem.create("ClusterSystem",
       ConfigFactory.parseString(
         "akka.actor.deployment {                       \n" +
-        "  /statsFacade/statsService/workerRouter {    \n" +
+        "  /singleton/statsService/workerRouter {      \n" +
         "    router = consistent-hashing               \n" +
         "    nr-of-instances = 100                     \n" +
         "    cluster {                                 \n" +
@@ -28,10 +32,24 @@ public class StatsSampleOneMasterMain {
         "  }                                           \n" +
         "}                                             \n")
         .withFallback(ConfigFactory.load()));
-
-    system.actorOf(new Props(StatsFacade.class), "statsFacade");
     //#start-router-deploy
 
-  }
+    //#create-singleton-manager
+    system.actorOf(new Props(new UntypedActorFactory() {
+      @Override
+      public ClusterSingletonManager create() {
+        return new ClusterSingletonManager("statsService", PoisonPill.getInstance(),
+            new ClusterSingletonPropsFactory() {
+              @Override
+              public Props create(Object handOverData) {
+                return new Props(StatsService.class);
+              }
+            });
+      }
+    }), "singleton");
+    //#create-singleton-manager
 
+    system.actorOf(new Props(StatsFacade.class), "statsFacade");
+
+  }
 }
diff --git a/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/transformation/japi/TransformationBackendMain.java b/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/transformation/japi/TransformationBackendMain.java
index 42fa8e6c80..4973b7a70b 100644
--- a/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/transformation/japi/TransformationBackendMain.java
+++ b/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/transformation/japi/TransformationBackendMain.java
@@ -9,7 +9,7 @@ public class TransformationBackendMain {
     // Override the configuration of the port
     // when specified as program argument
     if (args.length > 0)
-      System.setProperty("akka.remote.netty.port", args[0]);
+      System.setProperty("akka.remoting.transports.tcp.port", args[0]);
 
     ActorSystem system = ActorSystem.create("ClusterSystem");
 
diff --git a/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/transformation/japi/TransformationFrontendMain.java b/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/transformation/japi/TransformationFrontendMain.java
index 741d9452be..1f5387a942 100644
--- a/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/transformation/japi/TransformationFrontendMain.java
+++ b/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/transformation/japi/TransformationFrontendMain.java
@@ -18,7 +18,7 @@ public class TransformationFrontendMain {
     // Override the configuration of the port
     // when specified as program argument
     if (args.length > 0)
-      System.setProperty("akka.remote.netty.port", args[0]);
+      System.setProperty("akka.remoting.transports.tcp.port", args[0]);
 
     ActorSystem system = ActorSystem.create("ClusterSystem");
 
diff --git a/akka-samples/akka-sample-cluster/src/main/resources/application.conf b/akka-samples/akka-sample-cluster/src/main/resources/application.conf
index 507191b79c..552c44fdbc 100644
--- a/akka-samples/akka-sample-cluster/src/main/resources/application.conf
+++ b/akka-samples/akka-sample-cluster/src/main/resources/application.conf
@@ -1,12 +1,11 @@
 # //#cluster
-akka {  
+akka {
   actor {
     provider = "akka.cluster.ClusterActorRefProvider"
   }
-  remote {
-    transport = "akka.remote.netty.NettyRemoteTransport"
+  remoting {
     log-remote-lifecycle-events = off
-    netty {
+    transports.tcp {
       hostname = "127.0.0.1"
       port = 0
     }
@@ -14,8 +13,8 @@ akka {
 
   cluster {
     seed-nodes = [
-      "akka://ClusterSystem@127.0.0.1:2551", 
-      "akka://ClusterSystem@127.0.0.1:2552"]
+      "tcp.akka://ClusterSystem@127.0.0.1:2551",
+      "tcp.akka://ClusterSystem@127.0.0.1:2552"]
 
     auto-down = on
   }
diff --git a/akka-samples/akka-sample-cluster/src/main/scala/sample/cluster/factorial/FactorialSample.scala b/akka-samples/akka-sample-cluster/src/main/scala/sample/cluster/factorial/FactorialSample.scala
index d75dcb96e1..03a655209e 100644
--- a/akka-samples/akka-sample-cluster/src/main/scala/sample/cluster/factorial/FactorialSample.scala
+++ b/akka-samples/akka-sample-cluster/src/main/scala/sample/cluster/factorial/FactorialSample.scala
@@ -60,7 +60,7 @@ object FactorialBackend {
   def main(args: Array[String]): Unit = {
     // Override the configuration of the port
     // when specified as program argument
-    if (args.nonEmpty) System.setProperty("akka.remote.netty.port", args(0))
+    if (args.nonEmpty) System.setProperty("akka.remoting.transports.tcp.port", args(0))
 
     val system = ActorSystem("ClusterSystem", ConfigFactory.load("factorial"))
     system.actorOf(Props[FactorialBackend], name = "factorialBackend")
diff --git a/akka-samples/akka-sample-cluster/src/main/scala/sample/cluster/simple/SimpleClusterApp.scala b/akka-samples/akka-sample-cluster/src/main/scala/sample/cluster/simple/SimpleClusterApp.scala
index 6bdec7cfba..c0a55a737d 100644
--- a/akka-samples/akka-sample-cluster/src/main/scala/sample/cluster/simple/SimpleClusterApp.scala
+++ b/akka-samples/akka-sample-cluster/src/main/scala/sample/cluster/simple/SimpleClusterApp.scala
@@ -10,7 +10,7 @@ object SimpleClusterApp {
 
     // Override the configuration of the port 
     // when specified as program argument
-    if (args.nonEmpty) System.setProperty("akka.remote.netty.port", args(0))
+    if (args.nonEmpty) System.setProperty("akka.remoting.transports.tcp.port", args(0))
 
     // Create an Akka system
     val system = ActorSystem("ClusterSystem")
diff --git a/akka-samples/akka-sample-cluster/src/main/scala/sample/cluster/stats/StatsSample.scala b/akka-samples/akka-sample-cluster/src/main/scala/sample/cluster/stats/StatsSample.scala
index de7eff456c..0df220b567 100644
--- a/akka-samples/akka-sample-cluster/src/main/scala/sample/cluster/stats/StatsSample.scala
+++ b/akka-samples/akka-sample-cluster/src/main/scala/sample/cluster/stats/StatsSample.scala
@@ -10,6 +10,7 @@ import akka.actor.ActorLogging
 import akka.actor.ActorRef
 import akka.actor.ActorSystem
 import akka.actor.Address
+import akka.actor.PoisonPill
 import akka.actor.Props
 import akka.actor.ReceiveTimeout
 import akka.actor.RelativeActorPath
@@ -17,6 +18,7 @@ import akka.actor.RootActorPath
 import akka.cluster.Cluster
 import akka.cluster.ClusterEvent._
 import akka.cluster.MemberStatus
+import akka.contrib.pattern.ClusterSingletonManager
 import akka.routing.FromConfig
 import akka.routing.ConsistentHashingRouter.ConsistentHashableEnvelope
 import akka.pattern.ask
@@ -91,8 +93,7 @@ class StatsFacade extends Actor with ActorLogging {
   import context.dispatcher
   val cluster = Cluster(context.system)
 
-  var currentMaster: Option[ActorRef] = None
-  var currentMasterCreatedByMe = false
+  var currentMaster: Option[Address] = None
 
   // subscribe to cluster changes, LeaderChanged
   // re-subscribe when restart
@@ -104,33 +105,15 @@ class StatsFacade extends Actor with ActorLogging {
       sender ! JobFailed("Service unavailable, try again later")
     case job: StatsJob ⇒
       implicit val timeout = Timeout(5.seconds)
-      currentMaster foreach {
-        _ ? job recover {
+      currentMaster foreach { address ⇒
+        val service = context.actorFor(RootActorPath(address) /
+          "user" / "singleton" / "statsService")
+        service ? job recover {
           case _ ⇒ JobFailed("Service unavailable, try again later")
         } pipeTo sender
       }
-    case state: CurrentClusterState ⇒
-      state.leader foreach updateCurrentMaster
-    case LeaderChanged(Some(leaderAddress)) ⇒
-      updateCurrentMaster(leaderAddress)
-  }
-
-  def updateCurrentMaster(leaderAddress: Address): Unit = {
-    if (leaderAddress == cluster.selfAddress) {
-      if (!currentMasterCreatedByMe) {
-        log.info("Creating new statsService master at [{}]", leaderAddress)
-        currentMaster = Some(context.actorOf(Props[StatsService],
-          name = "statsService"))
-        currentMasterCreatedByMe = true
-      }
-    } else {
-      if (currentMasterCreatedByMe)
-        currentMaster foreach { context.stop(_) }
-      log.info("Using statsService master at [{}]", leaderAddress)
-      currentMaster = Some(context.actorFor(
-        self.path.toStringWithAddress(leaderAddress) + "/statsService"))
-      currentMasterCreatedByMe = false
-    }
+    case state: CurrentClusterState ⇒ currentMaster = state.leader
+    case LeaderChanged(leader)      ⇒ currentMaster = leader
   }
 
 }
@@ -140,7 +123,7 @@ object StatsSample {
   def main(args: Array[String]): Unit = {
     // Override the configuration of the port
     // when specified as program argument
-    if (args.nonEmpty) System.setProperty("akka.remote.netty.port", args(0))
+    if (args.nonEmpty) System.setProperty("akka.remoting.transports.tcp.port", args(0))
 
     //#start-router-lookup
     val system = ActorSystem("ClusterSystem", ConfigFactory.parseString("""
@@ -168,12 +151,12 @@ object StatsSampleOneMaster {
   def main(args: Array[String]): Unit = {
     // Override the configuration of the port
     // when specified as program argument
-    if (args.nonEmpty) System.setProperty("akka.remote.netty.port", args(0))
+    if (args.nonEmpty) System.setProperty("akka.remoting.transports.tcp.port", args(0))
 
     //#start-router-deploy
     val system = ActorSystem("ClusterSystem", ConfigFactory.parseString("""
       akka.actor.deployment {
-        /statsFacade/statsService/workerRouter {
+        /singleton/statsService/workerRouter {
             router = consistent-hashing
             nr-of-instances = 100
             cluster {
@@ -186,6 +169,11 @@ object StatsSampleOneMaster {
       """).withFallback(ConfigFactory.load()))
     //#start-router-deploy
 
+    //#create-singleton-manager
+    system.actorOf(Props(new ClusterSingletonManager(
+      singletonProps = _ ⇒ Props[StatsService], singletonName = "statsService",
+      terminationMessage = PoisonPill)), name = "singleton")
+    //#create-singleton-manager
     system.actorOf(Props[StatsFacade], name = "statsFacade")
   }
 }
@@ -200,6 +188,12 @@ object StatsSampleClient {
 object StatsSampleOneMasterClient {
   def main(args: Array[String]): Unit = {
     val system = ActorSystem("ClusterSystem")
+
+    // the client is also part of the cluster
+    system.actorOf(Props(new ClusterSingletonManager(
+      singletonProps = _ ⇒ Props[StatsService], singletonName = "statsService",
+      terminationMessage = PoisonPill)), name = "singleton")
+
     system.actorOf(Props(new StatsSampleClient("/user/statsFacade")), "client")
   }
 }
diff --git a/akka-samples/akka-sample-cluster/src/main/scala/sample/cluster/transformation/TransformationSample.scala b/akka-samples/akka-sample-cluster/src/main/scala/sample/cluster/transformation/TransformationSample.scala
index 4fc802a626..28c19e1bdc 100644
--- a/akka-samples/akka-sample-cluster/src/main/scala/sample/cluster/transformation/TransformationSample.scala
+++ b/akka-samples/akka-sample-cluster/src/main/scala/sample/cluster/transformation/TransformationSample.scala
@@ -30,7 +30,7 @@ object TransformationFrontend {
   def main(args: Array[String]): Unit = {
     // Override the configuration of the port
     // when specified as program argument
-    if (args.nonEmpty) System.setProperty("akka.remote.netty.port", args(0))
+    if (args.nonEmpty) System.setProperty("akka.remoting.transports.tcp.port", args(0))
 
     val system = ActorSystem("ClusterSystem")
     val frontend = system.actorOf(Props[TransformationFrontend], name = "frontend")
@@ -77,7 +77,7 @@ object TransformationBackend {
   def main(args: Array[String]): Unit = {
     // Override the configuration of the port
     // when specified as program argument
-    if (args.nonEmpty) System.setProperty("akka.remote.netty.port", args(0))
+    if (args.nonEmpty) System.setProperty("akka.remoting.transports.tcp.port", args(0))
 
     val system = ActorSystem("ClusterSystem")
     system.actorOf(Props[TransformationBackend], name = "backend")
diff --git a/akka-samples/akka-sample-cluster/src/multi-jvm/scala/sample/cluster/stats/StatsSampleSingleMasterSpec.scala b/akka-samples/akka-sample-cluster/src/multi-jvm/scala/sample/cluster/stats/StatsSampleSingleMasterSpec.scala
index 5f1c9728a3..e03c631f2e 100644
--- a/akka-samples/akka-sample-cluster/src/multi-jvm/scala/sample/cluster/stats/StatsSampleSingleMasterSpec.scala
+++ b/akka-samples/akka-sample-cluster/src/multi-jvm/scala/sample/cluster/stats/StatsSampleSingleMasterSpec.scala
@@ -2,15 +2,14 @@ package sample.cluster.stats
 
 import language.postfixOps
 import scala.concurrent.duration._
-
 import com.typesafe.config.ConfigFactory
-
 import org.scalatest.BeforeAndAfterAll
 import org.scalatest.WordSpec
 import org.scalatest.matchers.MustMatchers
-
+import akka.actor.PoisonPill
 import akka.actor.Props
 import akka.actor.RootActorPath
+import akka.contrib.pattern.ClusterSingletonManager
 import akka.cluster.Cluster
 import akka.cluster.Member
 import akka.cluster.MemberStatus
@@ -37,7 +36,7 @@ object StatsSampleSingleMasterSpecConfig extends MultiNodeConfig {
     akka.cluster.metrics.collector-class = akka.cluster.JmxMetricsCollector
     #//#router-deploy-config
     akka.actor.deployment {
-      /statsFacade/statsService/workerRouter {
+      /singleton/statsService/workerRouter {
           router = consistent-hashing
           nr-of-instances = 100
           cluster {
@@ -81,13 +80,17 @@ abstract class StatsSampleSingleMasterSpec extends MultiNodeSpec(StatsSampleSing
         MemberUp(Member(node(third).address, MemberStatus.Up)))
 
       Cluster(system).unsubscribe(testActor)
-      
+
+      system.actorOf(Props(new ClusterSingletonManager(
+        singletonProps = _ ⇒ Props[StatsService], singletonName = "statsService",
+        terminationMessage = PoisonPill)), name = "singleton")
+
       system.actorOf(Props[StatsFacade], "statsFacade")
 
       testConductor.enter("all-up")
     }
 
-    "show usage of the statsFacade" in within(20 seconds) {
+    "show usage of the statsFacade" in within(40 seconds) {
       val facade = system.actorFor(RootActorPath(node(third).address) / "user" / "statsFacade")
 
       // eventually the service should be ok,
diff --git a/akka-samples/akka-sample-cluster/src/multi-jvm/scala/sample/cluster/stats/japi/StatsSampleSingleMasterJapiSpec.scala b/akka-samples/akka-sample-cluster/src/multi-jvm/scala/sample/cluster/stats/japi/StatsSampleSingleMasterJapiSpec.scala
index ca69c1ae6c..3393db1a5f 100644
--- a/akka-samples/akka-sample-cluster/src/multi-jvm/scala/sample/cluster/stats/japi/StatsSampleSingleMasterJapiSpec.scala
+++ b/akka-samples/akka-sample-cluster/src/multi-jvm/scala/sample/cluster/stats/japi/StatsSampleSingleMasterJapiSpec.scala
@@ -2,13 +2,11 @@ package sample.cluster.stats.japi
 
 import language.postfixOps
 import scala.concurrent.duration._
-
 import com.typesafe.config.ConfigFactory
-
 import org.scalatest.BeforeAndAfterAll
 import org.scalatest.WordSpec
 import org.scalatest.matchers.MustMatchers
-
+import akka.actor.PoisonPill
 import akka.actor.Props
 import akka.actor.RootActorPath
 import akka.cluster.Cluster
@@ -16,10 +14,12 @@ import akka.cluster.Member
 import akka.cluster.MemberStatus
 import akka.cluster.ClusterEvent.CurrentClusterState
 import akka.cluster.ClusterEvent.MemberUp
+import akka.contrib.pattern.ClusterSingletonManager
 import akka.remote.testkit.MultiNodeConfig
 import akka.remote.testkit.MultiNodeSpec
 import akka.testkit.ImplicitSender
 import sample.cluster.stats.japi.StatsMessages._
+import akka.contrib.pattern.ClusterSingletonPropsFactory
 
 object StatsSampleSingleMasterJapiSpecConfig extends MultiNodeConfig {
   // register the named roles (nodes) of the test
@@ -37,7 +37,7 @@ object StatsSampleSingleMasterJapiSpecConfig extends MultiNodeConfig {
     # don't use sigar for tests, native lib not in path
     akka.cluster.metrics.collector-class = akka.cluster.JmxMetricsCollector
     akka.actor.deployment {
-      /statsFacade/statsService/workerRouter {
+      /singleton/statsService/workerRouter {
           router = consistent-hashing
           nr-of-instances = 100
           cluster {
@@ -81,12 +81,19 @@ abstract class StatsSampleSingleMasterJapiSpec extends MultiNodeSpec(StatsSample
 
       Cluster(system).unsubscribe(testActor)
 
+      system.actorOf(Props(new ClusterSingletonManager(
+        singletonName = "statsService",
+        terminationMessage = PoisonPill,
+        singletonPropsFactory = new ClusterSingletonPropsFactory {
+          def create(handOverData: Any) = Props[StatsService]
+        })), name = "singleton")
+
       system.actorOf(Props[StatsFacade], "statsFacade")
 
       testConductor.enter("all-up")
     }
 
-    "show usage of the statsFacade" in within(20 seconds) {
+    "show usage of the statsFacade" in within(40 seconds) {
       val facade = system.actorFor(RootActorPath(node(third).address) / "user" / "statsFacade")
 
       // eventually the service should be ok,
diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index 23b11e14f8..3859afcece 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -356,7 +356,7 @@ object AkkaBuild extends Build {
   lazy val clusterSample = Project(
     id = "akka-sample-cluster-experimental",
     base = file("akka-samples/akka-sample-cluster"),
-    dependencies = Seq(cluster, remoteTests % "test", testkit % "test"),
+    dependencies = Seq(cluster, contrib, remoteTests % "test", testkit % "test"),
     settings = sampleSettings ++ multiJvmSettings ++ experimentalSettings ++ Seq(
       // sigar is in Typesafe repo
       resolvers += "Typesafe Repo" at "http://repo.typesafe.com/typesafe/releases/",
@@ -419,7 +419,7 @@ object AkkaBuild extends Build {
   lazy val contrib = Project(
     id = "akka-contrib",
     base = file("akka-contrib"),
-    dependencies = Seq(remote, remoteTests % "compile;test->test"),
+    dependencies = Seq(remote, remoteTests % "compile;test->test", cluster),
     settings = defaultSettings ++ multiJvmSettings ++ Seq(
       libraryDependencies ++= Dependencies.contrib,
       testOptions += Tests.Argument(TestFrameworks.JUnit, "-v"),

From ce014ece3568938b2036c4ccfd21b92faba69607 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Endre=20S=C3=A1ndor=20Varga?= <vendre@hit.bme.hu>
Date: Mon, 14 Jan 2013 15:09:58 +0100
Subject: [PATCH 094/122] Updated samples to run with the new remoting #2906

---
 .../factorial/japi/FactorialBackendMain.java  |  2 +-
 .../cluster/simple/japi/SimpleClusterApp.java |  2 +-
 .../cluster/stats/japi/StatsSampleMain.java   |  2 +-
 .../stats/japi/StatsSampleOneMasterMain.java  |  2 +-
 .../japi/TransformationBackendMain.java       |  2 +-
 .../japi/TransformationFrontendMain.java      |  2 +-
 .../src/main/resources/application.conf       |  8 ++--
 .../cluster/factorial/FactorialSample.scala   |  2 +-
 .../cluster/simple/SimpleClusterApp.scala     |  2 +-
 .../sample/cluster/stats/StatsSample.scala    |  4 +-
 .../transformation/TransformationSample.scala |  4 +-
 akka-samples/akka-sample-remote/README.rst    | 48 ++++++++++---------
 .../calculator/java/JLookupApplication.java   |  2 +-
 .../src/main/resources/application.conf       |  8 ++--
 .../src/main/resources/common.conf            |  2 +-
 .../remote/calculator/LookupApplication.scala |  2 +-
 16 files changed, 49 insertions(+), 45 deletions(-)

diff --git a/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/factorial/japi/FactorialBackendMain.java b/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/factorial/japi/FactorialBackendMain.java
index 7989432a1d..14bf75091a 100644
--- a/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/factorial/japi/FactorialBackendMain.java
+++ b/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/factorial/japi/FactorialBackendMain.java
@@ -10,7 +10,7 @@ public class FactorialBackendMain {
     // Override the configuration of the port
     // when specified as program argument
     if (args.length > 0)
-      System.setProperty("akka.remoting.transports.tcp.port", args[0]);
+      System.setProperty("akka.remote.netty.tcp.port", args[0]);
 
     ActorSystem system = ActorSystem.create("ClusterSystem", ConfigFactory.load("factorial"));
 
diff --git a/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/simple/japi/SimpleClusterApp.java b/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/simple/japi/SimpleClusterApp.java
index 6d76dcfe5c..96d467b2b2 100644
--- a/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/simple/japi/SimpleClusterApp.java
+++ b/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/simple/japi/SimpleClusterApp.java
@@ -12,7 +12,7 @@ public class SimpleClusterApp {
     // Override the configuration of the port
     // when specified as program argument
     if (args.length > 0)
-      System.setProperty("akka.remoting.transports.tcp.port", args[0]);
+      System.setProperty("akka.remote.netty.tcp.port", args[0]);
 
     // Create an Akka system
     ActorSystem system = ActorSystem.create("ClusterSystem");
diff --git a/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/stats/japi/StatsSampleMain.java b/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/stats/japi/StatsSampleMain.java
index d5f2a8c4c3..9ca02ad644 100644
--- a/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/stats/japi/StatsSampleMain.java
+++ b/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/stats/japi/StatsSampleMain.java
@@ -11,7 +11,7 @@ public class StatsSampleMain {
     // Override the configuration of the port
     // when specified as program argument
     if (args.length > 0)
-      System.setProperty("akka.remoting.transports.tcp.port", args[0]);
+      System.setProperty("akka.remote.netty.tcp.port", args[0]);
 
     //#start-router-lookup
     ActorSystem system = ActorSystem.create("ClusterSystem",
diff --git a/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/stats/japi/StatsSampleOneMasterMain.java b/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/stats/japi/StatsSampleOneMasterMain.java
index 2a496770ae..aeed8b133f 100644
--- a/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/stats/japi/StatsSampleOneMasterMain.java
+++ b/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/stats/japi/StatsSampleOneMasterMain.java
@@ -15,7 +15,7 @@ public class StatsSampleOneMasterMain {
     // Override the configuration of the port
     // when specified as program argument
     if (args.length > 0)
-      System.setProperty("akka.remoting.transports.tcp.port", args[0]);
+      System.setProperty("akka.remote.netty.tcp.port", args[0]);
 
     //#start-router-deploy
     ActorSystem system = ActorSystem.create("ClusterSystem",
diff --git a/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/transformation/japi/TransformationBackendMain.java b/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/transformation/japi/TransformationBackendMain.java
index 4973b7a70b..dea1cff39d 100644
--- a/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/transformation/japi/TransformationBackendMain.java
+++ b/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/transformation/japi/TransformationBackendMain.java
@@ -9,7 +9,7 @@ public class TransformationBackendMain {
     // Override the configuration of the port
     // when specified as program argument
     if (args.length > 0)
-      System.setProperty("akka.remoting.transports.tcp.port", args[0]);
+      System.setProperty("akka.remote.netty.tcp.port", args[0]);
 
     ActorSystem system = ActorSystem.create("ClusterSystem");
 
diff --git a/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/transformation/japi/TransformationFrontendMain.java b/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/transformation/japi/TransformationFrontendMain.java
index 1f5387a942..6037d928a5 100644
--- a/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/transformation/japi/TransformationFrontendMain.java
+++ b/akka-samples/akka-sample-cluster/src/main/java/sample/cluster/transformation/japi/TransformationFrontendMain.java
@@ -18,7 +18,7 @@ public class TransformationFrontendMain {
     // Override the configuration of the port
     // when specified as program argument
     if (args.length > 0)
-      System.setProperty("akka.remoting.transports.tcp.port", args[0]);
+      System.setProperty("akka.remote.netty.tcp.port", args[0]);
 
     ActorSystem system = ActorSystem.create("ClusterSystem");
 
diff --git a/akka-samples/akka-sample-cluster/src/main/resources/application.conf b/akka-samples/akka-sample-cluster/src/main/resources/application.conf
index 552c44fdbc..b67eeac829 100644
--- a/akka-samples/akka-sample-cluster/src/main/resources/application.conf
+++ b/akka-samples/akka-sample-cluster/src/main/resources/application.conf
@@ -3,9 +3,9 @@ akka {
   actor {
     provider = "akka.cluster.ClusterActorRefProvider"
   }
-  remoting {
+  remote {
     log-remote-lifecycle-events = off
-    transports.tcp {
+    netty.tcp {
       hostname = "127.0.0.1"
       port = 0
     }
@@ -13,8 +13,8 @@ akka {
 
   cluster {
     seed-nodes = [
-      "tcp.akka://ClusterSystem@127.0.0.1:2551",
-      "tcp.akka://ClusterSystem@127.0.0.1:2552"]
+      "akka.tcp://ClusterSystem@127.0.0.1:2551",
+      "akka.tcp://ClusterSystem@127.0.0.1:2552"]
 
     auto-down = on
   }
diff --git a/akka-samples/akka-sample-cluster/src/main/scala/sample/cluster/factorial/FactorialSample.scala b/akka-samples/akka-sample-cluster/src/main/scala/sample/cluster/factorial/FactorialSample.scala
index 03a655209e..15e5bfa21f 100644
--- a/akka-samples/akka-sample-cluster/src/main/scala/sample/cluster/factorial/FactorialSample.scala
+++ b/akka-samples/akka-sample-cluster/src/main/scala/sample/cluster/factorial/FactorialSample.scala
@@ -60,7 +60,7 @@ object FactorialBackend {
   def main(args: Array[String]): Unit = {
     // Override the configuration of the port
     // when specified as program argument
-    if (args.nonEmpty) System.setProperty("akka.remoting.transports.tcp.port", args(0))
+    if (args.nonEmpty) System.setProperty("akka.remote.netty.tcp.port", args(0))
 
     val system = ActorSystem("ClusterSystem", ConfigFactory.load("factorial"))
     system.actorOf(Props[FactorialBackend], name = "factorialBackend")
diff --git a/akka-samples/akka-sample-cluster/src/main/scala/sample/cluster/simple/SimpleClusterApp.scala b/akka-samples/akka-sample-cluster/src/main/scala/sample/cluster/simple/SimpleClusterApp.scala
index c0a55a737d..8da64adac6 100644
--- a/akka-samples/akka-sample-cluster/src/main/scala/sample/cluster/simple/SimpleClusterApp.scala
+++ b/akka-samples/akka-sample-cluster/src/main/scala/sample/cluster/simple/SimpleClusterApp.scala
@@ -10,7 +10,7 @@ object SimpleClusterApp {
 
     // Override the configuration of the port 
     // when specified as program argument
-    if (args.nonEmpty) System.setProperty("akka.remoting.transports.tcp.port", args(0))
+    if (args.nonEmpty) System.setProperty("akka.remote.netty.tcp.port", args(0))
 
     // Create an Akka system
     val system = ActorSystem("ClusterSystem")
diff --git a/akka-samples/akka-sample-cluster/src/main/scala/sample/cluster/stats/StatsSample.scala b/akka-samples/akka-sample-cluster/src/main/scala/sample/cluster/stats/StatsSample.scala
index 0df220b567..6f157a77d6 100644
--- a/akka-samples/akka-sample-cluster/src/main/scala/sample/cluster/stats/StatsSample.scala
+++ b/akka-samples/akka-sample-cluster/src/main/scala/sample/cluster/stats/StatsSample.scala
@@ -123,7 +123,7 @@ object StatsSample {
   def main(args: Array[String]): Unit = {
     // Override the configuration of the port
     // when specified as program argument
-    if (args.nonEmpty) System.setProperty("akka.remoting.transports.tcp.port", args(0))
+    if (args.nonEmpty) System.setProperty("akka.remote.netty.tcp.port", args(0))
 
     //#start-router-lookup
     val system = ActorSystem("ClusterSystem", ConfigFactory.parseString("""
@@ -151,7 +151,7 @@ object StatsSampleOneMaster {
   def main(args: Array[String]): Unit = {
     // Override the configuration of the port
     // when specified as program argument
-    if (args.nonEmpty) System.setProperty("akka.remoting.transports.tcp.port", args(0))
+    if (args.nonEmpty) System.setProperty("akka.remote.netty.tcp.port", args(0))
 
     //#start-router-deploy
     val system = ActorSystem("ClusterSystem", ConfigFactory.parseString("""
diff --git a/akka-samples/akka-sample-cluster/src/main/scala/sample/cluster/transformation/TransformationSample.scala b/akka-samples/akka-sample-cluster/src/main/scala/sample/cluster/transformation/TransformationSample.scala
index 28c19e1bdc..e0947e04e7 100644
--- a/akka-samples/akka-sample-cluster/src/main/scala/sample/cluster/transformation/TransformationSample.scala
+++ b/akka-samples/akka-sample-cluster/src/main/scala/sample/cluster/transformation/TransformationSample.scala
@@ -30,7 +30,7 @@ object TransformationFrontend {
   def main(args: Array[String]): Unit = {
     // Override the configuration of the port
     // when specified as program argument
-    if (args.nonEmpty) System.setProperty("akka.remoting.transports.tcp.port", args(0))
+    if (args.nonEmpty) System.setProperty("akka.remote.netty.tcp.port", args(0))
 
     val system = ActorSystem("ClusterSystem")
     val frontend = system.actorOf(Props[TransformationFrontend], name = "frontend")
@@ -77,7 +77,7 @@ object TransformationBackend {
   def main(args: Array[String]): Unit = {
     // Override the configuration of the port
     // when specified as program argument
-    if (args.nonEmpty) System.setProperty("akka.remoting.transports.tcp.port", args(0))
+    if (args.nonEmpty) System.setProperty("akka.remote.netty.tcp.port", args(0))
 
     val system = ActorSystem("ClusterSystem")
     system.actorOf(Props[TransformationBackend], name = "backend")
diff --git a/akka-samples/akka-sample-remote/README.rst b/akka-samples/akka-sample-remote/README.rst
index 5f9a9fb6c6..22889d2b5b 100644
--- a/akka-samples/akka-sample-remote/README.rst
+++ b/akka-samples/akka-sample-remote/README.rst
@@ -55,17 +55,19 @@ Select to run "sample.remote.calculator.CalcApp" which in the case below is numb
 
     [1] sample.remote.calculator.LookupApp
     [2] sample.remote.calculator.CreationApp
-    [3] sample.remote.calculator.CalcApp
+    [3] sample.remote.calculator.java.JCreationApp
+    [4] sample.remote.calculator.CalcApp
+    [5] sample.remote.calculator.java.JCalcApp
+    [6] sample.remote.calculator.java.JLookupApp
 
-    Enter number: 3
+    Enter number: 4
 
 You should see something similar to this::
 
     [info] Running sample.remote.calculator.CalcApp
-    [INFO] [12/22/2011 14:21:51.631] [run-main] [ActorSystem] REMOTE: RemoteServerStarted@akka://CalculatorApplication@127.0.0.1:2552
-    [INFO] [12/22/2011 14:21:51.632] [run-main] [Remote] Starting remote server on [akka://CalculatorApplication@127.0.0.1:2552]
+    [INFO] [01/25/2013 15:02:51.355] [run-main] [Remoting] Starting remoting
+    [INFO] [01/25/2013 15:02:52.121] [run-main] [Remoting] Remoting started; listening on addresses :[akka.tcp://CalculatorApplication@127.0.0.1:2552]
     Started Calculator Application - waiting for messages
-    [INFO] [12/22/2011 14:22:39.894] [New I/O server worker #1-1] [ActorSystem] REMOTE: RemoteClientStarted@akka://127.0.0.1:2553
 
 Open up a new terminal window and run SBT once more:
 
@@ -81,21 +83,23 @@ Select to run "sample.remote.calculator.LookupApp" which in the case below is nu
 
     [1] sample.remote.calculator.LookupApp
     [2] sample.remote.calculator.CreationApp
-    [3] sample.remote.calculator.CalcApp
+    [3] sample.remote.calculator.java.JCreationApp
+    [4] sample.remote.calculator.CalcApp
+    [5] sample.remote.calculator.java.JCalcApp
+    [6] sample.remote.calculator.java.JLookupApp
 
     Enter number: 1
 
 Now you should see something like this::
 
     [info] Running sample.remote.calculator.LookupApp
-    [INFO] [12/22/2011 14:54:38.630] [run-main] [ActorSystem] REMOTE: RemoteServerStarted@akka://LookupApplication@127.0.0.1:2553
-    [INFO] [12/22/2011 14:54:38.632] [run-main] [Remote] Starting remote server on [akka://LookupApplication@127.0.0.1:2553]
+    [INFO] [01/25/2013 15:05:53.954] [run-main] [Remoting] Starting remoting
+    [INFO] [01/25/2013 15:05:54.769] [run-main] [Remoting] Remoting started; listening on addresses :[akka.tcp://LookupApplication@127.0.0.1:2553]
     Started Lookup Application
-    [INFO] [12/22/2011 14:54:38.801] [default-dispatcher-21] [ActorSystem] REMOTE: RemoteClientStarted@akka://127.0.0.1:2552
-    Sub result: 4 - 30 = -26
-    Add result: 17 + 1 = 18
-    Add result: 37 + 43 = 80
-    Add result: 68 + 66 = 134
+    Add result: 0 + 22 = 22
+    Add result: 41 + 71 = 112
+    Add result: 61 + 14 = 75
+    Add result: 77 + 82 = 159
 
 Congrats! You have now successfully looked up a remote actor and communicated with it.
 The next step is to have an actor deployed on a remote note.
@@ -113,22 +117,22 @@ Select to run "sample.remote.calculator.CreationApp" which in the case below is
 
     [1] sample.remote.calculator.LookupApp
     [2] sample.remote.calculator.CreationApp
-    [3] sample.remote.calculator.CalcApp
+    [3] sample.remote.calculator.java.JCreationApp
+    [4] sample.remote.calculator.CalcApp
+    [5] sample.remote.calculator.java.JCalcApp
+    [6] sample.remote.calculator.java.JLookupApp
 
     Enter number: 2
 
 Now you should see something like this::
 
     [info] Running sample.remote.calculator.CreationApp
-    [INFO] [12/22/2011 14:57:02.150] [run-main] [ActorSystem] REMOTE: RemoteServerStarted@akka://RemoteCreation@127.0.0.1:2554
-    [INFO] [12/22/2011 14:57:02.151] [run-main] [Remote] Starting remote server on [akka://RemoteCreation@127.0.0.1:2554]
-    [INFO] [12/22/2011 14:57:02.267] [default-dispatcher-21] [ActorSystem] REMOTE: RemoteClientStarted@akka://127.0.0.1:2552
+    [INFO] [01/14/2013 15:08:08.890] [run-main] [Remoting] Starting remoting
     Started Creation Application
-    Mul result: 14 * 17 = 238
-    Div result: 3764 / 80 = 47.00
-    Mul result: 16 * 5 = 80
-    Mul result: 1 * 18 = 18
-    Mul result: 8 * 13 = 104
+    Mul result: 15 * 12 = 180
+    Div result: 3840 / 10 = 384,00
+    Mul result: 1 * 5 = 5
+    Div result: 3240 / 45 = 72,00
 
 That's it!
 
diff --git a/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JLookupApplication.java b/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JLookupApplication.java
index e7535cdd5a..c4ae88987c 100644
--- a/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JLookupApplication.java
+++ b/akka-samples/akka-sample-remote/src/main/java/sample/remote/calculator/java/JLookupApplication.java
@@ -22,7 +22,7 @@ public class JLookupApplication implements Bootable {
         .getConfig("remotelookup"));
     actor = system.actorOf(new Props(JLookupActor.class));
     remoteActor = system.actorFor(
-      "akka://CalculatorApplication@127.0.0.1:2552/user/simpleCalculator");
+      "akka.tcp://CalculatorApplication@127.0.0.1:2552/user/simpleCalculator");
   }
 
   public void doSomething(Op.MathOp mathOp) {
diff --git a/akka-samples/akka-sample-remote/src/main/resources/application.conf b/akka-samples/akka-sample-remote/src/main/resources/application.conf
index 0fe79b9290..f614149373 100644
--- a/akka-samples/akka-sample-remote/src/main/resources/application.conf
+++ b/akka-samples/akka-sample-remote/src/main/resources/application.conf
@@ -3,7 +3,7 @@ calculator {
   include "common"
 
   akka {
-    remote.netty.port = 2552
+    remote.netty.tcp.port = 2552
   }
 }
 //#calculator
@@ -13,7 +13,7 @@ remotelookup {
   include "common"
 
   akka {
-    remote.netty.port = 2553
+    remote.netty.tcp.port = 2553
   }
 }
 //#remotelookup
@@ -26,12 +26,12 @@ remotecreation {
     actor {
       deployment {
         /advancedCalculator {
-          remote = "akka://CalculatorApplication@127.0.0.1:2552"
+          remote = "akka.tcp://CalculatorApplication@127.0.0.1:2552"
         }
       }
     }
 
-    remote.netty.port = 2554
+    remote.netty.tcp.port = 2554
   }
 }
 //#remotecreation
diff --git a/akka-samples/akka-sample-remote/src/main/resources/common.conf b/akka-samples/akka-sample-remote/src/main/resources/common.conf
index a3e16cf1a9..4886ad1c4d 100644
--- a/akka-samples/akka-sample-remote/src/main/resources/common.conf
+++ b/akka-samples/akka-sample-remote/src/main/resources/common.conf
@@ -5,7 +5,7 @@ akka {
   }
 
   remote {
-    netty {
+    netty.tcp {
       hostname = "127.0.0.1"
     }
   }
diff --git a/akka-samples/akka-sample-remote/src/main/scala/sample/remote/calculator/LookupApplication.scala b/akka-samples/akka-sample-remote/src/main/scala/sample/remote/calculator/LookupApplication.scala
index 09425f3378..6fa2d1b6df 100644
--- a/akka-samples/akka-sample-remote/src/main/scala/sample/remote/calculator/LookupApplication.scala
+++ b/akka-samples/akka-sample-remote/src/main/scala/sample/remote/calculator/LookupApplication.scala
@@ -20,7 +20,7 @@ class LookupApplication extends Bootable {
     ActorSystem("LookupApplication", ConfigFactory.load.getConfig("remotelookup"))
   val actor = system.actorOf(Props[LookupActor], "lookupActor")
   val remoteActor = system.actorFor(
-    "akka://CalculatorApplication@127.0.0.1:2552/user/simpleCalculator")
+    "akka.tcp://CalculatorApplication@127.0.0.1:2552/user/simpleCalculator")
 
   def doSomething(op: MathOp) = {
     actor ! (remoteActor, op)

From 9343c5380af84f5d182126c1a4c670c8386a4a19 Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Sun, 27 Jan 2013 20:03:27 +0100
Subject: [PATCH 095/122]  #2942 - prolonging timeout for one test in
 TypedActorSpec to accomodate for slow Jenkins

---
 .../src/test/scala/akka/actor/TypedActorSpec.scala            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/akka-actor-tests/src/test/scala/akka/actor/TypedActorSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/TypedActorSpec.scala
index 1270d62aca..17fa13bee3 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/TypedActorSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/TypedActorSpec.scala
@@ -300,10 +300,10 @@ class TypedActorSpec extends AkkaSpec(TypedActorSpec.config)
     }
 
     "be able to call Future-returning methods non-blockingly" in {
-      val t = newFooBar
+      val t = newFooBar(remaining)
       val f = t.futurePigdog(200)
       f.isCompleted must be(false)
-      Await.result(f, timeout.duration) must be("Pigdog")
+      Await.result(f, remaining) must be("Pigdog")
       mustStop(t)
     }
 

From 791bbd15658d374ca3cfbb93b758a7ecd0dacc1d Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Sun, 27 Jan 2013 21:47:05 +0100
Subject: [PATCH 096/122]  #2934 - explaining send a bit better in the docs

---
 akka-agent/src/main/scala/akka/agent/Agent.scala       | 9 ++-------
 akka-docs/rst/java/code/docs/agent/AgentDocTest.java   | 6 ++++--
 akka-docs/rst/scala/code/docs/agent/AgentDocSpec.scala | 6 ++++--
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/akka-agent/src/main/scala/akka/agent/Agent.scala b/akka-agent/src/main/scala/akka/agent/Agent.scala
index 9c8e6c93bb..fae81d1dc9 100644
--- a/akka-agent/src/main/scala/akka/agent/Agent.scala
+++ b/akka-agent/src/main/scala/akka/agent/Agent.scala
@@ -4,14 +4,9 @@
 
 package akka.agent
 
-import akka.actor._
-import akka.japi.{ Function ⇒ JFunc, Procedure ⇒ JProc }
-import akka.pattern.ask
 import scala.concurrent.stm._
-import scala.concurrent.{ ExecutionContext, Future, Promise, Await }
-import scala.concurrent.duration.{ FiniteDuration, Duration }
-import akka.util.{ SerializedSuspendableExecutionContext, Timeout }
-import util.Try
+import scala.concurrent.{ ExecutionContext, Future, Promise }
+import akka.util.{ SerializedSuspendableExecutionContext }
 
 /**
  * Factory method for creating an Agent.
diff --git a/akka-docs/rst/java/code/docs/agent/AgentDocTest.java b/akka-docs/rst/java/code/docs/agent/AgentDocTest.java
index afe671ca6d..f3facaca90 100644
--- a/akka-docs/rst/java/code/docs/agent/AgentDocTest.java
+++ b/akka-docs/rst/java/code/docs/agent/AgentDocTest.java
@@ -55,10 +55,12 @@ public class AgentDocTest {
     Agent<Integer> agent = new Agent<Integer>(5, ec);
 
     //#send
-    // send a value
+    // send a value, enqueues this change
+    // of the value of the Agent
     agent.send(7);
 
-    // send a function
+    // send a Mapper, enqueues this change
+    // to the value of the Agent
     agent.send(new Mapper<Integer, Integer>() {
       public Integer apply(Integer i) {
         return i * 2;
diff --git a/akka-docs/rst/scala/code/docs/agent/AgentDocSpec.scala b/akka-docs/rst/scala/code/docs/agent/AgentDocSpec.scala
index 9d4fd5c07b..b977f823bd 100644
--- a/akka-docs/rst/scala/code/docs/agent/AgentDocSpec.scala
+++ b/akka-docs/rst/scala/code/docs/agent/AgentDocSpec.scala
@@ -48,10 +48,12 @@ class AgentDocSpec extends AkkaSpec {
   "send and sendOff" in {
     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

From 7b3ec79c0cc4a964878328b7dacc109695ef5753 Mon Sep 17 00:00:00 2001
From: Rich Dougherty <rich@rd.gen.nz>
Date: Fri, 25 Jan 2013 14:24:23 +1300
Subject: [PATCH 097/122] Make it easer to override SystemMessage
 serialization. Fixes #2940

  * Make SystemMessage extend Serializable to avoid ambiguity when
    setting serialization-bindings.
  * Set serialVersionUID in SystemMessages and create tests to
    ensure binary formats remain unchanged.
  * Add tests for reference.conf's serialization settings.
  * Make some existing serialization tests more robust.

Removed boilerplate from serialization tests

Use actual reference.conf; tidy up

Make serialization compatible
---
 .../akka/serialization/serialized.conf        |  22 ++
 .../akka/serialization/SerializeSpec.scala    | 223 ++++++++++++++----
 .../akka/dispatch/AbstractDispatcher.scala    |  12 +-
 project/AkkaBuild.scala                       |  27 ++-
 4 files changed, 225 insertions(+), 59 deletions(-)
 create mode 100644 akka-actor-tests/src/test/resources/akka/serialization/serialized.conf

diff --git a/akka-actor-tests/src/test/resources/akka/serialization/serialized.conf b/akka-actor-tests/src/test/resources/akka/serialization/serialized.conf
new file mode 100644
index 0000000000..a15458be5a
--- /dev/null
+++ b/akka-actor-tests/src/test/resources/akka/serialization/serialized.conf
@@ -0,0 +1,22 @@
+# Serialized objects, used for testinging serialization compatibility across
+# different versions of Akka.
+
+akka.dispatch.Create = "aced00057372000c7363616c612e5475706c6532bc7daadf46211a990200024c00025f317400124c6a6176612f6c616e672f4f626a6563743b4c00025f3271007e0001787073720014616b6b612e64697370617463682e437265617465bcdf9f7f2675038d0200014900037569647870000004d27671007e0003"
+
+akka.dispatch.Recreate = "aced00057372000c7363616c612e5475706c6532bc7daadf46211a990200024c00025f317400124c6a6176612f6c616e672f4f626a6563743b4c00025f3271007e0001787073720016616b6b612e64697370617463682e52656372656174650987c65c8d378a800200014c000563617573657400154c6a6176612f6c616e672f5468726f7761626c653b787073720020616b6b612e73657269616c697a6174696f6e2e46616b655468726f7761626c6500000000000000010200014c00036d73677400124c6a6176612f6c616e672f537472696e673b787200136a6176612e6c616e672e5468726f7761626c65d5c635273977b8cb0300044c0005636175736571007e00044c000d64657461696c4d65737361676571007e00075b000a737461636b547261636574001e5b4c6a6176612f6c616e672f537461636b5472616365456c656d656e743b4c001473757070726573736564457863657074696f6e737400104c6a6176612f7574696c2f4c6973743b787071007e000b740001787572001e5b4c6a6176612e6c616e672e537461636b5472616365456c656d656e743b02462a3c3cfd2239020000787000000000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c69737471007e000a7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c0001637400164c6a6176612f7574696c2f436f6c6c656374696f6e3b7870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a657870000000007704000000007871007e00147871007e000c7671007e0003"
+
+akka.dispatch.Suspend = "aced00057372000c7363616c612e5475706c6532bc7daadf46211a990200024c00025f317400124c6a6176612f6c616e672f4f626a6563743b4c00025f3271007e0001787073720015616b6b612e64697370617463682e53757370656e6464e531d5d134b59902000078707671007e0003"
+
+akka.dispatch.Resume = "aced00057372000c7363616c612e5475706c6532bc7daadf46211a990200024c00025f317400124c6a6176612f6c616e672f4f626a6563743b4c00025f3271007e0001787073720014616b6b612e64697370617463682e526573756d65dc5e646d445fcb010200014c000f63617573656442794661696c7572657400154c6a6176612f6c616e672f5468726f7761626c653b787073720020616b6b612e73657269616c697a6174696f6e2e46616b655468726f7761626c6500000000000000010200014c00036d73677400124c6a6176612f6c616e672f537472696e673b787200136a6176612e6c616e672e5468726f7761626c65d5c635273977b8cb0300044c0005636175736571007e00044c000d64657461696c4d65737361676571007e00075b000a737461636b547261636574001e5b4c6a6176612f6c616e672f537461636b5472616365456c656d656e743b4c001473757070726573736564457863657074696f6e737400104c6a6176612f7574696c2f4c6973743b787071007e000b740001787572001e5b4c6a6176612e6c616e672e537461636b5472616365456c656d656e743b02462a3c3cfd2239020000787000000000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c69737471007e000a7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c0001637400164c6a6176612f7574696c2f436f6c6c656374696f6e3b7870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a657870000000007704000000007871007e00147871007e000c7671007e0003"
+
+akka.dispatch.Terminate = "aced00057372000c7363616c612e5475706c6532bc7daadf46211a990200024c00025f317400124c6a6176612f6c616e672f4f626a6563743b4c00025f3271007e0001787073720017616b6b612e64697370617463682e5465726d696e61746509d66ca68318700f02000078707671007e0003"
+
+akka.dispatch.Supervise = "aced00057372000c7363616c612e5475706c6532bc7daadf46211a990200024c00025f317400124c6a6176612f6c616e672f4f626a6563743b4c00025f3271007e0001787073720017616b6b612e64697370617463682e5375706572766973652d0b363f56ab5feb0200035a00056173796e634900037569644c00056368696c647400154c616b6b612f6163746f722f4163746f725265663b787001000009a47372001f616b6b612e73657269616c697a6174696f6e2e46616b654163746f7252656600000000000000010200014c00046e616d657400124c6a6176612f6c616e672f537472696e673b7872001b616b6b612e6163746f722e496e7465726e616c4163746f725265660d0aa2ca1e82097602000078720013616b6b612e6163746f722e4163746f72526566c3585dde655f469402000078707400056368696c647671007e0003"
+
+akka.dispatch.ChildTerminated = "aced00057372000c7363616c612e5475706c6532bc7daadf46211a990200024c00025f317400124c6a6176612f6c616e672f4f626a6563743b4c00025f3271007e000178707372001d616b6b612e64697370617463682e4368696c645465726d696e617465644c84222437ed5db40200014c00056368696c647400154c616b6b612f6163746f722f4163746f725265663b78707372001f616b6b612e73657269616c697a6174696f6e2e46616b654163746f7252656600000000000000010200014c00046e616d657400124c6a6176612f6c616e672f537472696e673b7872001b616b6b612e6163746f722e496e7465726e616c4163746f725265660d0aa2ca1e82097602000078720013616b6b612e6163746f722e4163746f72526566c3585dde655f469402000078707400056368696c647671007e0003"
+
+akka.dispatch.Watch = "aced00057372000c7363616c612e5475706c6532bc7daadf46211a990200024c00025f317400124c6a6176612f6c616e672f4f626a6563743b4c00025f3271007e0001787073720013616b6b612e64697370617463682e57617463682e1e65bc74394fc40200024c0007776174636865657400154c616b6b612f6163746f722f4163746f725265663b4c00077761746368657271007e000478707372001f616b6b612e73657269616c697a6174696f6e2e46616b654163746f7252656600000000000000010200014c00046e616d657400124c6a6176612f6c616e672f537472696e673b7872001b616b6b612e6163746f722e496e7465726e616c4163746f725265660d0aa2ca1e82097602000078720013616b6b612e6163746f722e4163746f72526566c3585dde655f46940200007870740007776174636865657371007e0006740007776174636865727671007e0003"
+
+akka.dispatch.Unwatch = "aced00057372000c7363616c612e5475706c6532bc7daadf46211a990200024c00025f317400124c6a6176612f6c616e672f4f626a6563743b4c00025f3271007e0001787073720015616b6b612e64697370617463682e556e776174636858501f7ee63dc2100200024c0007776174636865657400154c616b6b612f6163746f722f4163746f725265663b4c00077761746368657271007e000478707372001f616b6b612e73657269616c697a6174696f6e2e46616b654163746f7252656600000000000000010200014c00046e616d657400124c6a6176612f6c616e672f537472696e673b7872001b616b6b612e6163746f722e496e7465726e616c4163746f725265660d0aa2ca1e82097602000078720013616b6b612e6163746f722e4163746f72526566c3585dde655f46940200007870740007776174636865657371007e0006740007776174636865727671007e0003"
+
+akka.dispatch.NoMessage = "aced00057372000c7363616c612e5475706c6532bc7daadf46211a990200024c00025f317400124c6a6176612f6c616e672f4f626a6563743b4c00025f3271007e0001787073720018616b6b612e64697370617463682e4e6f4d65737361676524b401a3610ccb70dd02000078707671007e0003"
diff --git a/akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala b/akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala
index d7c7e61b2c..d3da2418c7 100644
--- a/akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala
@@ -8,17 +8,20 @@ import language.postfixOps
 
 import akka.testkit.{ AkkaSpec, EventFilter }
 import akka.actor._
+import akka.dispatch._
 import java.io._
 import scala.concurrent.Await
 import akka.util.Timeout
 import scala.concurrent.duration._
 import scala.reflect.BeanInfo
 import com.google.protobuf.Message
+import com.typesafe.config._
 import akka.pattern.ask
+import org.apache.commons.codec.binary.Hex.{ encodeHex, decodeHex }
 
-object SerializeSpec {
+object SerializationTests {
 
-  val config = """
+  val serializeConf = """
     akka {
       actor {
         serializers {
@@ -26,13 +29,13 @@ object SerializeSpec {
         }
 
         serialization-bindings {
-          "akka.serialization.SerializeSpec$Person" = java
-          "akka.serialization.SerializeSpec$Address" = java
-          "akka.serialization.TestSerializble" = test
-          "akka.serialization.SerializeSpec$PlainMessage" = test
-          "akka.serialization.SerializeSpec$A" = java
-          "akka.serialization.SerializeSpec$B" = test
-          "akka.serialization.SerializeSpec$D" = test
+          "akka.serialization.SerializationTests$Person" = java
+          "akka.serialization.SerializationTests$Address" = java
+          "akka.serialization.TestSerializable" = test
+          "akka.serialization.SerializationTests$PlainMessage" = test
+          "akka.serialization.SerializationTests$A" = java
+          "akka.serialization.SerializationTests$B" = test
+          "akka.serialization.SerializationTests$D" = test
         }
       }
     }
@@ -45,11 +48,11 @@ object SerializeSpec {
 
   case class Record(id: Int, person: Person)
 
-  class SimpleMessage(s: String) extends TestSerializble
+  class SimpleMessage(s: String) extends TestSerializable
 
   class ExtendedSimpleMessage(s: String, i: Int) extends SimpleMessage(s)
 
-  trait AnotherInterface extends TestSerializble
+  trait AnotherInterface extends TestSerializable
 
   class AnotherMessage extends AnotherInterface
 
@@ -67,11 +70,67 @@ object SerializeSpec {
   class D extends A
   class E extends D
 
+  val verifySerializabilityConf = """
+    akka {
+      actor {
+        serialize-messages = on
+        serialize-creators = on
+      }
+    }
+  """
+
+  class FooActor extends Actor {
+    def receive = {
+      case s: String ⇒ sender ! s
+    }
+  }
+
+  class FooUntypedActor extends UntypedActor {
+    def onReceive(message: Any) {}
+  }
+
+  class NonSerializableActor(system: ActorSystem) extends Actor {
+    def receive = {
+      case s: String ⇒ sender ! s
+    }
+  }
+
+  def mostlyReferenceSystem: ActorSystem = {
+    val referenceConf = ConfigFactory.defaultReference()
+    val mostlyReferenceConf = AkkaSpec.testConf.withFallback(referenceConf)
+    ActorSystem("SerializationSystem", mostlyReferenceConf)
+  }
+
+  val systemMessageMultiSerializerConf = """
+    akka {
+      actor {
+        serializers {
+          test = "akka.serialization.TestSerializer"
+        }
+
+        serialization-bindings {
+          "akka.dispatch.SystemMessage" = test
+        }
+      }
+    }
+  """
+
+  val systemMessageClasses = List[Class[_]](
+    classOf[Create],
+    classOf[Recreate],
+    classOf[Suspend],
+    classOf[Resume],
+    classOf[Terminate],
+    classOf[Supervise],
+    classOf[ChildTerminated],
+    classOf[Watch],
+    classOf[Unwatch],
+    NoMessage.getClass)
 }
 
 @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner])
-class SerializeSpec extends AkkaSpec(SerializeSpec.config) {
-  import SerializeSpec._
+class SerializeSpec extends AkkaSpec(SerializationTests.serializeConf) {
+  import SerializationTests._
 
   val ser = SerializationExtension(system)
   import ser._
@@ -156,7 +215,7 @@ class SerializeSpec extends AkkaSpec(SerializeSpec.config) {
 
     "give warning for message with several bindings" in {
       EventFilter.warning(start = "Multiple serializers found", occurrences = 1) intercept {
-        ser.serializerFor(classOf[Both]).getClass must be(classOf[TestSerializer])
+        ser.serializerFor(classOf[Both]).getClass must (be(classOf[TestSerializer]) or be(classOf[JavaSerializer]))
       }
     }
 
@@ -164,7 +223,7 @@ class SerializeSpec extends AkkaSpec(SerializeSpec.config) {
       ser.serializerFor(classOf[A]).getClass must be(classOf[JavaSerializer])
       ser.serializerFor(classOf[B]).getClass must be(classOf[TestSerializer])
       EventFilter.warning(start = "Multiple serializers found", occurrences = 1) intercept {
-        ser.serializerFor(classOf[C]).getClass must be(classOf[JavaSerializer])
+        ser.serializerFor(classOf[C]).getClass must (be(classOf[TestSerializer]) or be(classOf[JavaSerializer]))
       }
     }
 
@@ -194,36 +253,9 @@ class SerializeSpec extends AkkaSpec(SerializeSpec.config) {
   }
 }
 
-object VerifySerializabilitySpec {
-  val conf = """
-    akka {
-      actor {
-        serialize-messages = on
-        serialize-creators = on
-      }
-    }
-  """
-
-  class FooActor extends Actor {
-    def receive = {
-      case s: String ⇒ sender ! s
-    }
-  }
-
-  class FooUntypedActor extends UntypedActor {
-    def onReceive(message: Any) {}
-  }
-
-  class NonSerializableActor(system: ActorSystem) extends Actor {
-    def receive = {
-      case s: String ⇒ sender ! s
-    }
-  }
-}
-
 @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner])
-class VerifySerializabilitySpec extends AkkaSpec(VerifySerializabilitySpec.conf) {
-  import VerifySerializabilitySpec._
+class VerifySerializabilitySpec extends AkkaSpec(SerializationTests.verifySerializabilityConf) {
+  import SerializationTests._
   implicit val timeout = Timeout(5 seconds)
 
   "verify config" in {
@@ -260,7 +292,85 @@ class VerifySerializabilitySpec extends AkkaSpec(VerifySerializabilitySpec.conf)
   }
 }
 
-trait TestSerializble
+@org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner])
+class ReferenceSerializationSpec extends AkkaSpec(SerializationTests.mostlyReferenceSystem) {
+  import SerializationTests._
+
+  val ser = SerializationExtension(system)
+  def serializerMustBe(toSerialize: Class[_], expectedSerializer: Class[_]) =
+    ser.serializerFor(toSerialize).getClass must be(expectedSerializer)
+
+  "Serialization settings from reference.conf" must {
+
+    "declare Serializable classes to be use JavaSerializer" in {
+      serializerMustBe(classOf[Serializable], classOf[JavaSerializer])
+      serializerMustBe(classOf[String], classOf[JavaSerializer])
+      for (smc ← systemMessageClasses) {
+        serializerMustBe(smc, classOf[JavaSerializer])
+      }
+    }
+
+    "declare Array[Byte] to use ByteArraySerializer" in {
+      serializerMustBe(classOf[Array[Byte]], classOf[ByteArraySerializer])
+    }
+
+    "not support serialization for other classes" in {
+      intercept[NotSerializableException] { ser.serializerFor(classOf[Object]) }
+    }
+
+  }
+}
+
+@org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner])
+class SerializationCompatibilitySpec extends AkkaSpec(SerializationTests.mostlyReferenceSystem) {
+  import SerializationTests._
+
+  val ser = SerializationExtension(system)
+
+  "Cross-version serialization compatibility" must {
+
+    "be preserved for SystemMessages" in {
+      val objs = List[(String, Any)](
+        ("akka.dispatch.Create", Create(1234)),
+        ("akka.dispatch.Recreate", Recreate(FakeThrowable("x"))),
+        ("akka.dispatch.Suspend", Suspend()),
+        ("akka.dispatch.Resume", Resume(FakeThrowable("x"))),
+        ("akka.dispatch.Terminate", Terminate()),
+        ("akka.dispatch.Supervise", Supervise(FakeActorRef("child"), true, 2468)),
+        ("akka.dispatch.ChildTerminated", ChildTerminated(FakeActorRef("child"))),
+        ("akka.dispatch.Watch", Watch(FakeActorRef("watchee"), FakeActorRef("watcher"))),
+        ("akka.dispatch.Unwatch", Unwatch(FakeActorRef("watchee"), FakeActorRef("watcher"))),
+        ("akka.dispatch.NoMessage", NoMessage))
+      val expectedConf = ConfigFactory.load("akka/serialization/serialized.conf")
+      for ((key, obj) ← objs) {
+        val hex = new String(encodeHex(ser.serialize(obj, obj.getClass).get))
+        hex must be(expectedConf.getString(key))
+      }
+    }
+
+  }
+}
+
+@org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner])
+class OverriddenSystemMessageSerializationSpec extends AkkaSpec(SerializationTests.systemMessageMultiSerializerConf) {
+  import SerializationTests._
+
+  val ser = SerializationExtension(system)
+
+  "Overridden SystemMessage serialization" must {
+
+    "resolve to a single serializer" in {
+      EventFilter.warning(start = "Multiple serializers found", occurrences = 0) intercept {
+        for (smc ← systemMessageClasses) {
+          ser.serializerFor(smc).getClass must be(classOf[TestSerializer])
+        }
+      }
+    }
+
+  }
+}
+
+trait TestSerializable
 
 class TestSerializer extends Serializer {
   def includeManifest: Boolean = false
@@ -273,3 +383,26 @@ class TestSerializer extends Serializer {
 
   def fromBinary(bytes: Array[Byte], clazz: Option[Class[_]]): AnyRef = null
 }
+
+@SerialVersionUID(1)
+case class FakeThrowable(msg: String) extends Throwable(msg) with Serializable {
+  override def fillInStackTrace = null
+}
+
+@SerialVersionUID(1)
+case class FakeActorRef(name: String) extends InternalActorRef with ActorRefScope {
+  override def path = RootActorPath(Address("proto", "SomeSystem"), name)
+  override def forward(message: Any)(implicit context: ActorContext) = ???
+  override def isTerminated = ???
+  override def start() = ???
+  override def resume(causedByFailure: Throwable) = ???
+  override def suspend() = ???
+  override def restart(cause: Throwable) = ???
+  override def stop() = ???
+  override def sendSystemMessage(message: SystemMessage) = ???
+  override def provider = ???
+  override def getParent = ???
+  override def getChild(name: Iterator[String]) = ???
+  override def isLocal = ???
+  override def !(message: Any)(implicit sender: ActorRef = Actor.noSender) = ???
+}
\ No newline at end of file
diff --git a/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala b/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala
index 57f905ece8..e6f7dccd37 100644
--- a/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala
@@ -72,7 +72,7 @@ private[akka] object SystemMessage {
  *
  * ➡➡➡ NEVER SEND THE SAME SYSTEM MESSAGE OBJECT TO TWO ACTORS ⬅⬅⬅
  */
-private[akka] sealed trait SystemMessage extends PossiblyHarmful {
+private[akka] sealed trait SystemMessage extends PossiblyHarmful with Serializable {
   @transient
   var next: SystemMessage = _
 }
@@ -80,42 +80,52 @@ private[akka] sealed trait SystemMessage extends PossiblyHarmful {
 /**
  * INTERNAL API
  */
+@SerialVersionUID(-4836972106317757555L)
 private[akka] case class Create(uid: Int) extends SystemMessage // send to self from Dispatcher.register
 /**
  * INTERNAL API
  */
+@SerialVersionUID(686735569005808256L)
 private[akka] case class Recreate(cause: Throwable) extends SystemMessage // sent to self from ActorCell.restart
 /**
  * INTERNAL API
  */
+@SerialVersionUID(7270271967867221401L)
 private[akka] case class Suspend() extends SystemMessage // sent to self from ActorCell.suspend
 /**
  * INTERNAL API
  */
+@SerialVersionUID(-2567504317093262591L)
 private[akka] case class Resume(causedByFailure: Throwable) extends SystemMessage // sent to self from ActorCell.resume
 /**
  * INTERNAL API
  */
+@SerialVersionUID(708873453777219599L)
 private[akka] case class Terminate() extends SystemMessage // sent to self from ActorCell.stop
 /**
  * INTERNAL API
  */
+@SerialVersionUID(3245747602115485675L)
 private[akka] case class Supervise(child: ActorRef, async: Boolean, uid: Int) extends SystemMessage // sent to supervisor ActorRef from ActorCell.start
 /**
  * INTERNAL API
  */
+@SerialVersionUID(5513569382760799668L)
 private[akka] case class ChildTerminated(child: ActorRef) extends SystemMessage // sent to supervisor from ActorCell.doTerminate
 /**
  * INTERNAL API
  */
+@SerialVersionUID(3323205435124174788L)
 private[akka] case class Watch(watchee: ActorRef, watcher: ActorRef) extends SystemMessage // sent to establish a DeathWatch
 /**
  * INTERNAL API
  */
+@SerialVersionUID(6363620903363658256L)
 private[akka] case class Unwatch(watchee: ActorRef, watcher: ActorRef) extends SystemMessage // sent to tear down a DeathWatch
 /**
  * INTERNAL API
  */
+@SerialVersionUID(-5475916034683997987L)
 private[akka] case object NoMessage extends SystemMessage // switched into the mailbox to signal termination
 
 final case class TaskInvocation(eventStream: EventStream, runnable: Runnable, cleanup: () ⇒ Unit) extends Batchable {
diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index 3859afcece..5c2a328986 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -770,19 +770,20 @@ object Dependencies {
     // Test
 
     object Test {
-      val commonsMath = "org.apache.commons"          % "commons-math"                 % "2.1"              % "test" // ApacheV2
-      val commonsIo   = "commons-io"                  % "commons-io"                   % "2.0.1"            % "test" // ApacheV2
-      val junit       = "junit"                       % "junit"                        % "4.10"             % "test" // Common Public License 1.0
-      val logback     = "ch.qos.logback"              % "logback-classic"              % "1.0.7"            % "test" // EPL 1.0 / LGPL 2.1
-      val mockito     = "org.mockito"                 % "mockito-all"                  % "1.8.1"            % "test" // MIT
+      val commonsMath  = "org.apache.commons"          % "commons-math"                 % "2.1"              % "test" // ApacheV2
+      val commonsIo    = "commons-io"                  % "commons-io"                   % "2.0.1"            % "test" // ApacheV2
+      val commonsCodec = "commons-codec"               % "commons-codec"                % "1.7"              % "test" // ApacheV2
+      val junit        = "junit"                       % "junit"                        % "4.10"             % "test" // Common Public License 1.0
+      val logback      = "ch.qos.logback"              % "logback-classic"              % "1.0.7"            % "test" // EPL 1.0 / LGPL 2.1
+      val mockito      = "org.mockito"                 % "mockito-all"                  % "1.8.1"            % "test" // MIT
       // changing the scalatest dependency must be reflected in akka-docs/rst/dev/multi-jvm-testing.rst
-      val scalatest   = "org.scalatest"              %% "scalatest"                    % "1.9.1"            % "test" // ApacheV2
-      val scalacheck  = "org.scalacheck"             %% "scalacheck"                   % "1.10.0"           % "test" // New BSD
-      val ariesProxy  = "org.apache.aries.proxy"      % "org.apache.aries.proxy.impl"  % "0.3"              % "test" // ApacheV2
-      val pojosr      = "com.googlecode.pojosr"       % "de.kalpatec.pojosr.framework" % "0.1.4"            % "test" // ApacheV2
-      val tinybundles = "org.ops4j.pax.tinybundles"   % "tinybundles"                  % "1.0.0"            % "test" // ApacheV2
-      val log4j       = "log4j"                       % "log4j"                        % "1.2.14"           % "test" // ApacheV2
-      val junitIntf   = "com.novocode"                % "junit-interface"              % "0.8"              % "test" // MIT
+      val scalatest    = "org.scalatest"              %% "scalatest"                    % "1.9.1"            % "test" // ApacheV2
+      val scalacheck   = "org.scalacheck"             %% "scalacheck"                   % "1.10.0"           % "test" // New BSD
+      val ariesProxy   = "org.apache.aries.proxy"      % "org.apache.aries.proxy.impl"  % "0.3"              % "test" // ApacheV2
+      val pojosr       = "com.googlecode.pojosr"       % "de.kalpatec.pojosr.framework" % "0.1.4"            % "test" // ApacheV2
+      val tinybundles  = "org.ops4j.pax.tinybundles"   % "tinybundles"                  % "1.0.0"            % "test" // ApacheV2
+      val log4j        = "log4j"                       % "log4j"                        % "1.2.14"           % "test" // ApacheV2
+      val junitIntf    = "com.novocode"                % "junit-interface"              % "0.8"              % "test" // MIT
     }
   }
 
@@ -792,7 +793,7 @@ object Dependencies {
 
   val testkit = Seq(Test.junit, Test.scalatest)
 
-  val actorTests = Seq(Test.junit, Test.scalatest, Test.commonsMath, Test.mockito, Test.scalacheck, protobuf)
+  val actorTests = Seq(Test.junit, Test.scalatest, Test.commonsCodec, Test.commonsMath, Test.mockito, Test.scalacheck, protobuf)
 
   val remote = Seq(netty, protobuf, uncommonsMath, Test.junit, Test.scalatest)
 

From e0c8cc4ff3bc8f48f228665ba497650b5892ae52 Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Mon, 28 Jan 2013 02:01:02 +0100
Subject: [PATCH 098/122]  #2964 - Updating Camel to 2.10.3

---
 project/AkkaBuild.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index 3859afcece..7e414d691f 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -746,7 +746,7 @@ object Dependencies {
 
   object Compile {
     // Compile
-    val camelCore     = "org.apache.camel"            % "camel-core"                   % "2.10.0" exclude("org.slf4j", "slf4j-api") // ApacheV2
+    val camelCore     = "org.apache.camel"            % "camel-core"                   % "2.10.3" exclude("org.slf4j", "slf4j-api") // ApacheV2
 
     val config        = "com.typesafe"                % "config"                       % "1.0.0"       // ApacheV2
     val netty         = "io.netty"                    % "netty"                        % "3.6.1.Final" // ApacheV2

From a70db6a1412c136b4c435c06de97c71e2cffaf6c Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Sun, 27 Jan 2013 23:01:42 +0100
Subject: [PATCH 099/122] Adding migration docs for new Agents

---
 akka-docs/rst/java/agents.rst                 |  7 +---
 .../project/migration-guide-2.1.x-2.2.x.rst   | 39 +++++++++++++++++++
 akka-docs/rst/scala/agents.rst                |  2 +-
 3 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/akka-docs/rst/java/agents.rst b/akka-docs/rst/java/agents.rst
index d54b18e20f..98884bf37f 100644
--- a/akka-docs/rst/java/agents.rst
+++ b/akka-docs/rst/java/agents.rst
@@ -100,10 +100,7 @@ See :ref:`futures-java` for more information on ``Futures``.
 Transactional Agents
 ====================
 
-If an Agent is used within an enclosing transaction, then it will participate in
+If an Agent is used within an enclosing ``Scala STM transaction``, then it will participate in
 that transaction. If you send to an Agent within a transaction then the dispatch
 to the Agent will be held until that transaction commits, and discarded if the
-transaction is aborted. Here's an example:
-
-.. includecode:: code/docs/agent/AgentDocTest.java#transfer-example
-   :language: java
\ No newline at end of file
+transaction is aborted.
\ No newline at end of file
diff --git a/akka-docs/rst/project/migration-guide-2.1.x-2.2.x.rst b/akka-docs/rst/project/migration-guide-2.1.x-2.2.x.rst
index 8baa78b249..0a7d3da4df 100644
--- a/akka-docs/rst/project/migration-guide-2.1.x-2.2.x.rst
+++ b/akka-docs/rst/project/migration-guide-2.1.x-2.2.x.rst
@@ -53,3 +53,42 @@ ZeroMQ ByteString
 ``akka.zeromq.Frame`` and the use of ``Seq[Byte]`` in the API has been removed and is replaced by ``akka.util.ByteString``.
 
 ``ZMQMessage.firstFrameAsString`` has been removed, please use ``ZMQMessage.frames`` or ``ZMQMessage.frame(int)`` to access the frames.
+
+Brand new Agents
+================
+
+Akka's ``Agent`` has been rewritten to improve the API and to remove the need to manually ``close`` an Agent.
+The Java API has also been harmonized so both Java and Scala call the same methods.
+
+======================================================= =======================================================
+Old Java API                                            New Java API
+======================================================= =======================================================
+``new Agent<type>(value, actorSystem)``                   ``new Agent<type>(value, executionContext)``
+``agent.update(newValue)``                                ``agent.send(newValue)``
+``agent.future(Timeout)``                                 ``agent.future()``
+``agent.await(Timeout)``                                  ``Await.result(agent.future(), Timeout)``
+``agent.send(Function)``                                  ``agent.send(Mapper)``
+``agent.sendOff(Function, ExecutionContext)``             ``agent.sendOff(Mapper, ExecutionContext)``
+``agent.alter(Function, Timeout)``                        ``agent.alter(Mapper)``
+``agent.alterOff(Function, Timeout, ExecutionContext)``   ``agent.alter(Mapper, ExecutionContext)``
+``agent.map(Function)``                                   ``agent.map(Mapper)``
+``agent.flatMap(Function)``                               ``agent.flatMap(Mapper)``
+``agent.foreach(Procedure)``                              ``agent.foreach(Foreach)``
+``agent.suspend()``                                       ``No replacement, pointless feature``
+``agent.resume()``                                        ``No replacement, pointless feature``
+``agent.close()``                                         ``No replacement, not needed in new implementation``
+======================================================= =======================================================
+
+
+======================================================== ========================================================
+Old Scala API                                            New Scala API
+======================================================== ========================================================
+``Agent[T](value)(implicit ActorSystem)``                  ``Agent[T](value)(implicit ExecutionContext)``
+``agent.update(newValue)``                                 ``agent.send(newValue)``
+``agent.alterOff(Function1)(Timeout, ExecutionContext)``   ``agent.alterOff(Function1)(ExecutionContext)``
+``agent.await(Timeout)``                                   ``Await.result(agent.future, Timeout)``
+``agent.future(Timeout)``                                  ``agent.future``
+``agent.suspend()``                                        ``No replacement, pointless feature``
+``agent.resume()``                                         ``No replacement, pointless feature``
+``agent.close()``                                          ``No replacement, not needed in new implementation``
+======================================================== ========================================================
\ No newline at end of file
diff --git a/akka-docs/rst/scala/agents.rst b/akka-docs/rst/scala/agents.rst
index e14b6e129c..29fe8f5e23 100644
--- a/akka-docs/rst/scala/agents.rst
+++ b/akka-docs/rst/scala/agents.rst
@@ -56,7 +56,7 @@ happens immediately. So while updates to an Agent are asynchronous, reading the
 state of an Agent is synchronous.
 
 Updating Agents (send & alter)
-======================
+==============================
 
 You update an Agent by sending a function that transforms the current value or
 by sending just a new value. The Agent will apply the new value or function

From 2f86107b10b3b4b815c9a1e707bbb518dd049606 Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Sun, 27 Jan 2013 23:46:03 +0100
Subject: [PATCH 100/122]  #2913 - Adding asByteBuffers to ByteString

---
 .../test/scala/akka/util/ByteStringSpec.scala | 12 +++++-
 .../src/main/scala/akka/util/ByteString.scala | 38 ++++++++++++++++---
 2 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/akka-actor-tests/src/test/scala/akka/util/ByteStringSpec.scala b/akka-actor-tests/src/test/scala/akka/util/ByteStringSpec.scala
index a5f65b6a7e..b1a40c8cb7 100644
--- a/akka-actor-tests/src/test/scala/akka/util/ByteStringSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/util/ByteStringSpec.scala
@@ -269,9 +269,19 @@ class ByteStringSpec extends WordSpec with MustMatchers with Checkers {
             (b.compact eq b)
         }
       }
+
+      "asByteBuffers" in {
+        check { (a: ByteString) ⇒ if (a.isCompact) a.asByteBuffers.size == 1 && a.asByteBuffers.head == a.asByteBuffer else a.asByteBuffers.size > 0 }
+        check { (a: ByteString) ⇒ a.asByteBuffers.foldLeft(ByteString.empty) { (bs, bb) ⇒ bs ++ ByteString(bb) } == a }
+        check { (a: ByteString) ⇒ a.asByteBuffers.forall(_.isReadOnly) }
+        check { (a: ByteString) ⇒
+                import scala.collection.JavaConverters.iterableAsScalaIterableConverter;
+                a.asByteBuffers.zip(a.getByteBuffers().asScala).forall(x ⇒ x._1 == x._2)
+        }
+      }
     }
     "behave like a Vector" when {
-      "concatenating" in { check { (a: ByteString, b: ByteString) ⇒ likeVectors(a, b) { (a, b) ⇒ (a ++ b) } } }
+      "concatenating" in { check { (a: ByteString, b: ByteString) ⇒ likeVectors(a, b) { _ ++ _ } } }
 
       "calling apply" in {
         check { slice: ByteStringSlice ⇒
diff --git a/akka-actor/src/main/scala/akka/util/ByteString.scala b/akka-actor/src/main/scala/akka/util/ByteString.scala
index b694528541..7905a15e42 100644
--- a/akka-actor/src/main/scala/akka/util/ByteString.scala
+++ b/akka-actor/src/main/scala/akka/util/ByteString.scala
@@ -5,9 +5,11 @@
 package akka.util
 
 import java.nio.{ ByteBuffer, ByteOrder }
+import java.lang.{ Iterable ⇒ JIterable }
 
 import scala.collection.IndexedSeqOptimized
 import scala.collection.mutable.{ Builder, WrappedArray }
+import scala.collection.immutable
 import scala.collection.immutable.{ IndexedSeq, VectorBuilder }
 import scala.collection.generic.CanBuildFrom
 import scala.reflect.ClassTag
@@ -94,10 +96,12 @@ object ByteString {
 
     private[akka] def toByteString1: ByteString1 = ByteString1(bytes)
 
-    def asByteBuffer: ByteBuffer =
-      toByteString1.asByteBuffer
+    def asByteBuffer: ByteBuffer = toByteString1.asByteBuffer
 
-    def decodeString(charset: String): String = new String(bytes, charset)
+    def asByteBuffers: scala.collection.immutable.Iterable[ByteBuffer] = List(asByteBuffer)
+
+    def decodeString(charset: String): String =
+      if (isEmpty) "" else new String(bytes, charset)
 
     def ++(that: ByteString): ByteString =
       if (that.isEmpty) this
@@ -110,9 +114,10 @@ object ByteString {
   }
 
   private[akka] object ByteString1 {
-    def apply(bytes: Array[Byte]): ByteString1 = new ByteString1(bytes)
+    val empty: ByteString1 = new ByteString1(Array.empty[Byte])
+    def apply(bytes: Array[Byte]): ByteString1 = ByteString1(bytes, 0, bytes.length)
     def apply(bytes: Array[Byte], startIndex: Int, length: Int): ByteString1 =
-      new ByteString1(bytes, startIndex, length)
+      if (length == 0) empty else new ByteString1(bytes, startIndex, length)
   }
 
   /**
@@ -145,6 +150,8 @@ object ByteString {
       else buffer
     }
 
+    def asByteBuffers: scala.collection.immutable.Iterable[ByteBuffer] = List(asByteBuffer)
+
     def decodeString(charset: String): String =
       new String(if (length == bytes.length) bytes else toArray, charset)
 
@@ -250,6 +257,8 @@ object ByteString {
 
     def asByteBuffer: ByteBuffer = compact.asByteBuffer
 
+    def asByteBuffers: scala.collection.immutable.Iterable[ByteBuffer] = bytestrings map { _.asByteBuffer }
+
     def decodeString(charset: String): String = compact.decodeString(charset)
   }
 
@@ -345,6 +354,25 @@ sealed abstract class ByteString extends IndexedSeq[Byte] with IndexedSeqOptimiz
    */
   def asByteBuffer: ByteBuffer
 
+  /**
+   * Returns an immutable Iterable of read-only ByteBuffers that directly wraps this ByteStrings
+   * all fragments. Will always have at least one entry.
+   *
+   * Scala API
+   */
+  def asByteBuffers: immutable.Iterable[ByteBuffer]
+
+  /**
+   * Returns an Iterable of read-only ByteBuffers that directly wraps this ByteStrings
+   * all fragments. Will always have at least one entry.
+   *
+   * Java API
+   */
+  def getByteBuffers(): JIterable[ByteBuffer] = {
+    import scala.collection.JavaConverters.asJavaIterableConverter
+    asByteBuffers.asJava
+  }
+
   /**
    * Creates a new ByteBuffer with a copy of all bytes contained in this
    * ByteString.

From bd25c94445e89def93cebcb890c9eaf75750b99a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Antonsson?= <ban@rhsh.net>
Date: Fri, 25 Jan 2013 08:04:01 +0100
Subject: [PATCH 101/122] Keep the dispatcher inhabitants count balanced. See
 #2919

Conflicts:
	akka-remote/src/test/scala/akka/remote/UntrustedSpec.scala
---
 .../scala/akka/actor/ActorSystemSpec.scala    |  1 +
 .../scala/akka/actor/ActorRefProvider.scala   |  1 +
 .../akka/dispatch/AbstractDispatcher.scala    | 29 +++++++++++--------
 .../main/scala/akka/remote/RemoteDaemon.scala |  1 +
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorSystemSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorSystemSpec.scala
index 5f295de702..486761279a 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/ActorSystemSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/ActorSystemSpec.scala
@@ -270,6 +270,7 @@ class ActorSystemSpec extends AkkaSpec(ActorSystemSpec.config) with ImplicitSend
       val t = probe.expectMsg(Terminated(a)(existenceConfirmed = true, addressTerminated = false))
       t.existenceConfirmed must be(true)
       t.addressTerminated must be(false)
+      system.shutdown()
     }
 
     "shut down when /user escalates" in {
diff --git a/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala b/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala
index 184478c727..a593c6dde8 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala
@@ -550,6 +550,7 @@ class LocalActorRefProvider(
 
   def init(_system: ActorSystemImpl) {
     system = _system
+    rootGuardian.start()
     // chain death watchers so that killing guardian stops the application
     systemGuardian.sendSystemMessage(Watch(guardian, systemGuardian))
     rootGuardian.sendSystemMessage(Watch(systemGuardian, rootGuardian))
diff --git a/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala b/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala
index 57f905ece8..352338f64a 100644
--- a/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala
@@ -184,6 +184,13 @@ abstract class MessageDispatcher(val prerequisites: DispatcherPrerequisites) ext
   @tailrec private final def addInhabitants(add: Long): Long = {
     val c = inhabitants
     val r = c + add
+    if (r < 0) {
+      // We haven't succeeded in decreasing the inhabitants yet but the simple fact that we're trying to
+      // go below zero means that there is an imbalance and we might as well throw the exception
+      val e = new IllegalStateException("ACTOR SYSTEM CORRUPTED!!! A dispatcher can't have less than 0 inhabitants!")
+      reportFailure(e)
+      throw e
+    }
     if (Unsafe.instance.compareAndSwapLong(this, inhabitantsOffset, c, r)) r else addInhabitants(add)
   }
 
@@ -236,18 +243,16 @@ abstract class MessageDispatcher(val prerequisites: DispatcherPrerequisites) ext
   }
 
   @tailrec
-  private final def ifSensibleToDoSoThenScheduleShutdown(): Unit = inhabitants match {
-    case 0 ⇒
-      shutdownSchedule match {
-        case UNSCHEDULED ⇒
-          if (updateShutdownSchedule(UNSCHEDULED, SCHEDULED)) scheduleShutdownAction()
-          else ifSensibleToDoSoThenScheduleShutdown()
-        case SCHEDULED ⇒
-          if (updateShutdownSchedule(SCHEDULED, RESCHEDULED)) ()
-          else ifSensibleToDoSoThenScheduleShutdown()
-        case RESCHEDULED ⇒
-      }
-    case _ ⇒
+  private final def ifSensibleToDoSoThenScheduleShutdown(): Unit = {
+    if (inhabitants <= 0) shutdownSchedule match {
+      case UNSCHEDULED ⇒
+        if (updateShutdownSchedule(UNSCHEDULED, SCHEDULED)) scheduleShutdownAction()
+        else ifSensibleToDoSoThenScheduleShutdown()
+      case SCHEDULED ⇒
+        if (updateShutdownSchedule(SCHEDULED, RESCHEDULED)) ()
+        else ifSensibleToDoSoThenScheduleShutdown()
+      case RESCHEDULED ⇒
+    }
   }
 
   private def scheduleShutdownAction(): Unit = {
diff --git a/akka-remote/src/main/scala/akka/remote/RemoteDaemon.scala b/akka-remote/src/main/scala/akka/remote/RemoteDaemon.scala
index d1add9522a..850518b245 100644
--- a/akka-remote/src/main/scala/akka/remote/RemoteDaemon.scala
+++ b/akka-remote/src/main/scala/akka/remote/RemoteDaemon.scala
@@ -79,6 +79,7 @@ private[akka] class RemoteSystemDaemon(
                   path, systemService = false, Some(deploy), lookupDeploy = true, async = false)
                 addChild(subpath.mkString("/"), actor)
                 actor.sendSystemMessage(Watch(actor, this))
+                actor.start()
               }
               if (isTerminating) log.error("Skipping [{}] to RemoteSystemDaemon on [{}] while terminating", message, path.address)
             case _ ⇒

From 60ac7370572f22eb95870ddeb4e40abd0bde6782 Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Mon, 28 Jan 2013 12:47:35 +0100
Subject: [PATCH 102/122]  Alter the timeouts of the TypedActorSpec to use
 'remaining' when possible

---
 .../scala/akka/actor/TypedActorSpec.scala     | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/akka-actor-tests/src/test/scala/akka/actor/TypedActorSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/TypedActorSpec.scala
index 17fa13bee3..83e4e194d0 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/TypedActorSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/TypedActorSpec.scala
@@ -211,7 +211,7 @@ class TypedActorSpec extends AkkaSpec(TypedActorSpec.config)
 
   import TypedActorSpec._
 
-  def newFooBar: Foo = newFooBar(Duration(2, "s"))
+  def newFooBar: Foo = newFooBar(timeout.duration)
 
   def newFooBar(d: FiniteDuration): Foo =
     TypedActor(system).typedActorOf(TypedProps[Bar](classOf[Foo], classOf[Bar]).withTimeout(Timeout(d)))
@@ -221,7 +221,7 @@ class TypedActorSpec extends AkkaSpec(TypedActorSpec.config)
 
   def newStacked(): Stacked =
     TypedActor(system).typedActorOf(
-      TypedProps[StackedImpl](classOf[Stacked], classOf[StackedImpl]).withTimeout(Timeout(2000)))
+      TypedProps[StackedImpl](classOf[Stacked], classOf[StackedImpl]).withTimeout(timeout))
 
   def mustStop(typedActor: AnyRef) = TypedActor(system).stop(typedActor) must be(true)
 
@@ -296,22 +296,22 @@ class TypedActorSpec extends AkkaSpec(TypedActorSpec.config)
       t.nullJOption() must be === JOption.none
       t.nullOption() must be === None
       t.nullReturn() must be === null
-      Await.result(t.nullFuture(), remaining) must be === null
+      Await.result(t.nullFuture(), timeout.duration) must be === null
     }
 
     "be able to call Future-returning methods non-blockingly" in {
-      val t = newFooBar(remaining)
+      val t = newFooBar
       val f = t.futurePigdog(200)
       f.isCompleted must be(false)
-      Await.result(f, remaining) must be("Pigdog")
+      Await.result(f, timeout.duration) must be("Pigdog")
       mustStop(t)
     }
 
-    "be able to call multiple Future-returning methods non-blockingly" in {
+    "be able to call multiple Future-returning methods non-blockingly" in within(timeout.duration) {
       val t = newFooBar
       val futures = for (i ← 1 to 20) yield (i, t.futurePigdog(20, i))
       for ((i, f) ← futures) {
-        Await.result(f, timeout.duration) must be("Pigdog" + i)
+        Await.result(f, remaining) must be("Pigdog" + i)
       }
       mustStop(t)
     }
@@ -330,11 +330,11 @@ class TypedActorSpec extends AkkaSpec(TypedActorSpec.config)
       mustStop(t)
     }
 
-    "be able to compose futures without blocking" in {
-      val t, t2 = newFooBar(2 seconds)
+    "be able to compose futures without blocking" in within(timeout.duration) {
+      val t, t2 = newFooBar(remaining)
       val f = t.futureComposePigdogFrom(t2)
       f.isCompleted must be(false)
-      Await.result(f, timeout.duration) must equal("PIGDOG")
+      Await.result(f, remaining) must equal("PIGDOG")
       mustStop(t)
       mustStop(t2)
     }
@@ -391,13 +391,13 @@ class TypedActorSpec extends AkkaSpec(TypedActorSpec.config)
       mustStop(t)
     }
 
-    "be able to support implementation only typed actors" in {
+    "be able to support implementation only typed actors" in within(timeout.duration) {
       val t: Foo = TypedActor(system).typedActorOf(TypedProps[Bar]())
       val f = t.futurePigdog(200)
       val f2 = t.futurePigdog(0)
       f2.isCompleted must be(false)
       f.isCompleted must be(false)
-      Await.result(f, timeout.duration) must equal(Await.result(f2, timeout.duration))
+      Await.result(f, remaining) must equal(Await.result(f2, remaining))
       mustStop(t)
     }
 
@@ -408,13 +408,13 @@ class TypedActorSpec extends AkkaSpec(TypedActorSpec.config)
       mustStop(t)
     }
 
-    "be able to use balancing dispatcher" in {
+    "be able to use balancing dispatcher" in within(timeout.duration) {
       val thais = for (i ← 1 to 60) yield newFooBar("pooled-dispatcher", 6 seconds)
       val iterator = new CyclicIterator(thais)
 
       val results = for (i ← 1 to 120) yield (i, iterator.next.futurePigdog(200L, i))
 
-      for ((i, r) ← results) Await.result(r, timeout.duration) must be("Pigdog" + i)
+      for ((i, r) ← results) Await.result(r, remaining) must be("Pigdog" + i)
 
       for (t ← thais) mustStop(t)
     }

From 49e73f2fb731d7b232cc437970561858c0cb4c61 Mon Sep 17 00:00:00 2001
From: Christophe Pache <christophe.pache@crossing-tech.com>
Date: Mon, 28 Jan 2013 16:02:47 +0100
Subject: [PATCH 103/122] EventHandler using the OSGi LogService NB1: the
 EventHandler needs to be specified in the configuration NB2: there are some
 logs that appear in the OSGi prompt at starting and stopping of the Bundle

messages are stored in Buffer
 become used in DefaultOSGiLogger
 cleanings
thanks to patriknw

Conflicts:

	project/AkkaBuild.scala
---
 .../akka/osgi/ActorSystemActivator.scala      | 15 +++++++
 .../akka/osgi/impl/DefaultOSGiLogger.scala    | 45 +++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 akka-osgi/src/main/scala/akka/osgi/impl/DefaultOSGiLogger.scala

diff --git a/akka-osgi/src/main/scala/akka/osgi/ActorSystemActivator.scala b/akka-osgi/src/main/scala/akka/osgi/ActorSystemActivator.scala
index 7e33467c32..b3a1bbe43c 100644
--- a/akka-osgi/src/main/scala/akka/osgi/ActorSystemActivator.scala
+++ b/akka-osgi/src/main/scala/akka/osgi/ActorSystemActivator.scala
@@ -6,6 +6,8 @@ package akka.osgi
 import akka.actor.ActorSystem
 import java.util.{ Dictionary, Properties }
 import org.osgi.framework.{ ServiceRegistration, BundleContext, BundleActivator }
+import org.osgi.service.log.LogService
+import org.osgi.util.tracker.ServiceTracker
 
 /**
  * Abstract bundle activator implementation to bootstrap and configure an actor system in an
@@ -38,9 +40,22 @@ abstract class ActorSystemActivator extends BundleActivator {
    */
   def start(context: BundleContext): Unit = {
     system = Some(OsgiActorSystemFactory(context).createActorSystem(Option(getActorSystemName(context))))
+    findLogService(context) foreach (log ⇒ system.foreach(sys ⇒ sys.eventStream.publish(log)))
     system foreach (configure(context, _))
   }
 
+  /**
+   * Finds a LogService in the BundleContext in any
+   *
+   * @param context  the BundleContext
+   * @return An option of the LogService in the BundleContext
+   */
+  def findLogService(context: BundleContext): Option[LogService] = {
+    val logServiceTracker = new ServiceTracker(context, classOf[LogService].getName, null)
+    logServiceTracker.open()
+    Option(logServiceTracker.getService.asInstanceOf[LogService])
+  }
+
   /**
    * Shuts down the ActorSystem when the bundle is stopped and, if necessary, unregisters a service registration.
    *
diff --git a/akka-osgi/src/main/scala/akka/osgi/impl/DefaultOSGiLogger.scala b/akka-osgi/src/main/scala/akka/osgi/impl/DefaultOSGiLogger.scala
new file mode 100644
index 0000000000..2533c19cd9
--- /dev/null
+++ b/akka-osgi/src/main/scala/akka/osgi/impl/DefaultOSGiLogger.scala
@@ -0,0 +1,45 @@
+/**
+ *  Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ */
+package akka.osgi.impl
+
+import akka.event.Logging.{ LogEvent, DefaultLogger }
+import org.osgi.service.log.LogService
+import akka.event.Logging
+import collection.mutable.Buffer
+
+/**
+ * EventHandler for OSGi environment.
+ * Stands for an interface between akka and the OSGi LogService
+ * It uses the OSGi LogService to log the received LogEvents
+ */
+class DefaultOSGiLogger extends DefaultLogger {
+
+  //the Default Logger needs to be aware of the LogService which is published on the EventStream
+  context.system.eventStream.subscribe(self, classOf[LogService])
+
+  val messageFormat = "[%s] %s"
+
+  var messagesToLog: Vector[LogEvent] = Vector()
+
+  override def receive: Receive = {
+    //register the log service to use
+    case logService: LogService ⇒ setLogService(logService)
+    case logEvent: LogEvent     ⇒ messagesToLog = messagesToLog :+ logEvent
+  }
+
+  def setLogService(logService: LogService) {
+      messagesToLog.foreach(logMessage(logService, _))
+      context.become(receiveEvent(logService))
+  }
+
+  def receiveEvent(logService: LogService): Receive = { case logEvent: LogEvent ⇒ logMessage(logService, logEvent) }
+
+  def logMessage(logService: LogService, event: LogEvent) {
+    event match {
+      case error: Logging.Error ⇒ logService.log(event.level.asInt, Logging.stackTraceFor(error.cause))
+      case _ =>  logService.log(event.level.asInt, messageFormat.format(event.logSource, event.message))
+    }
+  }
+
+}
\ No newline at end of file

From a88eb0d85092b114b9709531e99c3f2c359ce4d3 Mon Sep 17 00:00:00 2001
From: Christophe Pache <christophe.pache@crossing-tech.com>
Date: Mon, 28 Jan 2013 16:03:42 +0100
Subject: [PATCH 104/122] OSGi EventHandler dynamically listen to LogService
 More information in logging

Conflicts:

	project/AkkaBuild.scala
---
 .../akka/osgi/ActorSystemActivator.scala      | 35 ++++++--
 .../scala/akka/osgi/DefaultOSGiLogger.scala   | 83 +++++++++++++++++++
 .../akka/osgi/impl/DefaultOSGiLogger.scala    | 45 ----------
 3 files changed, 109 insertions(+), 54 deletions(-)
 create mode 100644 akka-osgi/src/main/scala/akka/osgi/DefaultOSGiLogger.scala
 delete mode 100644 akka-osgi/src/main/scala/akka/osgi/impl/DefaultOSGiLogger.scala

diff --git a/akka-osgi/src/main/scala/akka/osgi/ActorSystemActivator.scala b/akka-osgi/src/main/scala/akka/osgi/ActorSystemActivator.scala
index b3a1bbe43c..f569a673a4 100644
--- a/akka-osgi/src/main/scala/akka/osgi/ActorSystemActivator.scala
+++ b/akka-osgi/src/main/scala/akka/osgi/ActorSystemActivator.scala
@@ -5,9 +5,8 @@ package akka.osgi
 
 import akka.actor.ActorSystem
 import java.util.{ Dictionary, Properties }
-import org.osgi.framework.{ ServiceRegistration, BundleContext, BundleActivator }
+import org.osgi.framework._
 import org.osgi.service.log.LogService
-import org.osgi.util.tracker.ServiceTracker
 
 /**
  * Abstract bundle activator implementation to bootstrap and configure an actor system in an
@@ -40,22 +39,40 @@ abstract class ActorSystemActivator extends BundleActivator {
    */
   def start(context: BundleContext): Unit = {
     system = Some(OsgiActorSystemFactory(context).createActorSystem(Option(getActorSystemName(context))))
-    findLogService(context) foreach (log ⇒ system.foreach(sys ⇒ sys.eventStream.publish(log)))
+    system foreach (addLogServiceListener(context, _))
     system foreach (configure(context, _))
   }
 
   /**
-   * Finds a LogService in the BundleContext in any
+   * Adds a LogService Listener that will advertise the ActorSystem on LogService registration and unregistration
    *
    * @param context  the BundleContext
-   * @return An option of the LogService in the BundleContext
+   * @param  system  the ActorSystem to be advertised
    */
-  def findLogService(context: BundleContext): Option[LogService] = {
-    val logServiceTracker = new ServiceTracker(context, classOf[LogService].getName, null)
-    logServiceTracker.open()
-    Option(logServiceTracker.getService.asInstanceOf[LogService])
+  def addLogServiceListener(context: BundleContext, system: ActorSystem) {
+    val logServiceListner = new ServiceListener {
+      def serviceChanged(event: ServiceEvent) {
+        event.getType match {
+          case ServiceEvent.REGISTERED    ⇒ system.eventStream.publish(serviceForReference[LogService](context, event.getServiceReference))
+          case ServiceEvent.UNREGISTERING ⇒ system.eventStream.publish(UnregisteringLogService)
+        }
+      }
+    }
+    val filter = s"(objectclass=${classOf[LogService].getName})"
+    context.addServiceListener(logServiceListner, filter)
+
+    //Small trick to create an event if the service is registred before this start listing for
+    Option(context.getServiceReference(classOf[LogService].getName)).foreach(x ⇒ {
+      logServiceListner.serviceChanged(new ServiceEvent(ServiceEvent.REGISTERED, x))
+    })
   }
 
+  /**
+   * Convenience method to find a service by its reference.
+   */
+  def serviceForReference[T](context: BundleContext, reference: ServiceReference): T =
+    context.getService(reference).asInstanceOf[T]
+
   /**
    * Shuts down the ActorSystem when the bundle is stopped and, if necessary, unregisters a service registration.
    *
diff --git a/akka-osgi/src/main/scala/akka/osgi/DefaultOSGiLogger.scala b/akka-osgi/src/main/scala/akka/osgi/DefaultOSGiLogger.scala
new file mode 100644
index 0000000000..2221ba6300
--- /dev/null
+++ b/akka-osgi/src/main/scala/akka/osgi/DefaultOSGiLogger.scala
@@ -0,0 +1,83 @@
+/**
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
+ */
+package akka.osgi
+
+import akka.event.Logging
+import org.osgi.service.log.LogService
+import akka.event.Logging.{ DefaultLogger, LogEvent }
+import akka.event.Logging.Error.NoCause
+
+/**
+ * EventHandler for OSGi environment.
+ * Stands for an interface between akka and the OSGi LogService
+ * It uses the OSGi LogService to log the received LogEvents
+ */
+class DefaultOSGiLogger extends DefaultLogger {
+
+  val messageFormat = " %s | %s | %s | %s"
+
+  override def receive: Receive = uninitialisedReceive orElse super.receive
+
+  /**
+   * Behaviour of the EventHandler that waits for its LogService
+   * @return  Receive: Store LogEvent or become initialised
+   */
+  def uninitialisedReceive: Receive = {
+    var messagesToLog: Vector[LogEvent] = Vector()
+    //the Default Logger needs to be aware of the LogService which is published on the EventStream
+    context.system.eventStream.subscribe(self, classOf[LogService])
+    context.system.eventStream.unsubscribe(self, UnregisteringLogService.getClass)
+    /**
+     * Logs every already received LogEvent and set the EventHandler ready to log every incoming LogEvent.
+     *
+     * @param logService OSGi LogService that has been registered,
+     */
+    def setLogService(logService: LogService) {
+      messagesToLog.foreach(x ⇒ {
+        logMessage(logService, x)
+      })
+      context.become(initialisedReceive(logService))
+    }
+
+    {
+      case logService: LogService ⇒ setLogService(logService)
+      case logEvent: LogEvent     ⇒ messagesToLog :+= logEvent
+    }
+  }
+
+  /**
+   * Behaviour of the Eventhanlder that is setup (has received a LogService)
+   * @param logService registrered OSGi LogService
+   * @return Receive : Logs LogEvent or go back to the uninitialised state
+   */
+  def initialisedReceive(logService: LogService): Receive = {
+    context.system.eventStream.subscribe(self, UnregisteringLogService.getClass)
+    context.system.eventStream.unsubscribe(self, classOf[LogService])
+
+    {
+      case logEvent: LogEvent      ⇒ logMessage(logService, logEvent)
+      case UnregisteringLogService ⇒ context.become(uninitialisedReceive)
+    }
+  }
+
+  /**
+   * Logs a message in an OSGi LogService
+   *
+   * @param logService  OSGi LogService registered and used for logging
+   * @param event akka LogEvent that is log unsing the LogService
+   */
+  def logMessage(logService: LogService, event: LogEvent) {
+    event match {
+      case error: Logging.Error if error.cause != NoCause ⇒ logService.log(event.level.asInt, messageFormat.format(timestamp, event.thread.getName, event.logSource, event.message), error.cause)
+      case _ ⇒ logService.log(event.level.asInt, messageFormat.format(timestamp, event.thread.getName, event.logSource, event.message))
+    }
+  }
+
+}
+
+/**
+ * Message sent when LogService is unregistred.
+ * Sent from the ActorSystemActivator to an EventHandler (as DefaultOsgiLogger).
+ */
+case object UnregisteringLogService
diff --git a/akka-osgi/src/main/scala/akka/osgi/impl/DefaultOSGiLogger.scala b/akka-osgi/src/main/scala/akka/osgi/impl/DefaultOSGiLogger.scala
deleted file mode 100644
index 2533c19cd9..0000000000
--- a/akka-osgi/src/main/scala/akka/osgi/impl/DefaultOSGiLogger.scala
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- *  Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
- */
-package akka.osgi.impl
-
-import akka.event.Logging.{ LogEvent, DefaultLogger }
-import org.osgi.service.log.LogService
-import akka.event.Logging
-import collection.mutable.Buffer
-
-/**
- * EventHandler for OSGi environment.
- * Stands for an interface between akka and the OSGi LogService
- * It uses the OSGi LogService to log the received LogEvents
- */
-class DefaultOSGiLogger extends DefaultLogger {
-
-  //the Default Logger needs to be aware of the LogService which is published on the EventStream
-  context.system.eventStream.subscribe(self, classOf[LogService])
-
-  val messageFormat = "[%s] %s"
-
-  var messagesToLog: Vector[LogEvent] = Vector()
-
-  override def receive: Receive = {
-    //register the log service to use
-    case logService: LogService ⇒ setLogService(logService)
-    case logEvent: LogEvent     ⇒ messagesToLog = messagesToLog :+ logEvent
-  }
-
-  def setLogService(logService: LogService) {
-      messagesToLog.foreach(logMessage(logService, _))
-      context.become(receiveEvent(logService))
-  }
-
-  def receiveEvent(logService: LogService): Receive = { case logEvent: LogEvent ⇒ logMessage(logService, logEvent) }
-
-  def logMessage(logService: LogService, event: LogEvent) {
-    event match {
-      case error: Logging.Error ⇒ logService.log(event.level.asInt, Logging.stackTraceFor(error.cause))
-      case _ =>  logService.log(event.level.asInt, messageFormat.format(event.logSource, event.message))
-    }
-  }
-
-}
\ No newline at end of file

From ed18c57183c90c2453dbc0ab564eef1774439c6b Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Mon, 28 Jan 2013 16:18:29 +0100
Subject: [PATCH 105/122] Stop sending 'timeout' from ReceiveTimeoutActor, see
 #2961

---
 .../src/test/scala/akka/testkit/TestActorRefSpec.scala    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala b/akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala
index 272d2a848b..f0ac8469da 100644
--- a/akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala
+++ b/akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala
@@ -56,7 +56,9 @@ object TestActorRefSpec {
 
   class WorkerActor() extends TActor {
     def receiveT = {
-      case "work"              ⇒ sender ! "workDone"; context.stop(self)
+      case "work" ⇒
+        sender ! "workDone"
+        context stop self
       case replyTo: Promise[_] ⇒ replyTo.asInstanceOf[Promise[Any]].success("complexReply")
       case replyTo: ActorRef   ⇒ replyTo ! "complexReply"
     }
@@ -88,7 +90,9 @@ object TestActorRefSpec {
   class ReceiveTimeoutActor(target: ActorRef) extends Actor {
     context setReceiveTimeout 1.second
     def receive = {
-      case ReceiveTimeout ⇒ target ! "timeout"
+      case ReceiveTimeout ⇒
+        target ! "timeout"
+        context stop self
     }
   }
 

From 647c128aaa047e497e41d4c44c1a4848ae459da2 Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Mon, 28 Jan 2013 17:56:29 +0100
Subject: [PATCH 106/122] Making it easier to understand where the
 SerializeSpec fails

---
 .../akka/serialization/serialized.conf        | 22 ---------
 .../akka/serialization/SerializeSpec.scala    | 49 ++++++++++++-------
 .../test/scala/akka/util/ByteStringSpec.scala |  4 +-
 3 files changed, 32 insertions(+), 43 deletions(-)
 delete mode 100644 akka-actor-tests/src/test/resources/akka/serialization/serialized.conf

diff --git a/akka-actor-tests/src/test/resources/akka/serialization/serialized.conf b/akka-actor-tests/src/test/resources/akka/serialization/serialized.conf
deleted file mode 100644
index a15458be5a..0000000000
--- a/akka-actor-tests/src/test/resources/akka/serialization/serialized.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-# Serialized objects, used for testinging serialization compatibility across
-# different versions of Akka.
-
-akka.dispatch.Create = "aced00057372000c7363616c612e5475706c6532bc7daadf46211a990200024c00025f317400124c6a6176612f6c616e672f4f626a6563743b4c00025f3271007e0001787073720014616b6b612e64697370617463682e437265617465bcdf9f7f2675038d0200014900037569647870000004d27671007e0003"
-
-akka.dispatch.Recreate = "aced00057372000c7363616c612e5475706c6532bc7daadf46211a990200024c00025f317400124c6a6176612f6c616e672f4f626a6563743b4c00025f3271007e0001787073720016616b6b612e64697370617463682e52656372656174650987c65c8d378a800200014c000563617573657400154c6a6176612f6c616e672f5468726f7761626c653b787073720020616b6b612e73657269616c697a6174696f6e2e46616b655468726f7761626c6500000000000000010200014c00036d73677400124c6a6176612f6c616e672f537472696e673b787200136a6176612e6c616e672e5468726f7761626c65d5c635273977b8cb0300044c0005636175736571007e00044c000d64657461696c4d65737361676571007e00075b000a737461636b547261636574001e5b4c6a6176612f6c616e672f537461636b5472616365456c656d656e743b4c001473757070726573736564457863657074696f6e737400104c6a6176612f7574696c2f4c6973743b787071007e000b740001787572001e5b4c6a6176612e6c616e672e537461636b5472616365456c656d656e743b02462a3c3cfd2239020000787000000000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c69737471007e000a7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c0001637400164c6a6176612f7574696c2f436f6c6c656374696f6e3b7870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a657870000000007704000000007871007e00147871007e000c7671007e0003"
-
-akka.dispatch.Suspend = "aced00057372000c7363616c612e5475706c6532bc7daadf46211a990200024c00025f317400124c6a6176612f6c616e672f4f626a6563743b4c00025f3271007e0001787073720015616b6b612e64697370617463682e53757370656e6464e531d5d134b59902000078707671007e0003"
-
-akka.dispatch.Resume = "aced00057372000c7363616c612e5475706c6532bc7daadf46211a990200024c00025f317400124c6a6176612f6c616e672f4f626a6563743b4c00025f3271007e0001787073720014616b6b612e64697370617463682e526573756d65dc5e646d445fcb010200014c000f63617573656442794661696c7572657400154c6a6176612f6c616e672f5468726f7761626c653b787073720020616b6b612e73657269616c697a6174696f6e2e46616b655468726f7761626c6500000000000000010200014c00036d73677400124c6a6176612f6c616e672f537472696e673b787200136a6176612e6c616e672e5468726f7761626c65d5c635273977b8cb0300044c0005636175736571007e00044c000d64657461696c4d65737361676571007e00075b000a737461636b547261636574001e5b4c6a6176612f6c616e672f537461636b5472616365456c656d656e743b4c001473757070726573736564457863657074696f6e737400104c6a6176612f7574696c2f4c6973743b787071007e000b740001787572001e5b4c6a6176612e6c616e672e537461636b5472616365456c656d656e743b02462a3c3cfd2239020000787000000000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c69737471007e000a7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c0001637400164c6a6176612f7574696c2f436f6c6c656374696f6e3b7870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a657870000000007704000000007871007e00147871007e000c7671007e0003"
-
-akka.dispatch.Terminate = "aced00057372000c7363616c612e5475706c6532bc7daadf46211a990200024c00025f317400124c6a6176612f6c616e672f4f626a6563743b4c00025f3271007e0001787073720017616b6b612e64697370617463682e5465726d696e61746509d66ca68318700f02000078707671007e0003"
-
-akka.dispatch.Supervise = "aced00057372000c7363616c612e5475706c6532bc7daadf46211a990200024c00025f317400124c6a6176612f6c616e672f4f626a6563743b4c00025f3271007e0001787073720017616b6b612e64697370617463682e5375706572766973652d0b363f56ab5feb0200035a00056173796e634900037569644c00056368696c647400154c616b6b612f6163746f722f4163746f725265663b787001000009a47372001f616b6b612e73657269616c697a6174696f6e2e46616b654163746f7252656600000000000000010200014c00046e616d657400124c6a6176612f6c616e672f537472696e673b7872001b616b6b612e6163746f722e496e7465726e616c4163746f725265660d0aa2ca1e82097602000078720013616b6b612e6163746f722e4163746f72526566c3585dde655f469402000078707400056368696c647671007e0003"
-
-akka.dispatch.ChildTerminated = "aced00057372000c7363616c612e5475706c6532bc7daadf46211a990200024c00025f317400124c6a6176612f6c616e672f4f626a6563743b4c00025f3271007e000178707372001d616b6b612e64697370617463682e4368696c645465726d696e617465644c84222437ed5db40200014c00056368696c647400154c616b6b612f6163746f722f4163746f725265663b78707372001f616b6b612e73657269616c697a6174696f6e2e46616b654163746f7252656600000000000000010200014c00046e616d657400124c6a6176612f6c616e672f537472696e673b7872001b616b6b612e6163746f722e496e7465726e616c4163746f725265660d0aa2ca1e82097602000078720013616b6b612e6163746f722e4163746f72526566c3585dde655f469402000078707400056368696c647671007e0003"
-
-akka.dispatch.Watch = "aced00057372000c7363616c612e5475706c6532bc7daadf46211a990200024c00025f317400124c6a6176612f6c616e672f4f626a6563743b4c00025f3271007e0001787073720013616b6b612e64697370617463682e57617463682e1e65bc74394fc40200024c0007776174636865657400154c616b6b612f6163746f722f4163746f725265663b4c00077761746368657271007e000478707372001f616b6b612e73657269616c697a6174696f6e2e46616b654163746f7252656600000000000000010200014c00046e616d657400124c6a6176612f6c616e672f537472696e673b7872001b616b6b612e6163746f722e496e7465726e616c4163746f725265660d0aa2ca1e82097602000078720013616b6b612e6163746f722e4163746f72526566c3585dde655f46940200007870740007776174636865657371007e0006740007776174636865727671007e0003"
-
-akka.dispatch.Unwatch = "aced00057372000c7363616c612e5475706c6532bc7daadf46211a990200024c00025f317400124c6a6176612f6c616e672f4f626a6563743b4c00025f3271007e0001787073720015616b6b612e64697370617463682e556e776174636858501f7ee63dc2100200024c0007776174636865657400154c616b6b612f6163746f722f4163746f725265663b4c00077761746368657271007e000478707372001f616b6b612e73657269616c697a6174696f6e2e46616b654163746f7252656600000000000000010200014c00046e616d657400124c6a6176612f6c616e672f537472696e673b7872001b616b6b612e6163746f722e496e7465726e616c4163746f725265660d0aa2ca1e82097602000078720013616b6b612e6163746f722e4163746f72526566c3585dde655f46940200007870740007776174636865657371007e0006740007776174636865727671007e0003"
-
-akka.dispatch.NoMessage = "aced00057372000c7363616c612e5475706c6532bc7daadf46211a990200024c00025f317400124c6a6176612f6c616e672f4f626a6563743b4c00025f3271007e0001787073720018616b6b612e64697370617463682e4e6f4d65737361676524b401a3610ccb70dd02000078707671007e0003"
diff --git a/akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala b/akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala
index d3da2418c7..bb5e7e9871 100644
--- a/akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala
@@ -328,26 +328,37 @@ class SerializationCompatibilitySpec extends AkkaSpec(SerializationTests.mostlyR
   val ser = SerializationExtension(system)
 
   "Cross-version serialization compatibility" must {
-
-    "be preserved for SystemMessages" in {
-      val objs = List[(String, Any)](
-        ("akka.dispatch.Create", Create(1234)),
-        ("akka.dispatch.Recreate", Recreate(FakeThrowable("x"))),
-        ("akka.dispatch.Suspend", Suspend()),
-        ("akka.dispatch.Resume", Resume(FakeThrowable("x"))),
-        ("akka.dispatch.Terminate", Terminate()),
-        ("akka.dispatch.Supervise", Supervise(FakeActorRef("child"), true, 2468)),
-        ("akka.dispatch.ChildTerminated", ChildTerminated(FakeActorRef("child"))),
-        ("akka.dispatch.Watch", Watch(FakeActorRef("watchee"), FakeActorRef("watcher"))),
-        ("akka.dispatch.Unwatch", Unwatch(FakeActorRef("watchee"), FakeActorRef("watcher"))),
-        ("akka.dispatch.NoMessage", NoMessage))
-      val expectedConf = ConfigFactory.load("akka/serialization/serialized.conf")
-      for ((key, obj) ← objs) {
-        val hex = new String(encodeHex(ser.serialize(obj, obj.getClass).get))
-        hex must be(expectedConf.getString(key))
-      }
+    def verify(obj: Any, asExpected: String): Unit = String.valueOf(encodeHex(ser.serialize(obj, obj.getClass).get)) must be(asExpected)
+    "be preserved for the Create SystemMessage" ignore {
+      verify(Create(1234), "aced00057372000c7363616c612e5475706c6532bc7daadf46211a990200024c00025f317400124c6a6176612f6c616e672f4f626a6563743b4c00025f3271007e0001787073720014616b6b612e64697370617463682e437265617465bcdf9f7f2675038d0200014900037569647870000004d27671007e0003")
+    }
+    "be preserved for the Recreate SystemMessage" ignore {
+      verify(Recreate(FakeThrowable("x")), "aced00057372000c7363616c612e5475706c6532bc7daadf46211a990200024c00025f317400124c6a6176612f6c616e672f4f626a6563743b4c00025f3271007e0001787073720016616b6b612e64697370617463682e52656372656174650987c65c8d378a800200014c000563617573657400154c6a6176612f6c616e672f5468726f7761626c653b787073720020616b6b612e73657269616c697a6174696f6e2e46616b655468726f7761626c6500000000000000010200014c00036d73677400124c6a6176612f6c616e672f537472696e673b787200136a6176612e6c616e672e5468726f7761626c65d5c635273977b8cb0300044c0005636175736571007e00044c000d64657461696c4d65737361676571007e00075b000a737461636b547261636574001e5b4c6a6176612f6c616e672f537461636b5472616365456c656d656e743b4c001473757070726573736564457863657074696f6e737400104c6a6176612f7574696c2f4c6973743b787071007e000b740001787572001e5b4c6a6176612e6c616e672e537461636b5472616365456c656d656e743b02462a3c3cfd2239020000787000000000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c69737471007e000a7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c0001637400164c6a6176612f7574696c2f436f6c6c656374696f6e3b7870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a657870000000007704000000007871007e00147871007e000c7671007e0003")
+    }
+    "be preserved for the Suspend SystemMessage" ignore {
+      verify(Suspend(), "aced00057372000c7363616c612e5475706c6532bc7daadf46211a990200024c00025f317400124c6a6176612f6c616e672f4f626a6563743b4c00025f3271007e0001787073720015616b6b612e64697370617463682e53757370656e6464e531d5d134b59902000078707671007e0003")
+    }
+    "be preserved for the Resume SystemMessage" ignore {
+      verify(Resume(FakeThrowable("x")), "aced00057372000c7363616c612e5475706c6532bc7daadf46211a990200024c00025f317400124c6a6176612f6c616e672f4f626a6563743b4c00025f3271007e0001787073720014616b6b612e64697370617463682e526573756d65dc5e646d445fcb010200014c000f63617573656442794661696c7572657400154c6a6176612f6c616e672f5468726f7761626c653b787073720020616b6b612e73657269616c697a6174696f6e2e46616b655468726f7761626c6500000000000000010200014c00036d73677400124c6a6176612f6c616e672f537472696e673b787200136a6176612e6c616e672e5468726f7761626c65d5c635273977b8cb0300044c0005636175736571007e00044c000d64657461696c4d65737361676571007e00075b000a737461636b547261636574001e5b4c6a6176612f6c616e672f537461636b5472616365456c656d656e743b4c001473757070726573736564457863657074696f6e737400104c6a6176612f7574696c2f4c6973743b787071007e000b740001787572001e5b4c6a6176612e6c616e672e537461636b5472616365456c656d656e743b02462a3c3cfd2239020000787000000000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c69737471007e000a7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c0001637400164c6a6176612f7574696c2f436f6c6c656374696f6e3b7870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a657870000000007704000000007871007e00147871007e000c7671007e0003")
+    }
+    "be preserved for the Terminate SystemMessage" ignore {
+      verify(Terminate(), "aced00057372000c7363616c612e5475706c6532bc7daadf46211a990200024c00025f317400124c6a6176612f6c616e672f4f626a6563743b4c00025f3271007e0001787073720017616b6b612e64697370617463682e5465726d696e61746509d66ca68318700f02000078707671007e0003")
+    }
+    "be preserved for the Supervise SystemMessage" ignore {
+      verify(Supervise(FakeActorRef("child"), true, 2468), "aced00057372000c7363616c612e5475706c6532bc7daadf46211a990200024c00025f317400124c6a6176612f6c616e672f4f626a6563743b4c00025f3271007e0001787073720017616b6b612e64697370617463682e5375706572766973652d0b363f56ab5feb0200035a00056173796e634900037569644c00056368696c647400154c616b6b612f6163746f722f4163746f725265663b787001000009a47372001f616b6b612e73657269616c697a6174696f6e2e46616b654163746f7252656600000000000000010200014c00046e616d657400124c6a6176612f6c616e672f537472696e673b7872001b616b6b612e6163746f722e496e7465726e616c4163746f725265660d0aa2ca1e82097602000078720013616b6b612e6163746f722e4163746f72526566c3585dde655f469402000078707400056368696c647671007e0003")
+    }
+    "be preserved for the ChildTerminated SystemMessage" ignore {
+      verify(ChildTerminated(FakeActorRef("child")), "aced00057372000c7363616c612e5475706c6532bc7daadf46211a990200024c00025f317400124c6a6176612f6c616e672f4f626a6563743b4c00025f3271007e000178707372001d616b6b612e64697370617463682e4368696c645465726d696e617465644c84222437ed5db40200014c00056368696c647400154c616b6b612f6163746f722f4163746f725265663b78707372001f616b6b612e73657269616c697a6174696f6e2e46616b654163746f7252656600000000000000010200014c00046e616d657400124c6a6176612f6c616e672f537472696e673b7872001b616b6b612e6163746f722e496e7465726e616c4163746f725265660d0aa2ca1e82097602000078720013616b6b612e6163746f722e4163746f72526566c3585dde655f469402000078707400056368696c647671007e0003")
+    }
+    "be preserved for the Watch SystemMessage" ignore {
+      verify(Watch(FakeActorRef("watchee"), FakeActorRef("watcher")), "aced00057372000c7363616c612e5475706c6532bc7daadf46211a990200024c00025f317400124c6a6176612f6c616e672f4f626a6563743b4c00025f3271007e0001787073720013616b6b612e64697370617463682e57617463682e1e65bc74394fc40200024c0007776174636865657400154c616b6b612f6163746f722f4163746f725265663b4c00077761746368657271007e000478707372001f616b6b612e73657269616c697a6174696f6e2e46616b654163746f7252656600000000000000010200014c00046e616d657400124c6a6176612f6c616e672f537472696e673b7872001b616b6b612e6163746f722e496e7465726e616c4163746f725265660d0aa2ca1e82097602000078720013616b6b612e6163746f722e4163746f72526566c3585dde655f46940200007870740007776174636865657371007e0006740007776174636865727671007e0003")
+    }
+    "be preserved for the Unwatch SystemMessage" ignore {
+      verify(Unwatch(FakeActorRef("watchee"), FakeActorRef("watcher")), "aced00057372000c7363616c612e5475706c6532bc7daadf46211a990200024c00025f317400124c6a6176612f6c616e672f4f626a6563743b4c00025f3271007e0001787073720015616b6b612e64697370617463682e556e776174636858501f7ee63dc2100200024c0007776174636865657400154c616b6b612f6163746f722f4163746f725265663b4c00077761746368657271007e000478707372001f616b6b612e73657269616c697a6174696f6e2e46616b654163746f7252656600000000000000010200014c00046e616d657400124c6a6176612f6c616e672f537472696e673b7872001b616b6b612e6163746f722e496e7465726e616c4163746f725265660d0aa2ca1e82097602000078720013616b6b612e6163746f722e4163746f72526566c3585dde655f46940200007870740007776174636865657371007e0006740007776174636865727671007e0003")
+    }
+    "be preserved for the NoMessage SystemMessage" ignore {
+      verify(NoMessage, "aced00057372000c7363616c612e5475706c6532bc7daadf46211a990200024c00025f317400124c6a6176612f6c616e672f4f626a6563743b4c00025f3271007e0001787073720018616b6b612e64697370617463682e4e6f4d65737361676524b401a3610ccb70dd02000078707671007e0003")
     }
-
   }
 }
 
diff --git a/akka-actor-tests/src/test/scala/akka/util/ByteStringSpec.scala b/akka-actor-tests/src/test/scala/akka/util/ByteStringSpec.scala
index b1a40c8cb7..117de28242 100644
--- a/akka-actor-tests/src/test/scala/akka/util/ByteStringSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/util/ByteStringSpec.scala
@@ -275,8 +275,8 @@ class ByteStringSpec extends WordSpec with MustMatchers with Checkers {
         check { (a: ByteString) ⇒ a.asByteBuffers.foldLeft(ByteString.empty) { (bs, bb) ⇒ bs ++ ByteString(bb) } == a }
         check { (a: ByteString) ⇒ a.asByteBuffers.forall(_.isReadOnly) }
         check { (a: ByteString) ⇒
-                import scala.collection.JavaConverters.iterableAsScalaIterableConverter;
-                a.asByteBuffers.zip(a.getByteBuffers().asScala).forall(x ⇒ x._1 == x._2)
+          import scala.collection.JavaConverters.iterableAsScalaIterableConverter;
+          a.asByteBuffers.zip(a.getByteBuffers().asScala).forall(x ⇒ x._1 == x._2)
         }
       }
     }

From d4549ffb719fbac34bfecb49e959511465eea4aa Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Mon, 28 Jan 2013 23:20:43 +0100
Subject: [PATCH 107/122] Reenabling the SerializationCompatibilitySpec, now
 with extra bells and whistles.

---
 .../akka/serialization/SerializeSpec.scala    | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala b/akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala
index bb5e7e9871..8e1ccd1bdc 100644
--- a/akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala
@@ -328,35 +328,37 @@ class SerializationCompatibilitySpec extends AkkaSpec(SerializationTests.mostlyR
   val ser = SerializationExtension(system)
 
   "Cross-version serialization compatibility" must {
-    def verify(obj: Any, asExpected: String): Unit = String.valueOf(encodeHex(ser.serialize(obj, obj.getClass).get)) must be(asExpected)
-    "be preserved for the Create SystemMessage" ignore {
+    def verify(obj: Any, asExpected: String): Unit =
+      String.valueOf(encodeHex(ser.serialize(obj, obj.getClass).get)) must be(asExpected)
+
+    "be preserved for the Create SystemMessage" in {
       verify(Create(1234), "aced00057372000c7363616c612e5475706c6532bc7daadf46211a990200024c00025f317400124c6a6176612f6c616e672f4f626a6563743b4c00025f3271007e0001787073720014616b6b612e64697370617463682e437265617465bcdf9f7f2675038d0200014900037569647870000004d27671007e0003")
     }
-    "be preserved for the Recreate SystemMessage" ignore {
-      verify(Recreate(FakeThrowable("x")), "aced00057372000c7363616c612e5475706c6532bc7daadf46211a990200024c00025f317400124c6a6176612f6c616e672f4f626a6563743b4c00025f3271007e0001787073720016616b6b612e64697370617463682e52656372656174650987c65c8d378a800200014c000563617573657400154c6a6176612f6c616e672f5468726f7761626c653b787073720020616b6b612e73657269616c697a6174696f6e2e46616b655468726f7761626c6500000000000000010200014c00036d73677400124c6a6176612f6c616e672f537472696e673b787200136a6176612e6c616e672e5468726f7761626c65d5c635273977b8cb0300044c0005636175736571007e00044c000d64657461696c4d65737361676571007e00075b000a737461636b547261636574001e5b4c6a6176612f6c616e672f537461636b5472616365456c656d656e743b4c001473757070726573736564457863657074696f6e737400104c6a6176612f7574696c2f4c6973743b787071007e000b740001787572001e5b4c6a6176612e6c616e672e537461636b5472616365456c656d656e743b02462a3c3cfd2239020000787000000000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c69737471007e000a7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c0001637400164c6a6176612f7574696c2f436f6c6c656374696f6e3b7870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a657870000000007704000000007871007e00147871007e000c7671007e0003")
+    "be preserved for the Recreate SystemMessage" in {
+      verify(Recreate(null), "aced00057372000c7363616c612e5475706c6532bc7daadf46211a990200024c00025f317400124c6a6176612f6c616e672f4f626a6563743b4c00025f3271007e0001787073720016616b6b612e64697370617463682e52656372656174650987c65c8d378a800200014c000563617573657400154c6a6176612f6c616e672f5468726f7761626c653b7870707671007e0003")
     }
-    "be preserved for the Suspend SystemMessage" ignore {
+    "be preserved for the Suspend SystemMessage" in {
       verify(Suspend(), "aced00057372000c7363616c612e5475706c6532bc7daadf46211a990200024c00025f317400124c6a6176612f6c616e672f4f626a6563743b4c00025f3271007e0001787073720015616b6b612e64697370617463682e53757370656e6464e531d5d134b59902000078707671007e0003")
     }
-    "be preserved for the Resume SystemMessage" ignore {
-      verify(Resume(FakeThrowable("x")), "aced00057372000c7363616c612e5475706c6532bc7daadf46211a990200024c00025f317400124c6a6176612f6c616e672f4f626a6563743b4c00025f3271007e0001787073720014616b6b612e64697370617463682e526573756d65dc5e646d445fcb010200014c000f63617573656442794661696c7572657400154c6a6176612f6c616e672f5468726f7761626c653b787073720020616b6b612e73657269616c697a6174696f6e2e46616b655468726f7761626c6500000000000000010200014c00036d73677400124c6a6176612f6c616e672f537472696e673b787200136a6176612e6c616e672e5468726f7761626c65d5c635273977b8cb0300044c0005636175736571007e00044c000d64657461696c4d65737361676571007e00075b000a737461636b547261636574001e5b4c6a6176612f6c616e672f537461636b5472616365456c656d656e743b4c001473757070726573736564457863657074696f6e737400104c6a6176612f7574696c2f4c6973743b787071007e000b740001787572001e5b4c6a6176612e6c616e672e537461636b5472616365456c656d656e743b02462a3c3cfd2239020000787000000000737200266a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c654c697374fc0f2531b5ec8e100200014c00046c69737471007e000a7872002c6a6176612e7574696c2e436f6c6c656374696f6e7324556e6d6f6469666961626c65436f6c6c656374696f6e19420080cb5ef71e0200014c0001637400164c6a6176612f7574696c2f436f6c6c656374696f6e3b7870737200136a6176612e7574696c2e41727261794c6973747881d21d99c7619d03000149000473697a657870000000007704000000007871007e00147871007e000c7671007e0003")
+    "be preserved for the Resume SystemMessage" in {
+      verify(Resume(null), "aced00057372000c7363616c612e5475706c6532bc7daadf46211a990200024c00025f317400124c6a6176612f6c616e672f4f626a6563743b4c00025f3271007e0001787073720014616b6b612e64697370617463682e526573756d65dc5e646d445fcb010200014c000f63617573656442794661696c7572657400154c6a6176612f6c616e672f5468726f7761626c653b7870707671007e0003")
     }
-    "be preserved for the Terminate SystemMessage" ignore {
+    "be preserved for the Terminate SystemMessage" in {
       verify(Terminate(), "aced00057372000c7363616c612e5475706c6532bc7daadf46211a990200024c00025f317400124c6a6176612f6c616e672f4f626a6563743b4c00025f3271007e0001787073720017616b6b612e64697370617463682e5465726d696e61746509d66ca68318700f02000078707671007e0003")
     }
-    "be preserved for the Supervise SystemMessage" ignore {
+    "be preserved for the Supervise SystemMessage" in {
       verify(Supervise(FakeActorRef("child"), true, 2468), "aced00057372000c7363616c612e5475706c6532bc7daadf46211a990200024c00025f317400124c6a6176612f6c616e672f4f626a6563743b4c00025f3271007e0001787073720017616b6b612e64697370617463682e5375706572766973652d0b363f56ab5feb0200035a00056173796e634900037569644c00056368696c647400154c616b6b612f6163746f722f4163746f725265663b787001000009a47372001f616b6b612e73657269616c697a6174696f6e2e46616b654163746f7252656600000000000000010200014c00046e616d657400124c6a6176612f6c616e672f537472696e673b7872001b616b6b612e6163746f722e496e7465726e616c4163746f725265660d0aa2ca1e82097602000078720013616b6b612e6163746f722e4163746f72526566c3585dde655f469402000078707400056368696c647671007e0003")
     }
-    "be preserved for the ChildTerminated SystemMessage" ignore {
+    "be preserved for the ChildTerminated SystemMessage" in {
       verify(ChildTerminated(FakeActorRef("child")), "aced00057372000c7363616c612e5475706c6532bc7daadf46211a990200024c00025f317400124c6a6176612f6c616e672f4f626a6563743b4c00025f3271007e000178707372001d616b6b612e64697370617463682e4368696c645465726d696e617465644c84222437ed5db40200014c00056368696c647400154c616b6b612f6163746f722f4163746f725265663b78707372001f616b6b612e73657269616c697a6174696f6e2e46616b654163746f7252656600000000000000010200014c00046e616d657400124c6a6176612f6c616e672f537472696e673b7872001b616b6b612e6163746f722e496e7465726e616c4163746f725265660d0aa2ca1e82097602000078720013616b6b612e6163746f722e4163746f72526566c3585dde655f469402000078707400056368696c647671007e0003")
     }
-    "be preserved for the Watch SystemMessage" ignore {
+    "be preserved for the Watch SystemMessage" in {
       verify(Watch(FakeActorRef("watchee"), FakeActorRef("watcher")), "aced00057372000c7363616c612e5475706c6532bc7daadf46211a990200024c00025f317400124c6a6176612f6c616e672f4f626a6563743b4c00025f3271007e0001787073720013616b6b612e64697370617463682e57617463682e1e65bc74394fc40200024c0007776174636865657400154c616b6b612f6163746f722f4163746f725265663b4c00077761746368657271007e000478707372001f616b6b612e73657269616c697a6174696f6e2e46616b654163746f7252656600000000000000010200014c00046e616d657400124c6a6176612f6c616e672f537472696e673b7872001b616b6b612e6163746f722e496e7465726e616c4163746f725265660d0aa2ca1e82097602000078720013616b6b612e6163746f722e4163746f72526566c3585dde655f46940200007870740007776174636865657371007e0006740007776174636865727671007e0003")
     }
-    "be preserved for the Unwatch SystemMessage" ignore {
+    "be preserved for the Unwatch SystemMessage" in {
       verify(Unwatch(FakeActorRef("watchee"), FakeActorRef("watcher")), "aced00057372000c7363616c612e5475706c6532bc7daadf46211a990200024c00025f317400124c6a6176612f6c616e672f4f626a6563743b4c00025f3271007e0001787073720015616b6b612e64697370617463682e556e776174636858501f7ee63dc2100200024c0007776174636865657400154c616b6b612f6163746f722f4163746f725265663b4c00077761746368657271007e000478707372001f616b6b612e73657269616c697a6174696f6e2e46616b654163746f7252656600000000000000010200014c00046e616d657400124c6a6176612f6c616e672f537472696e673b7872001b616b6b612e6163746f722e496e7465726e616c4163746f725265660d0aa2ca1e82097602000078720013616b6b612e6163746f722e4163746f72526566c3585dde655f46940200007870740007776174636865657371007e0006740007776174636865727671007e0003")
     }
-    "be preserved for the NoMessage SystemMessage" ignore {
+    "be preserved for the NoMessage SystemMessage" in {
       verify(NoMessage, "aced00057372000c7363616c612e5475706c6532bc7daadf46211a990200024c00025f317400124c6a6176612f6c616e672f4f626a6563743b4c00025f3271007e0001787073720018616b6b612e64697370617463682e4e6f4d65737361676524b401a3610ccb70dd02000078707671007e0003")
     }
   }

From 240981d4d55fb939c4ff5216d539b8b51e7f3965 Mon Sep 17 00:00:00 2001
From: Christophe Pache <christophe.pache@crossing-tech.com>
Date: Tue, 29 Jan 2013 10:17:06 +0100
Subject: [PATCH 108/122] user configuration for OSGi application bundle

---
 .../scala/akka/osgi/ActorSystemActivator.scala    | 15 ++++++++++++++-
 .../scala/akka/osgi/OsgiActorSystemFactory.scala  | 15 ++++-----------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/akka-osgi/src/main/scala/akka/osgi/ActorSystemActivator.scala b/akka-osgi/src/main/scala/akka/osgi/ActorSystemActivator.scala
index f569a673a4..dfe55728aa 100644
--- a/akka-osgi/src/main/scala/akka/osgi/ActorSystemActivator.scala
+++ b/akka-osgi/src/main/scala/akka/osgi/ActorSystemActivator.scala
@@ -7,6 +7,7 @@ import akka.actor.ActorSystem
 import java.util.{ Dictionary, Properties }
 import org.osgi.framework._
 import org.osgi.service.log.LogService
+import com.typesafe.config.{ ConfigFactory, Config }
 
 /**
  * Abstract bundle activator implementation to bootstrap and configure an actor system in an
@@ -38,7 +39,7 @@ abstract class ActorSystemActivator extends BundleActivator {
    * @param context the BundleContext
    */
   def start(context: BundleContext): Unit = {
-    system = Some(OsgiActorSystemFactory(context).createActorSystem(Option(getActorSystemName(context))))
+    system = Some(OsgiActorSystemFactory(context, getActorSystemConfiguration(context)).createActorSystem(Option(getActorSystemName(context))))
     system foreach (addLogServiceListener(context, _))
     system foreach (configure(context, _))
   }
@@ -109,4 +110,16 @@ abstract class ActorSystemActivator extends BundleActivator {
    */
   def getActorSystemName(context: BundleContext): String = null
 
+  /**
+   * Override this method to define a configuration for your [[akka.actor.ActorSystem]] instance.
+   * This configuration will be merged with fallback on
+   *    the application.conf of your bundle
+   *    the reference.conf of the akka bundles
+   *    the System properties.
+   *
+   * @param context the bundle context
+   * @return the actor system specific configuration, ConfigFactory.empty by default
+   */
+  def getActorSystemConfiguration(context: BundleContext): Config = ConfigFactory.empty
+
 }
diff --git a/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala b/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala
index 4194afba01..7e434671b2 100644
--- a/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala
+++ b/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala
@@ -13,7 +13,7 @@ import java.io.File
  * Factory class to create ActorSystem implementations in an OSGi environment.  This mainly involves dealing with
  * bundle classloaders appropriately to ensure that configuration files and classes get loaded properly
  */
-class OsgiActorSystemFactory(val context: BundleContext, val fallbackClassLoader: Option[ClassLoader]) {
+class OsgiActorSystemFactory(val context: BundleContext, val fallbackClassLoader: Option[ClassLoader], config: Config = ConfigFactory.empty) {
 
   /*
    * Classloader that delegates to the bundle for which the factory is creating an ActorSystem
@@ -34,19 +34,12 @@ class OsgiActorSystemFactory(val context: BundleContext, val fallbackClassLoader
     ActorSystem(actorSystemName(name), actorSystemConfig(context), classloader)
 
   /**
-   * Strategy method to create the Config for the ActorSystem, based on configuration files found in etc directory,
+   * Strategy method to create the Config for the ActorSystem
    * ensuring that the default/reference configuration is loaded from the akka-actor bundle.
-   * The configuration is based on
-   * etc/bundle-SYMBOLICNAME, etc/bundle-ID, etc/akka.conf
-   * in either ".conf", ".properties", ".json" formats
    * Configuration files found in akka-actor bundle
    */
   def actorSystemConfig(context: BundleContext): Config = {
-    val bundleSymbolicName = context.getBundle.getSymbolicName
-    val bundleId = context.getBundle.getBundleId
-    val acceptedFilePath = List(s"bundle-$bundleSymbolicName", s"bundle-$bundleId", "akka").map(x ⇒ s"etc/$x")
-    val applicationConfiguration = acceptedFilePath.foldLeft(ConfigFactory.empty())((x, y) ⇒ x.withFallback(ConfigFactory.parseFileAnySyntax(new File(y))))
-    applicationConfiguration.withFallback(ConfigFactory.load(classloader).withFallback(ConfigFactory.defaultReference(OsgiActorSystemFactory.akkaActorClassLoader)))
+    config.withFallback(ConfigFactory.load(classloader).withFallback(ConfigFactory.defaultReference(OsgiActorSystemFactory.akkaActorClassLoader)))
   }
 
   /**
@@ -67,5 +60,5 @@ object OsgiActorSystemFactory {
   /*
    * Create an [[OsgiActorSystemFactory]] instance to set up Akka in an OSGi environment
    */
-  def apply(context: BundleContext): OsgiActorSystemFactory = new OsgiActorSystemFactory(context, Some(akkaActorClassLoader))
+  def apply(context: BundleContext, config: Config): OsgiActorSystemFactory = new OsgiActorSystemFactory(context, Some(akkaActorClassLoader), config)
 }

From c48d9c058e499690ebb7b5563002b2b975da1424 Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Mon, 28 Jan 2013 08:47:52 +0100
Subject: [PATCH 109/122] Clarifications of cluster singleton docs, see #2895

---
 akka-contrib/docs/cluster-singleton.rst       | 22 ++++++---
 .../pattern/ClusterSingletonManager.scala     | 36 +++++++--------
 .../pattern/ClusterSingletonManagerSpec.scala | 45 +++++++++++++------
 3 files changed, 67 insertions(+), 36 deletions(-)

diff --git a/akka-contrib/docs/cluster-singleton.rst b/akka-contrib/docs/cluster-singleton.rst
index 943b72e9b4..47a372115b 100644
--- a/akka-contrib/docs/cluster-singleton.rst
+++ b/akka-contrib/docs/cluster-singleton.rst
@@ -33,9 +33,9 @@ node that becomes leader or removing current leader node. Be aware that there is
 time period when there is no active singleton during the hand over process.
 
 The cluster failure detector will notice when a leader node becomes unreachable due to 
-things like JVM crash, hard shutdown, or network failure. Then a new leader node will 
+things like JVM crash, hard shut down, or network failure. Then a new leader node will 
 take over and a new singleton actor is created. For these failure scenarios there will 
-not be a graceful hand over, but more than one active singletons is prevented by all 
+not be a graceful hand-over, but more than one active singletons is prevented by all 
 reasonable means. Some corner cases are eventually resolved by configurable timeouts.
 
 You access the singleton actor with ``actorFor`` using the names you have specified when 
@@ -71,10 +71,22 @@ Note that you can send back current state to the ``ClusterSingletonManager`` bef
 This message will be sent over to the ``ClusterSingletonManager`` at the new leader node and it
 will be passed to the ``singletonProps`` factory when creating the new singleton instance.
 
-With the names given above the singleton actor can be looked up by subscribing to 
-``LeaderChanged`` cluster event and using ``actorFor``:
+With the names given above the path of singleton actor can be constructed by subscribing to 
+``LeaderChanged`` cluster event and the actor reference is then looked up using ``actorFor``:
 
-.. includecode:: @contribSrc@/src/multi-jvm/scala/akka/contrib/pattern/ClusterSingletonManagerSpec.scala#singleton-actorFor
+.. includecode:: @contribSrc@/src/multi-jvm/scala/akka/contrib/pattern/ClusterSingletonManagerSpec.scala#singleton-proxy
 
+Note that the hand-over might still be in progress and the singleton actor might not be started yet 
+when you receive the ``LeaderChanged`` event.
+
+To test scenarios where the cluster leader node is removed or shut down you can use :ref:`multi-node-testing` and 
+utilize the fact that the leader is supposed to be the first member when sorted by member address.
+
+.. includecode:: @contribSrc@/src/multi-jvm/scala/akka/contrib/pattern/ClusterSingletonManagerSpec.scala#sort-cluster-roles
+
+.. includecode:: @contribSrc@/src/multi-jvm/scala/akka/contrib/pattern/ClusterSingletonManagerSpec.scala#test-leave
+
+Also, make sure that you don't shut down the first role, which is running the test conductor controller. 
+Use a dedicated role for the controller, which is not a cluster member.
 
 .. note:: The singleton pattern will be simplified, perhaps provided out-of-the-box, when the cluster handles automatic actor partitioning.
diff --git a/akka-contrib/src/main/scala/akka/contrib/pattern/ClusterSingletonManager.scala b/akka-contrib/src/main/scala/akka/contrib/pattern/ClusterSingletonManager.scala
index cc4b989328..c641524644 100644
--- a/akka-contrib/src/main/scala/akka/contrib/pattern/ClusterSingletonManager.scala
+++ b/akka-contrib/src/main/scala/akka/contrib/pattern/ClusterSingletonManager.scala
@@ -36,19 +36,19 @@ object ClusterSingletonManager {
   private object Internal {
     /**
      * Sent from new leader to previous leader to initate the
-     * hand over process. `HandOverInProgress` and `HandOverDone`
+     * hand-over process. `HandOverInProgress` and `HandOverDone`
      * are expected replies.
      */
     case object HandOverToMe
     /**
      * Confirmation by the previous leader that the hand
-     * over process, shutdown of the singleton actor, has
+     * over process, shut down of the singleton actor, has
      * started.
      */
     case object HandOverInProgress
     /**
      * Confirmation by the previous leader that the singleton
-     * actor has been terminated and the hand over process is
+     * actor has been terminated and the hand-over process is
      * completed. The `handOverData` holds the message, if any,
      * sent from the singleton actor to its parent ClusterSingletonManager
      * when shutting down. It is passed to the `singletonProps`
@@ -57,7 +57,7 @@ object ClusterSingletonManager {
     case class HandOverDone(handOverData: Option[Any])
     /**
      * Sent from from previous leader to new leader to
-     * initiate the normal hand over process.
+     * initiate the normal hand-over process.
      * Especially useful when new node joins and becomes
      * leader immediately, without knowing who was previous
      * leader.
@@ -160,7 +160,7 @@ trait ClusterSingletonPropsFactory extends Serializable {
   /**
    * Create the `Props` from the `handOverData` sent from
    * previous singleton. `handOverData` might be null
-   * when no hand over took place, or when the there is no need
+   * when no hand-over took place, or when the there is no need
    * for sending data to the new singleton.
    */
   def create(handOverData: Any): Props
@@ -189,18 +189,18 @@ class ClusterSingletonManagerIsStuck(message: String) extends AkkaException(mess
  * over can normally be performed when joining a new node that becomes
  * leader or removing current leader node. Be aware that there is a
  * short time period when there is no active singleton during the
- * hand over process.
+ * hand-over process.
  *
  * The singleton actor can at any time send a message to its parent
  * ClusterSingletonManager and this message will be passed to the
  * `singletonProps` factory on the new leader node when a graceful
- * hand over is performed.
+ * hand-over is performed.
  *
  * The cluster failure detector will notice when a leader node
- * becomes unreachable due to things like JVM crash, hard shutdown,
+ * becomes unreachable due to things like JVM crash, hard shut down,
  * or network failure. Then a new leader node will take over and a
  * new singleton actor is created. For these failure scenarios there
- * will not be a graceful hand over, but more than one active singletons
+ * will not be a graceful hand-over, but more than one active singletons
  * is prevented by all reasonable means. Some corner cases are eventually
  * resolved by configurable timeouts.
  *
@@ -215,7 +215,7 @@ class ClusterSingletonManagerIsStuck(message: String) extends AkkaException(mess
  * '''''singletonProps''''' Factory for [[akka.actor.Props]] of the
  *   singleton actor instance. The `Option` parameter is the the
  *   `handOverData` sent from previous singleton. `handOverData`
- *    might be None when no hand over took place, or when the there
+ *    might be None when no hand-over took place, or when the there
  *    is no need for sending data to the new singleton. The `handOverData`
  *    is typically passed as parameter to the constructor of the
  *    singleton actor.
@@ -227,13 +227,13 @@ class ClusterSingletonManagerIsStuck(message: String) extends AkkaException(mess
  *   it to finish its work, close resources, and stop. It can sending
  *   a message back to the parent ClusterSingletonManager, which will
  *   passed to the `singletonProps` factory on the new leader node.
- *   The hand over to the new leader node is completed when the
+ *   The hand-over to the new leader node is completed when the
  *   singleton actor is terminated.
  *   Note that [[akka.actor.PoisonPill]] is a perfectly fine
  *   `terminationMessage` if you only need to stop the actor.
  *
  * '''''maxHandOverRetries''''' When a node is becoming leader it sends
- *   hand over request to previous leader. This is retried with the
+ *   hand-over request to previous leader. This is retried with the
  *   `retryInterval` until the previous leader confirms that the hand
  *   over has started, or this `maxHandOverRetries` limit has been
  *   reached. If the retry limit is reached it takes the decision to be
@@ -246,7 +246,7 @@ class ClusterSingletonManagerIsStuck(message: String) extends AkkaException(mess
  *
  * '''''maxTakeOverRetries''''' When a leader node is not leader any more
  *   it sends take over request to the new leader to initiate the normal
- *   hand over process. This is especially useful when new node joins and becomes
+ *   hand-over process. This is especially useful when new node joins and becomes
  *   leader immediately, without knowing who was previous leader. This is retried
  *   with the `retryInterval` until this retry limit has been reached. If the retry
  *   limit is reached it initiates a new round by throwing
@@ -412,8 +412,8 @@ class ClusterSingletonManager(
   when(BecomingLeader) {
 
     case Event(HandOverInProgress, _) ⇒
-      // confirmation that the hand over process has started
-      logInfo("Hand over in progress at [{}]", sender.path.address)
+      // confirmation that the hand-over process has started
+      logInfo("Hand-over in progress at [{}]", sender.path.address)
       cancelTimer(HandOverRetryTimer)
       stay
 
@@ -480,7 +480,7 @@ class ClusterSingletonManager(
           setTimer(TakeOverRetryTimer, TakeOverRetry(leaderPeer, 1), retryInterval, repeat = false)
           goto(WasLeader) using WasLeaderData(singleton, singletonTerminated, handOverData, newLeader = a)
         case _ ⇒
-          // new leader will initiate the hand over
+          // new leader will initiate the hand-over
           stay
       }
 
@@ -503,7 +503,7 @@ class ClusterSingletonManager(
         setTimer(TakeOverRetryTimer, TakeOverRetry(leaderPeer, count + 1), retryInterval, repeat = false)
         stay
       } else
-        throw new ClusterSingletonManagerIsStuck(s"Expected hand over to [${newLeader}] never occured")
+        throw new ClusterSingletonManagerIsStuck(s"Expected hand-over to [${newLeader}] never occured")
 
     case Event(HandOverToMe, WasLeaderData(singleton, singletonTerminated, handOverData, _)) ⇒
       gotoHandingOver(singleton, singletonTerminated, handOverData, Some(sender))
@@ -546,7 +546,7 @@ class ClusterSingletonManager(
 
   def handOverDone(handOverTo: Option[ActorRef], handOverData: Option[Any]): State = {
     val newLeader = handOverTo.map(_.path.address)
-    logInfo("Singleton terminated, hand over done [{} -> {}]", cluster.selfAddress, newLeader)
+    logInfo("Singleton terminated, hand-over done [{} -> {}]", cluster.selfAddress, newLeader)
     handOverTo foreach { _ ! HandOverDone(handOverData) }
     goto(NonLeader) using NonLeaderData(newLeader)
   }
diff --git a/akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ClusterSingletonManagerSpec.scala b/akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ClusterSingletonManagerSpec.scala
index 83f9d4de92..672ca7037d 100644
--- a/akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ClusterSingletonManagerSpec.scala
+++ b/akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ClusterSingletonManagerSpec.scala
@@ -11,6 +11,7 @@ import com.typesafe.config.ConfigFactory
 import akka.actor.Actor
 import akka.actor.ActorLogging
 import akka.actor.ActorRef
+import akka.actor.Address
 import akka.actor.Props
 import akka.actor.RootActorPath
 import akka.cluster.Cluster
@@ -141,6 +142,29 @@ object ClusterSingletonManagerSpec extends MultiNodeConfig {
     }
   }
 
+  // documentation of how to keep track of the leader address in user land
+  //#singleton-proxy
+  class ConsumerProxy extends Actor {
+    // subscribe to LeaderChanged, re-subscribe when restart
+    override def preStart(): Unit =
+      Cluster(context.system).subscribe(self, classOf[LeaderChanged])
+    override def postStop(): Unit =
+      Cluster(context.system).unsubscribe(self)
+
+    var leaderAddress: Option[Address] = None
+
+    def receive = {
+      case state: CurrentClusterState ⇒ leaderAddress = state.leader
+      case LeaderChanged(leader) ⇒ leaderAddress = leader
+      case other => consumer foreach { _ forward other }
+    }
+
+    def consumer: Option[ActorRef] =
+      leaderAddress map (a => context.actorFor(RootActorPath(a) /
+        "user" / "singleton" / "consumer"))
+  }
+  //#singleton-proxy
+
 }
 
 class ClusterSingletonManagerMultiJvmNode1 extends ClusterSingletonManagerSpec
@@ -158,14 +182,17 @@ class ClusterSingletonManagerSpec extends MultiNodeSpec(ClusterSingletonManagerS
 
   override def initialParticipants = roles.size
 
+  //#sort-cluster-roles
   // Sort the roles in the order used by the cluster.
   lazy val sortedClusterRoles: immutable.IndexedSeq[RoleName] = {
     implicit val clusterOrdering: Ordering[RoleName] = new Ordering[RoleName] {
       import Member.addressOrdering
-      def compare(x: RoleName, y: RoleName) = addressOrdering.compare(node(x).address, node(y).address)
+      def compare(x: RoleName, y: RoleName) =
+        addressOrdering.compare(node(x).address, node(y).address)
     }
     roles.filterNot(_ == controller).toVector.sorted
   }
+  //#sort-cluster-roles
 
   def queue: ActorRef = system.actorFor(node(controller) / "user" / "queue")
 
@@ -180,18 +207,8 @@ class ClusterSingletonManagerSpec extends MultiNodeSpec(ClusterSingletonManagerS
     //#create-singleton-manager
   }
 
-  def consumer(leader: RoleName): ActorRef = {
-    // the reason for this complicated way of creating the path is to illustrate
-    // in documentation how it's typically done in user land
-    LeaderChanged(Some(node(leader).address)) match {
-      //#singleton-actorFor
-      case LeaderChanged(Some(leaderAddress)) ⇒
-        val path = RootActorPath(leaderAddress) / "user" / "singleton" / "consumer"
-        val consumer = system.actorFor(path)
-        //#singleton-actorFor
-        consumer
-    }
-  }
+  def consumer(leader: RoleName): ActorRef =
+    system.actorFor(RootActorPath(node(leader).address) / "user" / "singleton" / "consumer")
 
   def verify(leader: RoleName, msg: Int, expectedCurrent: Int): Unit = {
     enterBarrier("before-" + leader.name + "-verified")
@@ -284,12 +301,14 @@ class ClusterSingletonManagerSpec extends MultiNodeSpec(ClusterSingletonManagerS
     }
 
     "hand over when leader leaves in 6 nodes cluster " in within(20 seconds) {
+      //#test-leave
       val leaveRole = sortedClusterRoles(0)
       val newLeaderRole = sortedClusterRoles(1)
 
       runOn(leaveRole) {
         Cluster(system) leave node(leaveRole).address
       }
+      //#test-leave
 
       verify(newLeaderRole, msg = 5, expectedCurrent = 4)
 

From cc9c9ce12abad485408500488560752706e7df10 Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Mon, 28 Jan 2013 18:26:53 +0100
Subject: [PATCH 110/122] Fix race in CircuitBreakerMTSpec.openBreaker, see
 #2953

* The problem was that the breaker is asynchronous so it may
  take some extra time to open.
* Was able to reproduce with a sleep in onComplete in
  CircuitBreaker L303
* Added an extra awaitCond in case the normal (quick)
  failing calls don't open the breaker
---
 .../akka/pattern/CircuitBreakerMTSpec.scala   | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerMTSpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerMTSpec.scala
index c3a5a9cb83..57fc716682 100644
--- a/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerMTSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerMTSpec.scala
@@ -14,18 +14,22 @@ class CircuitBreakerMTSpec extends AkkaSpec {
   "A circuit breaker being called by many threads" must {
     val callTimeout = 1.second.dilated
     val resetTimeout = 2.seconds.dilated
-    val breaker = new CircuitBreaker(system.scheduler, 5, callTimeout, resetTimeout)
+    val maxFailures = 5
+    val breaker = new CircuitBreaker(system.scheduler, maxFailures, callTimeout, resetTimeout)
     val numberOfTestCalls = 100
 
     def openBreaker(): Unit = {
-      @tailrec def call(attemptsLeft: Int): Unit = {
-        attemptsLeft must be > (0)
-        if (Await.result(breaker.withCircuitBreaker(Future(throw new RuntimeException("FAIL"))) recover {
-          case _: CircuitBreakerOpenException ⇒ false
-          case _                              ⇒ true
-        }, remaining)) call(attemptsLeft - 1)
-      }
-      call(10)
+      // returns true if the breaker is open
+      def failingCall(): Boolean =
+        Await.result(breaker.withCircuitBreaker(Future(throw new RuntimeException("FAIL"))) recover {
+          case _: CircuitBreakerOpenException ⇒ true
+          case _                              ⇒ false
+        }, remaining)
+
+      // fire some failing calls
+      1 to (maxFailures + 1) foreach { _ ⇒ failingCall() }
+      // and then continue with failing calls until the breaker is open
+      awaitCond(failingCall())
     }
 
     def testCallsWithBreaker(): immutable.IndexedSeq[Future[String]] = {

From ff540d76ecdfbb2aa311d2c471f5ec583c8f7531 Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Mon, 28 Jan 2013 23:43:55 +0100
Subject: [PATCH 111/122] Making sure that the current Threads' UEH is called
 when using Akka FJP in Dispatcher as ExecutionContext

---
 .../main/scala/akka/actor/ActorSystem.scala   | 21 +++++++++----------
 .../akka/dispatch/AbstractDispatcher.scala    | 15 +++++++------
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala
index f4398a1180..0e9705fb65 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala
@@ -4,23 +4,22 @@
 
 package akka.actor
 
+import java.io.Closeable
+import java.util.concurrent.{ ConcurrentHashMap, ThreadFactory, CountDownLatch, TimeoutException, RejectedExecutionException }
+import java.util.concurrent.TimeUnit.MILLISECONDS
+import com.typesafe.config.{ Config, ConfigFactory }
 import akka.event._
 import akka.dispatch._
 import akka.japi.Util.immutableSeq
-import com.typesafe.config.{ Config, ConfigFactory }
+import akka.actor.dungeon.ChildrenContainer
+import akka.util._
 import scala.annotation.tailrec
 import scala.collection.immutable
 import scala.concurrent.duration.{ FiniteDuration, Duration }
-import scala.concurrent.{ Await, Awaitable, CanAwait, Future }
+import scala.concurrent.{ Await, Awaitable, CanAwait, Future, ExecutionContext }
 import scala.util.{ Failure, Success }
-import scala.util.control.NonFatal
-import akka.util._
-import java.io.Closeable
-import akka.util.internal.{ HashedWheelTimer }
-import java.util.concurrent.{ ConcurrentHashMap, ThreadFactory, CountDownLatch, TimeoutException, RejectedExecutionException }
-import java.util.concurrent.TimeUnit.MILLISECONDS
-import akka.actor.dungeon.ChildrenContainer
-import scala.concurrent.ExecutionContext
+import scala.util.control.{ NonFatal, ControlThrowable }
+
 
 object ActorSystem {
 
@@ -465,7 +464,7 @@ private[akka] class ActorSystemImpl(val name: String, applicationConfig: Config,
     new Thread.UncaughtExceptionHandler() {
       def uncaughtException(thread: Thread, cause: Throwable): Unit = {
         cause match {
-          case NonFatal(_) | _: InterruptedException ⇒ log.error(cause, "Uncaught error from thread [{}]", thread.getName)
+          case NonFatal(_) | _: InterruptedException | _: NotImplementedError | _: ControlThrowable ⇒ log.error(cause, "Uncaught error from thread [{}]", thread.getName)
           case _ ⇒
             if (settings.JvmExitOnFatalError) {
               try {
diff --git a/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala b/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala
index e6f7dccd37..9739a7284a 100644
--- a/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala
@@ -487,10 +487,8 @@ object ForkJoinExecutorConfigurator {
                                threadFactory: ForkJoinPool.ForkJoinWorkerThreadFactory,
                                unhandledExceptionHandler: Thread.UncaughtExceptionHandler)
     extends ForkJoinPool(parallelism, threadFactory, unhandledExceptionHandler, true) with LoadMetrics {
-    override def execute(r: Runnable): Unit = r match {
-      case m: Mailbox ⇒ super.execute(new MailboxExecutionTask(m))
-      case other      ⇒ super.execute(other)
-    }
+    override def execute(r: Runnable): Unit =
+      if (r eq null) throw new NullPointerException else super.execute(new AkkaForkJoinTask(r))
 
     def atFullThrottle(): Boolean = this.getActiveThreadCount() >= this.getParallelism()
   }
@@ -498,10 +496,11 @@ object ForkJoinExecutorConfigurator {
   /**
    * INTERNAL AKKA USAGE ONLY
    */
-  final class MailboxExecutionTask(mailbox: Mailbox) extends ForkJoinTask[Unit] {
-    final override def setRawResult(u: Unit): Unit = ()
-    final override def getRawResult(): Unit = ()
-    final override def exec(): Boolean = try { mailbox.run; true } catch {
+  @SerialVersionUID(1L)
+  final class AkkaForkJoinTask(runnable: Runnable) extends ForkJoinTask[Unit] {
+    override def getRawResult(): Unit = ()
+    override def setRawResult(unit: Unit): Unit = ()
+    final override def exec(): Boolean = try { runnable.run(); true } catch {
       case anything: Throwable ⇒
         val t = Thread.currentThread
         t.getUncaughtExceptionHandler match {

From e0a9dd70ba8fb0e5df0e398d13aa043c24ceea83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Endre=20S=C3=A1ndor=20Varga?= <vendre@hit.bme.hu>
Date: Mon, 28 Jan 2013 14:38:33 +0100
Subject: [PATCH 112/122] Dead letters containing remote envelopes handled
 correctly #2959

 - New DeadLetter class for handling remoting specific envelopes
 - Fixed error handling of name lookups
 - Name lookup is now handled via futures (future refactor opportunity)
---
 .../akka/cluster/ClusterDeathWatchSpec.scala  | 20 ++-----------
 akka-remote/src/main/resources/reference.conf |  8 +++++
 .../src/main/scala/akka/remote/Endpoint.scala |  2 +-
 .../akka/remote/RemoteActorRefProvider.scala  | 29 +++++++++++++++++--
 .../scala/akka/remote/RemoteSettings.scala    |  2 ++
 .../src/main/scala/akka/remote/Remoting.scala |  2 +-
 .../transport/netty/NettyTransport.scala      | 21 +++++++++-----
 .../scala/akka/remote/RemoteConfigSpec.scala  |  2 ++
 .../akka/remote/RemoteDeathWatchSpec.scala    | 16 +++++++++-
 9 files changed, 71 insertions(+), 31 deletions(-)

diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterDeathWatchSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterDeathWatchSpec.scala
index aca2ea196d..8a712dba0e 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterDeathWatchSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterDeathWatchSpec.scala
@@ -106,22 +106,6 @@ abstract class ClusterDeathWatchSpec
 
     }
 
-    "receive Terminated when watched node is unknown host" taggedAs LongRunningTest in {
-      runOn(first) {
-        val path = RootActorPath(Address("akka", system.name, "unknownhost", 2552)) / "user" / "subject"
-        system.actorOf(Props(new Actor {
-          context.watch(context.actorFor(path))
-          def receive = {
-            case t: Terminated ⇒ testActor ! t.actor.path
-          }
-        }), name = "observer2")
-
-        expectMsg(path)
-      }
-
-      enterBarrier("after-2")
-    }
-
     "receive Terminated when watched path doesn't exist" taggedAs LongRunningTest in {
       runOn(first) {
         val path = RootActorPath(second) / "user" / "non-existing"
@@ -135,7 +119,7 @@ abstract class ClusterDeathWatchSpec
         expectMsg(path)
       }
 
-      enterBarrier("after-3")
+      enterBarrier("after-2")
     }
 
     "be able to shutdown system when using remote deployed actor on node that crash" taggedAs LongRunningTest in within(20 seconds) {
@@ -172,7 +156,7 @@ abstract class ClusterDeathWatchSpec
           testConductor.removeNode(fourth)
         }
 
-        enterBarrier("after-4")
+        enterBarrier("after-3")
       }
 
     }
diff --git a/akka-remote/src/main/resources/reference.conf b/akka-remote/src/main/resources/reference.conf
index 8cf1adccc7..ce5a572484 100644
--- a/akka-remote/src/main/resources/reference.conf
+++ b/akka-remote/src/main/resources/reference.conf
@@ -179,6 +179,14 @@ akka {
     retry-window = 3 s
     maximum-retries-in-window = 5
 
+    # The length of time to gate an address whose name lookup has failed.
+    # No connection attempts will be made to an address while it remains
+    # gated. Any messages sent to a gated address will be directed to dead
+    # letters instead. Name lookups are costly, and the time to recovery
+    # is typically large, therefore this setting should be a value in the
+    # order of seconds or minutes.
+    gate-unknown-addresses-for = 60 s
+
     ### Transports and adapters
 
     # List of the transport drivers that will be loaded by the remoting.
diff --git a/akka-remote/src/main/scala/akka/remote/Endpoint.scala b/akka-remote/src/main/scala/akka/remote/Endpoint.scala
index e678fa9551..0b5cc1306d 100644
--- a/akka-remote/src/main/scala/akka/remote/Endpoint.scala
+++ b/akka-remote/src/main/scala/akka/remote/Endpoint.scala
@@ -172,7 +172,7 @@ private[remote] class EndpointWriter(
       stash()
       stay()
     case Event(Status.Failure(e: InvalidAssociationException), _) ⇒
-      log.error(e, "Tried to associate with invalid remote address [{}]. " +
+      log.error("Tried to associate with invalid remote address [{}]. " +
         "Address is now quarantined, all messages to this address will be delivered to dead letters.", remoteAddress)
       publishAndThrow(new InvalidAssociation(localAddress, remoteAddress, e))
     case Event(Status.Failure(e), _) ⇒
diff --git a/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala b/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
index d70dc96d2e..1f32d88140 100644
--- a/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
+++ b/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
@@ -8,11 +8,12 @@ import akka.actor._
 import akka.dispatch._
 import akka.event.{ Logging, LoggingAdapter, EventStream }
 import akka.event.Logging.Error
-import akka.serialization.{ Serialization, SerializationExtension }
+import akka.serialization.{ JavaSerializer, Serialization, SerializationExtension }
 import akka.pattern.pipe
 import scala.concurrent.Future
 import scala.util.control.NonFatal
 import akka.actor.SystemGuardian.{ TerminationHookDone, TerminationHook, RegisterTerminationHook }
+import scala.throws
 
 object RemoteActorRefProvider {
   private case class Internals(transport: RemoteTransport, serialization: Serialization, remoteDaemon: InternalActorRef)
@@ -59,6 +60,30 @@ object RemoteActorRefProvider {
     }
 
   }
+
+  /*
+   * Remoting wraps messages destined to a remote host in a remoting specific envelope: EndpointManager.Send
+   * As these wrapped messages might arrive to the dead letters of an EndpointWriter, they need to be unwrapped
+   * and handled as dead letters to the original (remote) destination. Without this special case, DeathWatch related
+   * functionality breaks, like the special handling of Watch messages arriving to dead letters.
+   */
+  private class RemoteDeadLetterActorRef(_provider: ActorRefProvider,
+                                         _path: ActorPath,
+                                         _eventStream: EventStream) extends DeadLetterActorRef(_provider, _path, _eventStream) {
+
+    override def !(message: Any)(implicit sender: ActorRef): Unit = message match {
+      case EndpointManager.Send(m, senderOption, _) ⇒ super.!(m)(senderOption.orNull)
+      case _                                        ⇒ super.!(message)(sender)
+    }
+
+    override def specialHandle(msg: Any): Boolean = msg match {
+      case EndpointManager.Send(m, _, _) ⇒ super.specialHandle(m)
+      case _                             ⇒ super.specialHandle(msg)
+    }
+
+    @throws(classOf[java.io.ObjectStreamException])
+    override protected def writeReplace(): AnyRef = DeadLetterActorRef.serialized
+  }
 }
 
 /**
@@ -93,7 +118,7 @@ class RemoteActorRefProvider(
   def log: LoggingAdapter = _log
 
   override def rootPath: ActorPath = local.rootPath
-  override def deadLetters: InternalActorRef = local.deadLetters
+  override val deadLetters: InternalActorRef = new RemoteDeadLetterActorRef(this, rootPath / "deadLetters", eventStream)
 
   // these are only available after init()
   override def rootGuardian: InternalActorRef = local.rootGuardian
diff --git a/akka-remote/src/main/scala/akka/remote/RemoteSettings.scala b/akka-remote/src/main/scala/akka/remote/RemoteSettings.scala
index 9b57579304..2dbcea4e41 100644
--- a/akka-remote/src/main/scala/akka/remote/RemoteSettings.scala
+++ b/akka-remote/src/main/scala/akka/remote/RemoteSettings.scala
@@ -31,6 +31,8 @@ class RemoteSettings(val config: Config) {
 
   val RetryGateClosedFor: FiniteDuration = Duration(getMilliseconds("akka.remote.retry-gate-closed-for"), MILLISECONDS)
 
+  val UnknownAddressGateClosedFor: FiniteDuration = Duration(getMilliseconds("akka.remote.gate-unknown-addresses-for"), MILLISECONDS)
+
   val UsePassiveConnections: Boolean = getBoolean("akka.remote.use-passive-connections")
 
   val MaximumRetriesInWindow: Int = getInt("akka.remote.maximum-retries-in-window")
diff --git a/akka-remote/src/main/scala/akka/remote/Remoting.scala b/akka-remote/src/main/scala/akka/remote/Remoting.scala
index adad076911..e78af62b27 100644
--- a/akka-remote/src/main/scala/akka/remote/Remoting.scala
+++ b/akka-remote/src/main/scala/akka/remote/Remoting.scala
@@ -334,7 +334,7 @@ private[remote] class EndpointManager(conf: Config, log: LoggingAdapter) extends
 
   override val supervisorStrategy = OneForOneStrategy(settings.MaximumRetriesInWindow, settings.RetryWindow) {
     case InvalidAssociation(localAddress, remoteAddress, e) ⇒
-      endpoints.markAsQuarantined(remoteAddress, e)
+      endpoints.markAsFailed(sender, Deadline.now + settings.UnknownAddressGateClosedFor)
       Stop
 
     case NonFatal(e) ⇒
diff --git a/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala b/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
index a7b31042cf..0a3c1a65e4 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala
@@ -318,12 +318,14 @@ class NettyTransport(private val settings: NettyTransportSettings, private val s
     case _                     ⇒ None
   }
 
-  def addressToSocketAddress(addr: Address): InetSocketAddress =
-    new InetSocketAddress(InetAddress.getByName(addr.host.get), addr.port.get)
+  // TODO: This should be factored out to an async (or thread-isolated) name lookup service #2960
+  def addressToSocketAddress(addr: Address): Future[InetSocketAddress] =
+    Future { new InetSocketAddress(InetAddress.getByName(addr.host.get), addr.port.get) }
 
-  override def listen: Future[(Address, Promise[AssociationEventListener])] =
-    (Promise[(Address, Promise[AssociationEventListener])]() complete Try {
-      val address = addressToSocketAddress(Address("", "", settings.Hostname, settings.PortSelector))
+  override def listen: Future[(Address, Promise[AssociationEventListener])] = {
+    for {
+      address ← addressToSocketAddress(Address("", "", settings.Hostname, settings.PortSelector))
+    } yield {
       val newServerChannel = inboundBootstrap match {
         case b: ServerBootstrap         ⇒ b.bind(address)
         case b: ConnectionlessBootstrap ⇒ b.bind(address)
@@ -342,7 +344,8 @@ class NettyTransport(private val settings: NettyTransportSettings, private val s
           (address, associationListenerPromise)
         case None ⇒ throw new NettyTransportException(s"Unknown local address type ${newServerChannel.getLocalAddress.getClass}")
       }
-    }).future
+    }
+  }
 
   override def associate(remoteAddress: Address): Future[AssociationHandle] = {
     if (!serverChannel.isBound) Future.failed(new NettyTransportException("Transport is not bound"))
@@ -350,7 +353,8 @@ class NettyTransport(private val settings: NettyTransportSettings, private val s
       val bootstrap: ClientBootstrap = outboundBootstrap
 
       (for {
-        readyChannel ← NettyFutureBridge(bootstrap.connect(addressToSocketAddress(remoteAddress))) map {
+        socketAddress ← addressToSocketAddress(remoteAddress)
+        readyChannel ← NettyFutureBridge(bootstrap.connect(socketAddress)) map {
           channel ⇒
             if (EnableSsl)
               blocking {
@@ -375,7 +379,8 @@ class NettyTransport(private val settings: NettyTransportSettings, private val s
           readyChannel.getPipeline.get[ClientHandler](classOf[ClientHandler]).statusFuture
       } yield handle) recover {
         case c: CancellationException ⇒ throw new NettyTransportException("Connection was cancelled") with NoStackTrace
-        case NonFatal(t)              ⇒ throw new NettyTransportException(t.getMessage, t.getCause) with NoStackTrace
+        case u @ (_: UnknownHostException | _: SecurityException) ⇒ throw new InvalidAssociationException(u.getMessage, u.getCause)
+        case NonFatal(t) ⇒ throw new NettyTransportException(t.getMessage, t.getCause) with NoStackTrace
       }
     }
   }
diff --git a/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala
index cfdc8b1915..ae47123818 100644
--- a/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala
@@ -33,6 +33,8 @@ class RemoteConfigSpec extends AkkaSpec(
       LogRemoteLifecycleEvents must be(false)
       LogReceive must be(false)
       LogSend must be(false)
+      RetryGateClosedFor must be === 0.seconds
+      UnknownAddressGateClosedFor must be === 10.seconds
       MaximumRetriesInWindow must be === 5
       RetryWindow must be === 3.seconds
       BackoffPeriod must be === 10.milliseconds
diff --git a/akka-remote/src/test/scala/akka/remote/RemoteDeathWatchSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteDeathWatchSpec.scala
index ca440806c7..ec0b55450f 100644
--- a/akka-remote/src/test/scala/akka/remote/RemoteDeathWatchSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/RemoteDeathWatchSpec.scala
@@ -4,8 +4,10 @@
 package akka.remote
 
 import akka.testkit._
-import akka.actor.{ ActorSystem, DeathWatchSpec }
+import akka.actor._
 import com.typesafe.config.ConfigFactory
+import akka.actor.RootActorPath
+import scala.concurrent.duration._
 
 @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner])
 class RemoteDeathWatchSpec extends AkkaSpec(ConfigFactory.parseString("""
@@ -35,4 +37,16 @@ akka {
     other.shutdown()
   }
 
+  "receive Terminated when watched node is unknown host" in {
+    val path = RootActorPath(Address("akka.tcp", system.name, "unknownhost", 2552)) / "user" / "subject"
+    system.actorOf(Props(new Actor {
+      context.watch(context.actorFor(path))
+      def receive = {
+        case t: Terminated ⇒ testActor ! t.actor.path
+      }
+    }), name = "observer2")
+
+    expectMsg(60.seconds, path)
+  }
+
 }

From 33c588d3fc762b8f4956886b45c1e7a2786402a9 Mon Sep 17 00:00:00 2001
From: Roland <rk@rkuhn.info>
Date: Tue, 29 Jan 2013 12:34:33 +0100
Subject: [PATCH 113/122] ignore automatically assembled files in akka-osgi
 resources dir

---
 .gitignore                                    | 125 +++---
 akka-osgi/src/main/resources/akka-actor.conf  | 406 ------------------
 akka-osgi/src/main/resources/akka-agent.conf  |  23 -
 akka-osgi/src/main/resources/akka-camel.conf  |  36 --
 .../resources/akka-cluster-experimental.conf  | 217 ----------
 .../src/main/resources/akka-file-mailbox.conf |  69 ---
 akka-osgi/src/main/resources/akka-osgi.conf   |   0
 akka-osgi/src/main/resources/akka-remote.conf | 299 -------------
 .../src/main/resources/akka-transactor.conf   |  13 -
 akka-osgi/src/main/resources/akka-zeromq.conf |  26 --
 akka-osgi/src/main/resources/reference.conf   |   9 -
 11 files changed, 63 insertions(+), 1160 deletions(-)
 delete mode 100644 akka-osgi/src/main/resources/akka-actor.conf
 delete mode 100644 akka-osgi/src/main/resources/akka-agent.conf
 delete mode 100644 akka-osgi/src/main/resources/akka-camel.conf
 delete mode 100644 akka-osgi/src/main/resources/akka-cluster-experimental.conf
 delete mode 100644 akka-osgi/src/main/resources/akka-file-mailbox.conf
 delete mode 100644 akka-osgi/src/main/resources/akka-osgi.conf
 delete mode 100644 akka-osgi/src/main/resources/akka-remote.conf
 delete mode 100644 akka-osgi/src/main/resources/akka-transactor.conf
 delete mode 100644 akka-osgi/src/main/resources/akka-zeromq.conf
 delete mode 100644 akka-osgi/src/main/resources/reference.conf

diff --git a/.gitignore b/.gitignore
index 980881bca9..0863ff8a05 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,72 +1,73 @@
-*.vim
-*~
 *#
-src_managed
-activemq-data
-project/akka-build.properties
-project/plugins/project
-project/boot/*
-*/project/build/target
+*.iml
+*.ipr
+*.iws
+*.pyc
+*.tm.epoch
+*.vim
 */project/boot
+*/project/build/target
 */project/project.target.config-classes
-lib_managed
-etags
-tags
+*~
+.#*
+.*.swp
+.DS_Store
+.cache
+.cache
+.classpath
+.codefellow
+.ensime*
+.eprj
+.history
+.idea
+.manager
+.multi-jvm
+.project
+.scala_dependencies
+.scalastyle
+.settings
 .tags
 .tags_sorted_by_file
-TAGS
-akka.tmproj
-reports
-target
-deploy/*.jar
-.history
-data
-out
-logs
-.#*
-.codefellow
-storage
-.ensime*
-_dump
-.manager
-manifest.mf
-semantic.cache
-tm*.log
-tm*.lck
-tm.out
-*.tm.epoch
-.DS_Store
-*.iws
-*.ipr
-*.iml
-run-codefellow
-.project
-.settings
-.classpath
-.cache
-.idea
-.scala_dependencies
-.cache
-multiverse.log
-.eprj
-.*.swp
-akka-docs/_build/
-akka-docs/rst_preprocessed/
-akka-contrib/rst_preprocessed/
-*.pyc
-akka-docs/exts/
-_akka_cluster/
+.target
+.worksheet
 Makefile
+TAGS
+_akka_cluster/
+_dump
+_mb
+activemq-data
+akka-contrib/rst_preprocessed/
+akka-docs/_build/
+akka-docs/exts/
+akka-docs/rst_preprocessed/
+akka-osgi/src/main/resources/*.conf
 akka.sublime-project
 akka.sublime-workspace
-.target
-.multi-jvm
-_mb
-schoir.props
-worker*.log
-mongoDB/
-redis/
+akka.tmproj
 beanstalk/
-.scalastyle
 bin/
-.worksheet
+data
+deploy/*.jar
+etags
+lib_managed
+logs
+manifest.mf
+mongoDB/
+multiverse.log
+out
+project/akka-build.properties
+project/boot/*
+project/plugins/project
+redis/
+reports
+run-codefellow
+schoir.props
+semantic.cache
+src_managed
+storage
+tags
+target
+tm*.lck
+tm*.log
+tm.out
+worker*.log
diff --git a/akka-osgi/src/main/resources/akka-actor.conf b/akka-osgi/src/main/resources/akka-actor.conf
deleted file mode 100644
index 0039320631..0000000000
--- a/akka-osgi/src/main/resources/akka-actor.conf
+++ /dev/null
@@ -1,406 +0,0 @@
-####################################
-# Akka Actor Reference Config File #
-####################################
-
-# This is the reference config file that contains all the default settings.
-# Make your edits/overrides in your application.conf.
-
-akka {
-  # Akka version, checked against the runtime version of Akka.
-  version = "2.2-SNAPSHOT"
-
-  # Home directory of Akka, modules in the deploy directory will be loaded
-  home = ""
-
-  # Event handlers to register at boot time (Logging$DefaultLogger logs to STDOUT)
-  event-handlers = ["akka.event.Logging$DefaultLogger"]
-
-  # Event handlers are created and registered synchronously during ActorSystem
-  # start-up, and since they are actors, this timeout is used to bound the
-  # waiting time
-  event-handler-startup-timeout = 5s
-
-  # Log level used by the configured loggers (see "event-handlers") as soon
-  # as they have been started; before that, see "stdout-loglevel"
-  # Options: ERROR, WARNING, INFO, DEBUG
-  loglevel = "INFO"
-
-  # Log level for the very basic logger activated during AkkaApplication startup
-  # Options: ERROR, WARNING, INFO, DEBUG
-  stdout-loglevel = "WARNING"
-
-  # Log the complete configuration at INFO level when the actor system is started.
-  # This is useful when you are uncertain of what configuration is used.
-  log-config-on-start = off
-
-  # List FQCN of extensions which shall be loaded at actor system startup.
-  # Should be on the format: 'extensions = ["foo", "bar"]' etc.
-  # See the Akka Documentation for more info about Extensions
-  extensions = []
-
-  # Toggles whether threads created by this ActorSystem should be daemons or not
-  daemonic = off
-
-  # JVM shutdown, System.exit(-1), in case of a fatal error,
-  # such as OutOfMemoryError
-  jvm-exit-on-fatal-error = on
-
-  actor {
-
-    # FQCN of the ActorRefProvider to be used; the below is the built-in default,
-    # another one is akka.remote.RemoteActorRefProvider in the akka-remote bundle.
-    provider = "akka.actor.LocalActorRefProvider"
-
-    # The guardian "/user" will use this class to obtain its supervisorStrategy.
-    # It needs to be a subclass of akka.actor.SupervisorStrategyConfigurator.
-    # In addition to the default there is akka.actor.StoppingSupervisorStrategy.
-    guardian-supervisor-strategy = "akka.actor.DefaultSupervisorStrategy"
-
-    # Timeout for ActorSystem.actorOf
-    creation-timeout = 20s
-
-    # Frequency with which stopping actors are prodded in case they had to be
-    # removed from their parents
-    reaper-interval = 5s
-
-    # Serializes and deserializes (non-primitive) messages to ensure immutability,
-    # this is only intended for testing.
-    serialize-messages = off
-
-    # Serializes and deserializes creators (in Props) to ensure that they can be
-    # sent over the network, this is only intended for testing.
-    serialize-creators = off
-
-    # Timeout for send operations to top-level actors which are in the process
-    # of being started. This is only relevant if using a bounded mailbox or the
-    # CallingThreadDispatcher for a top-level actor.
-    unstarted-push-timeout = 10s
-
-    typed {
-      # Default timeout for typed actor methods with non-void return type
-      timeout = 5s
-    }
-
-    deployment {
-
-      # deployment id pattern - on the format: /parent/child etc.
-      default {
-
-        # routing (load-balance) scheme to use
-        # - available: "from-code", "round-robin", "random", "smallest-mailbox",
-        #              "scatter-gather", "broadcast"
-        # - or:        Fully qualified class name of the router class.
-        #              The class must extend akka.routing.CustomRouterConfig and
-        #              have a constructor with com.typesafe.config.Config
-        #              parameter.
-        # - default is "from-code";
-        # Whether or not an actor is transformed to a Router is decided in code
-        # only (Props.withRouter). The type of router can be overridden in the
-        # configuration; specifying "from-code" means that the values specified
-        # in the code shall be used.
-        # In case of routing, the actors to be routed to can be specified
-        # in several ways:
-        # - nr-of-instances: will create that many children
-        # - routees.paths: will look the paths up using actorFor and route to
-        #   them, i.e. will not create children
-        # - resizer: dynamically resizable number of routees as specified in
-        #   resizer below
-        router = "from-code"
-
-        # number of children to create in case of a non-direct router;
-        # this setting is ignored if routees.paths is given
-        nr-of-instances = 1
-
-        # within is the timeout used for routers containing future calls
-        within = 5 seconds
-
-        # number of virtual nodes per node for consistent-hashing router
-        virtual-nodes-factor = 10
-
-        routees {
-          # Alternatively to giving nr-of-instances you can specify the full
-          # paths of those actors which should be routed to. This setting takes
-          # precedence over nr-of-instances
-          paths = []
-        }
-
-        # Routers with dynamically resizable number of routees; this feature is
-        # enabled by including (parts of) this section in the deployment
-        resizer {
-
-          # The fewest number of routees the router should ever have.
-          lower-bound = 1
-
-          # The most number of routees the router should ever have.
-          # Must be greater than or equal to lower-bound.
-          upper-bound = 10
-
-          # Threshold used to evaluate if a routee is considered to be busy
-          # (under pressure). Implementation depends on this value (default is 1).
-          # 0:   number of routees currently processing a message.
-          # 1:   number of routees currently processing a message has
-          #      some messages in mailbox.
-          # > 1: number of routees with at least the configured pressure-threshold
-          #      messages in their mailbox. Note that estimating mailbox size of
-          #      default UnboundedMailbox is O(N) operation.
-          pressure-threshold = 1
-
-          # Percentage to increase capacity whenever all routees are busy.
-          # For example, 0.2 would increase 20% (rounded up), i.e. if current
-          # capacity is 6 it will request an increase of 2 more routees.
-          rampup-rate = 0.2
-
-          # Minimum fraction of busy routees before backing off.
-          # For example, if this is 0.3, then we'll remove some routees only when
-          # less than 30% of routees are busy, i.e. if current capacity is 10 and
-          # 3 are busy then the capacity is unchanged, but if 2 or less are busy
-          # the capacity is decreased.
-          # Use 0.0 or negative to avoid removal of routees.
-          backoff-threshold = 0.3
-
-          # Fraction of routees to be removed when the resizer reaches the
-          # backoffThreshold.
-          # For example, 0.1 would decrease 10% (rounded up), i.e. if current
-          # capacity is 9 it will request an decrease of 1 routee.
-          backoff-rate = 0.1
-
-          # When the resizer reduce the capacity the abandoned routee actors are
-          # stopped with PoisonPill after this delay. The reason for the delay is
-          # to give concurrent messages a chance to be placed in mailbox before
-          # sending PoisonPill.
-          # Use 0s to skip delay.
-          stop-delay = 1s
-
-          # Number of messages between resize operation.
-          # Use 1 to resize before each message.
-          messages-per-resize = 10
-        }
-      }
-    }
-
-    # Default dispatcher for Actors that extend Stash
-    default-stash-dispatcher {
-      mailbox-type = "akka.dispatch.UnboundedDequeBasedMailbox"
-    }
-
-    default-dispatcher {
-      # Must be one of the following
-      # Dispatcher, (BalancingDispatcher, only valid when all actors using it are
-      # of the same type), PinnedDispatcher, or a FQCN to a class inheriting
-      # MessageDispatcherConfigurator with a constructor with
-      # both com.typesafe.config.Config parameter and
-      # akka.dispatch.DispatcherPrerequisites parameters.
-      # PinnedDispatcher must be used toghether with executor=thread-pool-executor.
-      type = "Dispatcher"
-
-      # Which kind of ExecutorService to use for this dispatcher
-      # Valid options:
-      #  - "fork-join-executor" requires a "fork-join-executor" section
-      #  - "thread-pool-executor" requires a "thread-pool-executor" section
-      #  - A FQCN of a class extending ExecutorServiceConfigurator
-      executor = "fork-join-executor"
-
-      # This will be used if you have set "executor = "fork-join-executor""
-      fork-join-executor {
-        # Min number of threads to cap factor-based parallelism number to
-        parallelism-min = 8
-
-        # The parallelism factor is used to determine thread pool size using the
-        # following formula: ceil(available processors * factor). Resulting size
-        # is then bounded by the parallelism-min and parallelism-max values.
-        parallelism-factor = 3.0
-
-        # Max number of threads to cap factor-based parallelism number to
-        parallelism-max = 64
-      }
-
-      # This will be used if you have set "executor = "thread-pool-executor""
-      thread-pool-executor {
-        # Keep alive time for threads
-        keep-alive-time = 60s
-
-        # Min number of threads to cap factor-based core number to
-        core-pool-size-min = 8
-
-        # The core pool size factor is used to determine thread pool core size
-        # using the following formula: ceil(available processors * factor).
-        # Resulting size is then bounded by the core-pool-size-min and
-        # core-pool-size-max values.
-        core-pool-size-factor = 3.0
-
-        # Max number of threads to cap factor-based number to
-        core-pool-size-max = 64
-
-        # Minimum number of threads to cap factor-based max number to
-        # (if using a bounded task queue)
-        max-pool-size-min = 8
-
-        # Max no of threads (if using a bounded task queue) is determined by
-        # calculating: ceil(available processors * factor)
-        max-pool-size-factor  = 3.0
-
-        # Max number of threads to cap factor-based max number to
-        # (if using a  bounded task queue)
-        max-pool-size-max = 64
-
-        # Specifies the bounded capacity of the task queue (< 1 == unbounded)
-        task-queue-size = -1
-
-        # Specifies which type of task queue will be used, can be "array" or
-        # "linked" (default)
-        task-queue-type = "linked"
-
-        # Allow core threads to time out
-        allow-core-timeout = on
-      }
-
-      # How long time the dispatcher will wait for new actors until it shuts down
-      shutdown-timeout = 1s
-
-      # Throughput defines the number of messages that are processed in a batch
-      # before the thread is returned to the pool. Set to 1 for as fair as possible.
-      throughput = 5
-
-      # Throughput deadline for Dispatcher, set to 0 or negative for no deadline
-      throughput-deadline-time = 0ms
-
-      # If negative (or zero) then an unbounded mailbox is used (default)
-      # If positive then a bounded mailbox is used and the capacity is set using
-      # the property
-      # NOTE: setting a mailbox to 'blocking' can be a bit dangerous, could lead
-      # to deadlock, use with care
-      # The following mailbox-push-timeout-time is only used for type=Dispatcher
-      # and only if mailbox-capacity > 0
-      mailbox-capacity = -1
-
-      # Specifies the timeout to add a new message to a mailbox that is full -
-      # negative number means infinite timeout. It is only used for type=Dispatcher
-      # and only if mailbox-capacity > 0
-      mailbox-push-timeout-time = 10s
-
-      # FQCN of the MailboxType, if not specified the default bounded or unbounded
-      # mailbox is used. The Class of the FQCN must have a constructor with
-      # (akka.actor.ActorSystem.Settings, com.typesafe.config.Config) parameters.
-      mailbox-type = ""
-
-      # For BalancingDispatcher: If the balancing dispatcher should attempt to
-      # schedule idle actors using the same dispatcher when a message comes in,
-      # and the dispatchers ExecutorService is not fully busy already.
-      attempt-teamwork = on
-
-      # For Actor with Stash: The default capacity of the stash.
-      # If negative (or zero) then an unbounded stash is used (default)
-      # If positive then a bounded stash is used and the capacity is set using
-      # the property
-      stash-capacity = -1
-    }
-
-    debug {
-      # enable function of Actor.loggable(), which is to log any received message
-      # at DEBUG level, see the “Testing Actor Systems” section of the Akka
-      # Documentation at http://akka.io/docs
-      receive = off
-
-      # enable DEBUG logging of all AutoReceiveMessages (Kill, PoisonPill et.c.)
-      autoreceive = off
-
-      # enable DEBUG logging of actor lifecycle changes
-      lifecycle = off
-
-      # enable DEBUG logging of all LoggingFSMs for events, transitions and timers
-      fsm = off
-
-      # enable DEBUG logging of subscription changes on the eventStream
-      event-stream = off
-
-      # enable DEBUG logging of unhandled messages
-      unhandled = off
-
-      # enable WARN logging of misconfigured routers
-      router-misconfiguration = off
-    }
-
-    # Entries for pluggable serializers and their bindings.
-    serializers {
-      java = "akka.serialization.JavaSerializer"
-      bytes = "akka.serialization.ByteArraySerializer"
-    }
-
-    # Class to Serializer binding. You only need to specify the name of an
-    # interface or abstract base class of the messages. In case of ambiguity it
-    # is using the most specific configured class, or giving a warning and
-    # choosing the “first” one.
-    #
-    # To disable one of the default serializers, assign its class to "none", like
-    # "java.io.Serializable" = none
-    serialization-bindings {
-      "[B" = bytes
-      "java.io.Serializable" = java
-    }
-
-    # Configuration items which are used by the akka.actor.ActorDSL._ methods
-    dsl {
-      # Maximum queue size of the actor created by newInbox(); this protects
-      # against faulty programs which use select() and consistently miss messages
-      inbox-size = 1000
-
-      # Default timeout to assume for operations like Inbox.receive et al
-      default-timeout = 5s
-    }
-  }
-
-  # Used to set the behavior of the scheduler.
-  # Changing the default values may change the system behavior drastically so make
-  # sure you know what you're doing! See the Scheduler section of the Akka
-  # Documentation for more details.
-  scheduler {
-    # The HashedWheelTimer (HWT) implementation from Netty is used as the default
-    # scheduler in the system.
-    # HWT does not execute the scheduled tasks on exact time.
-    # It will, on every tick, check if there are any tasks behind the schedule
-    # and execute them. You can increase or decrease the accuracy of the execution
-    # timing by specifying smaller or larger tick duration.
-    # If you are scheduling a lot of tasks you should consider increasing the
-    # ticks per wheel.
-    # For more information see: http://www.jboss.org/netty/
-    tick-duration = 100ms
-    
-    # The timer uses a circular wheel of buckets to store the timer tasks.
-    # This should be set such that the majority of scheduled timeouts (for high
-    # scheduling frequency) will be shorter than one rotation of the wheel
-    # (ticks-per-wheel * ticks-duration)
-    # THIS MUST BE A POWER OF TWO!
-    ticks-per-wheel = 512
-    
-    # This setting selects the timer implementation which shall be loaded at
-    # system start-up. Built-in choices are:
-    #  - akka.actor.DefaultScheduler (HWT)
-    #  - akka.actor.LightArrayRevolverScheduler
-    # (to be benchmarked and evaluated)
-    # The class given here must implement the akka.actor.Scheduler interface
-    # and offer a constructor which takes three arguments:
-    #  1) com.typesafe.config.Config
-    #  2) akka.event.LoggingAdapter
-    #  3) java.util.concurrent.ThreadFactory
-    implementation = akka.actor.LightArrayRevolverScheduler
-    
-    # When shutting down the scheduler, there will typically be a thread which
-    # needs to be stopped, and this timeout determines how long to wait for 
-    # that to happen. In case of timeout the shutdown of the actor system will
-    # proceed without running possibly still enqueued tasks.
-    shutdown-timeout = 5s
-  }
-
-  io {
-    # In bytes, the size of the shared read buffer. In the span 0b..2GiB.
-    #
-    read-buffer-size = 8KiB
-
-    # Specifies how many ops are done between every descriptor selection
-    select-interval = 100
-
-    # Number of connections that are allowed in the backlog.
-    # 0 or negative means that the platform default will be used.
-    default-backlog = 1000
-  }
-}
diff --git a/akka-osgi/src/main/resources/akka-agent.conf b/akka-osgi/src/main/resources/akka-agent.conf
deleted file mode 100644
index cf57b869de..0000000000
--- a/akka-osgi/src/main/resources/akka-agent.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-####################################
-# Akka Agent Reference Config File #
-####################################
-
-# This is the reference config file that contains all the default settings.
-# Make your edits/overrides in your application.conf.
-
-akka {
-  agent {
-
-    # The dispatcher used for agent-send-off actor
-    send-off-dispatcher {
-      executor = thread-pool-executor
-      type = PinnedDispatcher
-    }
-
-    # The dispatcher used for agent-alter-off actor
-    alter-off-dispatcher {
-      executor = thread-pool-executor
-      type = PinnedDispatcher
-    }
-  }
-}
diff --git a/akka-osgi/src/main/resources/akka-camel.conf b/akka-osgi/src/main/resources/akka-camel.conf
deleted file mode 100644
index 12bed5c28b..0000000000
--- a/akka-osgi/src/main/resources/akka-camel.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-####################################
-# Akka Camel Reference Config File #
-####################################
-
-# This is the reference config file that contains all the default settings.
-# Make your edits/overrides in your application.conf.
-
-akka {
-  camel {
-    # Whether JMX should be enabled or disabled for the Camel Context
-    jmx = off
-    # enable/disable streaming cache on the Camel Context
-    streamingCache = on
-    consumer {
-      # Configured setting which determines whether one-way communications
-      # between an endpoint and this consumer actor
-      # should be auto-acknowledged or application-acknowledged.
-      # This flag has only effect when exchange is in-only.
-      auto-ack = on
-
-      # When endpoint is out-capable (can produce responses) reply-timeout is the
-      # maximum time the endpoint can take to send the response before the message
-      # exchange fails. This setting is used for out-capable, in-only,
-      # manually acknowledged communication.
-      reply-timeout = 1m
-
-      # The duration of time to await activation of an endpoint.
-      activation-timeout = 10s
-    }
-
-    #Scheme to FQCN mappings for CamelMessage body conversions
-    conversions {
-      "file" = "java.io.InputStream"
-    }
-  }
-}
diff --git a/akka-osgi/src/main/resources/akka-cluster-experimental.conf b/akka-osgi/src/main/resources/akka-cluster-experimental.conf
deleted file mode 100644
index 4532c0ff8a..0000000000
--- a/akka-osgi/src/main/resources/akka-cluster-experimental.conf
+++ /dev/null
@@ -1,217 +0,0 @@
-######################################
-# Akka Cluster Reference Config File #
-######################################
-
-# This is the reference config file that contains all the default settings.
-# Make your edits/overrides in your application.conf.
-
-akka {
-
-  cluster {
-    # Initial contact points of the cluster.
-    # The nodes to join at startup if auto-join = on.
-    # Comma separated full URIs defined by a string on the form of
-    # "akka://system@hostname:port"
-    # Leave as empty if the node should be a singleton cluster.
-    seed-nodes = []
-
-    # how long to wait for one of the seed nodes to reply to initial join request
-    seed-node-timeout = 5s
-
-    # Automatic join the seed-nodes at startup.
-    # If seed-nodes is empty it will join itself and become a single node cluster.
-    auto-join = on
-
-    # Should the 'leader' in the cluster be allowed to automatically mark
-    # unreachable nodes as DOWN?
-    # Using auto-down implies that two separate clusters will automatically be
-    # formed in case of network partition.
-    auto-down = off
-
-    # Minimum required number of members before the leader changes member status
-    # of 'Joining' members to 'Up'. Typically used together with
-    # 'Cluster.registerOnMemberUp' to defer some action, such as starting actors,
-    # until the cluster has reached a certain size.
-    min-nr-of-members = 1
-
-    # Enable or disable JMX MBeans for management of the cluster
-    jmx.enabled = on
-
-    # how long should the node wait before starting the periodic tasks
-    # maintenance tasks?
-    periodic-tasks-initial-delay = 1s
-
-    # how often should the node send out gossip information?
-    gossip-interval = 1s
-
-    # how often should the leader perform maintenance tasks?
-    leader-actions-interval = 1s
-
-    # how often should the node move nodes, marked as unreachable by the failure
-    # detector, out of the membership ring?
-    unreachable-nodes-reaper-interval = 1s
-
-    # How often the current internal stats should be published.
-    # A value of 0 s can be used to always publish the stats, when it happens.
-    publish-stats-interval = 10s
-
-    # The id of the dispatcher to use for cluster actors. If not specified
-    # default dispatcher is used.
-    # If specified you need to define the settings of the actual dispatcher.
-    use-dispatcher = ""
-
-    # Gossip to random node with newer or older state information, if any with
-    # this probability. Otherwise Gossip to any random live node.
-    # Probability value is between 0.0 and 1.0. 0.0 means never, 1.0 means always.
-    gossip-different-view-probability = 0.8
-
-    # Limit number of merge conflicts per second that are handled. If the limit is
-    # exceeded the conflicting gossip messages are dropped and will reappear later.
-    max-gossip-merge-rate = 5.0
-
-    failure-detector {
-
-      # FQCN of the failure detector implementation.
-      # It must implement akka.cluster.FailureDetector and
-      # have constructor with akka.actor.ActorSystem and
-      # akka.cluster.ClusterSettings parameters
-      implementation-class = "akka.cluster.AccrualFailureDetector"
-
-      # how often should the node send out heartbeats?
-      heartbeat-interval = 1s
-
-      # Number of member nodes that each member will send heartbeat messages to,
-      # i.e. each node will be monitored by this number of other nodes.
-      monitored-by-nr-of-members = 5
-
-      # defines the failure detector threshold
-      #     A low threshold is prone to generate many wrong suspicions but ensures
-      #     a quick detection in the event of a real crash. Conversely, a high
-      #     threshold generates fewer mistakes but needs more time to detect
-      #     actual crashes
-      threshold = 8.0
-
-      # Minimum standard deviation to use for the normal distribution in
-      # AccrualFailureDetector. Too low standard deviation might result in
-      # too much sensitivity for sudden, but normal, deviations in heartbeat
-      # inter arrival times.
-      min-std-deviation = 100 ms
-
-      # Number of potentially lost/delayed heartbeats that will be
-      # accepted before considering it to be an anomaly.
-      # It is a factor of heartbeat-interval.
-      # This margin is important to be able to survive sudden, occasional,
-      # pauses in heartbeat arrivals, due to for example garbage collect or
-      # network drop.
-      acceptable-heartbeat-pause = 3s
-
-      # Number of samples to use for calculation of mean and standard deviation of
-      # inter-arrival times.
-      max-sample-size = 1000
-
-      # When a node stops sending heartbeats to another node it will end that
-      # with this number of EndHeartbeat messages, which will remove the
-      # monitoring from the failure detector.
-      nr-of-end-heartbeats = 8
-
-      # When no expected heartbeat message has been received an explicit
-      # heartbeat request is sent to the node that should emit heartbeats.
-      heartbeat-request {
-        # Grace period until an explicit heartbeat request is sent
-        grace-period = 10 s
-
-        # After the heartbeat request has been sent the first failure detection
-        # will start after this period, even though no heartbeat mesage has
-        # been received.
-        expected-response-after = 3 s
-
-        # Cleanup of obsolete heartbeat requests
-        time-to-live = 60 s
-      }
-    }
-
-    metrics {
-      # Enable or disable metrics collector for load-balancing nodes.
-      enabled = on
-
-      # FQCN of the metrics collector implementation.
-      # It must implement akka.cluster.cluster.MetricsCollector and
-      # have constructor with akka.actor.ActorSystem parameter.
-      # The default SigarMetricsCollector uses JMX and Hyperic SIGAR, if SIGAR
-      # is on the classpath, otherwise only JMX.
-      collector-class = "akka.cluster.SigarMetricsCollector"
-
-      # How often metrics are sampled on a node.
-      # Shorter interval will collect the metrics more often.
-      collect-interval = 3s
-
-      # How often a node publishes metrics information.
-      gossip-interval = 3s
-
-      # How quickly the exponential weighting of past data is decayed compared to
-      # new data. Set lower to increase the bias toward newer values.
-      # The relevance of each data sample is halved for every passing half-life duration,
-      # i.e. after 4 times the half-life, a data sample’s relevance is reduced to 6% of
-      # its original relevance. The initial relevance of a data sample is given by
-      # 1 – 0.5 ^ (collect-interval / half-life).
-      # See http://en.wikipedia.org/wiki/Moving_average#Exponential_moving_average
-      moving-average-half-life = 12s
-    }
-
-    # If the tick-duration of the default scheduler is longer than the
-    # tick-duration configured here a dedicated scheduler will be used for
-    # periodic tasks of the cluster, otherwise the default scheduler is used.
-    # See akka.scheduler settings for more details about the HashedWheelTimer.
-    scheduler {
-      tick-duration = 33ms
-      ticks-per-wheel = 512
-    }
-
-    # Netty blocks when sending to broken connections, and this circuit breaker
-    # is used to reduce connect attempts to broken connections.
-    send-circuit-breaker {
-      max-failures = 3
-      call-timeout = 2 s
-      reset-timeout = 30 s
-    }
-  }
-
-  # Default configuration for routers
-  actor.deployment.default {
-    # MetricsSelector to use
-    # - available: "mix", "heap", "cpu", "load"
-    # - or:        Fully qualified class name of the MetricsSelector class.
-    #              The class must extend akka.cluster.routing.MetricsSelector
-    #              and have a constructor with com.typesafe.config.Config
-    #              parameter.
-    # - default is "mix"
-    metrics-selector = mix
-  }
-  actor.deployment.default.cluster {
-    # enable cluster aware router that deploys to nodes in the cluster
-    enabled = off
-
-    # Maximum number of routees that will be deployed on each cluster
-    # member node.
-    # Note that nr-of-instances defines total number of routees, but
-    # number of routees per node will not be exceeded, i.e. if you
-    # define nr-of-instances = 50 and max-nr-of-instances-per-node = 2
-    # it will deploy 2 routees per new member in the cluster, up to
-    # 25 members.
-    max-nr-of-instances-per-node = 1
-
-    # Defines if routees are allowed to be located on the same node as
-    # the head router actor, or only on remote nodes.
-    # Useful for master-worker scenario where all routees are remote.
-    allow-local-routees = on
-
-    # Actor path of the routees to lookup with actorFor on the member
-    # nodes in the cluster. E.g. "/user/myservice". If this isn't defined
-    # the routees will be deployed instead of looked up.
-    # max-nr-of-instances-per-node should not be configured (default value is 1)
-    # when routees-path is defined.
-    routees-path = ""
-
-  }
-
-}
diff --git a/akka-osgi/src/main/resources/akka-file-mailbox.conf b/akka-osgi/src/main/resources/akka-file-mailbox.conf
deleted file mode 100644
index 66f125e624..0000000000
--- a/akka-osgi/src/main/resources/akka-file-mailbox.conf
+++ /dev/null
@@ -1,69 +0,0 @@
-#############################################
-# Akka File Mailboxes Reference Config File #
-#############################################
-
-# This is the reference config file that contains all the default settings.
-# Make your edits/overrides in your application.conf.
-#
-# For more information see <https://github.com/robey/kestrel/>
-
-akka {
-  actor {
-    mailbox {
-      file-based {
-        # directory below which this queue resides
-        directory-path = "./_mb"
-
-        # attempting to add an item after the queue reaches this size (in items)
-        # will fail.
-        max-items = 2147483647
-
-        # attempting to add an item after the queue reaches this size (in bytes)
-        # will fail.
-        max-size = 2147483647 bytes
-
-        # attempting to add an item larger than this size (in bytes) will fail.
-        max-item-size = 2147483647 bytes
-
-        # maximum expiration time for this queue (seconds).
-        max-age = 0s
-
-        # maximum journal size before the journal should be rotated.
-        max-journal-size = 16 MiB
-
-        # maximum size of a queue before it drops into read-behind mode.
-        max-memory-size = 128 MiB
-
-        # maximum overflow (multiplier) of a journal file before we re-create it.
-        max-journal-overflow = 10
-
-        # absolute maximum size of a journal file until we rebuild it,
-        # no matter what.
-        max-journal-size-absolute = 9223372036854775807 bytes
-
-        # whether to drop older items (instead of newer) when the queue is full
-        discard-old-when-full = on
-
-        # whether to keep a journal file at all
-        keep-journal = on
-
-        # whether to sync the journal after each transaction
-        sync-journal = off
-
-        # circuit breaker configuration
-        circuit-breaker {
-          # maximum number of failures before opening breaker
-          max-failures = 3
-
-          # duration of time beyond which a call is assumed to be timed out and
-          # considered a failure
-          call-timeout = 3 seconds
-
-          # duration of time to wait until attempting to reset the breaker during
-          # which all calls fail-fast
-          reset-timeout = 30 seconds
-        }
-      }
-    }
-  }
-}
diff --git a/akka-osgi/src/main/resources/akka-osgi.conf b/akka-osgi/src/main/resources/akka-osgi.conf
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/akka-osgi/src/main/resources/akka-remote.conf b/akka-osgi/src/main/resources/akka-remote.conf
deleted file mode 100644
index 8cf1adccc7..0000000000
--- a/akka-osgi/src/main/resources/akka-remote.conf
+++ /dev/null
@@ -1,299 +0,0 @@
-#####################################
-# Akka Remote Reference Config File #
-#####################################
-
-# This is the reference config file that contains all the default settings.
-# Make your edits/overrides in your application.conf.
-
-# comments about akka.actor settings left out where they are already in akka-
-# actor.jar, because otherwise they would be repeated in config rendering.
-
-akka {
-
-  actor {
-
-    serializers {
-      proto = "akka.remote.serialization.ProtobufSerializer"
-      daemon-create = "akka.remote.serialization.DaemonMsgCreateSerializer"
-    }
-
-
-    serialization-bindings {
-      # Since com.google.protobuf.Message does not extend Serializable but
-      # GeneratedMessage does, need to use the more specific one here in order
-      # to avoid ambiguity
-      "com.google.protobuf.GeneratedMessage" = proto
-      "akka.remote.DaemonMsgCreate" = daemon-create
-    }
-
-    deployment {
-
-      default {
-
-        # if this is set to a valid remote address, the named actor will be
-        # deployed at that node e.g. "akka://sys@host:port"
-        remote = ""
-
-        target {
-
-          # A list of hostnames and ports for instantiating the children of a
-          # non-direct router
-          #   The format should be on "akka://sys@host:port", where:
-          #    - sys is the remote actor system name
-          #    - hostname can be either hostname or IP address the remote actor
-          #      should connect to
-          #    - port should be the port for the remote server on the other node
-          # The number of actor instances to be spawned is still taken from the
-          # nr-of-instances setting as for local routers; the instances will be
-          # distributed round-robin among the given nodes.
-          nodes = []
-
-        }
-      }
-    }
-  }
-
-  remote {
-
-    ### General settings
-
-    # Timeout after which the startup of the remoting subsystem is considered to be failed.
-    # Increase this value if your transport drivers (see the enabled-transports section)
-    # need longer time to be loaded.
-    startup-timeout = 5 s
-
-    # Timout after which the graceful shutdown of the remoting subsystem is considered to be failed.
-    # After the timeout the remoting system is forcefully shut down.
-    # Increase this value if your transport drivers (see the enabled-transports section)
-    # need longer time to stop properly.
-    shutdown-timeout = 5 s
-
-    # Before shutting down the drivers, the remoting subsystem attempts to flush all pending
-    # writes. This setting controls the maximum time the remoting is willing to wait before
-    # moving on to shut down the drivers.
-    flush-wait-on-shutdown = 2 s
-
-    # Reuse inbound connections for outbound messages
-    use-passive-connections = on
-
-    # Dispatcher that the actors responsible to write to a connection will use.
-    # The mailbox type must be always a DequeBasedMailbox.
-    writer-dispatcher {
-      mailbox-type = "akka.dispatch.UnboundedDequeBasedMailbox"
-    }
-
-    # If enabled, an inbound connection is only considered to be live after the remote
-    # system sent an explicit acknowledgement.
-    # It is recommended to leave this setting on when connectionless transports (e.g. UDP)
-    # are used.
-    wait-activity-enabled = on
-
-    # Controls the backoff interval after a refused write is reattempted. (Transports may
-    # refuse writes if their internal buffer is full)
-    backoff-interval = 0.01 s
-
-    # Acknowledgment timeout of management commands sent to the transport stack.
-    command-ack-timeout = 30 s
-
-    ### Security settings
-
-    # Enable untrusted mode for full security of server managed actors, prevents
-    # system messages to be send by clients, e.g. messages like 'Create',
-    # 'Suspend', 'Resume', 'Terminate', 'Supervise', 'Link' etc.
-    untrusted-mode = off
-
-    # Should the remote server require that its peers share the same
-    # secure-cookie (defined in the 'remote' section)? Secure cookies are passed
-    # between during the initial handshake. Connections are refused if the initial
-    # message contains a mismatching cookie or the cookie is missing.
-    require-cookie = off
-
-    # Generate your own with the script availbale in
-    # '$AKKA_HOME/scripts/generate_config_with_secure_cookie.sh' or using
-    # 'akka.util.Crypt.generateSecureCookie'
-    secure-cookie = ""
-
-    ### Logging
-
-    # If this is "on", Akka will log all inbound messages at DEBUG level,
-    # if off then they are not logged
-    log-received-messages = off
-
-    # If this is "on", Akka will log all outbound messages at DEBUG level,
-    # if off then they are not logged
-    log-sent-messages = off
-
-    # If this is "on", Akka will log all RemoteLifeCycleEvents at the level
-    # defined for each, if off then they are not logged. Failures to deserialize
-    # received messages also fall under this flag.
-    log-remote-lifecycle-events = off
-
-    ### Failure detection and recovery
-
-    # how often should keep-alive heartbeat messages sent to connections.
-    heartbeat-interval = 1 s
-
-    # Settings for the Phi accrual failure detector (http://ddg.jaist.ac.jp/pub/HDY+04.pdf
-    # [Hayashibara et al]) used by the remoting subsystem to detect failed connections.
-    failure-detector {
-      # defines the failure detector threshold
-      # A low threshold is prone to generate many wrong suspicions but ensures
-      # a quick detection in the event of a real crash. Conversely, a high
-      # threshold generates fewer mistakes but needs more time to detect
-      # actual crashes
-      threshold = 7.0
-
-      # Number of the samples of inter-heartbeat arrival times to adaptively
-      # calculate the failure timeout for connections.
-      max-sample-size = 100
-
-      # Minimum standard deviation to use for the normal distribution in
-      # AccrualFailureDetector. Too low standard deviation might result in
-      # too much sensitivity for sudden, but normal, deviations in heartbeat
-      # inter arrival times.
-      min-std-deviation = 100 ms
-
-      # Number of potentially lost/delayed heartbeats that will be
-      # accepted before considering it to be an anomaly.
-      # It is a factor of heartbeat-interval.
-      # This margin is important to be able to survive sudden, occasional,
-      # pauses in heartbeat arrivals, due to for example garbage collect or
-      # network drop.
-      acceptable-heartbeat-pause = 3 s
-    }
-
-    # After failed to establish an outbound connection, the remoting will mark the
-    # address as failed. This configuration option controls how much time should
-    # be elapsed before reattempting a new connection. While the address is
-    # gated, all messages sent to the address are delivered to dead-letters.
-    # If this setting is 0, the remoting will always immediately reattempt
-    # to establish a failed outbound connection and will buffer writes until
-    # it succeeds.
-    retry-gate-closed-for = 0 s
-
-    # If the retry gate function is disabled (see retry-gate-closed-for) the
-    # remoting subsystem will always attempt to reestablish failed outbound
-    # connections. The settings below together control the maximum number of
-    # reattempts in a given time window. The number of reattempts during
-    # a window of "retry-window" will be maximum "maximum-retries-in-window".
-    retry-window = 3 s
-    maximum-retries-in-window = 5
-
-    ### Transports and adapters
-
-    # List of the transport drivers that will be loaded by the remoting.
-    # A list of fully qualified config paths must be provided where
-    # the given configuration path contains a transport-class key
-    # pointing to an implementation class of the Transport interface.
-    # If multiple transports are provided, the address of the first
-    # one will be used as a default address.
-    enabled-transports = ["akka.remote.netty.tcp"]
-
-    # Transport drivers can be augmented with adapters by adding their
-    # name to the applied-adapters setting in the configuration of a
-    # transport. The available adapters should be configured in this
-    # section by providing a name, and the fully qualified name of
-    # their corresponding implementation
-    adapters {
-      gremlin = "akka.remote.transport.FailureInjectorProvider"
-      trttl = "akka.remote.transport.ThrottlerProvider"
-    }
-
-    ### Default configuration for the Netty based transport drivers
-
-    netty.tcp {
-      transport-class = "akka.remote.transport.netty.NettyTransport"
-
-      # Transport drivers can be augmented with adapters by adding their
-      # name to the applied-adapters list. The last adapter in the
-      # list is the adapter immediately above the driver, while
-      # the first one is the top of the stack below the standard
-      # Akka protocol
-      applied-adapters = []
-
-      transport-protocol = tcp
-
-      # The default remote server port clients should connect to.
-      # Default is 2552 (AKKA), use 0 if you want a random available port
-      # This port needs to be unique for each actor system on the same machine.
-      port = 2552
-
-      # The hostname or ip to bind the remoting to,
-      # InetAddress.getLocalHost.getHostAddress is used if empty
-      hostname = ""
-
-      # Enables SSL support on this transport
-      enable-ssl = false
-
-      # Sets the connectTimeoutMillis of all outbound connections,
-      # i.e. how long a connect may take until it is timed out
-      connection-timeout = 120s
-
-      # If set to "<id.of.dispatcher>" then the specified dispatcher
-      # will be used to accept inbound connections, and perform IO. If "" then
-      # dedicated threads will be used.
-      use-dispatcher-for-io = ""
-
-      # Sets the high water mark for the in and outbound sockets,
-      # set to 0b for platform default
-      write-buffer-high-water-mark = 0b
-
-      # Sets the low water mark for the in and outbound sockets,
-      # set to 0b for platform default
-      write-buffer-low-water-mark = 0b
-
-      # Sets the send buffer size of the Sockets,
-      # set to 0b for platform default
-      send-buffer-size = 32000b
-
-      # Sets the receive buffer size of the Sockets,
-      # set to 0b for platform default
-      receive-buffer-size = 32000b
-
-      # Sets the size of the connection backlog
-      backlog = 4096
-
-      # Used to configure the number of I/O worker threads on server sockets
-      server-socket-worker-pool {
-        # Min number of threads to cap factor-based number to
-        pool-size-min = 2
-
-        # The pool size factor is used to determine thread pool size
-        # using the following formula: ceil(available processors * factor).
-        # Resulting size is then bounded by the pool-size-min and
-        # pool-size-max values.
-        pool-size-factor = 1.0
-
-        # Max number of threads to cap factor-based number to
-        pool-size-max = 8
-      }
-
-      # Used to configure the number of I/O worker threads on client sockets
-      client-socket-worker-pool {
-        # Min number of threads to cap factor-based number to
-        pool-size-min = 2
-
-        # The pool size factor is used to determine thread pool size
-        # using the following formula: ceil(available processors * factor).
-        # Resulting size is then bounded by the pool-size-min and
-        # pool-size-max values.
-        pool-size-factor = 1.0
-
-        # Max number of threads to cap factor-based number to
-        pool-size-max = 8
-      }
-    }
-
-    netty.udp = ${akka.remote.netty.tcp}
-    netty.udp {
-      transport-protocol = udp
-    }
-
-    netty.ssl = ${akka.remote.netty.tcp}
-    netty.ssl = {
-      enable-ssl = true
-    }
-
-  }
-
-}
diff --git a/akka-osgi/src/main/resources/akka-transactor.conf b/akka-osgi/src/main/resources/akka-transactor.conf
deleted file mode 100644
index d1216bd73e..0000000000
--- a/akka-osgi/src/main/resources/akka-transactor.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-#########################################
-# Akka Transactor Reference Config File #
-#########################################
-
-# This is the reference config file that contains all the default settings.
-# Make your edits/overrides in your application.conf.
-
-akka {
-  transactor {
-    # The timeout used for coordinated transactions across actors
-    coordinated-timeout = 5s
-  }
-}
diff --git a/akka-osgi/src/main/resources/akka-zeromq.conf b/akka-osgi/src/main/resources/akka-zeromq.conf
deleted file mode 100644
index 6a83e1a166..0000000000
--- a/akka-osgi/src/main/resources/akka-zeromq.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-#####################################
-# Akka ZeroMQ Reference Config File #
-#####################################
-
-# This is the reference config file that contains all the default settings.
-# Make your edits/overrides in your application.conf.
-
-akka {
-
-  zeromq {
-
-    # The default timeout for a poll on the actual zeromq socket.
-    poll-timeout = 100ms
-
-    # Timeout for creating a new socket
-    new-socket-timeout = 5s
-
-    socket-dispatcher {
-      # A zeromq socket needs to be pinned to the thread that created it.
-      # Changing this value results in weird errors and race conditions within
-      # zeromq
-      executor = thread-pool-executor
-      type = "PinnedDispatcher"
-    }
-  }
-}
diff --git a/akka-osgi/src/main/resources/reference.conf b/akka-osgi/src/main/resources/reference.conf
deleted file mode 100644
index 70545b2e2d..0000000000
--- a/akka-osgi/src/main/resources/reference.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-include "akka-actor.conf"
-include "akka-agent.conf"
-include "akka-camel.conf"
-include "akka-cluster-experimental.conf"
-include "akka-file-mailbox.conf"
-include "akka-osgi.conf"
-include "akka-remote.conf"
-include "akka-transactor.conf"
-include "akka-zeromq.conf"
\ No newline at end of file

From 2773b685d1fe5ab1b5a1ff9d7f78a42782d6c431 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Endre=20S=C3=A1ndor=20Varga?= <vendre@hit.bme.hu>
Date: Tue, 29 Jan 2013 14:17:37 +0100
Subject: [PATCH 114/122] Fixed mismatched RemoteConfigSpec with reference.conf

---
 akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala
index ae47123818..46d3341db2 100644
--- a/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala
@@ -34,7 +34,7 @@ class RemoteConfigSpec extends AkkaSpec(
       LogReceive must be(false)
       LogSend must be(false)
       RetryGateClosedFor must be === 0.seconds
-      UnknownAddressGateClosedFor must be === 10.seconds
+      UnknownAddressGateClosedFor must be === 60.seconds
       MaximumRetriesInWindow must be === 5
       RetryWindow must be === 3.seconds
       BackoffPeriod must be === 10.milliseconds

From f9611178a3cc68d7d2c97521d3e234d89dcb595c Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Tue, 29 Jan 2013 16:10:46 +0100
Subject: [PATCH 115/122] Remove try ... catch constructs around invokations of
 tell, see #2870

---
 .../src/main/scala/akka/actor/dungeon/DeathWatch.scala |  4 +---
 akka-remote/src/main/scala/akka/remote/Endpoint.scala  |  4 +---
 .../src/main/scala/akka/remote/RemoteDaemon.scala      | 10 +++++++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/akka-actor/src/main/scala/akka/actor/dungeon/DeathWatch.scala b/akka-actor/src/main/scala/akka/actor/dungeon/DeathWatch.scala
index 017a880b1a..ebe92b23b1 100644
--- a/akka-actor/src/main/scala/akka/actor/dungeon/DeathWatch.scala
+++ b/akka-actor/src/main/scala/akka/actor/dungeon/DeathWatch.scala
@@ -78,9 +78,7 @@ private[akka] trait DeathWatch { this: ActorCell ⇒
     if (!watching.isEmpty) {
       try {
         watching foreach { // ➡➡➡ NEVER SEND THE SAME SYSTEM MESSAGE OBJECT TO TWO ACTORS ⬅⬅⬅
-          case watchee: InternalActorRef ⇒ try watchee.sendSystemMessage(Unwatch(watchee, self)) catch {
-            case NonFatal(t) ⇒ publish(Error(t, self.path.toString, clazz(actor), "deathwatch"))
-          }
+          case watchee: InternalActorRef ⇒ watchee.sendSystemMessage(Unwatch(watchee, self))
         }
       } finally {
         watching = ActorCell.emptyActorRefSet
diff --git a/akka-remote/src/main/scala/akka/remote/Endpoint.scala b/akka-remote/src/main/scala/akka/remote/Endpoint.scala
index 0b5cc1306d..89ffe0ac11 100644
--- a/akka-remote/src/main/scala/akka/remote/Endpoint.scala
+++ b/akka-remote/src/main/scala/akka/remote/Endpoint.scala
@@ -56,9 +56,7 @@ private[remote] class DefaultMessageDispatcher(private val system: ExtendedActor
           if (LogReceive) log.debug("received daemon message {}", msgLog)
           payload match {
             case m @ (_: DaemonMsg | _: Terminated) ⇒
-              try remoteDaemon ! m catch {
-                case NonFatal(e) ⇒ log.error(e, "exception while processing remote command {} from {}", m, sender)
-              }
+              remoteDaemon ! m
             case x ⇒ log.debug("remoteDaemon received illegal message {} from {}", x, sender)
           }
         }
diff --git a/akka-remote/src/main/scala/akka/remote/RemoteDaemon.scala b/akka-remote/src/main/scala/akka/remote/RemoteDaemon.scala
index 850518b245..a6e8f762d9 100644
--- a/akka-remote/src/main/scala/akka/remote/RemoteDaemon.scala
+++ b/akka-remote/src/main/scala/akka/remote/RemoteDaemon.scala
@@ -5,6 +5,7 @@
 package akka.remote
 
 import scala.annotation.tailrec
+import scala.util.control.NonFatal
 import akka.actor.{ VirtualPathContainer, Terminated, Deploy, Props, Nobody, LocalActorRef, InternalActorRef, Address, ActorSystemImpl, ActorRef, ActorPathExtractor, ActorPath, Actor, AddressTerminated }
 import akka.event.LoggingAdapter
 import akka.dispatch.Watch
@@ -62,11 +63,11 @@ private[akka] class RemoteSystemDaemon(
     }
   }
 
-  override def !(msg: Any)(implicit sender: ActorRef = Actor.noSender): Unit = msg match {
+  override def !(msg: Any)(implicit sender: ActorRef = Actor.noSender): Unit = try msg match {
     case message: DaemonMsg ⇒
       log.debug("Received command [{}] to RemoteSystemDaemon on [{}]", message, path.address)
       message match {
-        case DaemonMsgCreate(_, _, path, _) if untrustedMode ⇒ log.debug("does not accept deployments (untrusted) for {}", path)
+        case DaemonMsgCreate(_, _, path, _) if untrustedMode ⇒ log.debug("does not accept deployments (untrusted) for [{}]", path)
         case DaemonMsgCreate(props, deploy, path, supervisor) ⇒
           path match {
             case ActorPathExtractor(address, elems) if elems.nonEmpty && elems.head == "remote" ⇒
@@ -107,7 +108,10 @@ private[akka] class RemoteSystemDaemon(
         case _ ⇒ // skip, this child doesn't belong to the terminated address
       }
 
-    case unknown ⇒ log.warning("Unknown message {} received by {}", unknown, this)
+    case unknown ⇒ log.warning("Unknown message [{}] received by [{}]", unknown, this)
+
+  } catch {
+    case NonFatal(e) ⇒ log.error(e, "exception while processing remote command [{}] from [{}]", msg, sender)
   }
 
   def terminationHookDoneWhenNoChildren(): Unit = terminating.whileOn {

From afb5740d742a5212246f27612bcf09d9aada114f Mon Sep 17 00:00:00 2001
From: Roland <rk@rkuhn.info>
Date: Fri, 25 Jan 2013 13:10:14 +0100
Subject: [PATCH 116/122] fix the first of the issues: too strict test
 requirement, see #2950

LARS may execute recurring tasks a little too early on occasion, which
is a direct consequence of it trying to keep them running more regularly
and also allowing them to run at 1/tick rate.
---
 .../src/test/scala/akka/actor/SchedulerSpec.scala            | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala
index d5a2f9a027..8d12f58a46 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala
@@ -210,7 +210,10 @@ trait SchedulerSpec extends BeforeAndAfterEach with DefaultTimeout with Implicit
       collectCancellable(system.scheduler.schedule(1 second, 300 milliseconds, actor, Msg))
       Await.ready(ticks, 3 seconds)
 
-      (System.nanoTime() - startTime).nanos.toMillis must be(1800L plusOrMinus 199)
+      // LARS is a bit more aggressive in scheduling recurring tasks at the right
+      // frequency and may execute them a little earlier; the actual expected timing 
+      // is 1599ms on a fast machine or 1699ms on a loaded one (plus some room for jenkins)
+      (System.nanoTime() - startTime).nanos.toMillis must be(1750L plusOrMinus 250)
     }
 
     "adjust for scheduler inaccuracy" taggedAs TimingTest in {

From b8819639073228ba3690de8275793f934d730afb Mon Sep 17 00:00:00 2001
From: Roland <rk@rkuhn.info>
Date: Sun, 27 Jan 2013 12:56:35 +0100
Subject: [PATCH 117/122] make sure that InterruptExceptions are not swallowed,
 see #2963

also remove an old work-around in CallingThreadDispatcherModelSpec and
describe the rules for interrupting in the testing docs
---
 .../akka/actor/dispatch/ActorModelSpec.scala  |  6 ++-
 .../scala/akka/actor/dungeon/Dispatch.scala   | 51 ++++++-------------
 akka-docs/rst/java/testing.rst                | 22 ++++++++
 akka-docs/rst/scala/testing.rst               | 22 ++++++++
 .../akka/remote/RemoteActorRefProvider.scala  | 25 ++++-----
 5 files changed, 75 insertions(+), 51 deletions(-)

diff --git a/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala
index 443d6f5981..75e4718718 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala
@@ -415,9 +415,11 @@ abstract class ActorModelSpec(config: String) extends AkkaSpec(config) with Defa
         val a = newTestActor(dispatcher.id)
         val f1 = a ? Reply("foo")
         val f2 = a ? Reply("bar")
-        val f3 = try { a ? Interrupt } catch { case ie: InterruptedException ⇒ Promise.failed(new ActorInterruptedException(ie)).future }
+        val f3 = a ? Interrupt
+        Thread.interrupted() // CallingThreadDispatcher may necessitate this
         val f4 = a ? Reply("foo2")
-        val f5 = try { a ? Interrupt } catch { case ie: InterruptedException ⇒ Promise.failed(new ActorInterruptedException(ie)).future }
+        val f5 = a ? Interrupt
+        Thread.interrupted() // CallingThreadDispatcher may necessitate this
         val f6 = a ? Reply("bar2")
 
         val c = system.scheduler.scheduleOnce(2.seconds) {
diff --git a/akka-actor/src/main/scala/akka/actor/dungeon/Dispatch.scala b/akka-actor/src/main/scala/akka/actor/dungeon/Dispatch.scala
index 9bce41fc4f..910ca9bf4d 100644
--- a/akka-actor/src/main/scala/akka/actor/dungeon/Dispatch.scala
+++ b/akka-actor/src/main/scala/akka/actor/dungeon/Dispatch.scala
@@ -12,6 +12,7 @@ import scala.util.control.NonFatal
 import akka.dispatch.NullMessage
 import akka.actor.{ NoSerializationVerificationNeeded, InvalidMessageException, ActorRef, ActorCell }
 import akka.serialization.SerializationExtension
+import scala.util.control.Exception.Catcher
 
 private[akka] trait Dispatch { this: ActorCell ⇒
 
@@ -71,37 +72,25 @@ private[akka] trait Dispatch { this: ActorCell ⇒
     this
   }
 
-  // ➡➡➡ NEVER SEND THE SAME SYSTEM MESSAGE OBJECT TO TWO ACTORS ⬅⬅⬅
-  final def suspend(): Unit =
-    try dispatcher.systemDispatch(this, Suspend())
-    catch {
-      case e @ (_: InterruptedException | NonFatal(_)) ⇒
-        system.eventStream.publish(Error(e, self.path.toString, clazz(actor), "swallowing exception during message send"))
-    }
+  private def handleException: Catcher[Unit] = {
+    case e: InterruptedException ⇒
+      system.eventStream.publish(Error(e, self.path.toString, clazz(actor), "interrupted during message send"))
+      Thread.currentThread.interrupt()
+    case NonFatal(e) ⇒
+      system.eventStream.publish(Error(e, self.path.toString, clazz(actor), "swallowing exception during message send"))
+  }
 
   // ➡➡➡ NEVER SEND THE SAME SYSTEM MESSAGE OBJECT TO TWO ACTORS ⬅⬅⬅
-  final def resume(causedByFailure: Throwable): Unit =
-    try dispatcher.systemDispatch(this, Resume(causedByFailure))
-    catch {
-      case e @ (_: InterruptedException | NonFatal(_)) ⇒
-        system.eventStream.publish(Error(e, self.path.toString, clazz(actor), "swallowing exception during message send"))
-    }
+  final def suspend(): Unit = try dispatcher.systemDispatch(this, Suspend()) catch handleException
 
   // ➡➡➡ NEVER SEND THE SAME SYSTEM MESSAGE OBJECT TO TWO ACTORS ⬅⬅⬅
-  final def restart(cause: Throwable): Unit =
-    try dispatcher.systemDispatch(this, Recreate(cause))
-    catch {
-      case e @ (_: InterruptedException | NonFatal(_)) ⇒
-        system.eventStream.publish(Error(e, self.path.toString, clazz(actor), "swallowing exception during message send"))
-    }
+  final def resume(causedByFailure: Throwable): Unit = try dispatcher.systemDispatch(this, Resume(causedByFailure)) catch handleException
 
   // ➡➡➡ NEVER SEND THE SAME SYSTEM MESSAGE OBJECT TO TWO ACTORS ⬅⬅⬅
-  final def stop(): Unit =
-    try dispatcher.systemDispatch(this, Terminate())
-    catch {
-      case e @ (_: InterruptedException | NonFatal(_)) ⇒
-        system.eventStream.publish(Error(e, self.path.toString, clazz(actor), "swallowing exception during message send"))
-    }
+  final def restart(cause: Throwable): Unit = try dispatcher.systemDispatch(this, Recreate(cause)) catch handleException
+
+  // ➡➡➡ NEVER SEND THE SAME SYSTEM MESSAGE OBJECT TO TWO ACTORS ⬅⬅⬅
+  final def stop(): Unit = try dispatcher.systemDispatch(this, Terminate()) catch handleException
 
   def sendMessage(msg: Envelope): Unit =
     try {
@@ -112,16 +101,8 @@ private[akka] trait Dispatch { this: ActorCell ⇒
         s.deserialize(s.serialize(m).get, m.getClass).get
       }
       dispatcher.dispatch(this, msg)
-    } catch {
-      case e @ (_: InterruptedException | NonFatal(_)) ⇒
-        system.eventStream.publish(Error(e, self.path.toString, clazz(actor), "swallowing exception during message send"))
-    }
+    } catch handleException
 
-  override def sendSystemMessage(message: SystemMessage): Unit =
-    try dispatcher.systemDispatch(this, message)
-    catch {
-      case e @ (_: InterruptedException | NonFatal(_)) ⇒
-        system.eventStream.publish(Error(e, self.path.toString, clazz(actor), "swallowing exception during message send"))
-    }
+  override def sendSystemMessage(message: SystemMessage): Unit = try dispatcher.systemDispatch(this, message) catch handleException
 
 }
diff --git a/akka-docs/rst/java/testing.rst b/akka-docs/rst/java/testing.rst
index 07f0cbf60a..cfb5469c6b 100644
--- a/akka-docs/rst/java/testing.rst
+++ b/akka-docs/rst/java/testing.rst
@@ -546,6 +546,28 @@ production.
    scenarios, but keep in mind that it has may give false negatives as well as
    false positives.
 
+Thread Interruptions
+--------------------
+
+If the CallingThreadDispatcher sees that the current thread has its
+``isInterrupted()`` flag set when message processing returns, it will throw an
+:class:`InterruptedException` after finishing all its processing (i.e. all
+messages which need processing as described above are processed before this
+happens). As :meth:`tell` cannot throw exceptions due to its contract, this
+exception will then be caught and logged, and the thread’s interrupted status
+will be set again.
+
+If during message processing an :class:`InterruptedException` is thrown then it
+will be caught inside the CallingThreadDispatcher’s message handling loop, the
+thread’s interrupted flag will be set and processing continues normally.
+
+.. note::
+
+  The summary of these two paragraphs is that if the current thread is
+  interrupted while doing work under the CallingThreadDispatcher, then that
+  will result in the ``isInterrupted`` flag to be ``true`` when the message
+  send returns and no :class:`InterruptedException` will be thrown.
+
 Benefits
 --------
 
diff --git a/akka-docs/rst/scala/testing.rst b/akka-docs/rst/scala/testing.rst
index ad9bf330f7..8841280e79 100644
--- a/akka-docs/rst/scala/testing.rst
+++ b/akka-docs/rst/scala/testing.rst
@@ -614,6 +614,28 @@ production.
    scenarios, but keep in mind that it has may give false negatives as well as
    false positives.
 
+Thread Interruptions
+--------------------
+
+If the CallingThreadDispatcher sees that the current thread has its
+``isInterrupted()`` flag set when message processing returns, it will throw an
+:class:`InterruptedException` after finishing all its processing (i.e. all
+messages which need processing as described above are processed before this
+happens). As :meth:`tell` cannot throw exceptions due to its contract, this
+exception will then be caught and logged, and the thread’s interrupted status
+will be set again.
+
+If during message processing an :class:`InterruptedException` is thrown then it
+will be caught inside the CallingThreadDispatcher’s message handling loop, the
+thread’s interrupted flag will be set and processing continues normally.
+
+.. note::
+
+  The summary of these two paragraphs is that if the current thread is
+  interrupted while doing work under the CallingThreadDispatcher, then that
+  will result in the ``isInterrupted`` flag to be ``true`` when the message
+  send returns and no :class:`InterruptedException` will be thrown.
+
 Benefits
 --------
 
diff --git a/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala b/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
index 1f32d88140..a64b9b3a71 100644
--- a/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
+++ b/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
@@ -13,7 +13,7 @@ import akka.pattern.pipe
 import scala.concurrent.Future
 import scala.util.control.NonFatal
 import akka.actor.SystemGuardian.{ TerminationHookDone, TerminationHook, RegisterTerminationHook }
-import scala.throws
+import scala.util.control.Exception.Catcher
 
 object RemoteActorRefProvider {
   private case class Internals(transport: RemoteTransport, serialization: Serialization, remoteDaemon: InternalActorRef)
@@ -339,21 +339,18 @@ private[akka] class RemoteActorRef private[akka] (
 
   def isTerminated: Boolean = false
 
-  def sendSystemMessage(message: SystemMessage): Unit =
-    try remote.send(message, None, this)
-    catch {
-      case e @ (_: InterruptedException | NonFatal(_)) ⇒
-        remote.system.eventStream.publish(Error(e, path.toString, classOf[RemoteActorRef], "swallowing exception during message send"))
-        provider.deadLetters ! message
-    }
+  private def handleException: Catcher[Unit] = {
+    case e: InterruptedException ⇒
+      remote.system.eventStream.publish(Error(e, path.toString, getClass, "interrupted during message send"))
+      Thread.currentThread.interrupt()
+    case NonFatal(e) ⇒
+      remote.system.eventStream.publish(Error(e, path.toString, getClass, "swallowing exception during message send"))
+  }
+
+  def sendSystemMessage(message: SystemMessage): Unit = try remote.send(message, None, this) catch handleException
 
   override def !(message: Any)(implicit sender: ActorRef = Actor.noSender): Unit =
-    try remote.send(message, Option(sender), this)
-    catch {
-      case e @ (_: InterruptedException | NonFatal(_)) ⇒
-        remote.system.eventStream.publish(Error(e, path.toString, classOf[RemoteActorRef], "swallowing exception during message send"))
-        provider.deadLetters ! message
-    }
+    try remote.send(message, Option(sender), this) catch handleException
 
   def start(): Unit = if (props.isDefined && deploy.isDefined) provider.useActorOnNode(path, props.get, deploy.get, getParent)
 

From f89dd499546751b7c58dd40939e0d6e3a7fac644 Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Thu, 31 Jan 2013 09:24:12 +0100
Subject: [PATCH 118/122] Share same instance of deadLetters between LARP and
 RARP, see #2983

---
 .../src/main/scala/akka/actor/ActorRefProvider.scala | 12 ++++++++----
 .../scala/akka/remote/RemoteActorRefProvider.scala   |  6 ++++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala b/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala
index a593c6dde8..3271537e82 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala
@@ -326,13 +326,15 @@ private[akka] object SystemGuardian {
  *
  * Depending on this class is not supported, only the [[ActorRefProvider]] interface is supported.
  */
-class LocalActorRefProvider(
+class LocalActorRefProvider private[akka] (
   _systemName: String,
   override val settings: ActorSystem.Settings,
   val eventStream: EventStream,
   override val scheduler: Scheduler,
   val dynamicAccess: DynamicAccess,
-  override val deployer: Deployer) extends ActorRefProvider {
+  override val deployer: Deployer,
+  _deadLetters: Option[ActorPath ⇒ InternalActorRef])
+  extends ActorRefProvider {
 
   // this is the constructor needed for reflectively instantiating the provider
   def this(_systemName: String,
@@ -345,13 +347,15 @@ class LocalActorRefProvider(
       eventStream,
       scheduler,
       dynamicAccess,
-      new Deployer(settings, dynamicAccess))
+      new Deployer(settings, dynamicAccess),
+      None)
 
   override val rootPath: ActorPath = RootActorPath(Address("akka", _systemName))
 
   private[akka] val log: LoggingAdapter = Logging(eventStream, "LocalActorRefProvider(" + rootPath.address + ")")
 
-  override val deadLetters: InternalActorRef = new DeadLetterActorRef(this, rootPath / "deadLetters", eventStream)
+  override val deadLetters: InternalActorRef =
+    _deadLetters.getOrElse((p: ActorPath) ⇒ new DeadLetterActorRef(this, p, eventStream)).apply(rootPath / "deadLetters")
 
   /*
    * generate name for temporary actor refs
diff --git a/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala b/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
index a64b9b3a71..d8fcab4fcd 100644
--- a/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
+++ b/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
@@ -77,6 +77,7 @@ object RemoteActorRefProvider {
     }
 
     override def specialHandle(msg: Any): Boolean = msg match {
+      // unwrap again in case the original message was DeadLetter(EndpointManager.Send(m))
       case EndpointManager.Send(m, _, _) ⇒ super.specialHandle(m)
       case _                             ⇒ super.specialHandle(msg)
     }
@@ -111,14 +112,15 @@ class RemoteActorRefProvider(
    */
   protected def createDeployer: RemoteDeployer = new RemoteDeployer(settings, dynamicAccess)
 
-  private val local = new LocalActorRefProvider(systemName, settings, eventStream, scheduler, dynamicAccess, deployer)
+  private val local = new LocalActorRefProvider(systemName, settings, eventStream, scheduler, dynamicAccess, deployer,
+    Some(deadLettersPath ⇒ new RemoteDeadLetterActorRef(this, deadLettersPath, eventStream)))
 
   @volatile
   private var _log = local.log
   def log: LoggingAdapter = _log
 
   override def rootPath: ActorPath = local.rootPath
-  override val deadLetters: InternalActorRef = new RemoteDeadLetterActorRef(this, rootPath / "deadLetters", eventStream)
+  override def deadLetters: InternalActorRef = local.deadLetters
 
   // these are only available after init()
   override def rootGuardian: InternalActorRef = local.rootGuardian

From 85cfa78e920011346996f194ec9b3c4bff9d5706 Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Thu, 31 Jan 2013 09:24:34 +0100
Subject: [PATCH 119/122] Generate ChildTerminated from all Terminated in
 RemoteDeploymentWatcher, see #2983

* The problem is that we do remote deployment to a node that isn't alive and with ordinary
  remoting that is not detected at all, as we know. With cluster this was taken care of by
  a later AddressTerminated and ChildTerminated generated by RemoteDeploymentWatcher. With
  the new RemoteDeadLetters the additional watch triggers an immediate Terminate which is
  captured by RemoteDeploymentWatcher but not acted upon since it's not an addressTerminated.
  RemoteDeploymentWatcher unwatch and will therefor not act on later AddressTerminated.
* The long term solution is to have reliable system messages and remote supervision without
  explicit watch, so that we know that the remote deployment fails.
* This short term solution is to let RemoteDeploymentWatcher always generate ChildTerminated,
  also for non-addressTerminated.
* It's possibly racy since ChildTerminated is not idempotent.
---
 .../src/main/scala/akka/cluster/ClusterActorRefProvider.scala   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterActorRefProvider.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterActorRefProvider.scala
index f2e3b9e3be..b1ed2e7c38 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterActorRefProvider.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/ClusterActorRefProvider.scala
@@ -94,7 +94,7 @@ private[akka] class RemoteDeploymentWatcher extends Actor {
 
     case t @ Terminated(a) if supervisors isDefinedAt a ⇒
       // send extra ChildTerminated to the supervisor so that it will remove the child
-      if (t.addressTerminated) supervisors(a).sendSystemMessage(ChildTerminated(a))
+      supervisors(a).sendSystemMessage(ChildTerminated(a))
       supervisors -= a
 
     case _: Terminated ⇒

From 938cf7126b8e57b507f6b6a201ab5d1654f1cd4d Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Thu, 31 Jan 2013 09:30:05 +0100
Subject: [PATCH 120/122] Send ChildTerminated before Terminated when
 AddressTerminated, see #2983

* Replaces the previous half-baked removeChildWhenToAddressTerminated
---
 .../src/main/scala/akka/actor/ActorCell.scala  | 18 ++----------------
 .../scala/akka/actor/dungeon/DeathWatch.scala  |  6 +++++-
 akka-docs/rst/cluster/cluster-usage-java.rst   | 10 ++++++++++
 akka-docs/rst/cluster/cluster-usage-scala.rst  | 11 +++++++++++
 4 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/akka-actor/src/main/scala/akka/actor/ActorCell.scala b/akka-actor/src/main/scala/akka/actor/ActorCell.scala
index fa0fdb4e52..80771df376 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorCell.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorCell.scala
@@ -408,10 +408,8 @@ private[akka] class ActorCell(
         publish(Debug(self.path.toString, clazz(actor), "received AutoReceiveMessage " + msg))
 
       msg.message match {
-        case Failed(cause, uid) ⇒ handleFailure(sender, cause, uid)
-        case t: Terminated ⇒
-          if (t.addressTerminated) removeChildWhenToAddressTerminated(t.actor)
-          watchedActorTerminated(t)
+        case Failed(cause, uid)         ⇒ handleFailure(sender, cause, uid)
+        case t: Terminated              ⇒ watchedActorTerminated(t)
         case AddressTerminated(address) ⇒ addressTerminated(address)
         case Kill                       ⇒ throw new ActorKilledException("Kill")
         case PoisonPill                 ⇒ self.stop()
@@ -421,18 +419,6 @@ private[akka] class ActorCell(
       }
     }
 
-  /**
-   * When a parent is watching a child and it terminates due to AddressTerminated,
-   * it should be removed to support immediate creation of child with same name.
-   *
-   * For remote deployed actors ChildTerminated should be sent to the supervisor
-   * to clean up child references of remote deployed actors when remote node
-   * goes down, i.e. triggered by AddressTerminated, but that is the responsibility
-   * of the ActorRefProvider to handle that scenario.
-   */
-  private def removeChildWhenToAddressTerminated(child: ActorRef): Unit =
-    childrenRefs.getByRef(child) foreach { crs ⇒ removeChildAndGetStateChange(crs.child) }
-
   final def receiveMessage(msg: Any): Unit = behaviorStack.head.applyOrElse(msg, actor.unhandled)
 
   /*
diff --git a/akka-actor/src/main/scala/akka/actor/dungeon/DeathWatch.scala b/akka-actor/src/main/scala/akka/actor/dungeon/DeathWatch.scala
index 017a880b1a..4e697d3f70 100644
--- a/akka-actor/src/main/scala/akka/actor/dungeon/DeathWatch.scala
+++ b/akka-actor/src/main/scala/akka/actor/dungeon/DeathWatch.scala
@@ -5,7 +5,7 @@
 package akka.actor.dungeon
 
 import akka.actor.{ Terminated, InternalActorRef, ActorRef, ActorRefScope, ActorCell, Actor, Address, AddressTerminated }
-import akka.dispatch.{ Watch, Unwatch }
+import akka.dispatch.{ ChildTerminated, Watch, Unwatch }
 import akka.event.Logging.{ Warning, Error, Debug }
 import scala.util.control.NonFatal
 
@@ -130,7 +130,11 @@ private[akka] trait DeathWatch { this: ActorCell ⇒
     // send Terminated to self for all matching subjects
     // existenceConfirmed = false because we could have been watching a
     // non-local ActorRef that had never resolved before the other node went down
+    // When a parent is watching a child and it terminates due to AddressTerminated
+    // it is removed by sending ChildTerminated to support immediate creation of child
+    // with same name.
     for (a ← watching; if a.path.address == address) {
+      childrenRefs.getByRef(a) foreach { _ ⇒ self.sendSystemMessage(ChildTerminated(a)) }
       self ! Terminated(a)(existenceConfirmed = false, addressTerminated = true)
     }
   }
diff --git a/akka-docs/rst/cluster/cluster-usage-java.rst b/akka-docs/rst/cluster/cluster-usage-java.rst
index 518b371f38..b9b23b0163 100644
--- a/akka-docs/rst/cluster/cluster-usage-java.rst
+++ b/akka-docs/rst/cluster/cluster-usage-java.rst
@@ -320,6 +320,16 @@ This is how the curve looks like for ``acceptable-heartbeat-pause`` configured t
 
 .. image:: images/phi3.png
 
+Death watch uses the cluster failure detector for nodes in the cluster, i.e. it 
+generates ``Terminated`` message from network failures and JVM crashes, in addition 
+to graceful termination of watched actor. 
+
+.. warning::
+
+  Creating a remote deployed child actor with the same name as the terminated 
+  actor is not fully supported. There is a race condition that potentially removes the new 
+  actor.
+
 Cluster Aware Routers
 ^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/akka-docs/rst/cluster/cluster-usage-scala.rst b/akka-docs/rst/cluster/cluster-usage-scala.rst
index 70d96da22d..ea18cc7c61 100644
--- a/akka-docs/rst/cluster/cluster-usage-scala.rst
+++ b/akka-docs/rst/cluster/cluster-usage-scala.rst
@@ -293,6 +293,17 @@ This is how the curve looks like for ``acceptable-heartbeat-pause`` configured t
 
 .. image:: images/phi3.png
 
+
+Death watch uses the cluster failure detector for nodes in the cluster, i.e. it 
+generates ``Terminated`` message from network failures and JVM crashes, in addition 
+to graceful termination of watched actor. 
+
+.. warning::
+
+  Creating a remote deployed child actor with the same name as the terminated 
+  actor is not fully supported. There is a race condition that potentially removes the new 
+  actor.
+
 .. _cluster_aware_routers_scala:
 
 Cluster Aware Routers

From 9dc124dacd9f282b494582cdb6b07fe0812bfc77 Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Fri, 25 Jan 2013 15:03:52 +0100
Subject: [PATCH 121/122] Remove work-around for sending to broken connections,
 see #2909

* Previous work-around was introduced because Netty blocks when sending
to broken connections. This is supposed to be solved by the non-blocking
new remoting.
* Removed HeartbeatSender and CoreSender in cluster
* Added tests to verify that broken connections don't disturb live connection
---
 .../src/main/resources/reference.conf         |   7 --
 .../scala/akka/cluster/ClusterDaemon.scala    |  46 ++------
 .../scala/akka/cluster/ClusterHeartbeat.scala | 101 ++----------------
 .../scala/akka/cluster/ClusterSettings.scala  |   5 -
 .../akka/cluster/ClusterConfigSpec.scala      |   4 -
 .../test/scala/akka/remote/RemotingSpec.scala |  63 ++++++++---
 6 files changed, 72 insertions(+), 154 deletions(-)

diff --git a/akka-cluster/src/main/resources/reference.conf b/akka-cluster/src/main/resources/reference.conf
index 4532c0ff8a..6a1f7ac3c3 100644
--- a/akka-cluster/src/main/resources/reference.conf
+++ b/akka-cluster/src/main/resources/reference.conf
@@ -167,13 +167,6 @@ akka {
       ticks-per-wheel = 512
     }
 
-    # Netty blocks when sending to broken connections, and this circuit breaker
-    # is used to reduce connect attempts to broken connections.
-    send-circuit-breaker {
-      max-failures = 3
-      call-timeout = 2 s
-      reset-timeout = 30 s
-    }
   }
 
   # Default configuration for routers
diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterDaemon.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterDaemon.scala
index b2ecc0fbdb..106de783ae 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterDaemon.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/ClusterDaemon.scala
@@ -99,8 +99,6 @@ private[cluster] object InternalClusterAction {
 
   case object PublishStatsTick extends Tick
 
-  case class SendClusterMessage(to: Address, msg: ClusterMessage)
-
   case class SendGossipTo(address: Address)
 
   case object GetClusterCoreRef
@@ -194,8 +192,12 @@ private[cluster] final class ClusterCoreDaemon(publisher: ActorRef) extends Acto
 
   var stats = ClusterStats()
 
-  val coreSender = context.actorOf(Props[ClusterCoreSender].
-    withDispatcher(UseDispatcher), name = "coreSender")
+  /**
+   * Looks up and returns the remote cluster command connection for the specific address.
+   */
+  private def clusterCore(address: Address): ActorRef =
+    context.actorFor(RootActorPath(address) / "system" / "cluster" / "core")
+
   val heartbeatSender = context.actorOf(Props[ClusterHeartbeatSender].
     withDispatcher(UseDispatcher), name = "heartbeatSender")
 
@@ -300,7 +302,7 @@ private[cluster] final class ClusterCoreDaemon(publisher: ActorRef) extends Acto
       if (address == selfAddress)
         joining(address)
       else
-        coreSender ! SendClusterMessage(address, ClusterUserAction.Join(selfAddress))
+        clusterCore(address) ! ClusterUserAction.Join(selfAddress)
     }
   }
 
@@ -497,7 +499,7 @@ private[cluster] final class ClusterCoreDaemon(publisher: ActorRef) extends Acto
         val rate = mergeRate(stats.mergeConflictCount)
 
         if (rate <= MaxGossipMergeRate)
-          coreSender ! SendClusterMessage(to = localGossip.leader.get, msg = GossipMergeConflict(GossipEnvelope(selfAddress, localGossip), envelope))
+          localGossip.leader foreach { clusterCore(_) ! GossipMergeConflict(GossipEnvelope(selfAddress, localGossip), envelope) }
         else
           log.debug("Skipping gossip merge conflict due to rate [{}] / s ", rate)
 
@@ -712,18 +714,14 @@ private[cluster] final class ClusterCoreDaemon(publisher: ActorRef) extends Acto
         removedMembers foreach { member ⇒
           val address = member.address
           log.info("Cluster Node [{}] - Leader is moving node [{}] from EXITING to REMOVED - and removing node from node ring", selfAddress, address)
-          coreSender ! SendClusterMessage(
-            to = address,
-            msg = ClusterLeaderAction.Remove(address))
+          clusterCore(address) ! ClusterLeaderAction.Remove(address)
         }
 
         //  tell all exiting members to exit
         exitingMembers foreach { member ⇒
           val address = member.address
           log.info("Cluster Node [{}] - Leader is moving node [{}] from LEAVING to EXITING", selfAddress, address)
-          coreSender ! SendClusterMessage(
-            to = address,
-            msg = ClusterLeaderAction.Exit(address)) // FIXME should use ? to await completion of handoff?
+          clusterCore(address) ! ClusterLeaderAction.Exit(address) // FIXME should use ? to await completion of handoff?
         }
 
         // log the auto-downing of the unreachable nodes
@@ -804,8 +802,7 @@ private[cluster] final class ClusterCoreDaemon(publisher: ActorRef) extends Acto
     gossipTo(address, GossipEnvelope(selfAddress, latestGossip, conversation = false))
 
   def gossipTo(address: Address, gossipMsg: GossipEnvelope): Unit =
-    if (address != selfAddress)
-      coreSender ! SendClusterMessage(address, gossipMsg)
+    if (address != selfAddress) clusterCore(address) ! gossipMsg
 
   def publish(newGossip: Gossip): Unit = {
     publisher ! PublishChanges(newGossip)
@@ -873,27 +870,6 @@ private[cluster] final class JoinSeedNodeProcess(seedNodes: immutable.IndexedSeq
   }
 }
 
-/**
- * INTERNAL API.
- */
-private[cluster] final class ClusterCoreSender extends Actor with ActorLogging {
-  import InternalClusterAction._
-
-  val selfAddress = Cluster(context.system).selfAddress
-
-  /**
-   * Looks up and returns the remote cluster command connection for the specific address.
-   */
-  private def clusterCoreConnectionFor(address: Address): ActorRef =
-    context.actorFor(RootActorPath(address) / "system" / "cluster" / "core")
-
-  def receive = {
-    case SendClusterMessage(to, msg) ⇒
-      log.debug("Cluster Node [{}] - Trying to send [{}] to [{}]", selfAddress, msg.getClass.getSimpleName, to)
-      clusterCoreConnectionFor(to) ! msg
-  }
-}
-
 /**
  * INTERNAL API
  *
diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterHeartbeat.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterHeartbeat.scala
index f46b611c44..309b0d039a 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterHeartbeat.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/ClusterHeartbeat.scala
@@ -7,9 +7,7 @@ import language.postfixOps
 
 import scala.collection.immutable
 import scala.concurrent.duration._
-import java.net.URLEncoder
-import akka.actor.{ ActorLogging, ActorRef, Address, Actor, RootActorPath, PoisonPill, Props }
-import akka.pattern.{ CircuitBreaker, CircuitBreakerOpenException }
+import akka.actor.{ ActorLogging, ActorRef, Address, Actor, RootActorPath, Props }
 import akka.cluster.ClusterEvent._
 import akka.routing.MurmurHash
 
@@ -81,15 +79,9 @@ private[cluster] object ClusterHeartbeatSender {
  *
  * This actor is responsible for sending the heartbeat messages to
  * a few other nodes that will monitor this node.
- *
- * Netty blocks when sending to broken connections. This actor
- * isolates sending to different nodes by using child actors for each target
- * address and thereby reduce the risk of irregular heartbeats to healty
- * nodes due to broken connections to other nodes.
  */
 private[cluster] final class ClusterHeartbeatSender extends Actor with ActorLogging {
   import ClusterHeartbeatSender._
-  import ClusterHeartbeatSenderConnection._
   import ClusterHeartbeatReceiver._
   import InternalClusterAction.HeartbeatTick
 
@@ -121,13 +113,13 @@ private[cluster] final class ClusterHeartbeatSender extends Actor with ActorLogg
   /**
    * Looks up and returns the remote cluster heartbeat connection for the specific address.
    */
-  def clusterHeartbeatConnectionFor(address: Address): ActorRef =
+  def heartbeatReceiver(address: Address): ActorRef =
     context.actorFor(RootActorPath(address) / "system" / "cluster" / "heartbeatReceiver")
 
   /**
    * Looks up and returns the remote cluster heartbeat sender for the specific address.
    */
-  def heartbeatSenderFor(address: Address): ActorRef = context.actorFor(self.path.toStringWithAddress(address))
+  def heartbeatSender(address: Address): ActorRef = context.actorFor(self.path.toStringWithAddress(address))
 
   def receive = {
     case HeartbeatTick                ⇒ heartbeat()
@@ -154,7 +146,7 @@ private[cluster] final class ClusterHeartbeatSender extends Actor with ActorLogg
 
   def sendHeartbeatRequest(address: Address): Unit =
     if (!cluster.failureDetector.isMonitoring(address) && state.ring.mySenders.contains(address)) {
-      heartbeatSenderFor(address) ! selfHeartbeatRequest
+      heartbeatSender(address) ! selfHeartbeatRequest
       // schedule the expected heartbeat for later, which will give the
       // sender a chance to start heartbeating, and also trigger some resends of
       // the heartbeat request
@@ -170,28 +162,19 @@ private[cluster] final class ClusterHeartbeatSender extends Actor with ActorLogg
   def heartbeat(): Unit = {
     state = state.removeOverdueHeartbeatRequest()
 
-    def connection(to: Address): ActorRef = {
-      // URL encoded target address as child actor name
-      val connectionName = URLEncoder.encode(to.toString, "UTF-8")
-      context.actorFor(connectionName) match {
-        case notFound if notFound.isTerminated ⇒
-          context.actorOf(Props(new ClusterHeartbeatSenderConnection(clusterHeartbeatConnectionFor(to))), connectionName)
-        case child ⇒ child
-      }
+    state.active foreach { to ⇒
+      log.debug("Cluster Node [{}] - Heartbeat to [{}]", cluster.selfAddress, to)
+      heartbeatReceiver(to) ! selfHeartbeat
     }
 
-    val deadline = Deadline.now + HeartbeatInterval
-    state.active foreach { to ⇒ connection(to) ! SendHeartbeat(selfHeartbeat, to, deadline) }
-
     // When sending heartbeats to a node is stopped a few `EndHeartbeat` messages is
     // sent to notify it that no more heartbeats will be sent.
     for ((to, count) ← state.ending) {
-      val c = connection(to)
-      c ! SendEndHeartbeat(selfEndHeartbeat, to)
-      if (count == NumberOfEndHeartbeats) {
+      log.debug("Cluster Node [{}] - EndHeartbeat to [{}]", cluster.selfAddress, to)
+      heartbeatReceiver(to) ! selfEndHeartbeat
+      if (count == NumberOfEndHeartbeats)
         state = state.removeEnding(to)
-        c ! PoisonPill
-      } else
+      else
         state = state.increaseEndingCount(to)
     }
 
@@ -308,68 +291,6 @@ private[cluster] case class ClusterHeartbeatSenderState private (
 
 }
 
-/**
- * INTERNAL API
- */
-private[cluster] object ClusterHeartbeatSenderConnection {
-  import ClusterHeartbeatReceiver._
-
-  /**
-   * Command to [akka.cluster.ClusterHeartbeatSenderConnection]], which will send
-   * [[akka.cluster.ClusterHeartbeatReceiver.Heartbeat]] to the other node.
-   * Local only, no need to serialize.
-   */
-  case class SendHeartbeat(heartbeatMsg: Heartbeat, to: Address, deadline: Deadline)
-
-  /**
-   * Command to [akka.cluster.ClusterHeartbeatSenderConnection]], which will send
-   * [[akka.cluster.ClusterHeartbeatReceiver.EndHeartbeat]] to the other node.
-   * Local only, no need to serialize.
-   */
-  case class SendEndHeartbeat(endHeartbeatMsg: EndHeartbeat, to: Address)
-}
-
-/**
- * Responsible for sending [[akka.cluster.ClusterHeartbeatReceiver.Heartbeat]]
- * and [[akka.cluster.ClusterHeartbeatReceiver.EndHeartbeat]] to one specific address.
- *
- * This actor exists only because Netty blocks when sending to broken connections,
- * and this actor uses a configurable circuit breaker to reduce connect attempts to broken
- * connections.
- *
- * @see akka.cluster.ClusterHeartbeatSender
- */
-private[cluster] final class ClusterHeartbeatSenderConnection(toRef: ActorRef)
-  extends Actor with ActorLogging {
-
-  import ClusterHeartbeatSenderConnection._
-
-  val breaker = {
-    val cbSettings = Cluster(context.system).settings.SendCircuitBreakerSettings
-    CircuitBreaker(context.system.scheduler,
-      cbSettings.maxFailures, cbSettings.callTimeout, cbSettings.resetTimeout).
-      onHalfOpen(log.debug("CircuitBreaker Half-Open for: [{}]", toRef)).
-      onOpen(log.info("CircuitBreaker Open for [{}]", toRef)).
-      onClose(log.debug("CircuitBreaker Closed for [{}]", toRef))
-  }
-
-  def receive = {
-    case SendHeartbeat(heartbeatMsg, _, deadline) ⇒
-      if (!deadline.isOverdue) {
-        log.debug("Cluster Node [{}] - Heartbeat to [{}]", heartbeatMsg.from, toRef)
-        // Netty blocks when sending to broken connections, the CircuitBreaker will
-        // measure elapsed time and open if too many long calls
-        try breaker.withSyncCircuitBreaker {
-          toRef ! heartbeatMsg
-        } catch { case e: CircuitBreakerOpenException ⇒ /* skip sending heartbeat to broken connection */ }
-      }
-      if (deadline.isOverdue) log.info("Sending heartbeat to [{}] took longer than expected", toRef)
-    case SendEndHeartbeat(endHeartbeatMsg, _) ⇒
-      log.debug("Cluster Node [{}] - EndHeartbeat to [{}]", endHeartbeatMsg.from, toRef)
-      toRef ! endHeartbeatMsg
-  }
-}
-
 /**
  * INTERNAL API
  *
diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterSettings.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterSettings.scala
index eced8bae97..2020c67993 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterSettings.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/ClusterSettings.scala
@@ -72,10 +72,6 @@ class ClusterSettings(val config: Config, val systemName: String) {
   final val MaxGossipMergeRate: Double = getDouble("akka.cluster.max-gossip-merge-rate")
   final val SchedulerTickDuration: FiniteDuration = Duration(getMilliseconds("akka.cluster.scheduler.tick-duration"), MILLISECONDS)
   final val SchedulerTicksPerWheel: Int = getInt("akka.cluster.scheduler.ticks-per-wheel")
-  final val SendCircuitBreakerSettings: CircuitBreakerSettings = CircuitBreakerSettings(
-    maxFailures = getInt("akka.cluster.send-circuit-breaker.max-failures"),
-    callTimeout = Duration(getMilliseconds("akka.cluster.send-circuit-breaker.call-timeout"), MILLISECONDS),
-    resetTimeout = Duration(getMilliseconds("akka.cluster.send-circuit-breaker.reset-timeout"), MILLISECONDS))
   final val MetricsEnabled: Boolean = getBoolean("akka.cluster.metrics.enabled")
   final val MetricsCollectorClass: String = getString("akka.cluster.metrics.collector-class")
   final val MetricsInterval: FiniteDuration = {
@@ -87,4 +83,3 @@ class ClusterSettings(val config: Config, val systemName: String) {
   } requiring (_ > Duration.Zero, "metrics.moving-average-half-life must be > 0")
 }
 
-case class CircuitBreakerSettings(maxFailures: Int, callTimeout: FiniteDuration, resetTimeout: FiniteDuration)
diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterConfigSpec.scala b/akka-cluster/src/test/scala/akka/cluster/ClusterConfigSpec.scala
index 60c83399be..4479520833 100644
--- a/akka-cluster/src/test/scala/akka/cluster/ClusterConfigSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/ClusterConfigSpec.scala
@@ -45,10 +45,6 @@ class ClusterConfigSpec extends AkkaSpec {
       MaxGossipMergeRate must be(5.0 plusOrMinus 0.0001)
       SchedulerTickDuration must be(33 millis)
       SchedulerTicksPerWheel must be(512)
-      SendCircuitBreakerSettings must be(CircuitBreakerSettings(
-        maxFailures = 3,
-        callTimeout = 2 seconds,
-        resetTimeout = 30 seconds))
       MetricsEnabled must be(true)
       MetricsCollectorClass must be(classOf[SigarMetricsCollector].getName)
       MetricsInterval must be(3 seconds)
diff --git a/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala b/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala
index 71f70129fa..72f3b83ce4 100644
--- a/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala
@@ -13,11 +13,11 @@ import scala.concurrent.duration._
 import akka.remote.transport.AssociationRegistry
 
 object RemotingSpec {
-  class Echo extends Actor {
+  class Echo1 extends Actor {
     var target: ActorRef = context.system.deadLetters
 
     def receive = {
-      case (p: Props, n: String) ⇒ sender ! context.actorOf(Props[Echo], n)
+      case (p: Props, n: String) ⇒ sender ! context.actorOf(Props[Echo1], n)
       case ex: Exception         ⇒ throw ex
       case s: String             ⇒ sender ! context.actorFor(s)
       case x                     ⇒ target = sender; sender ! x
@@ -33,6 +33,12 @@ object RemotingSpec {
     }
   }
 
+  class Echo2 extends Actor {
+    def receive = {
+      case "ping" ⇒ sender ! (("pong", sender))
+    }
+  }
+
   val cfg: Config = ConfigFactory parseString ("""
     common-ssl-settings {
       key-store = "%s"
@@ -115,11 +121,7 @@ class RemotingSpec extends AkkaSpec(RemotingSpec.cfg) with ImplicitSender with D
     sys.asInstanceOf[ExtendedActorSystem].provider.asInstanceOf[RemoteActorRefProvider].deployer.deploy(d)
   }
 
-  val remote = other.actorOf(Props(new Actor {
-    def receive = {
-      case "ping" ⇒ sender ! (("pong", sender))
-    }
-  }), "echo")
+  val remote = other.actorOf(Props[Echo2], "echo")
 
   val here = system.actorFor("akka.test://remote-sys@localhost:12346/user/echo")
 
@@ -154,8 +156,43 @@ class RemotingSpec extends AkkaSpec(RemotingSpec.cfg) with ImplicitSender with D
       }(other)
     }
 
+    "not be exhausted by sending to broken connections" in {
+      val moreSystems = Vector.fill(10)(ActorSystem(other.name, other.settings.config))
+      moreSystems foreach (_.actorOf(Props[Echo2], name = "echo"))
+      val moreRefs = moreSystems map (sys ⇒ system.actorFor(RootActorPath(addr(sys, "tcp")) / "user" / "echo"))
+      val aliveEcho = system.actorFor(RootActorPath(addr(other, "tcp")) / "user" / "echo")
+      val n = 100
+
+      // first everything is up and running
+      1 to n foreach { x ⇒
+        aliveEcho ! "ping"
+        moreRefs(x % moreSystems.size) ! "ping"
+      }
+
+      within(5.seconds) {
+        receiveN(n * 2) foreach { reply ⇒ reply must be(("pong", testActor)) }
+      }
+
+      // then we shutdown all but one system to simulate broken connections
+      moreSystems foreach { sys ⇒
+        sys.shutdown()
+        sys.awaitTermination(5.seconds.dilated)
+        sys.isTerminated must be(true)
+      }
+
+      1 to n foreach { x ⇒
+        aliveEcho ! "ping"
+        moreRefs(x % moreSystems.size) ! "ping"
+      }
+
+      // ping messages to aliveEcho should go through even though we use many different broken connections
+      within(5.seconds) {
+        receiveN(n) foreach { reply ⇒ reply must be(("pong", testActor)) }
+      }
+    }
+
     "create and supervise children on remote node" in {
-      val r = system.actorOf(Props[Echo], "blub")
+      val r = system.actorOf(Props[Echo1], "blub")
       r.path.toString must be === "akka.test://remote-sys@localhost:12346/remote/akka.test/RemotingSpec@localhost:12345/user/blub"
       r ! 42
       expectMsg(42)
@@ -176,9 +213,9 @@ class RemotingSpec extends AkkaSpec(RemotingSpec.cfg) with ImplicitSender with D
           case s: String             ⇒ sender ! context.actorFor(s)
         }
       }), "looker")
-      l ! (Props[Echo], "child")
+      l ! (Props[Echo1], "child")
       val r = expectMsgType[ActorRef]
-      r ! (Props[Echo], "grandchild")
+      r ! (Props[Echo1], "grandchild")
       val remref = expectMsgType[ActorRef]
       remref.asInstanceOf[ActorRefScope].isLocal must be(true)
       val myref = system.actorFor(system / "looker" / "child" / "grandchild")
@@ -199,7 +236,7 @@ class RemotingSpec extends AkkaSpec(RemotingSpec.cfg) with ImplicitSender with D
     }
 
     "be able to use multiple transports and use the appropriate one (TCP)" in {
-      val r = system.actorOf(Props[Echo], "gonk")
+      val r = system.actorOf(Props[Echo1], "gonk")
       r.path.toString must be ===
         s"akka.tcp://remote-sys@localhost:${port(other, "tcp")}/remote/akka.tcp/RemotingSpec@localhost:${port(system, "tcp")}/user/gonk"
       r ! 42
@@ -215,7 +252,7 @@ class RemotingSpec extends AkkaSpec(RemotingSpec.cfg) with ImplicitSender with D
     }
 
     "be able to use multiple transports and use the appropriate one (UDP)" in {
-      val r = system.actorOf(Props[Echo], "zagzag")
+      val r = system.actorOf(Props[Echo1], "zagzag")
       r.path.toString must be ===
         s"akka.udp://remote-sys@localhost:${port(other, "udp")}/remote/akka.udp/RemotingSpec@localhost:${port(system, "udp")}/user/zagzag"
       r ! 42
@@ -231,7 +268,7 @@ class RemotingSpec extends AkkaSpec(RemotingSpec.cfg) with ImplicitSender with D
     }
 
     "be able to use multiple transports and use the appropriate one (SSL)" in {
-      val r = system.actorOf(Props[Echo], "roghtaar")
+      val r = system.actorOf(Props[Echo1], "roghtaar")
       r.path.toString must be ===
         s"akka.ssl.tcp://remote-sys@localhost:${port(other, "ssl.tcp")}/remote/akka.ssl.tcp/RemotingSpec@localhost:${port(system, "ssl.tcp")}/user/roghtaar"
       r ! 42

From e519e3dc3bbf3bfae642697c07db21aecb6ba8ed Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Thu, 31 Jan 2013 02:16:39 +0100
Subject: [PATCH 122/122]  #2986 - Changing ActorContext and ActorRefFactory's
 dispatcher to return ExecutionContext

---
 .../test/scala/akka/pattern/CircuitBreakerSpec.scala   |  2 +-
 akka-actor/src/main/scala/akka/actor/ActorCell.scala   |  3 ++-
 akka-actor/src/main/scala/akka/actor/ActorDSL.scala    |  2 +-
 .../src/main/scala/akka/actor/ActorRefProvider.scala   | 10 +++++-----
 akka-actor/src/main/scala/akka/actor/ActorSystem.scala |  4 ++--
 .../src/main/scala/akka/actor/dungeon/Dispatch.scala   |  8 ++------
 .../main/scala/akka/dispatch/AbstractDispatcher.scala  |  2 --
 .../util/SerializedSuspendableExecutionContext.scala   |  4 ++--
 akka-camel/src/main/scala/akka/camel/Activation.scala  |  5 ++---
 .../main/scala/akka/camel/internal/DefaultCamel.scala  |  2 +-
 .../scala/akka/camel/ActivationIntegrationTest.scala   |  2 +-
 .../scala/akka/camel/ConsumerIntegrationTest.scala     |  2 +-
 akka-camel/src/test/scala/akka/camel/TestSupport.scala |  2 +-
 .../camel/internal/component/ActorProducerTest.scala   |  2 +-
 akka-cluster/src/main/scala/akka/cluster/Cluster.scala |  2 +-
 .../main/scala/akka/contrib/jul/JulEventHandler.scala  |  2 +-
 akka-docs/rst/project/migration-guide-2.1.x-2.2.x.rst  |  6 ++++++
 .../scala/akka/remote/RemoteActorRefProvider.scala     |  4 ++--
 .../transport/FailureInjectorTransportAdapter.scala    |  2 --
 .../src/test/scala/akka/testkit/AkkaSpecSpec.scala     |  2 +-
 20 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerSpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerSpec.scala
index 8cfcb559a9..05a5fcb5c6 100644
--- a/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerSpec.scala
@@ -10,7 +10,7 @@ import scala.concurrent.duration._
 import akka.testkit._
 import org.scalatest.BeforeAndAfter
 import akka.actor.{ ActorSystem, Scheduler }
-import concurrent.{ ExecutionContext, Future, Await }
+import scala.concurrent.{ ExecutionContext, Future, Await }
 
 object CircuitBreakerSpec {
 
diff --git a/akka-actor/src/main/scala/akka/actor/ActorCell.scala b/akka-actor/src/main/scala/akka/actor/ActorCell.scala
index fa0fdb4e52..d1aec217be 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorCell.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorCell.scala
@@ -15,6 +15,7 @@ import akka.dispatch.{ Watch, Unwatch, Terminate, SystemMessage, Suspend, Superv
 import akka.event.Logging.{ LogEvent, Debug, Error }
 import akka.japi.Procedure
 import akka.dispatch.NullMessage
+import scala.concurrent.ExecutionContext
 
 /**
  * The actor context - the view of the actor cell from the actor.
@@ -119,7 +120,7 @@ trait ActorContext extends ActorRefFactory {
    * Returns the dispatcher (MessageDispatcher) that is used for this Actor.
    * Importing this member will place a implicit MessageDispatcher in scope.
    */
-  implicit def dispatcher: MessageDispatcher
+  implicit def dispatcher: ExecutionContext
 
   /**
    * The system that the actor belongs to.
diff --git a/akka-actor/src/main/scala/akka/actor/ActorDSL.scala b/akka-actor/src/main/scala/akka/actor/ActorDSL.scala
index 2b43fb8196..b229795736 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorDSL.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorDSL.scala
@@ -23,7 +23,7 @@ import java.util.concurrent.TimeUnit
  *
  * {{{
  * import ActorDSL._
- * import concurrent.util.duration._
+ * import scala.concurrent.util.duration._
  *
  * implicit val system: ActorSystem = ...
  *
diff --git a/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala b/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala
index a593c6dde8..82d919ec96 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala
@@ -11,8 +11,8 @@ import akka.util.{ Switch, Helpers }
 import akka.japi.Util.immutableSeq
 import akka.util.Collections.EmptyImmutableSeq
 import scala.util.{ Success, Failure }
-import scala.concurrent.{ Future, Promise }
 import java.util.concurrent.atomic.AtomicLong
+import scala.concurrent.{ ExecutionContext, Future, Promise }
 
 /**
  * Interface for all ActorRef providers to implement.
@@ -51,8 +51,8 @@ trait ActorRefProvider {
    */
   def settings: ActorSystem.Settings
 
-  //FIXME WHY IS THIS HERE?
-  def dispatcher: MessageDispatcher
+  //FIXME Only here because of AskSupport, should be dealt with
+  def dispatcher: ExecutionContext
 
   /**
    * Initialization of an ActorRefProvider happens in two steps: first
@@ -169,7 +169,7 @@ trait ActorRefFactory {
   /**
    * Returns the default MessageDispatcher associated with this ActorRefFactory
    */
-  implicit def dispatcher: MessageDispatcher
+  implicit def dispatcher: ExecutionContext
 
   /**
    * Father of all children created by this interface.
@@ -469,7 +469,7 @@ class LocalActorRefProvider(
   @volatile
   private var system: ActorSystemImpl = _
 
-  def dispatcher: MessageDispatcher = system.dispatcher
+  def dispatcher: ExecutionContext = system.dispatcher
 
   lazy val terminationPromise: Promise[Unit] = Promise[Unit]()
 
diff --git a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala
index a08a3d0311..d0139af91d 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala
@@ -318,7 +318,7 @@ abstract class ActorSystem extends ActorRefFactory {
    * explicitly.
    * Importing this member will place the default MessageDispatcher in scope.
    */
-  implicit def dispatcher: MessageDispatcher
+  implicit def dispatcher: ExecutionContext
 
   /**
    * Register a block of code (callback) to run after ActorSystem.shutdown has been issued and
@@ -564,7 +564,7 @@ private[akka] class ActorSystemImpl(val name: String, applicationConfig: Config,
   val dispatchers: Dispatchers = new Dispatchers(settings, DefaultDispatcherPrerequisites(
     threadFactory, eventStream, deadLetterMailbox, scheduler, dynamicAccess, settings))
 
-  val dispatcher: MessageDispatcher = dispatchers.defaultGlobalDispatcher
+  val dispatcher: ExecutionContext = dispatchers.defaultGlobalDispatcher
 
   def terminationFuture: Future[Unit] = provider.terminationFuture
   def lookupRoot: InternalActorRef = provider.rootGuardian
diff --git a/akka-actor/src/main/scala/akka/actor/dungeon/Dispatch.scala b/akka-actor/src/main/scala/akka/actor/dungeon/Dispatch.scala
index 910ca9bf4d..8d4a62d073 100644
--- a/akka-actor/src/main/scala/akka/actor/dungeon/Dispatch.scala
+++ b/akka-actor/src/main/scala/akka/actor/dungeon/Dispatch.scala
@@ -8,11 +8,12 @@ import scala.annotation.tailrec
 import akka.dispatch.{ Terminate, SystemMessage, Suspend, Resume, Recreate, MessageDispatcher, Mailbox, Envelope, Create }
 import akka.event.Logging.Error
 import akka.util.Unsafe
-import scala.util.control.NonFatal
 import akka.dispatch.NullMessage
 import akka.actor.{ NoSerializationVerificationNeeded, InvalidMessageException, ActorRef, ActorCell }
 import akka.serialization.SerializationExtension
+import scala.util.control.NonFatal
 import scala.util.control.Exception.Catcher
+import scala.concurrent.ExecutionContext
 
 private[akka] trait Dispatch { this: ActorCell ⇒
 
@@ -32,11 +33,6 @@ private[akka] trait Dispatch { this: ActorCell ⇒
 
   val dispatcher: MessageDispatcher = system.dispatchers.lookup(props.dispatcher)
 
-  /**
-   * UntypedActorContext impl
-   */
-  final def getDispatcher(): MessageDispatcher = dispatcher
-
   final def isTerminated: Boolean = mailbox.isClosed
 
   /**
diff --git a/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala b/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala
index 4f59b9abe6..fff250c547 100644
--- a/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala
@@ -178,8 +178,6 @@ private[akka] object MessageDispatcher {
         println(" -> " + a + status + messages + parent)
       }
     }
-
-  implicit def defaultDispatcher(implicit system: ActorSystem): MessageDispatcher = system.dispatcher
 }
 
 abstract class MessageDispatcher(val prerequisites: DispatcherPrerequisites) extends AbstractMessageDispatcher with BatchingExecutor with ExecutionContext {
diff --git a/akka-actor/src/main/scala/akka/util/SerializedSuspendableExecutionContext.scala b/akka-actor/src/main/scala/akka/util/SerializedSuspendableExecutionContext.scala
index 841cd865fd..fa52d20c5c 100644
--- a/akka-actor/src/main/scala/akka/util/SerializedSuspendableExecutionContext.scala
+++ b/akka-actor/src/main/scala/akka/util/SerializedSuspendableExecutionContext.scala
@@ -11,8 +11,8 @@ private[akka] object SerializedSuspendableExecutionContext {
   final val On = 1
   final val Suspended = 2
 
-  def apply(batchSize: Int)(implicit context: ExecutionContext): SerializedSuspendableExecutionContext =
-    new SerializedSuspendableExecutionContext(batchSize)(context match {
+  def apply(throughput: Int)(implicit context: ExecutionContext): SerializedSuspendableExecutionContext =
+    new SerializedSuspendableExecutionContext(throughput)(context match {
       case s: SerializedSuspendableExecutionContext ⇒ s.context
       case other                                    ⇒ other
     })
diff --git a/akka-camel/src/main/scala/akka/camel/Activation.scala b/akka-camel/src/main/scala/akka/camel/Activation.scala
index 983dba0b2d..c4f1097a18 100644
--- a/akka-camel/src/main/scala/akka/camel/Activation.scala
+++ b/akka-camel/src/main/scala/akka/camel/Activation.scala
@@ -8,9 +8,8 @@ import akka.camel.internal._
 import akka.util.Timeout
 import akka.actor.{ ActorSystem, Props, ActorRef }
 import akka.pattern._
-import concurrent.{ ExecutionContext, Future }
-import scala.concurrent.duration.Duration
-import scala.concurrent.duration.FiniteDuration
+import scala.concurrent.{ ExecutionContext, Future }
+import scala.concurrent.duration.{ Duration, FiniteDuration }
 
 /**
  * Activation trait that can be used to wait on activation or de-activation of Camel endpoints.
diff --git a/akka-camel/src/main/scala/akka/camel/internal/DefaultCamel.scala b/akka-camel/src/main/scala/akka/camel/internal/DefaultCamel.scala
index e876a36e2a..f79da6b568 100644
--- a/akka-camel/src/main/scala/akka/camel/internal/DefaultCamel.scala
+++ b/akka-camel/src/main/scala/akka/camel/internal/DefaultCamel.scala
@@ -9,7 +9,7 @@ import akka.camel.internal.ActivationProtocol._
 import scala.util.control.NonFatal
 import scala.concurrent.duration._
 import org.apache.camel.ProducerTemplate
-import concurrent.{ Future, ExecutionContext }
+import scala.concurrent.{ Future, ExecutionContext }
 import akka.util.Timeout
 import akka.pattern.ask
 import java.io.InputStream
diff --git a/akka-camel/src/test/scala/akka/camel/ActivationIntegrationTest.scala b/akka-camel/src/test/scala/akka/camel/ActivationIntegrationTest.scala
index a8edab40ce..408139fc18 100644
--- a/akka-camel/src/test/scala/akka/camel/ActivationIntegrationTest.scala
+++ b/akka-camel/src/test/scala/akka/camel/ActivationIntegrationTest.scala
@@ -13,7 +13,7 @@ import akka.actor._
 import TestSupport._
 import org.scalatest.WordSpec
 import akka.testkit.TestLatch
-import concurrent.Await
+import scala.concurrent.Await
 import java.util.concurrent.TimeoutException
 import akka.util.Timeout
 
diff --git a/akka-camel/src/test/scala/akka/camel/ConsumerIntegrationTest.scala b/akka-camel/src/test/scala/akka/camel/ConsumerIntegrationTest.scala
index e903d2ce19..4d2c3e7b48 100644
--- a/akka-camel/src/test/scala/akka/camel/ConsumerIntegrationTest.scala
+++ b/akka-camel/src/test/scala/akka/camel/ConsumerIntegrationTest.scala
@@ -18,7 +18,7 @@ import org.apache.camel.{ FailedToCreateRouteException, CamelExecutionException
 import java.util.concurrent.{ ExecutionException, TimeUnit, TimeoutException }
 import akka.actor.Status.Failure
 import scala.concurrent.duration._
-import concurrent.{ ExecutionContext, Await }
+import scala.concurrent.{ ExecutionContext, Await }
 import akka.testkit._
 import akka.util.Timeout
 
diff --git a/akka-camel/src/test/scala/akka/camel/TestSupport.scala b/akka-camel/src/test/scala/akka/camel/TestSupport.scala
index 0102d06f9f..55e6b13d53 100644
--- a/akka-camel/src/test/scala/akka/camel/TestSupport.scala
+++ b/akka-camel/src/test/scala/akka/camel/TestSupport.scala
@@ -13,7 +13,7 @@ import org.scalatest.{ BeforeAndAfterEach, BeforeAndAfterAll, Suite }
 import org.scalatest.matchers.{ BePropertyMatcher, BePropertyMatchResult }
 import scala.reflect.ClassTag
 import akka.actor.{ ActorRef, Props, ActorSystem, Actor }
-import concurrent.Await
+import scala.concurrent.Await
 import akka.util.Timeout
 import akka.testkit.AkkaSpec
 
diff --git a/akka-camel/src/test/scala/akka/camel/internal/component/ActorProducerTest.scala b/akka-camel/src/test/scala/akka/camel/internal/component/ActorProducerTest.scala
index 35dfb53b18..f353669bd3 100644
--- a/akka-camel/src/test/scala/akka/camel/internal/component/ActorProducerTest.scala
+++ b/akka-camel/src/test/scala/akka/camel/internal/component/ActorProducerTest.scala
@@ -25,7 +25,7 @@ import akka.actor.ActorSystem.Settings
 import akka.event.LoggingAdapter
 import akka.testkit.{ TestLatch, TimingTest, TestKit, TestProbe }
 import org.apache.camel.impl.DefaultCamelContext
-import concurrent.{ Await, Promise, Future }
+import scala.concurrent.{ Await, Promise, Future }
 import akka.util.Timeout
 import akka.actor._
 import akka.testkit._
diff --git a/akka-cluster/src/main/scala/akka/cluster/Cluster.scala b/akka-cluster/src/main/scala/akka/cluster/Cluster.scala
index 11d0a0e2ec..e8bd2e21fc 100644
--- a/akka-cluster/src/main/scala/akka/cluster/Cluster.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/Cluster.scala
@@ -22,7 +22,7 @@ import java.io.Closeable
 import java.util.concurrent.atomic.AtomicBoolean
 import java.util.concurrent.atomic.AtomicReference
 import akka.util.internal.HashedWheelTimer
-import concurrent.{ ExecutionContext, Await }
+import scala.concurrent.{ ExecutionContext, Await }
 import com.typesafe.config.ConfigFactory
 
 /**
diff --git a/akka-contrib/src/main/scala/akka/contrib/jul/JulEventHandler.scala b/akka-contrib/src/main/scala/akka/contrib/jul/JulEventHandler.scala
index 68ce0ed973..6e971ddfcb 100644
--- a/akka-contrib/src/main/scala/akka/contrib/jul/JulEventHandler.scala
+++ b/akka-contrib/src/main/scala/akka/contrib/jul/JulEventHandler.scala
@@ -4,7 +4,7 @@ import akka.event.Logging._
 import akka.actor._
 import akka.event.LoggingAdapter
 import java.util.logging
-import concurrent.{ ExecutionContext, Future }
+import scala.concurrent.{ ExecutionContext, Future }
 
 /**
  * Makes the Akka `Logging` API available as the `log`
diff --git a/akka-docs/rst/project/migration-guide-2.1.x-2.2.x.rst b/akka-docs/rst/project/migration-guide-2.1.x-2.2.x.rst
index 0a7d3da4df..61411c3675 100644
--- a/akka-docs/rst/project/migration-guide-2.1.x-2.2.x.rst
+++ b/akka-docs/rst/project/migration-guide-2.1.x-2.2.x.rst
@@ -25,6 +25,12 @@ Search                               Replace with
 If you need to convert from Java to ``scala.collection.immutable.Seq`` or ``scala.collection.immutable.Iterable`` you should use ``akka.japi.Util.immutableSeq(…)``,
 and if you need to convert from Scala you can simply switch to using immutable collections yourself or use the ``to[immutable.<collection-type>]`` method.
 
+ActorContext & ActorRefFactory dispatcher
+=========================================
+
+The return type of ``ActorContext``'s and ``ActorRefFactory``'s ``dispatcher``-method now returns ``ExecutionContext`` instead of ``MessageDispatcher``.
+
+
 API changes to FSM and TestFSMRef
 =================================
 
diff --git a/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala b/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
index a64b9b3a71..254fcc30b0 100644
--- a/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
+++ b/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
@@ -10,10 +10,10 @@ import akka.event.{ Logging, LoggingAdapter, EventStream }
 import akka.event.Logging.Error
 import akka.serialization.{ JavaSerializer, Serialization, SerializationExtension }
 import akka.pattern.pipe
-import scala.concurrent.Future
 import scala.util.control.NonFatal
 import akka.actor.SystemGuardian.{ TerminationHookDone, TerminationHook, RegisterTerminationHook }
 import scala.util.control.Exception.Catcher
+import scala.concurrent.{ ExecutionContext, Future }
 
 object RemoteActorRefProvider {
   private case class Internals(transport: RemoteTransport, serialization: Serialization, remoteDaemon: InternalActorRef)
@@ -125,7 +125,7 @@ class RemoteActorRefProvider(
   override def guardian: LocalActorRef = local.guardian
   override def systemGuardian: LocalActorRef = local.systemGuardian
   override def terminationFuture: Future[Unit] = local.terminationFuture
-  override def dispatcher: MessageDispatcher = local.dispatcher
+  override def dispatcher: ExecutionContext = local.dispatcher
   override def registerTempActor(actorRef: InternalActorRef, path: ActorPath): Unit = local.registerTempActor(actorRef, path)
   override def unregisterTempActor(path: ActorPath): Unit = local.unregisterTempActor(path)
   override def tempPath(): ActorPath = local.tempPath()
diff --git a/akka-remote/src/main/scala/akka/remote/transport/FailureInjectorTransportAdapter.scala b/akka-remote/src/main/scala/akka/remote/transport/FailureInjectorTransportAdapter.scala
index ab32cbefe4..1efd89c2fc 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/FailureInjectorTransportAdapter.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/FailureInjectorTransportAdapter.scala
@@ -39,8 +39,6 @@ private[remote] object FailureInjectorTransportAdapter {
 private[remote] class FailureInjectorTransportAdapter(wrappedTransport: Transport, val extendedSystem: ExtendedActorSystem)
   extends AbstractTransportAdapter(wrappedTransport)(extendedSystem.dispatcher) with AssociationEventListener {
 
-  import extendedSystem.dispatcher
-
   private def rng = ThreadLocalRandom.current()
   private val log = Logging(extendedSystem, "FailureInjector (gremlin)")
 
diff --git a/akka-testkit/src/test/scala/akka/testkit/AkkaSpecSpec.scala b/akka-testkit/src/test/scala/akka/testkit/AkkaSpecSpec.scala
index 35dd83e7f3..b21ef8dd03 100644
--- a/akka-testkit/src/test/scala/akka/testkit/AkkaSpecSpec.scala
+++ b/akka-testkit/src/test/scala/akka/testkit/AkkaSpecSpec.scala
@@ -10,7 +10,7 @@ import org.scalatest.WordSpec
 import org.scalatest.matchers.MustMatchers
 import akka.actor._
 import com.typesafe.config.ConfigFactory
-import concurrent.Await
+import scala.concurrent.Await
 import scala.concurrent.duration._
 import akka.actor.DeadLetter
 import akka.pattern.ask