From 1ad701c330fccd12e169f6f42d070368f50691de Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Tue, 21 Aug 2012 17:51:49 +0200
Subject: [PATCH 01/10] Fix failing TransitionSpec, see #2423

* The failure is due to the now eventually updated view.
* Must use await asserts.
---
 .../scala/akka/cluster/TransitionSpec.scala   | 76 +++++++++----------
 1 file changed, 38 insertions(+), 38 deletions(-)

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 0d5e60b7ad..e3e446bd50 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/TransitionSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/TransitionSpec.scala
@@ -120,11 +120,11 @@ abstract class TransitionSpec
 
       runOn(first) {
         startClusterNode()
-        clusterView.isSingletonCluster must be(true)
-        clusterView.status must be(Joining)
-        clusterView.convergence must be(true)
+        awaitCond(clusterView.isSingletonCluster)
+        awaitMemberStatus(myself, Joining)
+        awaitCond(clusterView.convergence)
         leaderActions()
-        clusterView.status must be(Up)
+        awaitMemberStatus(myself, Up)
       }
 
       enterBarrier("after-1")
@@ -138,8 +138,8 @@ abstract class TransitionSpec
       runOn(first, second) {
         // gossip chat from the join will synchronize the views
         awaitMembers(first, second)
-        memberStatus(first) must be(Up)
-        memberStatus(second) must be(Joining)
+        awaitMemberStatus(first, Up)
+        awaitMemberStatus(second, Joining)
         awaitCond(seenLatestGossip == Set(first, second))
         clusterView.convergence must be(true)
       }
@@ -147,17 +147,17 @@ abstract class TransitionSpec
 
       runOn(leader(first, second)) {
         leaderActions()
-        memberStatus(first) must be(Up)
-        memberStatus(second) must be(Up)
+        awaitMemberStatus(first, Up)
+        awaitMemberStatus(second, Up)
       }
       enterBarrier("leader-actions-2")
 
       leader(first, second) gossipTo nonLeader(first, second).head
       runOn(first, second) {
         // gossip chat will synchronize the views
-        awaitCond(memberStatus(second) == Up)
-        seenLatestGossip must be(Set(first, second))
-        memberStatus(first) must be(Up)
+        awaitMemberStatus(second, Up)
+        awaitCond(seenLatestGossip == Set(first, second))
+        awaitMemberStatus(first, Up)
         clusterView.convergence must be(true)
       }
 
@@ -172,7 +172,7 @@ abstract class TransitionSpec
       runOn(second, third) {
         // gossip chat from the join will synchronize the views
         awaitMembers(first, second, third)
-        memberStatus(third) must be(Joining)
+        awaitMemberStatus(third, Joining)
         awaitCond(seenLatestGossip == Set(second, third))
         clusterView.convergence must be(false)
       }
@@ -182,19 +182,19 @@ abstract class TransitionSpec
       runOn(first, second) {
         // gossip chat will synchronize the views
         awaitMembers(first, second, third)
-        memberStatus(third) must be(Joining)
-        awaitCond(memberStatus(second) == Up)
-        seenLatestGossip must be(Set(first, second, third))
+        awaitMemberStatus(third, Joining)
+        awaitMemberStatus(second, Up)
+        awaitCond(seenLatestGossip == Set(first, second, third))
         clusterView.convergence must be(true)
       }
 
       first gossipTo third
       runOn(first, second, third) {
-        members must be(Set(first, second, third))
-        memberStatus(first) must be(Up)
-        memberStatus(second) must be(Up)
-        memberStatus(third) must be(Joining)
-        seenLatestGossip must be(Set(first, second, third))
+        awaitMembers(first, second, third)
+        awaitMemberStatus(first, Up)
+        awaitMemberStatus(second, Up)
+        awaitMemberStatus(third, Joining)
+        awaitCond(seenLatestGossip == Set(first, second, third))
         clusterView.convergence must be(true)
       }
 
@@ -202,17 +202,17 @@ abstract class TransitionSpec
 
       runOn(leader(first, second, third)) {
         leaderActions()
-        memberStatus(first) must be(Up)
-        memberStatus(second) must be(Up)
-        memberStatus(third) must be(Up)
+        awaitMemberStatus(first, Up)
+        awaitMemberStatus(second, Up)
+        awaitMemberStatus(third, Up)
       }
       enterBarrier("leader-actions-3")
 
       // leader gossipTo first non-leader
       leader(first, second, third) gossipTo nonLeader(first, second, third).head
       runOn(nonLeader(first, second, third).head) {
-        memberStatus(third) must be(Up)
-        seenLatestGossip must be(Set(leader(first, second, third), myself))
+        awaitMemberStatus(third, Up)
+        awaitCond(seenLatestGossip == Set(leader(first, second, third), myself))
         clusterView.convergence must be(false)
       }
 
@@ -223,18 +223,18 @@ abstract class TransitionSpec
         cluster.clusterCore ! InternalClusterAction.SendGossipTo(nonLeader(first, second, third).tail.head)
       }
       runOn(nonLeader(first, second, third).tail.head) {
-        memberStatus(third) must be(Up)
-        seenLatestGossip must be(Set(first, second, third))
+        awaitMemberStatus(third, Up)
+        awaitCond(seenLatestGossip == Set(first, second, third))
         clusterView.convergence must be(true)
       }
 
       // first non-leader gossipTo the leader
       nonLeader(first, second, third).head gossipTo leader(first, second, third)
       runOn(first, second, third) {
-        memberStatus(first) must be(Up)
-        memberStatus(second) must be(Up)
-        memberStatus(third) must be(Up)
-        seenLatestGossip must be(Set(first, second, third))
+        awaitMemberStatus(first, Up)
+        awaitMemberStatus(second, Up)
+        awaitMemberStatus(third, Up)
+        awaitCond(seenLatestGossip == Set(first, second, third))
         clusterView.convergence must be(true)
       }
 
@@ -245,8 +245,8 @@ abstract class TransitionSpec
       runOn(third) {
         markNodeAsUnavailable(second)
         reapUnreachable()
-        clusterView.unreachableMembers must contain(Member(second, Up))
-        seenLatestGossip must be(Set(third))
+        awaitCond(clusterView.unreachableMembers.contains(Member(second, Up)))
+        awaitCond(seenLatestGossip == Set(third))
       }
 
       enterBarrier("after-second-unavailble")
@@ -254,8 +254,8 @@ abstract class TransitionSpec
       third gossipTo first
 
       runOn(first, third) {
-        clusterView.unreachableMembers must contain(Member(second, Up))
-        clusterView.convergence must be(false)
+        awaitCond(clusterView.unreachableMembers.contains(Member(second, Up)))
+        awaitCond(!clusterView.convergence)
       }
 
       runOn(first) {
@@ -268,9 +268,9 @@ abstract class TransitionSpec
       first gossipTo third
 
       runOn(first, third) {
-        clusterView.unreachableMembers must contain(Member(second, Down))
-        memberStatus(second) must be(Down)
-        seenLatestGossip must be(Set(first, third))
+        awaitCond(clusterView.unreachableMembers.contains(Member(second, Down)))
+        awaitMemberStatus(second, Down)
+        awaitCond(seenLatestGossip == Set(first, third))
         clusterView.convergence must be(true)
       }
 

From 8fe8fc5512a8d97da2ced9d65328695a39755417 Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Tue, 21 Aug 2012 18:16:04 +0200
Subject: [PATCH 02/10] Remove cluster-sample/README, was added prematurely

---
 akka-samples/akka-sample-cluster/README.rst | 143 --------------------
 1 file changed, 143 deletions(-)
 delete mode 100644 akka-samples/akka-sample-cluster/README.rst

diff --git a/akka-samples/akka-sample-cluster/README.rst b/akka-samples/akka-sample-cluster/README.rst
deleted file mode 100644
index 5f9a9fb6c6..0000000000
--- a/akka-samples/akka-sample-cluster/README.rst
+++ /dev/null
@@ -1,143 +0,0 @@
-REMOTE CALCULATOR
-=================
-
-Requirements
-------------
-
-To build and run remote calculator you need [Simple Build Tool][sbt] (sbt).
-
-The Sample Explained
---------------------
-
-In order to showcase the remote capabilities of Akka 2.0 we thought a remote calculator could do the trick.
-
-There are two implementations of the sample; one in Scala and one in Java.
-The explanation below is for Scala, but everything is similar in Java except that the class names begin with a ``J``,
-e.g. ``JCalcApp`` instead of ``CalcApp``, and that the Java classes reside in another package structure.
-
-There are three actor systems used in the sample:
-
-* CalculatorApplication : the actor system performing the number crunching
-* LookupApplication     : illustrates how to look up an actor on a remote node and and how communicate with that actor
-* CreationApplication   : illustrates how to create an actor on a remote node and how to communicate with that actor
-
-The CalculatorApplication contains an actor, SimpleCalculatorActor, which can handle simple math operations such as
-addition and subtraction. This actor is looked up and used from the LookupApplication.
-
-The CreationApplication wants to use more "advanced" mathematical operations, such as multiplication and division,
-but as the CalculatorApplication does not have any actor that can perform those type of calculations the
-CreationApplication has to remote deploy an actor that can (which in our case is AdvancedCalculatorActor).
-So this actor is deployed, over the network, onto the CalculatorApplication actor system and thereafter the
-CreationApplication will send messages to it.
-
-It is important to point out that as the actor system run on different ports it is possible to run all three in parallel.
-See the next section for more information of how to run the sample application.
-
-Running
--------
-
-In order to run all three actor systems you have to start SBT in three different terminal windows.
-
-We start off by running the CalculatorApplication:
-
-First type 'sbt' to start SBT interactively, the run 'update' and 'run':
-> cd $AKKA_HOME
-
-> sbt
-
-> project akka-sample-remote
-
-> run
-
-Select to run "sample.remote.calculator.CalcApp" which in the case below is number 3:
-
-    Multiple main classes detected, select one to run:
-
-    [1] sample.remote.calculator.LookupApp
-    [2] sample.remote.calculator.CreationApp
-    [3] sample.remote.calculator.CalcApp
-
-    Enter number: 3
-
-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]
-    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:
-
-> sbt
-
-> project akka-sample-remote
-
-> run
-
-Select to run "sample.remote.calculator.LookupApp" which in the case below is number 1::
-
-    Multiple main classes detected, select one to run:
-
-    [1] sample.remote.calculator.LookupApp
-    [2] sample.remote.calculator.CreationApp
-    [3] sample.remote.calculator.CalcApp
-
-    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]
-    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
-
-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.
-Once more you should open a new terminal window and run SBT:
-
-> sbt
-
-> project akka-sample-remote
-
-> run
-
-Select to run "sample.remote.calculator.CreationApp" which in the case below is number 2::
-
-    Multiple main classes detected, select one to run:
-
-    [1] sample.remote.calculator.LookupApp
-    [2] sample.remote.calculator.CreationApp
-    [3] sample.remote.calculator.CalcApp
-
-    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
-    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
-
-That's it!
-
-Notice
-------
-
-The sample application is just that, i.e. a sample. Parts of it are not the way you would do a "real" application.
-Some improvements are to remove all hard coded addresses from the code as they reduce the flexibility of how and
-where the application can be run. We leave this to the astute reader to refine the sample into a real-world app.
-
-* `Akka <http://akka.io/>`_
-* `SBT <http://https://github.com/harrah/xsbt/wiki/>`_

