From 0cf5c22eac47f3d07213c153c793445f617589e7 Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Tue, 17 Jan 2012 08:44:46 +0100 Subject: [PATCH] Fixed target.nodes config property. See #1599 --- akka-docs/java/remoting.rst | 8 ++++---- akka-docs/scala/remoting.rst | 6 +++--- akka-remote/src/main/resources/reference.conf | 2 +- .../{RemoteRouters.scala => RemoteRouterConfig.scala} | 0 4 files changed, 8 insertions(+), 8 deletions(-) rename akka-remote/src/main/scala/akka/routing/{RemoteRouters.scala => RemoteRouterConfig.scala} (100%) diff --git a/akka-docs/java/remoting.rst b/akka-docs/java/remoting.rst index 7ec163726a..909315af46 100644 --- a/akka-docs/java/remoting.rst +++ b/akka-docs/java/remoting.rst @@ -69,7 +69,7 @@ The "app" in this case refers to the name of the ``ActorSystem``:: actor { deployment { /serviceA/retrieval { - remote = “akka://app@10.0.0.1:2552” + remote = "akka://app@10.0.0.1:2552” } } } @@ -106,10 +106,10 @@ This is also done via configuration:: actor { deployment { /serviceA/aggregation { - router = “round-robin” + router = "round-robin" nr-of-instances = 10 - routees { - nodes = [“akka://app@10.0.0.2:2552”, “akka://app@10.0.0.3:2552”] + target { + nodes = ["akka://app@10.0.0.2:2552", "akka://app@10.0.0.3:2552"] } } } diff --git a/akka-docs/scala/remoting.rst b/akka-docs/scala/remoting.rst index 5a8005fbf2..2d460aa060 100644 --- a/akka-docs/scala/remoting.rst +++ b/akka-docs/scala/remoting.rst @@ -124,10 +124,10 @@ This is also done via configuration:: actor { deployment { /serviceA/aggregation { - router = “round-robin” + router = "round-robin" nr-of-instances = 10 - routees { - nodes = [“akka://app@10.0.0.2:2552”, “akka://app@10.0.0.3:2552”] + target { + nodes = ["akka://app@10.0.0.2:2552", "akka://app@10.0.0.3:2552"] } } } diff --git a/akka-remote/src/main/resources/reference.conf b/akka-remote/src/main/resources/reference.conf index b3d2027d91..7456b4f3d9 100644 --- a/akka-remote/src/main/resources/reference.conf +++ b/akka-remote/src/main/resources/reference.conf @@ -17,7 +17,7 @@ akka { # at that node e.g. "akka://sys@host:port" remote = "" - routees { + target { # A list of hostnames and ports for instantiating the children of a # non-direct router diff --git a/akka-remote/src/main/scala/akka/routing/RemoteRouters.scala b/akka-remote/src/main/scala/akka/routing/RemoteRouterConfig.scala similarity index 100% rename from akka-remote/src/main/scala/akka/routing/RemoteRouters.scala rename to akka-remote/src/main/scala/akka/routing/RemoteRouterConfig.scala