Merge pull request #1521 from akka/wip-3342-mailbox-split-∂π

rewrite mailbox selection logic, see #3342

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

@@ -203,8 +203,7 @@ object DispatcherDocSpec {
     import akka.dispatch.{
       Envelope,
       MessageQueue,
-      QueueBasedMessageQueue,
-      UnboundedMessageQueueSemantics
+      UnboundedQueueBasedMessageQueue
     }
 
     // This constructor signature must exist, it will be called by Akka
@@ -213,7 +212,7 @@ object DispatcherDocSpec {
     // The create method is called to create the MessageQueue
     final override def create(owner: Option[ActorRef],
                               system: Option[ActorSystem]): MessageQueue =
-      new QueueBasedMessageQueue with UnboundedMessageQueueSemantics {
+      new UnboundedQueueBasedMessageQueue {
         final val queue = new ConcurrentLinkedQueue[Envelope]()
       }
   }

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

@@ -40,7 +40,7 @@ class RouterViaProgramDocSpec extends AkkaSpec with ImplicitSender {
     val actor3 = system.actorOf(Props[ExampleActor1], "actor3")
     val routees = Vector[String]("/user/actor1", "/user/actor2", "/user/actor3")
     val router = system.actorOf(
-      Props().withRouter(RoundRobinRouter(routees = routees)))
+      Props.empty.withRouter(RoundRobinRouter(routees = routees)))
     //#programmaticRoutingRouteePaths
     1 to 6 foreach { i ⇒ router ! Message1(i) }
     val received = receiveN(6, 5.seconds.dilated)