From a15900a59170eea4668b9eea477f5a26bc9b7b1f Mon Sep 17 00:00:00 2001
From: Roland <rk@rkuhn.info>
Date: Mon, 20 Aug 2012 15:21:44 +0200
Subject: [PATCH 03/10] port onto SBT-0.12 branch

---
 .../java/akka/dispatch/JavaFutureTests.java   |  2 +-
 .../src/test/scala/akka/actor/IOActor.scala   |  4 +-
 .../actor/LocalActorRefProviderSpec.scala     |  7 ++--
 .../test/scala/akka/dispatch/FutureSpec.scala | 39 +++++++++----------
 .../src/test/scala/akka/pattern/AskSpec.scala |  9 +++--
 .../akka/serialization/SerializeSpec.scala    |  2 +-
 .../test/scala/akka/util/ByteStringSpec.scala |  2 +-
 .../scala/akka/actor/ActorRefProvider.scala   |  4 +-
 .../main/scala/akka/actor/TypedActor.scala    | 10 ++---
 .../src/main/scala/akka/dispatch/Future.scala |  9 +++--
 .../main/scala/akka/pattern/AskSupport.scala  | 16 ++++----
 .../scala/akka/pattern/CircuitBreaker.scala   |  5 ++-
 .../akka/pattern/GracefulStopSupport.scala    |  5 ++-
 .../scala/akka/pattern/PipeToSupport.scala    |  5 ++-
 .../internal/component/ActorComponent.scala   | 21 +++++-----
 .../akka/camel/ProducerFeatureTest.scala      |  1 +
 .../akka/camel/UntypedProducerTest.scala      |  4 +-
 .../main/scala/akka/dataflow/package.scala    |  5 ++-
 .../scala/akka/dataflow/DataflowSpec.scala    |  2 +-
 .../code/docs/future/FutureDocSpec.scala      | 11 +++---
 .../code/docs/testkit/TestkitDocSpec.scala    |  3 +-
 project/AkkaBuild.scala                       | 12 +++++-
 project/plugins.sbt                           |  2 +-
 23 files changed, 99 insertions(+), 81 deletions(-)

diff --git a/akka-actor-tests/src/test/java/akka/dispatch/JavaFutureTests.java b/akka-actor-tests/src/test/java/akka/dispatch/JavaFutureTests.java
index c092ccceb2..4053a2d7f2 100644
--- a/akka-actor-tests/src/test/java/akka/dispatch/JavaFutureTests.java
+++ b/akka-actor-tests/src/test/java/akka/dispatch/JavaFutureTests.java
@@ -93,7 +93,7 @@ public class JavaFutureTests {
     Throwable exception = new NullPointerException();
     cf.failure(exception);
     assertTrue(latch.await(5000, TimeUnit.MILLISECONDS));
-    assertEquals(f.value().get().left().get(), exception);
+    assertEquals(f.value().get().failed().get(), exception);
   }
 
   @Test
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 acd5828dc9..72efaef0d4 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/IOActor.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/IOActor.scala
@@ -15,6 +15,8 @@ import akka.testkit._
 import akka.dispatch.MessageDispatcher
 import akka.pattern.ask
 import java.net.{ Socket, InetSocketAddress, InetAddress, SocketAddress }
