diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/AbstractRemoteActorMultiJvmSpec.scala b/akka-remote/src/multi-jvm/scala/akka/remote/AbstractRemoteActorMultiJvmSpec.scala index 9e2960465e..8fdb6f62e3 100755 --- a/akka-remote/src/multi-jvm/scala/akka/remote/AbstractRemoteActorMultiJvmSpec.scala +++ b/akka-remote/src/multi-jvm/scala/akka/remote/AbstractRemoteActorMultiJvmSpec.scala @@ -11,6 +11,12 @@ trait AbstractRemoteActorMultiJvmSpec { listOpt getOrElse List.fill(NrOfNodes)("localhost") } + def specString(count: Int): String = { + val specs = for ((host, idx) <- remotes.take(count).zipWithIndex) yield + "\"akka://AkkaRemoteSpec@%s:%d\"".format(host, 9991+idx) + specs.mkString(",") + } + val nodeConfigs = ((1 to NrOfNodes).toList zip remotes) map { case (idx, host) => ConfigFactory.parseString(""" diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/DirectRoutedRemoteActorMultiJvmSpec.scala b/akka-remote/src/multi-jvm/scala/akka/remote/DirectRoutedRemoteActorMultiJvmSpec.scala index 11a1d2fe86..1b7a561cda 100644 --- a/akka-remote/src/multi-jvm/scala/akka/remote/DirectRoutedRemoteActorMultiJvmSpec.scala +++ b/akka-remote/src/multi-jvm/scala/akka/remote/DirectRoutedRemoteActorMultiJvmSpec.scala @@ -22,10 +22,10 @@ object DirectRoutedRemoteActorMultiJvmSpec extends AbstractRemoteActorMultiJvmSp actor { provider = "akka.remote.RemoteActorRefProvider" deployment { - /service-hello.remote = "akka://AkkaRemoteSpec@localhost:9991" + /service-hello.remote = %s } } - }""") + }""" format specString(1)) } class DirectRoutedRemoteActorMultiJvmNode1 extends AkkaRemoteSpec(DirectRoutedRemoteActorMultiJvmSpec.nodeConfigs(0)) { diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/NewRemoteActorMultiJvmSpec.scala b/akka-remote/src/multi-jvm/scala/akka/remote/NewRemoteActorMultiJvmSpec.scala index a8fbffff4d..f7a02c3988 100644 --- a/akka-remote/src/multi-jvm/scala/akka/remote/NewRemoteActorMultiJvmSpec.scala +++ b/akka-remote/src/multi-jvm/scala/akka/remote/NewRemoteActorMultiJvmSpec.scala @@ -23,10 +23,10 @@ object NewRemoteActorMultiJvmSpec extends AbstractRemoteActorMultiJvmSpec { actor { provider = "akka.remote.RemoteActorRefProvider" deployment { - /service-hello.remote = "akka://AkkaRemoteSpec@localhost:9991" + /service-hello.remote = %s } } - }""") + }""" format specString(1)) } class NewRemoteActorMultiJvmNode1 extends AkkaRemoteSpec(NewRemoteActorMultiJvmSpec.nodeConfigs(0)) { diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/RandomRoutedRemoteActorMultiJvmSpec.scala b/akka-remote/src/multi-jvm/scala/akka/remote/RandomRoutedRemoteActorMultiJvmSpec.scala index 33bb8cd36e..b9440d28b3 100644 --- a/akka-remote/src/multi-jvm/scala/akka/remote/RandomRoutedRemoteActorMultiJvmSpec.scala +++ b/akka-remote/src/multi-jvm/scala/akka/remote/RandomRoutedRemoteActorMultiJvmSpec.scala @@ -23,11 +23,11 @@ object RandomRoutedRemoteActorMultiJvmSpec extends AbstractRemoteActorMultiJvmSp provider = "akka.remote.RemoteActorRefProvider" deployment { /service-hello.router = "random" - /service-hello.nr-of-instances = 3 - /service-hello.target.nodes = ["akka://AkkaRemoteSpec@localhost:9991","akka://AkkaRemoteSpec@localhost:9992","akka://AkkaRemoteSpec@localhost:9993"] + /service-hello.nr-of-instances = %d + /service-hello.target.nodes = [%s] } } - }""") + }""" format (3, specString(3))) } class RandomRoutedRemoteActorMultiJvmNode1 extends AkkaRemoteSpec(RandomRoutedRemoteActorMultiJvmSpec.nodeConfigs(0)) { diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/RoundRobinRoutedRemoteActorMultiJvmSpec.scala b/akka-remote/src/multi-jvm/scala/akka/remote/RoundRobinRoutedRemoteActorMultiJvmSpec.scala index a04d7bd855..5b5c6cbf6d 100644 --- a/akka-remote/src/multi-jvm/scala/akka/remote/RoundRobinRoutedRemoteActorMultiJvmSpec.scala +++ b/akka-remote/src/multi-jvm/scala/akka/remote/RoundRobinRoutedRemoteActorMultiJvmSpec.scala @@ -24,11 +24,11 @@ object RoundRobinRoutedRemoteActorMultiJvmSpec extends AbstractRemoteActorMultiJ provider = "akka.remote.RemoteActorRefProvider" deployment { /service-hello.router = "round-robin" - /service-hello.nr-of-instances = 3 - /service-hello.target.nodes = ["akka://AkkaRemoteSpec@localhost:9991","akka://AkkaRemoteSpec@localhost:9992","akka://AkkaRemoteSpec@localhost:9993"] + /service-hello.nr-of-instances = %d + /service-hello.target.nodes = [%s] } } - }""") + }""" format (3, specString(3))) } class RoundRobinRoutedRemoteActorMultiJvmNode1 extends AkkaRemoteSpec(RoundRobinRoutedRemoteActorMultiJvmSpec.nodeConfigs(0)) { diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/ScatterGatherRoutedRemoteActorMultiJvmSpec.scala b/akka-remote/src/multi-jvm/scala/akka/remote/ScatterGatherRoutedRemoteActorMultiJvmSpec.scala index 04800d7c89..c34de28882 100644 --- a/akka-remote/src/multi-jvm/scala/akka/remote/ScatterGatherRoutedRemoteActorMultiJvmSpec.scala +++ b/akka-remote/src/multi-jvm/scala/akka/remote/ScatterGatherRoutedRemoteActorMultiJvmSpec.scala @@ -23,11 +23,11 @@ object ScatterGatherRoutedRemoteActorMultiJvmSpec extends AbstractRemoteActorMul provider = "akka.remote.RemoteActorRefProvider" deployment { /service-hello.router = "scatter-gather" - /service-hello.nr-of-instances = 3 - /service-hello.target.nodes = ["akka://AkkaRemoteSpec@localhost:9991","akka://AkkaRemoteSpec@localhost:9992","akka://AkkaRemoteSpec@localhost:9993"] + /service-hello.nr-of-instances = %d + /service-hello.target.nodes = [%s] } } - }""") + }""" format (3, specString(3))) } class ScatterGatherRoutedRemoteActorMultiJvmNode1 extends AkkaRemoteSpec(ScatterGatherRoutedRemoteActorMultiJvmSpec.nodeConfigs(0)) {