Merging in master, huge work trying to get things to compile, tests not green at this stage

akka-docs/java/code/docs/actor/TypedActorDocTestBase.java

@@ -6,10 +6,11 @@ package docs.actor;
 //#imports
 
 import akka.actor.TypedActor;
-import akka.dispatch.*;
 import akka.actor.*;
 import akka.japi.*;
+import akka.dispatch.Futures;
 import scala.concurrent.Await;
+import scala.concurrent.Future;
 import scala.concurrent.util.Duration;
 import java.util.concurrent.TimeUnit;
 

akka-docs/java/code/docs/actor/UntypedActorDocTestBase.java

@@ -11,7 +11,7 @@ import akka.actor.Props;
 
 //#import-future
 import scala.concurrent.Future;
-import scala.concurrent.Futures;
+import akka.dispatch.Futures;
 import akka.dispatch.Mapper;
 import scala.concurrent.Await;
 import scala.concurrent.util.Duration;
@@ -43,13 +43,17 @@ import akka.pattern.AskTimeoutException;
 import static akka.pattern.Patterns.ask;
 import static akka.pattern.Patterns.pipe;
 import scala.concurrent.Future;
-import scala.concurrent.Futures;
+import akka.dispatch.Futures;
 import scala.concurrent.util.Duration;
 import akka.util.Timeout;
 import java.util.concurrent.TimeUnit;
 import java.util.ArrayList;
 //#import-askPipe
 
+//#import-stash
+import akka.actor.UntypedActorWithStash;
+//#import-stash
+
 import akka.actor.Props;
 import akka.actor.UntypedActor;
 import akka.actor.UntypedActorFactory;
@@ -246,7 +250,7 @@ public class UntypedActorDocTestBase {
         final int x = (Integer) it.next();
         return new Result(x, s);
       }
-    });
+    }, system.dispatcher());
 
     pipe(transformed).to(actorC);
     //#ask-pipe
@@ -346,6 +350,31 @@ public class UntypedActorDocTestBase {
 
   //#hot-swap-actor
 
+  //#stash
+  public static class ActorWithProtocol extends UntypedActorWithStash {
+    private Boolean isOpen = false;
+    public void onReceive(Object msg) {
+      if (isOpen) {
+        if (msg.equals("write")) {
+          // do writing...
+        } else if (msg.equals("close")) {
+          unstashAll();
+          isOpen = false;
+        } else {
+          stash();
+        }
+      } else {
+        if (msg.equals("open")) {
+          unstashAll();
+          isOpen = true;
+        } else {
+          stash();
+        }
+      }
+    }
+  }
+  //#stash
+
   //#watch
   public static class WatchActor extends UntypedActor {
     final ActorRef child = this.getContext().actorOf(Props.empty(), "child");

akka-docs/java/code/docs/actor/japi/FaultHandlingDocSample.java

@@ -151,7 +151,7 @@ public class FaultHandlingDocSample {
             public Progress apply(CurrentCount c) {
                 return new Progress(100.0 * c.count / totalCount);
             }
-        }))
+        }, getContext().dispatcher()))
         .to(progressListener);
       } else {
         unhandled(msg);