+import scala.util.Failure
+import annotation.tailrec
 
 object IOActorSpec {
 
@@ -256,7 +258,7 @@ class IOActorSpec extends AkkaSpec with DefaultTimeout {
 
     def run(n: Int) {
       future onComplete {
-        case Left(e) if check(n, e) ⇒
+        case Failure(e) if check(n, e) ⇒
           if (delay.isDefined) {
             executor match {
               case m: MessageDispatcher ⇒ m.prerequisites.scheduler.scheduleOnce(delay.get)(run(n + 1))
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 426f940b5d..f263a2f188 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/LocalActorRefProviderSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/LocalActorRefProviderSpec.scala
@@ -11,6 +11,7 @@ import scala.concurrent.Await
 import scala.concurrent.util.duration._
 import akka.util.Timeout
 import scala.concurrent.Future
+import scala.util.Success
 
 object LocalActorRefProviderSpec {
   val config = """
@@ -53,9 +54,9 @@ class LocalActorRefProviderSpec extends AkkaSpec(LocalActorRefProviderSpec.confi
         implicit val timeout = Timeout(5 seconds)
         val actors = for (j ← 1 to 4) yield Future(system.actorOf(Props(c ⇒ { case _ ⇒ }), address))
         val set = Set() ++ actors.map(a ⇒ Await.ready(a, timeout.duration).value match {
-          case Some(Right(a: ActorRef))                  ⇒ 1
-          case Some(Left(ex: InvalidActorNameException)) ⇒ 2
-          case x                                         ⇒ x
+          case Some(Success(a: ActorRef)) ⇒ 1
+          case Some(Success(ex: InvalidActorNameException)) ⇒ 2
+          case x ⇒ x
         })
         set must be === Set(1, 2)
       }
diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala b/akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala
index 96c9f6a0d9..a151330b80 100644
--- a/akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala
@@ -21,6 +21,7 @@ import akka.pattern.ask
 import java.lang.{ IllegalStateException, ArithmeticException }
 import java.util.concurrent._
 import scala.reflect.ClassTag
+import scala.util.{ Failure, Success, Try }
 
 object FutureSpec {
 
@@ -75,22 +76,22 @@ class FutureSpec extends AkkaSpec with Checkers with BeforeAndAfterAll with Defa
     }
     "completed with a result" must {
       val result = "test value"
-      val future = Promise[String]().complete(Right(result)).future
+      val future = Promise[String]().complete(Success(result)).future
       behave like futureWithResult(_(future, result))
     }
     "completed with an exception" must {
       val message = "Expected Exception"
-      val future = Promise[String]().complete(Left(new RuntimeException(message))).future
+      val future = Promise[String]().complete(Failure(new RuntimeException(message))).future
       behave like futureWithException[RuntimeException](_(future, message))
     }
     "completed with an InterruptedException" must {
       val message = "Boxed InterruptedException"
-      val future = Promise[String]().complete(Left(new InterruptedException(message))).future
+      val future = Promise[String]().complete(Failure(new InterruptedException(message))).future
       behave like futureWithException[RuntimeException](_(future, message))
     }
     "completed with a NonLocalReturnControl" must {
       val result = "test value"
-      val future = Promise[String]().complete(Left(new NonLocalReturnControl[String]("test", result))).future
+      val future = Promise[String]().complete(Failure(new NonLocalReturnControl[String]("test", result))).future
       behave like futureWithResult(_(future, result))
     }
 
@@ -155,13 +156,13 @@ class FutureSpec extends AkkaSpec with Checkers with BeforeAndAfterAll with Defa
         "pass checks" in {
           filterException[ArithmeticException] {
             check({ (future: Future[Int], actions: List[FutureAction]) ⇒
-              def wrap[T](f: Future[T]): Either[Throwable, T] = FutureSpec.ready(f, timeout.duration).value.get
+              def wrap[T](f: Future[T]): Try[T] = FutureSpec.ready(f, timeout.duration).value.get
               val result = (future /: actions)(_ /: _)
               val expected = (wrap(future) /: actions)(_ /: _)
               ((wrap(result), expected) match {
-                case (Right(a), Right(b)) ⇒ a == b
-                case (Left(a), Left(b)) if a.toString == b.toString ⇒ true
-                case (Left(a), Left(b)) if a.getStackTrace.isEmpty || b.getStackTrace.isEmpty ⇒ a.getClass.toString == b.getClass.toString
+                case (Success(a), Success(b)) ⇒ a == b
+                case (Failure(a), Failure(b)) if a.toString == b.toString ⇒ true
+                case (Failure(a), Failure(b)) if a.getStackTrace.isEmpty || b.getStackTrace.isEmpty ⇒ a.getClass.toString == b.getClass.toString
                 case _ ⇒ false
               }) :| result.value.get.toString + " is expected to be " + expected.toString
             }, minSuccessful(10000), workers(4))
@@ -360,7 +361,7 @@ class FutureSpec extends AkkaSpec with Checkers with BeforeAndAfterAll with Defa
       "andThen like a boss" in {
         val q = new LinkedBlockingQueue[Int]
         for (i ← 1 to 1000) {
-          Await.result(Future { q.add(1); 3 } andThen { case _ ⇒ q.add(2) } andThen { case Right(0) ⇒ q.add(Int.MaxValue) } andThen { case _ ⇒ q.add(3); }, timeout.duration) must be(3)
+          Await.result(Future { q.add(1); 3 } andThen { case _ ⇒ q.add(2) } andThen { case Success(0) ⇒ q.add(Int.MaxValue) } andThen { case _ ⇒ q.add(3); }, timeout.duration) must be(3)
           q.poll() must be(1)
           q.poll() must be(2)
           q.poll() must be(3)
@@ -821,7 +822,7 @@ class FutureSpec extends AkkaSpec with Checkers with BeforeAndAfterAll with Defa
         p1 must not be ('completed)
         f4 must not be ('completed)
 
-        p1 complete Right("Hello")
+        p1 complete Success("Hello")
 
         FutureSpec.ready(latch(7), TestLatch.DefaultTimeout)
 
@@ -889,7 +890,7 @@ class FutureSpec extends AkkaSpec with Checkers with BeforeAndAfterAll with Defa
 
   def futureWithResult(f: ((Future[Any], Any) ⇒ Unit) ⇒ Unit) {
     "be completed" in { f((future, _) ⇒ future must be('completed)) }
-    "contain a value" in { f((future, result) ⇒ future.value must be(Some(Right(result)))) }
+    "contain a value" in { f((future, result) ⇒ future.value must be(Some(Success(result)))) }
     "return result with 'get'" in { f((future, result) ⇒ Await.result(future, timeout.duration) must be(result)) }
     "return result with 'Await.result'" in { f((future, result) ⇒ Await.result(future, timeout.duration) must be(result)) }
     "not timeout" in { f((future, _) ⇒ FutureSpec.ready(future, 0 millis)) }
@@ -938,7 +939,9 @@ class FutureSpec extends AkkaSpec with Checkers with BeforeAndAfterAll with Defa
       f((future, message) ⇒ {
         future.value must be('defined)
         future.value.get must be('left)
-        future.value.get.left.get.getMessage must be(message)
+        future.value.get match {
+          case Failure(f) ⇒ f.getMessage must be(message)
+        }
       })
     }
     "throw exception with 'get'" in { f((future, message) ⇒ (evaluating { Await.result(future, timeout.duration) } must produce[java.lang.Exception]).getMessage must be(message)) }
@@ -976,23 +979,17 @@ class FutureSpec extends AkkaSpec with Checkers with BeforeAndAfterAll with Defa
   case class IntDiv(n: Int) extends IntAction { def apply(that: Int) = that / n }
 
   sealed trait FutureAction {
-    def /:(that: Either[Throwable, Int]): Either[Throwable, Int]
+    def /:(that: Try[Int]): Try[Int]
     def /:(that: Future[Int]): Future[Int]
   }
 
   case class MapAction(action: IntAction) extends FutureAction {
-    def /:(that: Either[Throwable, Int]): Either[Throwable, Int] = that match {
-      case Left(e)  ⇒ that
-      case Right(r) ⇒ try { Right(action(r)) } catch { case e if NonFatal(e) ⇒ Left(e) }
-    }
+    def /:(that: Try[Int]): Try[Int] = that map action.apply
     def /:(that: Future[Int]): Future[Int] = that map action.apply
   }
 
   case class FlatMapAction(action: IntAction) extends FutureAction {
-    def /:(that: Either[Throwable, Int]): Either[Throwable, Int] = that match {
-      case Left(e)  ⇒ that
-      case Right(r) ⇒ try { Right(action(r)) } catch { case e if NonFatal(e) ⇒ Left(e) }
-    }
+    def /:(that: Try[Int]): Try[Int] = that map action.apply
     def /:(that: Future[Int]): Future[Int] = that flatMap (n ⇒ Future.successful(action(n)))
   }
 
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 cbb098defc..31a314da2e 100644
--- a/akka-actor-tests/src/test/scala/akka/pattern/AskSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/pattern/AskSpec.scala
@@ -11,6 +11,7 @@ import scala.concurrent.Await
 import akka.testkit.DefaultTimeout
 import akka.actor.{ Props, ActorRef }
 import akka.util.Timeout
+import scala.util.Failure
 
 class AskSpec extends AkkaSpec {
 
@@ -22,8 +23,8 @@ class AskSpec extends AkkaSpec {
       val f = dead.ask(42)(1 second)
       f.isCompleted must be(true)
       f.value.get match {
-        case Left(_: AskTimeoutException) ⇒
-        case v                            ⇒ fail(v + " was not Left(AskTimeoutException)")
+        case Failure(_: AskTimeoutException) ⇒
+        case v                               ⇒ fail(v + " was not Left(AskTimeoutException)")
       }
     }
 
@@ -33,8 +34,8 @@ class AskSpec extends AkkaSpec {
       val f = empty ? 3.14
       f.isCompleted must be(true)
       f.value.get match {
-        case Left(_: AskTimeoutException) ⇒
-        case v                            ⇒ fail(v + " was not Left(AskTimeoutException)")
+        case Failure(_: AskTimeoutException) ⇒
+        case v                               ⇒ fail(v + " was not Left(AskTimeoutException)")
       }
     }
 
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 4cd5a876d5..90cf83a3a9 100644
--- a/akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala
@@ -254,7 +254,7 @@ class VerifySerializabilitySpec extends AkkaSpec(VerifySerializabilitySpec.conf)
     val b = system.actorOf(Props(new FooActor))
     system stop b
 
-    val c = system.actorOf(Props().withCreator(new UntypedActorFactory {
+    val c = system.actorOf(Props.empty.withCreator(new UntypedActorFactory {
       def create() = new FooUntypedActor
     }))
     system stop c
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 981d407472..a5f65b6a7e 100644
--- a/akka-actor-tests/src/test/scala/akka/util/ByteStringSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/util/ByteStringSpec.scala
@@ -11,7 +11,7 @@ import org.scalacheck.Gen._
 
 import scala.collection.mutable.Builder
 
-import java.nio.{ ByteBuffer, ShortBuffer, IntBuffer, FloatBuffer, DoubleBuffer }
+import java.nio.{ ByteBuffer }
 import java.nio.ByteOrder, ByteOrder.{ BIG_ENDIAN, LITTLE_ENDIAN }
 import java.lang.Float.floatToRawIntBits
 import java.lang.Double.doubleToRawLongBits
diff --git a/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala b/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala
index e71782869d..fa85a19ac2 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala
@@ -8,6 +8,7 @@ import akka.dispatch._
 import akka.routing._
 import akka.event._
 import akka.util.{ Switch, Helpers }
+import scala.util.{ Success, Failure }
 import scala.util.control.NonFatal
 import scala.concurrent.{ Future, Promise }
 import java.util.concurrent.atomic.AtomicLong
@@ -354,8 +355,7 @@ class LocalActorRefProvider(
 
     def provider: ActorRefProvider = LocalActorRefProvider.this
 
-    override def stop(): Unit = stopped switchOn { terminationPromise.complete(causeOfTermination.toLeft(())) }
-
+    override def stop(): Unit = stopped switchOn { terminationPromise.complete(causeOfTermination.map(Failure(_)).getOrElse(Success(()))) }
     override def isTerminated: Boolean = stopped.isOn
 
     override def !(message: Any)(implicit sender: ActorRef = null): Unit = stopped.ifOff(message match {
diff --git a/akka-actor/src/main/scala/akka/actor/TypedActor.scala b/akka-actor/src/main/scala/akka/actor/TypedActor.scala
index eed2f56efd..aaa5432815 100644
--- a/akka-actor/src/main/scala/akka/actor/TypedActor.scala
+++ b/akka-actor/src/main/scala/akka/actor/TypedActor.scala
@@ -19,6 +19,7 @@ import java.util.concurrent.TimeUnit.MILLISECONDS
 import scala.reflect.ClassTag
 import akka.serialization.{ JavaSerializer, SerializationExtension }
 import java.io.ObjectStreamException
+import scala.util.{ Try, Success, Failure }
 
 /**
  * A TypedActorFactory is something that can created TypedActor instances.
@@ -302,8 +303,8 @@ object TypedActor extends ExtensionId[TypedActorExtension] with ExtensionIdProvi
             if (m.returnsFuture_?) {
               val s = sender
               m(me).asInstanceOf[Future[Any]] onComplete {
-                case Left(f)  ⇒ s ! Status.Failure(f)
-                case Right(r) ⇒ s ! r
+                case Failure(f) ⇒ s ! Status.Failure(f)
+                case Success(r) ⇒ s ! r
               }
             } else {
               sender ! m(me)
@@ -408,9 +409,8 @@ object TypedActor extends ExtensionId[TypedActorExtension] with ExtensionIdProvi
           case m if m.returnsJOption_? || m.returnsOption_? ⇒
             val f = ask(actor, m)(timeout)
             (try { Await.ready(f, timeout.duration).value } catch { case _: TimeoutException ⇒ None }) match {
-              case None | Some(Right(null)) ⇒ if (m.returnsJOption_?) JOption.none[Any] else None
-              case Some(Right(joption))     ⇒ joption.asInstanceOf[AnyRef]
-              case Some(Left(ex))           ⇒ throw ex
+              case None | Some(Success(null)) ⇒ if (m.returnsJOption_?) JOption.none[Any] else None
+              case Some(t: Try[_])            ⇒ t.get.asInstanceOf[AnyRef]
             }
           case m ⇒ Await.result(ask(actor, m)(timeout), timeout.duration).asInstanceOf[AnyRef]
         }
diff --git a/akka-actor/src/main/scala/akka/dispatch/Future.scala b/akka-actor/src/main/scala/akka/dispatch/Future.scala
index 0ab004fc59..113215cd23 100644
--- a/akka-actor/src/main/scala/akka/dispatch/Future.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/Future.scala
@@ -10,6 +10,7 @@ import scala.concurrent.{ Future, Promise, ExecutionContext, ExecutionContextExe
 import java.lang.{ Iterable ⇒ JIterable }
 import java.util.{ LinkedList ⇒ JLinkedList }
 import java.util.concurrent.{ Executor, ExecutorService, ExecutionException, Callable, TimeoutException }
+import scala.util.{ Try, Success, Failure }
 
 /**
  * ExecutionContexts is the Java API for ExecutionContexts
@@ -227,10 +228,10 @@ abstract class OnFailure extends japi.CallbackBridge[Throwable] {
  *
  * Java API
  */
-abstract class OnComplete[-T] extends japi.CallbackBridge[Either[Throwable, T]] {
-  protected final override def internal(value: Either[Throwable, T]): Unit = value match {
-    case Left(t)  ⇒ onComplete(t, null.asInstanceOf[T])
-    case Right(r) ⇒ onComplete(null, r)
+abstract class OnComplete[-T] extends japi.CallbackBridge[Try[T]] {
+  protected final override def internal(value: Try[T]): Unit = value match {
+    case Failure(t) ⇒ onComplete(t, null.asInstanceOf[T])
+    case Success(r) ⇒ onComplete(null, r)
   }
 
   /**
diff --git a/akka-actor/src/main/scala/akka/pattern/AskSupport.scala b/akka-actor/src/main/scala/akka/pattern/AskSupport.scala
index 42bc9fcb9b..ba9558aa84 100644
--- a/akka-actor/src/main/scala/akka/pattern/AskSupport.scala
+++ b/akka-actor/src/main/scala/akka/pattern/AskSupport.scala
@@ -12,6 +12,7 @@ import scala.annotation.tailrec
 import scala.util.control.NonFatal
 import scala.concurrent.{ Future, Promise, ExecutionContext }
 import akka.util.{ Timeout, Unsafe }
+import scala.util.{ Success, Failure }
 
 /**
  * This is what is used to complete a Future that is returned from an ask/? call,
@@ -249,13 +250,12 @@ private[akka] final class PromiseActorRef private (val provider: ActorRefProvide
 
   override def !(message: Any)(implicit sender: ActorRef = null): Unit = state match {
     case Stopped | _: StoppedWithPath ⇒ provider.deadLetters ! message
-    case _ ⇒ if (!(result.tryComplete {
+    case _ ⇒ if (!(result.tryComplete(
       message match {
-        case Status.Success(r) ⇒ Right(r)
-        case Status.Failure(f) ⇒ Left(f)
-        case other             ⇒ Right(other)
-      }
-    })) provider.deadLetters ! message
+        case Status.Success(r) ⇒ Success(r)
+        case Status.Failure(f) ⇒ Failure(f)
+        case other             ⇒ Success(other)
+      }))) provider.deadLetters ! message
   }
 
   override def sendSystemMessage(message: SystemMessage): Unit = message match {
@@ -278,7 +278,7 @@ private[akka] final class PromiseActorRef private (val provider: ActorRefProvide
   @tailrec
   override def stop(): Unit = {
     def ensureCompleted(): Unit = {
-      result.tryComplete(Left(new ActorKilledException("Stopped")))
+      result tryComplete Failure(new ActorKilledException("Stopped"))
       val watchers = clearWatchers()
       if (!watchers.isEmpty) {
         val termination = Terminated(this)(existenceConfirmed = true, 0)
@@ -308,7 +308,7 @@ private[akka] object PromiseActorRef {
     implicit val ec = provider.dispatcher // TODO should we take an ExecutionContext in the method signature?
     val result = Promise[Any]()
     val a = new PromiseActorRef(provider, result)
-    val f = provider.scheduler.scheduleOnce(timeout.duration) { result.tryComplete(Left(new AskTimeoutException("Timed out"))) }
+    val f = provider.scheduler.scheduleOnce(timeout.duration) { result tryComplete Failure(new AskTimeoutException("Timed out")) }
     result.future onComplete { _ ⇒ try a.stop() finally f.cancel() }
     a
   }
diff --git a/akka-actor/src/main/scala/akka/pattern/CircuitBreaker.scala b/akka-actor/src/main/scala/akka/pattern/CircuitBreaker.scala
index 64c2e7c21a..a9cb8bc0c5 100644
--- a/akka-actor/src/main/scala/akka/pattern/CircuitBreaker.scala
+++ b/akka-actor/src/main/scala/akka/pattern/CircuitBreaker.scala
@@ -13,6 +13,7 @@ import scala.concurrent.{ ExecutionContext, Future, Promise, Await }
 import scala.concurrent.util.{ Duration, Deadline }
 import scala.concurrent.util.duration._
 import scala.util.control.NonFatal
+import scala.util.Success
 
 /**
  * Companion object providing factory methods for Circuit Breaker which runs callbacks in caller's thread
@@ -306,8 +307,8 @@ class CircuitBreaker(scheduler: Scheduler, maxFailures: Int, callTimeout: Durati
       val deadline = callTimeout.fromNow
       val bodyFuture = try body catch { case NonFatal(t) ⇒ Future.failed(t) }
       bodyFuture.onComplete({
-        case Right(_) if !deadline.isOverdue() ⇒ callSucceeds()
-        case _                                 ⇒ callFails()
+        case s: Success[_] if !deadline.isOverdue() ⇒ callSucceeds()
+        case _                                      ⇒ callFails()
       })(CircuitBreaker.syncExecutionContext)
       bodyFuture
     }
diff --git a/akka-actor/src/main/scala/akka/pattern/GracefulStopSupport.scala b/akka-actor/src/main/scala/akka/pattern/GracefulStopSupport.scala
index 4a11da219a..3db168e4c4 100644
--- a/akka-actor/src/main/scala/akka/pattern/GracefulStopSupport.scala
+++ b/akka-actor/src/main/scala/akka/pattern/GracefulStopSupport.scala
@@ -9,6 +9,7 @@ import akka.util.{ Timeout }
 import akka.dispatch.{ Unwatch, Watch }
 import scala.concurrent.Future
 import scala.concurrent.util.Duration
+import scala.util.Success
 
 trait GracefulStopSupport {
   /**
@@ -45,8 +46,8 @@ trait GracefulStopSupport {
         internalTarget.sendSystemMessage(Watch(target, ref))
         val f = ref.result.future
         f onComplete { // Just making sure we're not leaking here
-          case Right(Terminated(`target`)) ⇒ ()
-          case _                           ⇒ internalTarget.sendSystemMessage(Unwatch(target, ref))
+          case Success(Terminated(`target`)) ⇒ ()
+          case _                             ⇒ internalTarget.sendSystemMessage(Unwatch(target, ref))
         }
         target ! PoisonPill
         f map {
diff --git a/akka-actor/src/main/scala/akka/pattern/PipeToSupport.scala b/akka-actor/src/main/scala/akka/pattern/PipeToSupport.scala
index 8eb3859f12..5563a908de 100644
--- a/akka-actor/src/main/scala/akka/pattern/PipeToSupport.scala
+++ b/akka-actor/src/main/scala/akka/pattern/PipeToSupport.scala
@@ -6,6 +6,7 @@ package akka.pattern
 import language.implicitConversions
 
 import scala.concurrent.{ Future, ExecutionContext }
+import scala.util.{ Failure, Success }
 import akka.actor.{ Status, ActorRef }
 
 trait PipeToSupport {
@@ -13,8 +14,8 @@ trait PipeToSupport {
   final class PipeableFuture[T](val future: Future[T])(implicit executionContext: ExecutionContext) {
     def pipeTo(recipient: ActorRef)(implicit sender: ActorRef = null): Future[T] = {
       future onComplete {
-        case Right(r) ⇒ recipient ! r
-        case Left(f)  ⇒ recipient ! Status.Failure(f)
+        case Success(r) ⇒ recipient ! r
+        case Failure(f) ⇒ recipient ! Status.Failure(f)
       }
       future
     }
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 4dff298ecb..159ec437c5 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
@@ -24,6 +24,7 @@ import akka.util.Timeout
 import akka.camel.internal.CamelExchangeAdapter
 import akka.camel.{ ActorNotRegisteredException, Camel, Ack, FailureResult, CamelMessage }
 import support.TypeConverterSupport
+import scala.util.{ Failure, Success, Try }
 
 /**
  * For internal use only.
@@ -155,18 +156,18 @@ private[camel] class ActorProducer(val endpoint: ActorEndpoint, camel: Camel) ex
       callback.done(true)
       true // done sync
     } else {
-      val action: PartialFunction[Either[Throwable, Any], Unit] =
+      val action: PartialFunction[Try[Any], Unit] =
         if (exchange.isOutCapable) {
-          case Right(failure: FailureResult) ⇒ exchange.setFailure(failure)
-          case Right(msg)                    ⇒ exchange.setResponse(CamelMessage.canonicalize(msg))
-          case Left(e: TimeoutException)     ⇒ exchange.setFailure(FailureResult(new TimeoutException("Failed to get response from the actor [%s] within timeout [%s]. Check replyTimeout and blocking settings [%s]" format (endpoint.path, endpoint.replyTimeout, endpoint))))
-          case Left(throwable)               ⇒ exchange.setFailure(FailureResult(throwable))
+          case Success(failure: FailureResult) ⇒ exchange.setFailure(failure)
+          case Success(msg)                    ⇒ exchange.setResponse(CamelMessage.canonicalize(msg))
+          case Failure(e: TimeoutException)    ⇒ exchange.setFailure(FailureResult(new TimeoutException("Failed to get response from the actor [%s] within timeout [%s]. Check replyTimeout and blocking settings [%s]" format (endpoint.path, endpoint.replyTimeout, endpoint))))
+          case Failure(throwable)              ⇒ exchange.setFailure(FailureResult(throwable))
         } else {
-          case Right(Ack)                    ⇒ () /* no response message to set */
-          case Right(failure: FailureResult) ⇒ exchange.setFailure(failure)
-          case Right(msg)                    ⇒ exchange.setFailure(FailureResult(new IllegalArgumentException("Expected Ack or Failure message, but got: [%s] from actor [%s]" format (msg, endpoint.path))))
-          case Left(e: TimeoutException)     ⇒ exchange.setFailure(FailureResult(new TimeoutException("Failed to get Ack or Failure response from the actor [%s] within timeout [%s]. Check replyTimeout and blocking settings [%s]" format (endpoint.path, endpoint.replyTimeout, endpoint))))
-          case Left(throwable)               ⇒ exchange.setFailure(FailureResult(throwable))
+          case Success(Ack)                    ⇒ () /* no response message to set */
+          case Success(failure: FailureResult) ⇒ exchange.setFailure(failure)
+          case Success(msg)                    ⇒ exchange.setFailure(FailureResult(new IllegalArgumentException("Expected Ack or Failure message, but got: [%s] from actor [%s]" format (msg, endpoint.path))))
+          case Failure(e: TimeoutException)    ⇒ exchange.setFailure(FailureResult(new TimeoutException("Failed to get Ack or Failure response from the actor [%s] within timeout [%s]. Check replyTimeout and blocking settings [%s]" format (endpoint.path, endpoint.replyTimeout, endpoint))))
+          case Failure(throwable)              ⇒ exchange.setFailure(FailureResult(throwable))
         }
       val async = try actorFor(endpoint.path).ask(messageFor(exchange))(Timeout(endpoint.replyTimeout)) catch { case NonFatal(e) ⇒ Future.failed(e) }
       implicit val ec = camel.system.dispatcher // FIXME which ExecutionContext should be used here?
diff --git a/akka-camel/src/test/scala/akka/camel/ProducerFeatureTest.scala b/akka-camel/src/test/scala/akka/camel/ProducerFeatureTest.scala
index e9d5382843..6510f6fd67 100644
--- a/akka-camel/src/test/scala/akka/camel/ProducerFeatureTest.scala
+++ b/akka-camel/src/test/scala/akka/camel/ProducerFeatureTest.scala
@@ -19,6 +19,7 @@ import scala.concurrent.util.duration._
 import akka.util.Timeout
 import org.scalatest.matchers.MustMatchers
 import akka.testkit._
+import scala.util.Success
 
 /**
  * Tests the features of the Camel Producer.
diff --git a/akka-camel/src/test/scala/akka/camel/UntypedProducerTest.scala b/akka-camel/src/test/scala/akka/camel/UntypedProducerTest.scala
index 11178277b9..ba853083bf 100644
--- a/akka-camel/src/test/scala/akka/camel/UntypedProducerTest.scala
+++ b/akka-camel/src/test/scala/akka/camel/UntypedProducerTest.scala
@@ -53,8 +53,8 @@ class UntypedProducerTest extends WordSpec with MustMatchers with BeforeAndAfter
       filterEvents(EventFilter[AkkaCamelException](occurrences = 1)) {
         val future = producer.ask(message)(timeout).failed
 
-        Await.ready(future, timeout).value match {
-          case Some(Right(e: AkkaCamelException)) ⇒
+        Await.result(future, timeout) match {
+          case e: AkkaCamelException ⇒
             e.getMessage must be("failure")
             e.headers must be(Map(CamelMessage.MessageExchangeId -> "123"))
           case unexpected ⇒ fail("Actor responded with unexpected message:" + unexpected)
diff --git a/akka-dataflow/src/main/scala/akka/dataflow/package.scala b/akka-dataflow/src/main/scala/akka/dataflow/package.scala
index bdf1d79aa2..9f4e6a0da2 100644
--- a/akka-dataflow/src/main/scala/akka/dataflow/package.scala
+++ b/akka-dataflow/src/main/scala/akka/dataflow/package.scala
@@ -9,6 +9,7 @@ import language.implicitConversions
 import scala.util.continuations._
 import scala.concurrent.{ Promise, Future, ExecutionContext }
 import scala.util.control.NonFatal
+import scala.util.Failure
 
 package object dataflow {
   /**
@@ -33,10 +34,10 @@ package object dataflow {
       new Runnable {
         def run = try {
           (reify(body) foreachFull (r ⇒ p.success(r).future, f ⇒ p.failure(f).future): Future[Any]) onFailure {
-            case NonFatal(e) ⇒ p tryComplete Left(e)
+            case NonFatal(e) ⇒ p tryComplete Failure(e)
           }
         } catch {
-          case NonFatal(e) ⇒ p tryComplete Left(e)
+          case NonFatal(e) ⇒ p tryComplete Failure(e)
         }
       })
     p.future
diff --git a/akka-dataflow/src/test/scala/akka/dataflow/DataflowSpec.scala b/akka-dataflow/src/test/scala/akka/dataflow/DataflowSpec.scala
index c5d543f84d..18f2d5068d 100644
--- a/akka-dataflow/src/test/scala/akka/dataflow/DataflowSpec.scala
+++ b/akka-dataflow/src/test/scala/akka/dataflow/DataflowSpec.scala
@@ -121,7 +121,7 @@ class DataflowSpec extends AkkaSpec with DefaultTimeout {
       val a, b, c = Promise[Int]()
 
       val result2 = flow {
-        val n = (a << c).value.get.right.get + 10
+        val n = (a << c).value.get.get + 10
         b << (c() - 2)
         a() + n * b()
       }
diff --git a/akka-docs/scala/code/docs/future/FutureDocSpec.scala b/akka-docs/scala/code/docs/future/FutureDocSpec.scala
index dc28fd7185..90da94bae5 100644
--- a/akka-docs/scala/code/docs/future/FutureDocSpec.scala
+++ b/akka-docs/scala/code/docs/future/FutureDocSpec.scala
@@ -7,18 +7,19 @@ import language.postfixOps
 
 import akka.testkit._
 import akka.actor.{ Actor, Props }
-import akka.actor.Status.Failure
+import akka.actor.Status
 import akka.util.Timeout
 import scala.concurrent.util.duration._
 import java.lang.IllegalStateException
 import scala.concurrent.{ Await, ExecutionContext, Future, Promise }
+import scala.util.{ Failure, Success }
 
 object FutureDocSpec {
 
   class MyActor extends Actor {
     def receive = {
       case x: String       ⇒ sender ! x.toUpperCase
-      case x: Int if x < 0 ⇒ sender ! Failure(new ArithmeticException("Negative values not supported"))
+      case x: Int if x < 0 ⇒ sender ! Status.Failure(new ArithmeticException("Negative values not supported"))
       case x: Int          ⇒ sender ! x
     }
   }
@@ -312,7 +313,7 @@ class FutureDocSpec extends AkkaSpec {
     def watchSomeTV = ()
     //#and-then
     val result = Future { loadPage(url) } andThen {
-      case Left(exception) ⇒ log(exception)
+      case Failure(exception) ⇒ log(exception)
     } andThen {
       case _ ⇒ watchSomeTV
     }
@@ -358,8 +359,8 @@ class FutureDocSpec extends AkkaSpec {
       def doSomethingOnFailure(t: Throwable) = ()
       //#onComplete
       future onComplete {
-        case Right(result) ⇒ doSomethingOnSuccess(result)
-        case Left(failure) ⇒ doSomethingOnFailure(failure)
+        case Success(result)  ⇒ doSomethingOnSuccess(result)
+        case Failure(failure) ⇒ doSomethingOnFailure(failure)
       }
       //#onComplete
       Await.result(future, 1 second) must be("foo")
diff --git a/akka-docs/scala/code/docs/testkit/TestkitDocSpec.scala b/akka-docs/scala/code/docs/testkit/TestkitDocSpec.scala
index 94ddceab2f..830830dffa 100644
--- a/akka-docs/scala/code/docs/testkit/TestkitDocSpec.scala
+++ b/akka-docs/scala/code/docs/testkit/TestkitDocSpec.scala
@@ -4,6 +4,7 @@
 package docs.testkit
 
 import language.postfixOps
+import scala.util.Success
 
 //#imports-test-probe
 import akka.testkit.TestProbe
@@ -129,7 +130,7 @@ class TestkitDocSpec extends AkkaSpec with DefaultTimeout with ImplicitSender {
     // hypothetical message stimulating a '42' answer
     val future = actorRef ? Say42
     val result = future.value.get match {
-      case Right(x: Int) ⇒ x
+      case Success(x: Int) ⇒ x
     }
     result must be(42)
     //#test-behavior
diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index 4e3047b920..2d011e1d51 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -24,7 +24,11 @@ object AkkaBuild extends Build {
   lazy val buildSettings = Seq(
     organization := "com.typesafe.akka",
     version      := "2.1-SNAPSHOT",
-    scalaVersion := "2.10.0-M6"
+    scalaVersion := "2.10.0-SNAPSHOT",
+    scalaVersion in update <<= (scalaVersion) apply {
+      case "2.10.0-SNAPSHOT" => "2.10.0-M6"
+      case x => x
+    }
   )
 
   lazy val akka = Project(
@@ -347,6 +351,7 @@ object AkkaBuild extends Build {
   // Settings
 
   override lazy val settings = super.settings ++ buildSettings ++ Seq(
+      resolvers += "Scala Community 2.10.0-SNAPSHOT" at "https://scala-webapps.epfl.ch/jenkins/job/community-nightly/ws/target/repositories/8e83577d99af1d718fe369c4a4ee92737b9cf669",
       resolvers += "Sonatype Snapshot Repo" at "https://oss.sonatype.org/content/repositories/snapshots/",
       resolvers += "Sonatype Releases Repo" at "https://oss.sonatype.org/content/repositories/releases/",
       shellPrompt := { s => Project.extract(s).currentProject.id + " > " }
@@ -580,7 +585,10 @@ object Dependency {
   val config        = "com.typesafe"                % "config"                       % "0.5.0"       // ApacheV2
   val netty         = "io.netty"                    % "netty"                        % "3.5.4.Final" // ApacheV2
   val protobuf      = "com.google.protobuf"         % "protobuf-java"                % "2.4.1"       // New BSD
-  val scalaStm      = "org.scala-tools"             % "scala-stm"                    % "0.6" cross CrossVersion.full // Modified BSD (Scala)
+  // TODO FIXME use live version
+  // val scalaStm      = "org.scala-tools"            %% "scala-stm"                    % "0.6"         // Modified BSD (Scala)
+   val scalaStm      = "org.scala-tools"            % "scala-stm"                    % "0.7-SNAPSHOT"   // Modified BSD (Scala)
+
   val slf4jApi      = "org.slf4j"                   % "slf4j-api"                    % "1.6.4"       // MIT
   val zeroMQClient  = "org.zeromq"                  % "zeromq-scala-binding"         % "0.0.6" cross CrossVersion.full // ApacheV2
   val uncommonsMath = "org.uncommons.maths"         % "uncommons-maths"              % "1.2.2a"      // ApacheV2
diff --git a/project/plugins.sbt b/project/plugins.sbt
index b6ffd705bf..2f4e1d369b 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,7 +1,7 @@
 
 resolvers += Classpaths.typesafeResolver
 
-addSbtPlugin("com.typesafe.sbtmultijvm" % "sbt-multi-jvm" % "0.2.0-M4")
+addSbtPlugin("com.typesafe.sbtmultijvm" % "sbt-multi-jvm" % "0.2.0-M4" cross CrossVersion.full)
 
 addSbtPlugin("com.typesafe.sbtscalariform" % "sbtscalariform" % "0.4.0")
 

From f41f706ce5f8bcb02bd989c19577cd7c438688a9 Mon Sep 17 00:00:00 2001
From: Roland <rk@rkuhn.info>
Date: Mon, 20 Aug 2012 21:42:50 +0200
Subject: [PATCH 04/10] adapt to different error messages, fix one case of
 Props()

---
 .../src/test/scala/akka/actor/LocalActorRefProviderSpec.scala | 4 ++--
 .../src/test/scala/akka/dispatch/FutureSpec.scala             | 4 ++--
 .../akka/serialization/DaemonMsgCreateSerializerSpec.scala    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

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 f263a2f188..084d2ddf8b 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/LocalActorRefProviderSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/LocalActorRefProviderSpec.scala
@@ -5,13 +5,13 @@
 package akka.actor
 
 import language.postfixOps
-
 import akka.testkit._
 import scala.concurrent.Await
 import scala.concurrent.util.duration._
 import akka.util.Timeout
 import scala.concurrent.Future
 import scala.util.Success
+import scala.util.Failure
 
 object LocalActorRefProviderSpec {
   val config = """
@@ -55,7 +55,7 @@ class LocalActorRefProviderSpec extends AkkaSpec(LocalActorRefProviderSpec.confi
         val actors = for (j ← 1 to 4) yield Future(system.actorOf(Props(c ⇒ { case _ ⇒ }), address))
         val set = Set() ++ actors.map(a ⇒ Await.ready(a, timeout.duration).value match {
           case Some(Success(a: ActorRef)) ⇒ 1
-          case Some(Success(ex: InvalidActorNameException)) ⇒ 2
+          case Some(Failure(ex: InvalidActorNameException)) ⇒ 2
           case x ⇒ x
         })
         set must be === Set(1, 2)
diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala b/akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala
index a151330b80..82cea61625 100644
--- a/akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala
@@ -897,7 +897,7 @@ class FutureSpec extends AkkaSpec with Checkers with BeforeAndAfterAll with Defa
     "filter result" in {
       f { (future, result) ⇒
         Await.result((future filter (_ ⇒ true)), timeout.duration) must be(result)
-        (evaluating { Await.result((future filter (_ ⇒ false)), timeout.duration) } must produce[java.util.NoSuchElementException]).getMessage must endWith(result.toString)
+        evaluating { Await.result((future filter (_ ⇒ false)), timeout.duration) } must produce[java.util.NoSuchElementException]
       }
     }
     "transform result with map" in { f((future, result) ⇒ Await.result((future map (_.toString.length)), timeout.duration) must be(result.toString.length)) }
@@ -938,7 +938,7 @@ class FutureSpec extends AkkaSpec with Checkers with BeforeAndAfterAll with Defa
     "contain a value" in {
       f((future, message) ⇒ {
         future.value must be('defined)
-        future.value.get must be('left)
+        future.value.get must be('failure)
         future.value.get match {
           case Failure(f) ⇒ f.getMessage must be(message)
         }
diff --git a/akka-remote/src/test/scala/akka/serialization/DaemonMsgCreateSerializerSpec.scala b/akka-remote/src/test/scala/akka/serialization/DaemonMsgCreateSerializerSpec.scala
index 89532bea91..0c92ec7ee1 100644
--- a/akka-remote/src/test/scala/akka/serialization/DaemonMsgCreateSerializerSpec.scala
+++ b/akka-remote/src/test/scala/akka/serialization/DaemonMsgCreateSerializerSpec.scala
@@ -47,7 +47,7 @@ class DaemonMsgCreateSerializerSpec extends AkkaSpec {
     "serialize and de-serialize DaemonMsgCreate with function creator" in {
       verifySerialization {
         DaemonMsgCreate(
-          props = Props().withCreator(new MyActor),
+          props = Props.empty.withCreator(new MyActor),
           deploy = Deploy(),
           path = "foo",
           supervisor = supervisor)

From 531e3fc5a04bbd24e6dc72fd2c238b53a704e85a Mon Sep 17 00:00:00 2001
From: Roland <rk@rkuhn.info>
Date: Mon, 20 Aug 2012 21:43:28 +0200
Subject: [PATCH 05/10] disable one of Dataflow tests which depends on SI-6262,
 to be re-enabled later

---
 akka-dataflow/src/test/scala/akka/dataflow/DataflowSpec.scala | 1 +
 1 file changed, 1 insertion(+)

diff --git a/akka-dataflow/src/test/scala/akka/dataflow/DataflowSpec.scala b/akka-dataflow/src/test/scala/akka/dataflow/DataflowSpec.scala
index 18f2d5068d..5024e911b6 100644
--- a/akka-dataflow/src/test/scala/akka/dataflow/DataflowSpec.scala
+++ b/akka-dataflow/src/test/scala/akka/dataflow/DataflowSpec.scala
@@ -81,6 +81,7 @@ class DataflowSpec extends AkkaSpec with DefaultTimeout {
     }
 
     "futureComposingWithContinuationsFailureCastNothing" in {
+      pending
       filterException[ClassCastException] {
 
         val actor = system.actorOf(Props[TestActor])

From d11083662994239910ab318a7b24383230b7a153 Mon Sep 17 00:00:00 2001
From: Roland <rk@rkuhn.info>
Date: Wed, 22 Aug 2012 15:52:32 +0200
Subject: [PATCH 06/10] make all tests pass again with 2.10.0-M7

---
 akka-docs/scala/code/docs/actor/ActorDocSpec.scala |  2 +-
 .../scala/code/docs/future/FutureDocSpec.scala     |  2 +-
 .../scala/code/docs/testkit/TestkitDocSpec.scala   |  2 +-
 project/AkkaBuild.scala                            | 14 +++++---------
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/akka-docs/scala/code/docs/actor/ActorDocSpec.scala b/akka-docs/scala/code/docs/actor/ActorDocSpec.scala
index a5021bf525..690b0ad838 100644
--- a/akka-docs/scala/code/docs/actor/ActorDocSpec.scala
+++ b/akka-docs/scala/code/docs/actor/ActorDocSpec.scala
@@ -221,7 +221,7 @@ class ActorDocSpec extends AkkaSpec(Map("akka.loglevel" -> "INFO")) {
   "creating a Props config" in {
     //#creating-props-config
     import akka.actor.Props
-    val props1 = Props()
+    val props1 = Props.empty
     val props2 = Props[MyActor]
     val props3 = Props(new MyActor)
     val props4 = Props(
diff --git a/akka-docs/scala/code/docs/future/FutureDocSpec.scala b/akka-docs/scala/code/docs/future/FutureDocSpec.scala
index 90da94bae5..74cc28ce06 100644
--- a/akka-docs/scala/code/docs/future/FutureDocSpec.scala
+++ b/akka-docs/scala/code/docs/future/FutureDocSpec.scala
@@ -108,7 +108,7 @@ class FutureDocSpec extends AkkaSpec {
     }
     val result = Await.result(f2, 1 second)
     result must be(10)
-    f1.value must be(Some(Right("HelloWorld")))
+    f1.value must be(Some(Success("HelloWorld")))
     //#map
   }
 
diff --git a/akka-docs/scala/code/docs/testkit/TestkitDocSpec.scala b/akka-docs/scala/code/docs/testkit/TestkitDocSpec.scala
index 830830dffa..fcb9360559 100644
--- a/akka-docs/scala/code/docs/testkit/TestkitDocSpec.scala
+++ b/akka-docs/scala/code/docs/testkit/TestkitDocSpec.scala
@@ -217,7 +217,7 @@ class TestkitDocSpec extends AkkaSpec with DefaultTimeout with ImplicitSender {
     val future = probe.ref ? "hello"
     probe.expectMsg(0 millis, "hello") // TestActor runs on CallingThreadDispatcher
     probe.reply("world")
-    assert(future.isCompleted && future.value == Some(Right("world")))
+    assert(future.isCompleted && future.value == Some(Success("world")))
     //#test-probe-reply
   }
 
diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index 2d011e1d51..7a3ff0ebab 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -24,11 +24,7 @@ object AkkaBuild extends Build {
   lazy val buildSettings = Seq(
     organization := "com.typesafe.akka",
     version      := "2.1-SNAPSHOT",
-    scalaVersion := "2.10.0-SNAPSHOT",
-    scalaVersion in update <<= (scalaVersion) apply {
-      case "2.10.0-SNAPSHOT" => "2.10.0-M6"
-      case x => x
-    }
+    scalaVersion := "2.10.0-M7"
   )
 
   lazy val akka = Project(
@@ -425,6 +421,8 @@ object AkkaBuild extends Build {
     scalacOptions in Compile ++= Seq("-encoding", "UTF-8", "-target:jvm-1.6", "-deprecation", "-feature", "-unchecked", "-Xlog-reflective-calls", "-Ywarn-adapted-args"),
     javacOptions in Compile ++= Seq("-source", "1.6", "-target", "1.6", "-Xlint:unchecked", "-Xlint:deprecation"),
 
+    crossVersion := CrossVersion.full,
+
     ivyLoggingLevel in ThisBuild := UpdateLogging.Quiet,
 
     parallelExecution in Test := System.getProperty("akka.parallelExecution", "false").toBoolean,
@@ -585,9 +583,7 @@ object Dependency {
   val config        = "com.typesafe"                % "config"                       % "0.5.0"       // ApacheV2
   val netty         = "io.netty"                    % "netty"                        % "3.5.4.Final" // ApacheV2
   val protobuf      = "com.google.protobuf"         % "protobuf-java"                % "2.4.1"       // New BSD
-  // TODO FIXME use live version
-  // val scalaStm      = "org.scala-tools"            %% "scala-stm"                    % "0.6"         // Modified BSD (Scala)
-   val scalaStm      = "org.scala-tools"            % "scala-stm"                    % "0.7-SNAPSHOT"   // Modified BSD (Scala)
+  val scalaStm      = "org.scala-tools"             % "scala-stm"                    % "0.6" cross CrossVersion.full // Modified BSD (Scala)
 
   val slf4jApi      = "org.slf4j"                   % "slf4j-api"                    % "1.6.4"       // MIT
   val zeroMQClient  = "org.zeromq"                  % "zeromq-scala-binding"         % "0.0.6" cross CrossVersion.full // ApacheV2
@@ -603,7 +599,7 @@ object Dependency {
     val junit       = "junit"                       % "junit"                        % "4.10"             % "test" // Common Public License 1.0
     val logback     = "ch.qos.logback"              % "logback-classic"              % "1.0.4"            % "test" // EPL 1.0 / LGPL 2.1
     val mockito     = "org.mockito"                 % "mockito-all"                  % "1.8.1"            % "test" // MIT
-    val scalatest   = "org.scalatest"               % "scalatest"                    % "1.9-2.10.0-M6-B2" % "test" cross CrossVersion.full // ApacheV2
+    val scalatest   = "org.scalatest"               % "scalatest"                    % "1.9-2.10.0-M7-B1" % "test" cross CrossVersion.full // ApacheV2
     val scalacheck  = "org.scalacheck"              % "scalacheck"                   % "1.10.0"           % "test" cross CrossVersion.full // 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

From 43170ff168024263af6b7f32df3a79a05808b22b Mon Sep 17 00:00:00 2001
From: Roland <rk@rkuhn.info>
Date: Wed, 22 Aug 2012 16:44:35 +0200
Subject: [PATCH 07/10] redo ChildTerminated() processing, see #2391"

the previous patch of including the UID in the Terminated message did
suffer from the system vs. normal message ordering problem, hence I
reverted the previous fix and replaced it by sending a NullMessage after
ChildTerminated, exactly like in the Supervise case.
---
 .../src/test/scala/akka/actor/ActorSystemSpec.scala    |  2 +-
 akka-actor/src/main/scala/akka/actor/Actor.scala       |  5 +----
 akka-actor/src/main/scala/akka/actor/ActorCell.scala   | 10 ++--------
 akka-actor/src/main/scala/akka/actor/ActorRef.scala    |  9 +++++----
 .../src/main/scala/akka/actor/cell/Children.scala      |  2 +-
 .../src/main/scala/akka/actor/cell/DeathWatch.scala    |  2 +-
 .../src/main/scala/akka/actor/cell/FaultHandling.scala |  2 ++
 .../src/main/scala/akka/pattern/AskSupport.scala       |  4 ++--
 .../java/code/docs/actor/FaultHandlingTestBase.java    |  2 +-
 .../scala/code/docs/actor/FaultHandlingDocSpec.scala   |  2 +-
 10 files changed, 17 insertions(+), 23 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 1daddfb5b1..28485c9bad 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/ActorSystemSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/ActorSystemSpec.scala
@@ -214,7 +214,7 @@ class ActorSystemSpec extends AkkaSpec("""akka.extensions = ["akka.actor.TestExt
       EventFilter[Exception]("hello", occurrences = 1) intercept {
         a ! "die"
       }
-      val t = probe.expectMsg(Terminated(a)(true, 0))
+      val t = probe.expectMsg(Terminated(a)(true))
       t.existenceConfirmed must be(true)
     }
 
diff --git a/akka-actor/src/main/scala/akka/actor/Actor.scala b/akka-actor/src/main/scala/akka/actor/Actor.scala
index 2a977d72c6..77e1add959 100644
--- a/akka-actor/src/main/scala/akka/actor/Actor.scala
+++ b/akka-actor/src/main/scala/akka/actor/Actor.scala
@@ -63,10 +63,7 @@ case object Kill extends Kill {
  * When Death Watch is used, the watcher will receive a Terminated(watched) message when watched is terminated.
  */
 @SerialVersionUID(1L)
-case class Terminated private[akka] (@BeanProperty actor: ActorRef)(
-  @BeanProperty val existenceConfirmed: Boolean,
-  private[akka] val uid: Int)
-  extends AutoReceivedMessage
+case class Terminated private[akka] (@BeanProperty actor: ActorRef)(@BeanProperty val existenceConfirmed: Boolean) extends AutoReceivedMessage
 
 abstract class ReceiveTimeout extends PossiblyHarmful
 
diff --git a/akka-actor/src/main/scala/akka/actor/ActorCell.scala b/akka-actor/src/main/scala/akka/actor/ActorCell.scala
index bf6ae5731c..1699a27505 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorCell.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorCell.scala
@@ -375,14 +375,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(actor) ⇒
-        getChildByRef(actor) match {
-          case Some(crs) if crs.uid == t.uid ⇒ removeChild(actor)
-          case _                             ⇒
-        }
-        watchedActorTerminated(t.actor)
-        receiveMessage(t)
+      case Failed(cause, uid)       ⇒ handleFailure(sender, cause, uid)
+      case t: Terminated            ⇒ watchedActorTerminated(t.actor); receiveMessage(t)
       case Kill                     ⇒ throw new ActorKilledException("Kill")
       case PoisonPill               ⇒ self.stop()
       case SelectParent(m)          ⇒ parent.tell(m, msg.sender)
diff --git a/akka-actor/src/main/scala/akka/actor/ActorRef.scala b/akka-actor/src/main/scala/akka/actor/ActorRef.scala
index 13225165f1..c5e49ece70 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorRef.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorRef.scala
@@ -441,7 +441,7 @@ private[akka] class EmptyLocalActorRef(override val provider: ActorRefProvider,
   protected def specialHandle(msg: Any): Boolean = msg match {
     case w: Watch ⇒
       if (w.watchee == this && w.watcher != this)
-        w.watcher ! Terminated(w.watchee)(existenceConfirmed = false, 0)
+        w.watcher ! Terminated(w.watchee)(existenceConfirmed = false)
       true
     case _: Unwatch ⇒ true // Just ignore
     case _          ⇒ false
@@ -466,10 +466,11 @@ private[akka] class DeadLetterActorRef(_provider: ActorRefProvider,
   override protected def specialHandle(msg: Any): Boolean = msg match {
     case w: Watch ⇒
       if (w.watchee != this && w.watcher != this)
-        w.watcher ! Terminated(w.watchee)(existenceConfirmed = false, 0)
+        w.watcher ! Terminated(w.watchee)(existenceConfirmed = false)
       true
-    case w: Unwatch ⇒ true // Just ignore
-    case _          ⇒ false
+    case w: Unwatch  ⇒ true // Just ignore
+    case NullMessage ⇒ true
+    case _           ⇒ false
   }
 
   @throws(classOf[java.io.ObjectStreamException])
diff --git a/akka-actor/src/main/scala/akka/actor/cell/Children.scala b/akka-actor/src/main/scala/akka/actor/cell/Children.scala
index c0988fe13c..53b4dfb99e 100644
--- a/akka-actor/src/main/scala/akka/actor/cell/Children.scala
+++ b/akka-actor/src/main/scala/akka/actor/cell/Children.scala
@@ -94,7 +94,7 @@ private[akka] trait Children { this: ActorCell ⇒
     swapChildrenRefs(c, c.shallDie(ref)) || shallDie(ref)
   }
 
-  @tailrec final protected def removeChild(ref: ActorRef): ChildrenContainer = {
+  @tailrec final private def removeChild(ref: ActorRef): ChildrenContainer = {
     val c = childrenRefs
     val n = c.remove(ref)
     if (swapChildrenRefs(c, n)) n
diff --git a/akka-actor/src/main/scala/akka/actor/cell/DeathWatch.scala b/akka-actor/src/main/scala/akka/actor/cell/DeathWatch.scala
index 2c78075764..031019f3f6 100644
--- a/akka-actor/src/main/scala/akka/actor/cell/DeathWatch.scala
+++ b/akka-actor/src/main/scala/akka/actor/cell/DeathWatch.scala
@@ -36,7 +36,7 @@ private[akka] trait DeathWatch { this: ActorCell ⇒
 
   protected def tellWatchersWeDied(actor: Actor): Unit = {
     if (!watchedBy.isEmpty) {
-      val terminated = Terminated(self)(existenceConfirmed = true, uid)
+      val terminated = Terminated(self)(existenceConfirmed = true)
       try {
         watchedBy foreach {
           watcher ⇒
diff --git a/akka-actor/src/main/scala/akka/actor/cell/FaultHandling.scala b/akka-actor/src/main/scala/akka/actor/cell/FaultHandling.scala
index 4e5eeedcc6..0c0f9bb9c0 100644
--- a/akka-actor/src/main/scala/akka/actor/cell/FaultHandling.scala
+++ b/akka-actor/src/main/scala/akka/actor/cell/FaultHandling.scala
@@ -11,6 +11,7 @@ import akka.event.Logging.{ Warning, Error, Debug }
 import scala.util.control.NonFatal
 import akka.dispatch.SystemMessage
 import akka.event.Logging
+import akka.dispatch.NullMessage
 
 private[akka] trait FaultHandling { this: ActorCell ⇒
 
@@ -157,6 +158,7 @@ private[akka] trait FaultHandling { this: ActorCell ⇒
     try if (a ne null) a.postStop()
     finally try dispatcher.detach(this)
     finally try parent.sendSystemMessage(ChildTerminated(self))
+    finally try parent.tell(NullMessage) // read ScalaDoc of NullMessage to see why
     finally try tellWatchersWeDied(a)
     finally try unwatchWatchedActors(a)
     finally {
diff --git a/akka-actor/src/main/scala/akka/pattern/AskSupport.scala b/akka-actor/src/main/scala/akka/pattern/AskSupport.scala
index ba9558aa84..345d133ea4 100644
--- a/akka-actor/src/main/scala/akka/pattern/AskSupport.scala
+++ b/akka-actor/src/main/scala/akka/pattern/AskSupport.scala
@@ -262,7 +262,7 @@ private[akka] final class PromiseActorRef private (val provider: ActorRefProvide
     case _: Terminate ⇒ stop()
     case Watch(watchee, watcher) ⇒
       if (watchee == this && watcher != this) {
-        if (!addWatcher(watcher)) watcher ! Terminated(watchee)(existenceConfirmed = true, 0)
+        if (!addWatcher(watcher)) watcher ! Terminated(watchee)(existenceConfirmed = true)
       } else System.err.println("BUG: illegal Watch(%s,%s) for %s".format(watchee, watcher, this))
     case Unwatch(watchee, watcher) ⇒
       if (watchee == this && watcher != this) remWatcher(watcher)
@@ -281,7 +281,7 @@ private[akka] final class PromiseActorRef private (val provider: ActorRefProvide
       result tryComplete Failure(new ActorKilledException("Stopped"))
       val watchers = clearWatchers()
       if (!watchers.isEmpty) {
-        val termination = Terminated(this)(existenceConfirmed = true, 0)
+        val termination = Terminated(this)(existenceConfirmed = true)
         watchers foreach { w ⇒ try w.tell(termination, this) catch { case NonFatal(t) ⇒ /* FIXME LOG THIS */ } }
       }
     }
diff --git a/akka-docs/java/code/docs/actor/FaultHandlingTestBase.java b/akka-docs/java/code/docs/actor/FaultHandlingTestBase.java
index 75d732427a..6f31be6ef4 100644
--- a/akka-docs/java/code/docs/actor/FaultHandlingTestBase.java
+++ b/akka-docs/java/code/docs/actor/FaultHandlingTestBase.java
@@ -211,4 +211,4 @@ public class FaultHandlingTestBase {
   }
   //#testkit
 }
-//#testkit
\ No newline at end of file
+//#testkit
diff --git a/akka-docs/scala/code/docs/actor/FaultHandlingDocSpec.scala b/akka-docs/scala/code/docs/actor/FaultHandlingDocSpec.scala
index 0387c6e6a6..c5aff099da 100644
--- a/akka-docs/scala/code/docs/actor/FaultHandlingDocSpec.scala
+++ b/akka-docs/scala/code/docs/actor/FaultHandlingDocSpec.scala
@@ -153,4 +153,4 @@ class FaultHandlingDocSpec extends AkkaSpec with ImplicitSender {
     }
   }
 }
-//#testkit
\ No newline at end of file
+//#testkit

From 04159dc9318a738fde0afcceb9a0033e03a191a8 Mon Sep 17 00:00:00 2001
From: Roland <rk@rkuhn.info>
Date: Wed, 22 Aug 2012 18:36:13 +0200
Subject: [PATCH 08/10] fix scalaBinaryVersion for sbt plugin

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

diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index 7a3ff0ebab..07fcd8f09b 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -276,7 +276,8 @@ object AkkaBuild extends Build {
     settings = defaultSettings ++ Seq(
       sbtPlugin := true,
       scalacOptions in Compile := Seq("-encoding", "UTF-8", "-deprecation", "-unchecked"),
-      scalaVersion := "2.9.1"
+      scalaVersion := "2.9.1",
+      scalaBinaryVersion <<= scalaVersion
     )
   )
 

From 1be260c283f563acb74865c7ec6ae314664e49f5 Mon Sep 17 00:00:00 2001
From: Josh Suereth <joshua.suereth@gmail.com>
Date: Wed, 22 Aug 2012 12:54:25 -0400
Subject: [PATCH 09/10] Publish-to now accepts jvm property
 publish.maven.central to rewire resolver to be aven central.

---
 project/Publish.scala | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/project/Publish.scala b/project/Publish.scala
index 1a545531b9..3c1b3dc148 100644
--- a/project/Publish.scala
+++ b/project/Publish.scala
@@ -67,13 +67,27 @@ object Publish {
   }
 
   def akkaPublishTo: Initialize[Option[Resolver]] = {
-    defaultPublishTo { default =>
-      val property = Option(System.getProperty("akka.publish.repository"))
-      val repo = property map { "Akka Publish Repository" at _ }
-      repo orElse Some(Resolver.file("Default Local Repository", default))
+    (defaultPublishTo, version) { (default, v) =>
+      akkaPublishRepository orElse
+      sonatypeRepo(v) orElse
+      Some(Resolver.file("Default Local Repository", default))
     }
   }
 
+  def sonatypeRepo(version: String): Option[Resolver] = {
+    Option(sys.props("publish.maven.central")) filter (_.toLowerCase == "true") map { _ =>
+      val nexus = "https://oss.sonatype.org/"
+      if(version endsWith "-SNAPSHOT") ("snapshots" at nexus + "content/repositories/snapshots")
+      else ("releases"  at nexus + "service/local/staging/deploy/maven2")
+    }
+  }
+
+
+  def akkaPublishRepository: Option[Resolver] = {
+      val property = Option(System.getProperty("akka.publish.repository"))
+      property map { "Akka Publish Repository" at _ }
+  }
+
   def akkaCredentials: Seq[Credentials] = {
     val property = Option(System.getProperty("akka.publish.credentials"))
     property map (f => Credentials(new File(f))) toSeq

From 66d071ab84c6d81644a9bdb903bc0abc9a6acd92 Mon Sep 17 00:00:00 2001
From: Roland <rk@rkuhn.info>
Date: Wed, 22 Aug 2012 21:18:37 +0200
Subject: [PATCH 10/10] adapt release script to maven publishing

---
 project/scripts/release | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/project/scripts/release b/project/scripts/release
index b4f9b9cda2..1dd5d9d3ae 100755
--- a/project/scripts/release
+++ b/project/scripts/release
@@ -221,8 +221,12 @@ fi
 
 # build the release
 echolog "Building the release..."
-try sbt build-release
-#try cp akka-spring/src/main/resources/akka/spring/akka-*.xsd ${release_dir}
+if [ ! $dry_run ]; then
+  RELEASE_OPT="-Dpublish.maven.central=true"
+else
+  RELEASE_OPT=""
+fi
+try sbt $RELEASE_OPT build-release
 echolog "Creating gzipped tar download..."
 try tar -cz -C ${unzipped_dir} -f ${release_dir}/downloads/akka-${version}.tgz akka-${version}
 echolog "Successfully created local release"