Updated after comments, see #1278

akka-samples/akka-sample-ants/README.md

@@ -19,8 +19,6 @@ Here is an example. First type 'sbt' to start SBT interactively, the run 'update
 
 > % sbt
 
-> > update
-
 > > project akka-sample-ants
 
 > > run

akka-samples/akka-sample-fsm/src/README

@@ -15,8 +15,6 @@ Here is an example. First type 'sbt' to start SBT interactively, the run 'update
 
 > % sbt
 
-> > update
-
 > > project akka-sample-fsm
 
 > > run

akka-samples/akka-sample-fsm/src/main/scala/DiningHakkersOnBecome.scala

@@ -127,7 +127,7 @@ class Hakker(name: String, left: ActorRef, right: ActorRef) extends Actor {
 object DiningHakkers {
   val system = ActorSystem()
 
-  def main(args: Array[String]) {
+  def main(args: Array[String]): Unit = {
     run
   }
 

akka-samples/akka-sample-fsm/src/main/scala/DiningHakkersOnFsm.scala

@@ -168,7 +168,7 @@ object DiningHakkersOnFsm {
 
   val system = ActorSystem()
 
-  def main(args: Array[String]) {
+  def main(args: Array[String]): Unit = {
     run
   }
 

akka-samples/akka-sample-hello/src/README

@@ -15,8 +15,6 @@ Here is an example. First type 'sbt' to start SBT interactively, the run 'update
 
 > % sbt
 
-> > update
-
 > > project akka-sample-hello
 
 > > run

akka-samples/akka-sample-hello/src/main/scala/sample/hello/Main.scala

@@ -8,7 +8,7 @@ import akka.actor.{ ActorSystem, Actor }
 case object Start
 
 object Main {
-  def main(args: Array[String]) {
+  def main(args: Array[String]): Unit = {
     val system = ActorSystem()
     system.actorOf[HelloActor] ! Start
   }

akka-tutorials/akka-tutorial-first/src/main/java/akka/tutorial/first/java/Pi.java

@@ -16,8 +16,6 @@ import java.util.concurrent.CountDownLatch;
 
 public class Pi {
 
-    private static final ActorSystem system = ActorSystem.apply();
-
     public static void main(String[] args) throws Exception {
         Pi pi = new Pi();
         pi.calculate(4, 10000, 10000);
@@ -113,18 +111,17 @@ public class Pi {
             };
             LinkedList<ActorRef> actors = new LinkedList<ActorRef>() {
                 {
-                    for (int i = 0; i < nrOfWorkers; i++) add(system.actorOf(Worker.class));
+                    for (int i = 0; i < nrOfWorkers; i++) add(context().actorOf(Worker.class));
                 }
             };
             RoutedProps props = new RoutedProps(routerCreator, new LocalConnectionManager(actors), new akka.actor.Timeout(-1), true);
-            router = new RoutedActorRef(system, props, getSelf(), "pi");
+            router = new RoutedActorRef(system(), props, getSelf(), "pi");
         }
 
         // message handler
         public void onReceive(Object message) {
 
             if (message instanceof Calculate) {
-
                 // schedule work
                 for (int start = 0; start < nrOfMessages; start++) {
                     router.tell(new Work(start, nrOfElements), getSelf());
@@ -161,6 +158,7 @@ public class Pi {
     // ==================
     public void calculate(final int nrOfWorkers, final int nrOfElements, final int nrOfMessages)
             throws Exception {
+        final ActorSystem system = ActorSystem.create();
 
         // this latch is only plumbing to know when the calculation is completed
         final CountDownLatch latch = new CountDownLatch(1);

akka-tutorials/akka-tutorial-first/src/main/scala/Pi.scala

@@ -9,8 +9,6 @@ import akka.actor.{ ActorSystemImpl, Actor, ActorSystem }
 
 object Pi extends App {
 
-  val system = ActorSystem()
-
   // Initiate the calculation
   calculate(nrOfWorkers = 4, nrOfElements = 10000, nrOfMessages = 10000)
 
@@ -87,14 +85,11 @@ object Pi extends App {
     }
   }
 
-  object Master {
-    val impl = system.asInstanceOf[ActorSystemImpl]
-  }
-
   // ==================
   // ===== Run it =====
   // ==================
   def calculate(nrOfWorkers: Int, nrOfElements: Int, nrOfMessages: Int) {
+    val system = ActorSystem()
 
     // this latch is only plumbing to know when the calculation is completed
     val latch = new CountDownLatch(1)

akka-tutorials/akka-tutorial-first/src/test/scala/WorkerSpec.scala

@@ -20,7 +20,7 @@ class WorkerSpec extends WordSpec with MustMatchers {
       val testActor = TestActorRef[Worker]
       val actor = testActor.underlyingActor
       actor.calculatePiFor(0, 0) must equal(0.0)
-      actor.calculatePiFor(1, 1) must equal(-1.3333333333333333)
+      actor.calculatePiFor(1, 1) must be(-1.3333333333333333 plusOrMinus 0.0000000001)
     }
   }
 }