Rename dispatcherFactory to dispatchers in ActorSystem. See #1458

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

@@ -78,7 +78,7 @@ class DispatcherDocSpec extends AkkaSpec(DispatcherDocSpec.config) {
   }
 
   "defining dispatcher with bounded queue" in {
-    val dispatcher = system.dispatcherFactory.lookup("my-dispatcher-bounded-queue")
+    val dispatcher = system.dispatchers.lookup("my-dispatcher-bounded-queue")
   }
 
   "defining pinned dispatcher" in {
@@ -100,11 +100,11 @@ class DispatcherDocSpec extends AkkaSpec(DispatcherDocSpec.config) {
     // FIXME #1458: how should we make it easy to configure prio mailbox?
     // We create a new Priority dispatcher and seed it with the priority generator
     val dispatcherKey = "prio-dispatcher"
-    val dispatcherConfigurator = new MessageDispatcherConfigurator(system.dispatcherFactory.defaultDispatcherConfig, system.dispatcherFactory.prerequisites) {
-      val instance = system.dispatcherFactory.newDispatcher(dispatcherKey, 5, UnboundedPriorityMailbox(gen)).build
+    val dispatcherConfigurator = new MessageDispatcherConfigurator(system.dispatchers.defaultDispatcherConfig, system.dispatchers.prerequisites) {
+      val instance = system.dispatchers.newDispatcher(dispatcherKey, 5, UnboundedPriorityMailbox(gen)).build
       override def dispatcher(): MessageDispatcher = instance
     }
-    system.dispatcherFactory.register(dispatcherKey, dispatcherConfigurator)
+    system.dispatchers.register(dispatcherKey, dispatcherConfigurator)
 
     val a = system.actorOf( // We create a new Actor that just prints out what it processes
       Props(new Actor {
@@ -140,7 +140,7 @@ class DispatcherDocSpec extends AkkaSpec(DispatcherDocSpec.config) {
   }
 
   "defining balancing dispatcher" in {
-    val dispatcher = system.dispatcherFactory.lookup("my-balancing-dispatcher")
+    val dispatcher = system.dispatchers.lookup("my-balancing-dispatcher")
   }
 
 }

akka-docs/scala/code/akka/docs/testkit/TestkitDocSpec.scala

@@ -181,8 +181,8 @@ class TestkitDocSpec extends AkkaSpec with DefaultTimeout with ImplicitSender {
     val actor = system.actorOf(Props[MyDoubleEcho])
     actor ! (probe1.ref, probe2.ref)
     actor ! "hello"
-    probe1.expectMsg(50 millis, "hello")
-    probe2.expectMsg(50 millis, "hello")
+    probe1.expectMsg(500 millis, "hello")
+    probe2.expectMsg(500 millis, "hello")
     //#test-probe
 
     //#test-special-probe

akka-docs/scala/dispatchers.rst

@@ -44,7 +44,7 @@ There are 4 different types of message dispatchers:
 
 It is recommended to define the dispatcher in :ref:`configuration` to allow for tuning for different environments.
 
-Example of a custom event-based dispatcher, which can be fetched with ``system.dispatcherFactory.lookup("my-dispatcher")``
+Example of a custom event-based dispatcher, which can be fetched with ``system.dispatchers.lookup("my-dispatcher")``
 as in the example above:
 
 .. includecode:: code/akka/docs/dispatcher/DispatcherDocSpec.scala#my-dispatcher-config
@@ -54,7 +54,7 @@ Default values are taken from ``default-dispatcher``, i.e. all options doesn't n
 .. warning::
 
   Factory methods for creating dispatchers programmatically are available in ``akka.dispatch.Dispatchers``, i.e.
-  ``dispatcherFactory`` of the ``ActorSystem``. These methods will probably be changed or removed before
+  ``dispatchers`` of the ``ActorSystem``. These methods will probably be changed or removed before
   2.0 final release, because dispatchers need to be defined by configuration to work in a clustered setup.
 
 Let's now walk through the different dispatchers in more detail.