From 8d36499cd439d0df1c8eabdd2d58260a82caa795 Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Thu, 29 Sep 2016 15:01:05 +0200 Subject: [PATCH] shortname for provider config --- .../akka/cluster/pubsub/DistributedPubSubRestartSpec.scala | 2 +- .../scala/akka/http/AkkaHttpServerLatencyMultiNodeSpec.scala | 2 +- .../compress/HandshakeShouldDropCompressionTableSpec.scala | 2 +- .../src/main/resources/application.conf | 2 +- .../multi-jvm/scala/sample/cluster/stats/StatsSampleSpec.scala | 2 +- .../cluster/transformation/TransformationSampleSpec.scala | 2 +- project/AkkaBuild.scala | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/pubsub/DistributedPubSubRestartSpec.scala b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/pubsub/DistributedPubSubRestartSpec.scala index d7450cfd2c..7a582a1fd4 100644 --- a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/pubsub/DistributedPubSubRestartSpec.scala +++ b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/pubsub/DistributedPubSubRestartSpec.scala @@ -36,7 +36,7 @@ object DistributedPubSubRestartSpec extends MultiNodeConfig { commonConfig(ConfigFactory.parseString(""" akka.loglevel = INFO akka.cluster.pub-sub.gossip-interval = 500ms - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = cluster akka.remote.log-remote-lifecycle-events = off akka.cluster.auto-down-unreachable-after = off """)) diff --git a/akka-http-tests/src/multi-jvm/scala/akka/http/AkkaHttpServerLatencyMultiNodeSpec.scala b/akka-http-tests/src/multi-jvm/scala/akka/http/AkkaHttpServerLatencyMultiNodeSpec.scala index 0e480f80b2..11cf3ec5a2 100644 --- a/akka-http-tests/src/multi-jvm/scala/akka/http/AkkaHttpServerLatencyMultiNodeSpec.scala +++ b/akka-http-tests/src/multi-jvm/scala/akka/http/AkkaHttpServerLatencyMultiNodeSpec.scala @@ -32,7 +32,7 @@ object AkkaHttpServerLatencyMultiNodeSpec extends MultiNodeConfig { """ akka { actor.default-mailbox.mailbox-type = "akka.dispatch.UnboundedMailbox" - actor.provider = "akka.remote.RemoteActorRefProvider" + actor.provider = remote stream.materializer.debug.fuzzing-mode = off testconductor.barrier-timeout = 30m diff --git a/akka-remote/src/test/scala/akka/remote/artery/compress/HandshakeShouldDropCompressionTableSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/compress/HandshakeShouldDropCompressionTableSpec.scala index 8cc12fc4d8..3505185b51 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/compress/HandshakeShouldDropCompressionTableSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/compress/HandshakeShouldDropCompressionTableSpec.scala @@ -26,7 +26,7 @@ object HandshakeShouldDropCompressionTableSpec { akka { loglevel = INFO - actor.provider = "akka.remote.RemoteActorRefProvider" + actor.provider = remote remote.artery.enabled = on remote.artery.canonical.hostname = localhost remote.artery.canonical.port = 0 diff --git a/akka-samples/akka-sample-cluster-scala/src/main/resources/application.conf b/akka-samples/akka-sample-cluster-scala/src/main/resources/application.conf index 676a223350..ce7a714a67 100644 --- a/akka-samples/akka-sample-cluster-scala/src/main/resources/application.conf +++ b/akka-samples/akka-sample-cluster-scala/src/main/resources/application.conf @@ -1,7 +1,7 @@ #//#snippet akka { actor { - provider = "akka.cluster.ClusterActorRefProvider" + provider = cluster } remote { log-remote-lifecycle-events = off diff --git a/akka-samples/akka-sample-cluster-scala/src/multi-jvm/scala/sample/cluster/stats/StatsSampleSpec.scala b/akka-samples/akka-sample-cluster-scala/src/multi-jvm/scala/sample/cluster/stats/StatsSampleSpec.scala index dba0965de2..40d706ea52 100644 --- a/akka-samples/akka-sample-cluster-scala/src/multi-jvm/scala/sample/cluster/stats/StatsSampleSpec.scala +++ b/akka-samples/akka-sample-cluster-scala/src/multi-jvm/scala/sample/cluster/stats/StatsSampleSpec.scala @@ -40,7 +40,7 @@ object StatsSampleSpecConfig extends MultiNodeConfig { // this configuration will be used for all nodes // note that no fixed host names and ports are used commonConfig(ConfigFactory.parseString(""" - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = cluster akka.remote.log-remote-lifecycle-events = off akka.cluster.roles = [compute] #//#router-lookup-config diff --git a/akka-samples/akka-sample-cluster-scala/src/multi-jvm/scala/sample/cluster/transformation/TransformationSampleSpec.scala b/akka-samples/akka-sample-cluster-scala/src/multi-jvm/scala/sample/cluster/transformation/TransformationSampleSpec.scala index cd9324181c..d96b5edecf 100644 --- a/akka-samples/akka-sample-cluster-scala/src/multi-jvm/scala/sample/cluster/transformation/TransformationSampleSpec.scala +++ b/akka-samples/akka-sample-cluster-scala/src/multi-jvm/scala/sample/cluster/transformation/TransformationSampleSpec.scala @@ -42,7 +42,7 @@ object TransformationSampleSpecConfig extends MultiNodeConfig { // this configuration will be used for all nodes // note that no fixed host names and ports are used commonConfig(ConfigFactory.parseString(""" - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = cluster akka.remote.log-remote-lifecycle-events = off """)) diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala index ef30823021..ee05c18118 100644 --- a/project/AkkaBuild.scala +++ b/project/AkkaBuild.scala @@ -528,7 +528,7 @@ object AkkaBuild extends Build { |import scala.concurrent.duration._ |import akka.util.Timeout |var config = ConfigFactory.parseString("akka.stdout-loglevel=INFO,akka.loglevel=DEBUG,pinned{type=PinnedDispatcher,executor=thread-pool-executor,throughput=1000}") - |var remoteConfig = ConfigFactory.parseString("akka.remote.netty{port=0,use-dispatcher-for-io=akka.actor.default-dispatcher,execution-pool-size=0},akka.actor.provider=akka.remote.RemoteActorRefProvider").withFallback(config) + |var remoteConfig = ConfigFactory.parseString("akka.remote.netty{port=0,use-dispatcher-for-io=akka.actor.default-dispatcher,execution-pool-size=0},akka.actor.provider=remote").withFallback(config) |var system: ActorSystem = null |implicit def _system = system |def startSystem(remoting: Boolean = false) { system = ActorSystem("repl", if(remoting) remoteConfig else config); println("don’t forget to system.terminate()!") }