diff --git a/akka-actor/src/main/resources/reference.conf b/akka-actor/src/main/resources/reference.conf index a58c8e0c21..394025c4db 100644 --- a/akka-actor/src/main/resources/reference.conf +++ b/akka-actor/src/main/resources/reference.conf @@ -83,9 +83,11 @@ akka { actor { + # Either one of "local", "remote" or "cluster" or the # FQCN of the ActorRefProvider to be used; the below is the built-in default, - # another one is akka.remote.RemoteActorRefProvider in the akka-remote bundle. - provider = "akka.actor.LocalActorRefProvider" + # note that "remote" and "cluster" requires the akka-remote and akka-cluster + # artifacts to be on the classpath. + provider = "local" # The guardian "/user" will use this class to obtain its supervisorStrategy. # It needs to be a subclass of akka.actor.SupervisorStrategyConfigurator. diff --git a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala index c0789e1481..15f190bbfd 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala @@ -166,7 +166,15 @@ object ActorSystem { import config._ final val ConfigVersion: String = getString("akka.version") - final val ProviderClass: String = getString("akka.actor.provider") + final val ProviderClass: String = + getString("akka.actor.provider") match { + case "local" => classOf[LocalActorRefProvider].getName + // these two cannot be referenced by class as they may not be on the classpath + case "remote" => "akka.remote.RemoteActorRefProvider" + case "cluster" => "akka.cluster.ClusterActorRefProvider" + case fqcn => fqcn + } + final val SupervisorStrategyClass: String = getString("akka.actor.guardian-supervisor-strategy") final val CreationTimeout: Timeout = Timeout(config.getMillisDuration("akka.actor.creation-timeout")) final val UnstartedPushTimeout: Timeout = Timeout(config.getMillisDuration("akka.actor.unstarted-push-timeout")) @@ -831,6 +839,7 @@ private[akka] class ActorSystemImpl( /** * Adds a Runnable that will be executed on ActorSystem termination. * Note that callbacks are executed in reverse order of insertion. + * * @param r The callback to be executed on ActorSystem termination * Throws RejectedExecutionException if called after ActorSystem has been terminated. */ diff --git a/akka-bench-jmh/src/main/scala/akka/remote/artery/CodecBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/remote/artery/CodecBenchmark.scala index 95969a10b4..b02ca87672 100644 --- a/akka-bench-jmh/src/main/scala/akka/remote/artery/CodecBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/remote/artery/CodecBenchmark.scala @@ -40,7 +40,7 @@ class CodecBenchmark { """ akka { loglevel = WARNING - actor.provider = "akka.remote.RemoteActorRefProvider" + actor.provider = remote remote.artery.enabled = on remote.artery.hostname = localhost remote.artery.port = 0 diff --git a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/TestUtil.scala b/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/TestUtil.scala index 6f6689b3e2..243915a8a8 100644 --- a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/TestUtil.scala +++ b/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/TestUtil.scala @@ -153,7 +153,7 @@ object MetricsConfig { gossip-interval = 1s } } - akka.actor.provider = "akka.remote.RemoteActorRefProvider" + akka.actor.provider = remote """ /** Test w/o cluster, with collection disabled. */ @@ -163,7 +163,7 @@ object MetricsConfig { enabled = off } } - akka.actor.provider = "akka.remote.RemoteActorRefProvider" + akka.actor.provider = remote """ /** Test in cluster, with manual collection activation, collector mock, fast. */ @@ -178,7 +178,7 @@ object MetricsConfig { fallback = false } } - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" """ } diff --git a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/protobuf/MessageSerializerSpec.scala b/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/protobuf/MessageSerializerSpec.scala index ffa044a193..5ae834d543 100644 --- a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/protobuf/MessageSerializerSpec.scala +++ b/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/protobuf/MessageSerializerSpec.scala @@ -15,7 +15,7 @@ import akka.cluster.TestMember import akka.cluster.metrics.MetricsGossipEnvelope class MessageSerializerSpec extends AkkaSpec( - "akka.actor.provider = akka.cluster.ClusterActorRefProvider") { + "akka.actor.provider = cluster") { val serializer = new MessageSerializer(system.asInstanceOf[ExtendedActorSystem]) diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingCustomShardAllocationSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingCustomShardAllocationSpec.scala index ba1c05e08d..864c2ad949 100644 --- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingCustomShardAllocationSpec.scala +++ b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingCustomShardAllocationSpec.scala @@ -85,7 +85,7 @@ abstract class ClusterShardingCustomShardAllocationSpecConfig(val mode: String) commonConfig(ConfigFactory.parseString(s""" akka.loglevel = INFO - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" akka.remote.log-remote-lifecycle-events = off akka.persistence.journal.plugin = "akka.persistence.journal.leveldb-shared" akka.persistence.journal.leveldb-shared { diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingFailureSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingFailureSpec.scala index 887b82d7bc..2086ee0e75 100644 --- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingFailureSpec.scala +++ b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingFailureSpec.scala @@ -55,7 +55,7 @@ abstract class ClusterShardingFailureSpecConfig(val mode: String) extends MultiN commonConfig(ConfigFactory.parseString(s""" akka.loglevel = INFO - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" akka.remote.log-remote-lifecycle-events = off akka.cluster.auto-down-unreachable-after = 0s akka.cluster.roles = ["backend"] diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGetStateSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGetStateSpec.scala index 2cea3817f1..baf9f7c3ea 100644 --- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGetStateSpec.scala +++ b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGetStateSpec.scala @@ -46,7 +46,7 @@ object ClusterShardingGetStateSpecConfig extends MultiNodeConfig { commonConfig(ConfigFactory.parseString(""" akka.loglevel = INFO - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" akka.remote.log-remote-lifecycle-events = off akka.cluster.metrics.enabled = off akka.cluster.auto-down-unreachable-after = 0s diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGetStatsSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGetStatsSpec.scala index 149577b3e0..2d55b5c555 100644 --- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGetStatsSpec.scala +++ b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGetStatsSpec.scala @@ -47,7 +47,7 @@ object ClusterShardingGetStatsSpecConfig extends MultiNodeConfig { commonConfig(ConfigFactory.parseString(""" akka.loglevel = INFO - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" akka.remote.log-remote-lifecycle-events = off akka.log-dead-letters-during-shutdown = off akka.cluster.metrics.enabled = off diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGracefulShutdownSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGracefulShutdownSpec.scala index 00c3ff0400..2433a53a3d 100644 --- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGracefulShutdownSpec.scala +++ b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGracefulShutdownSpec.scala @@ -72,7 +72,7 @@ abstract class ClusterShardingGracefulShutdownSpecConfig(val mode: String) exten commonConfig(ConfigFactory.parseString(s""" akka.loglevel = INFO - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" akka.remote.log-remote-lifecycle-events = off akka.persistence.journal.plugin = "akka.persistence.journal.leveldb-shared" akka.persistence.journal.leveldb-shared { diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingLeavingSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingLeavingSpec.scala index fb88783782..56beb82211 100644 --- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingLeavingSpec.scala +++ b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingLeavingSpec.scala @@ -63,7 +63,7 @@ abstract class ClusterShardingLeavingSpecConfig(val mode: String) extends MultiN commonConfig(ConfigFactory.parseString(s""" akka.loglevel = INFO - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" akka.remote.log-remote-lifecycle-events = off akka.cluster.auto-down-unreachable-after = 0s akka.persistence.journal.plugin = "akka.persistence.journal.leveldb-shared" diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingSpec.scala index 0788c895cb..cc9e19b88a 100644 --- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingSpec.scala +++ b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingSpec.scala @@ -125,7 +125,7 @@ abstract class ClusterShardingSpecConfig(val mode: String) extends MultiNodeConf commonConfig(ConfigFactory.parseString(s""" akka.loglevel = INFO - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" akka.remote.log-remote-lifecycle-events = off akka.cluster.auto-down-unreachable-after = 0s akka.cluster.roles = ["backend"] diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/RemoveInternalClusterShardingDataSpec.scala b/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/RemoveInternalClusterShardingDataSpec.scala index 817c49a4c1..b772d60d01 100644 --- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/RemoveInternalClusterShardingDataSpec.scala +++ b/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/RemoveInternalClusterShardingDataSpec.scala @@ -27,7 +27,7 @@ import org.apache.commons.io.FileUtils object RemoveInternalClusterShardingDataSpec { val config = """ akka.loglevel = INFO - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" akka.remote.netty.tcp.port = 0 akka.persistence.journal.plugin = "akka.persistence.journal.leveldb" akka.persistence.journal.leveldb { diff --git a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/client/ClusterClientSpec.scala b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/client/ClusterClientSpec.scala index f55cf493ee..26d549e40c 100644 --- a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/client/ClusterClientSpec.scala +++ b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/client/ClusterClientSpec.scala @@ -30,7 +30,7 @@ object ClusterClientSpec extends MultiNodeConfig { commonConfig(ConfigFactory.parseString(""" akka.loglevel = INFO - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" akka.remote.log-remote-lifecycle-events = off akka.cluster.auto-down-unreachable-after = 0s akka.cluster.client.heartbeat-interval = 1s diff --git a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/client/ClusterClientStopSpec.scala b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/client/ClusterClientStopSpec.scala index f5112076b2..95949577a1 100644 --- a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/client/ClusterClientStopSpec.scala +++ b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/client/ClusterClientStopSpec.scala @@ -19,7 +19,7 @@ object ClusterClientStopSpec extends MultiNodeConfig { val second = role("second") commonConfig(ConfigFactory.parseString(""" akka.loglevel = INFO - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" akka.remote.log-remote-lifecycle-events = off akka.cluster.client { heartbeat-interval = 1s diff --git a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/pubsub/DistributedPubSubMediatorSpec.scala b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/pubsub/DistributedPubSubMediatorSpec.scala index 09a761863b..1483e8784c 100644 --- a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/pubsub/DistributedPubSubMediatorSpec.scala +++ b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/pubsub/DistributedPubSubMediatorSpec.scala @@ -28,7 +28,7 @@ object DistributedPubSubMediatorSpec extends MultiNodeConfig { commonConfig(ConfigFactory.parseString(""" akka.loglevel = INFO - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" akka.remote.log-remote-lifecycle-events = off akka.cluster.auto-down-unreachable-after = 0s akka.cluster.pub-sub.max-delta-elements = 500 diff --git a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerChaosSpec.scala b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerChaosSpec.scala index c3fd74b90a..122348fb63 100644 --- a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerChaosSpec.scala +++ b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerChaosSpec.scala @@ -38,7 +38,7 @@ object ClusterSingletonManagerChaosSpec extends MultiNodeConfig { commonConfig(ConfigFactory.parseString(""" akka.loglevel = INFO - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" akka.remote.log-remote-lifecycle-events = off akka.cluster.auto-down-unreachable-after = 0s """)) diff --git a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerLeaveSpec.scala b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerLeaveSpec.scala index 71652eee0f..b66fe09871 100644 --- a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerLeaveSpec.scala +++ b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerLeaveSpec.scala @@ -35,7 +35,7 @@ object ClusterSingletonManagerLeaveSpec extends MultiNodeConfig { commonConfig(ConfigFactory.parseString(""" akka.loglevel = INFO - 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-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerSpec.scala b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerSpec.scala index fe5ceab877..2901929d3a 100644 --- a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerSpec.scala +++ b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerSpec.scala @@ -41,7 +41,7 @@ object ClusterSingletonManagerSpec extends MultiNodeConfig { commonConfig(ConfigFactory.parseString(""" akka.loglevel = INFO - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" akka.remote.log-remote-lifecycle-events = off akka.cluster.auto-down-unreachable-after = 0s """)) diff --git a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerStartupSpec.scala b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerStartupSpec.scala index 0b0b42b7a8..3e6ab7f6df 100644 --- a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerStartupSpec.scala +++ b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerStartupSpec.scala @@ -35,7 +35,7 @@ object ClusterSingletonManagerStartupSpec extends MultiNodeConfig { commonConfig(ConfigFactory.parseString(""" akka.loglevel = INFO - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" akka.remote.log-remote-lifecycle-events = off akka.cluster.auto-down-unreachable-after = 0s """)) diff --git a/akka-cluster-tools/src/test/java/akka/cluster/client/ClusterClientTest.java b/akka-cluster-tools/src/test/java/akka/cluster/client/ClusterClientTest.java index 71117b1629..88d4614ac1 100644 --- a/akka-cluster-tools/src/test/java/akka/cluster/client/ClusterClientTest.java +++ b/akka-cluster-tools/src/test/java/akka/cluster/client/ClusterClientTest.java @@ -21,7 +21,7 @@ public class ClusterClientTest extends JUnitSuite { public static AkkaJUnitActorSystemResource actorSystemResource = new AkkaJUnitActorSystemResource("DistributedPubSubMediatorTest", ConfigFactory.parseString( - "akka.actor.provider = \"akka.cluster.ClusterActorRefProvider\"\n" + + "akka.actor.provider = \"cluster\"\n" + "akka.remote.netty.tcp.port=0")); private final ActorSystem system = actorSystemResource.getSystem(); diff --git a/akka-cluster-tools/src/test/java/akka/cluster/pubsub/DistributedPubSubMediatorTest.java b/akka-cluster-tools/src/test/java/akka/cluster/pubsub/DistributedPubSubMediatorTest.java index c1c9311bd6..91fb51d33e 100644 --- a/akka-cluster-tools/src/test/java/akka/cluster/pubsub/DistributedPubSubMediatorTest.java +++ b/akka-cluster-tools/src/test/java/akka/cluster/pubsub/DistributedPubSubMediatorTest.java @@ -25,7 +25,7 @@ public class DistributedPubSubMediatorTest extends JUnitSuite { public static AkkaJUnitActorSystemResource actorSystemResource = new AkkaJUnitActorSystemResource("DistributedPubSubMediatorTest", ConfigFactory.parseString( - "akka.actor.provider = \"akka.cluster.ClusterActorRefProvider\"\n" + + "akka.actor.provider = \"cluster\"\n" + "akka.remote.netty.tcp.port=0")); private final ActorSystem system = actorSystemResource.getSystem(); diff --git a/akka-cluster-tools/src/test/scala/akka/cluster/pubsub/DistributedPubSubMediatorRouterSpec.scala b/akka-cluster-tools/src/test/scala/akka/cluster/pubsub/DistributedPubSubMediatorRouterSpec.scala index f1c05a2752..52bf506cfb 100644 --- a/akka-cluster-tools/src/test/scala/akka/cluster/pubsub/DistributedPubSubMediatorRouterSpec.scala +++ b/akka-cluster-tools/src/test/scala/akka/cluster/pubsub/DistributedPubSubMediatorRouterSpec.scala @@ -15,7 +15,7 @@ case class UnwrappedMessage(msg: String) object DistributedPubSubMediatorRouterSpec { def config(routingLogic: String) = s""" akka.loglevel = INFO - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" akka.remote.netty.tcp.port=0 akka.remote.log-remote-lifecycle-events = off akka.cluster.pub-sub.routing-logic = $routingLogic diff --git a/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonProxySpec.scala b/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonProxySpec.scala index 005f7b608d..0c32cd051a 100644 --- a/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonProxySpec.scala +++ b/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonProxySpec.scala @@ -68,7 +68,7 @@ object ClusterSingletonProxySpec { min-nr-of-members = 2 } - actor.provider = "akka.cluster.ClusterActorRefProvider" + actor.provider = "cluster" remote { log-remote-lifecycle-events = off diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiNodeClusterSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiNodeClusterSpec.scala index 064ec57774..ed5ac063ff 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiNodeClusterSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiNodeClusterSpec.scala @@ -34,7 +34,7 @@ object MultiNodeClusterSpec { if (failureDetectorPuppet) clusterConfigWithFailureDetectorPuppet else clusterConfig def clusterConfig: Config = ConfigFactory.parseString(""" - akka.actor.provider = akka.cluster.ClusterActorRefProvider + akka.actor.provider = cluster akka.cluster { jmx.enabled = off gossip-interval = 200 ms diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/StressSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/StressSpec.scala index 1551253ed0..06ae2bc94e 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/StressSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/StressSpec.scala @@ -124,7 +124,7 @@ private[cluster] object StressMultiJvmSpec extends MultiNodeConfig { akka.actor.serialize-messages = off akka.actor.serialize-creators = off - akka.actor.provider = akka.cluster.ClusterActorRefProvider + akka.actor.provider = cluster akka.cluster { failure-detector.acceptable-heartbeat-pause = 5s auto-down-unreachable-after = 1s diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/SunnyWeatherSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/SunnyWeatherSpec.scala index c9e0bb7104..7ab3a00bfb 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/SunnyWeatherSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/SunnyWeatherSpec.scala @@ -24,7 +24,7 @@ class SunnyWeatherMultiJvmSpec(artery: Boolean) extends MultiNodeConfig { val common = """ akka { - actor.provider = akka.cluster.ClusterActorRefProvider + actor.provider = cluster loggers = ["akka.testkit.TestEventListener"] loglevel = INFO remote.log-remote-lifecycle-events = off diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterDeployerSpec.scala b/akka-cluster/src/test/scala/akka/cluster/ClusterDeployerSpec.scala index 9409b89019..d993b58e64 100644 --- a/akka-cluster/src/test/scala/akka/cluster/ClusterDeployerSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/ClusterDeployerSpec.scala @@ -14,7 +14,7 @@ import akka.cluster.routing.ClusterRouterGroupSettings object ClusterDeployerSpec { val deployerConf = ConfigFactory.parseString(""" - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" akka.actor.deployment { /user/service1 { router = round-robin-pool diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterDomainEventPublisherSpec.scala b/akka-cluster/src/test/scala/akka/cluster/ClusterDomainEventPublisherSpec.scala index 766a09479b..c3232097df 100644 --- a/akka-cluster/src/test/scala/akka/cluster/ClusterDomainEventPublisherSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/ClusterDomainEventPublisherSpec.scala @@ -21,7 +21,7 @@ import akka.testkit.TestProbe object ClusterDomainEventPublisherSpec { val config = """ - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" akka.remote.netty.tcp.port = 0 """ } diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterSpec.scala b/akka-cluster/src/test/scala/akka/cluster/ClusterSpec.scala index 7fec648cc4..2abf34c82f 100644 --- a/akka-cluster/src/test/scala/akka/cluster/ClusterSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/ClusterSpec.scala @@ -25,7 +25,7 @@ object ClusterSpec { publish-stats-interval = 0 s # always, when it happens failure-detector.implementation-class = akka.cluster.FailureDetectorPuppet } - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" akka.remote.log-remote-lifecycle-events = off akka.remote.netty.tcp.port = 0 #akka.loglevel = DEBUG @@ -107,7 +107,7 @@ class ClusterSpec extends AkkaSpec(ClusterSpec.config) with ImplicitSender { "allow join and leave with local address" in { val sys2 = ActorSystem("ClusterSpec2", ConfigFactory.parseString(""" - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" akka.remote.netty.tcp.port = 0 """)) try { diff --git a/akka-cluster/src/test/scala/akka/cluster/DowningProviderSpec.scala b/akka-cluster/src/test/scala/akka/cluster/DowningProviderSpec.scala index 87025c791b..d1c540422b 100644 --- a/akka-cluster/src/test/scala/akka/cluster/DowningProviderSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/DowningProviderSpec.scala @@ -38,7 +38,7 @@ class DowningProviderSpec extends WordSpec with Matchers { """ akka { loglevel = WARNING - actor.provider = "akka.cluster.ClusterActorRefProvider" + actor.provider = "cluster" remote { netty.tcp { hostname = "127.0.0.1" diff --git a/akka-cluster/src/test/scala/akka/cluster/MetricsCollectorSpec.scala b/akka-cluster/src/test/scala/akka/cluster/MetricsCollectorSpec.scala index a07aea4f17..55823c387d 100644 --- a/akka-cluster/src/test/scala/akka/cluster/MetricsCollectorSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/MetricsCollectorSpec.scala @@ -21,7 +21,7 @@ object MetricsEnabledSpec { akka.cluster.metrics.enabled = on akka.cluster.metrics.collect-interval = 1 s akka.cluster.metrics.gossip-interval = 1 s - akka.actor.provider = "akka.remote.RemoteActorRefProvider" + akka.actor.provider = remote """ } diff --git a/akka-cluster/src/test/scala/akka/cluster/StartupWithOneThreadSpec.scala b/akka-cluster/src/test/scala/akka/cluster/StartupWithOneThreadSpec.scala index 028a881e32..54d3ae9db7 100644 --- a/akka-cluster/src/test/scala/akka/cluster/StartupWithOneThreadSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/StartupWithOneThreadSpec.scala @@ -14,7 +14,7 @@ import akka.actor.ActorLogging object StartupWithOneThreadSpec { val config = """ - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" akka.actor.creation-timeout = 10s akka.remote.netty.tcp.port = 0 diff --git a/akka-cluster/src/test/scala/akka/cluster/protobuf/ClusterMessageSerializerSpec.scala b/akka-cluster/src/test/scala/akka/cluster/protobuf/ClusterMessageSerializerSpec.scala index 8ef6d7e938..e94f1b359c 100644 --- a/akka-cluster/src/test/scala/akka/cluster/protobuf/ClusterMessageSerializerSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/protobuf/ClusterMessageSerializerSpec.scala @@ -11,7 +11,7 @@ import collection.immutable.SortedSet import akka.testkit.AkkaSpec class ClusterMessageSerializerSpec extends AkkaSpec( - "akka.actor.provider = akka.cluster.ClusterActorRefProvider") { + "akka.actor.provider = cluster") { val serializer = new ClusterMessageSerializer(system.asInstanceOf[ExtendedActorSystem]) diff --git a/akka-cluster/src/test/scala/akka/cluster/routing/ClusterRouterSupervisorSpec.scala b/akka-cluster/src/test/scala/akka/cluster/routing/ClusterRouterSupervisorSpec.scala index e034b67ecb..0b895f33b3 100644 --- a/akka-cluster/src/test/scala/akka/cluster/routing/ClusterRouterSupervisorSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/routing/ClusterRouterSupervisorSpec.scala @@ -22,7 +22,7 @@ object ClusterRouterSupervisorSpec { } class ClusterRouterSupervisorSpec extends AkkaSpec(""" - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" akka.remote.netty.tcp.port = 0 """) { diff --git a/akka-cluster/src/test/scala/akka/cluster/routing/WeightedRouteesSpec.scala b/akka-cluster/src/test/scala/akka/cluster/routing/WeightedRouteesSpec.scala index 224394fdae..49ae6f32fc 100644 --- a/akka-cluster/src/test/scala/akka/cluster/routing/WeightedRouteesSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/routing/WeightedRouteesSpec.scala @@ -12,7 +12,7 @@ import akka.routing.ActorSelectionRoutee import akka.routing.ActorRefRoutee class WeightedRouteesSpec extends AkkaSpec(ConfigFactory.parseString(""" - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" akka.remote.netty.tcp.port = 0 """)) { diff --git a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/JepsenInspiredInsertSpec.scala b/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/JepsenInspiredInsertSpec.scala index b7a70f86b4..cc1c5cb0c5 100644 --- a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/JepsenInspiredInsertSpec.scala +++ b/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/JepsenInspiredInsertSpec.scala @@ -24,7 +24,7 @@ object JepsenInspiredInsertSpec extends MultiNodeConfig { commonConfig(ConfigFactory.parseString(""" akka.loglevel = INFO - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" akka.log-dead-letters = off akka.log-dead-letters-during-shutdown = off akka.remote.log-remote-lifecycle-events = ERROR diff --git a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/PerformanceSpec.scala b/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/PerformanceSpec.scala index 589b55d948..d2b1142621 100644 --- a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/PerformanceSpec.scala +++ b/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/PerformanceSpec.scala @@ -26,7 +26,7 @@ object PerformanceSpec extends MultiNodeConfig { commonConfig(ConfigFactory.parseString(""" akka.loglevel = ERROR akka.stdout-loglevel = ERROR - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" akka.log-dead-letters = off akka.log-dead-letters-during-shutdown = off akka.remote.log-remote-lifecycle-events = ERROR diff --git a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorChaosSpec.scala b/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorChaosSpec.scala index 7fe8e31c73..44cea5dbcb 100644 --- a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorChaosSpec.scala +++ b/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorChaosSpec.scala @@ -22,7 +22,7 @@ object ReplicatorChaosSpec extends MultiNodeConfig { commonConfig(ConfigFactory.parseString(""" akka.loglevel = INFO - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" akka.cluster.roles = ["backend"] akka.log-dead-letters-during-shutdown = off """)) diff --git a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorPruningSpec.scala b/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorPruningSpec.scala index b24b185779..10c57cc006 100644 --- a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorPruningSpec.scala +++ b/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorPruningSpec.scala @@ -21,7 +21,7 @@ object ReplicatorPruningSpec extends MultiNodeConfig { commonConfig(ConfigFactory.parseString(""" akka.loglevel = INFO - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" akka.log-dead-letters-during-shutdown = off """)) diff --git a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorSpec.scala b/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorSpec.scala index 2c72c3cf0c..78efdb3a46 100644 --- a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorSpec.scala +++ b/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorSpec.scala @@ -20,7 +20,7 @@ object ReplicatorSpec extends MultiNodeConfig { commonConfig(ConfigFactory.parseString(""" akka.loglevel = INFO - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" akka.log-dead-letters-during-shutdown = off """)) diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/LocalConcurrencySpec.scala b/akka-distributed-data/src/test/scala/akka/cluster/ddata/LocalConcurrencySpec.scala index ccc2a2f7eb..854f0d359d 100644 --- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/LocalConcurrencySpec.scala +++ b/akka-distributed-data/src/test/scala/akka/cluster/ddata/LocalConcurrencySpec.scala @@ -44,7 +44,7 @@ class LocalConcurrencySpec(_system: ActorSystem) extends TestKit(_system) this(ActorSystem( "LocalConcurrencySpec", ConfigFactory.parseString(""" - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" akka.remote.netty.tcp.port=0 """))) } diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/LotsOfDataBot.scala b/akka-distributed-data/src/test/scala/akka/cluster/ddata/LotsOfDataBot.scala index 89c6b12071..ef9732b079 100644 --- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/LotsOfDataBot.scala +++ b/akka-distributed-data/src/test/scala/akka/cluster/ddata/LotsOfDataBot.scala @@ -40,7 +40,7 @@ object LotsOfDataBot { ConfigFactory.parseString(""" passive = off max-entries = 100000 - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" akka.remote { netty.tcp { hostname = "127.0.0.1" diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/WriteAggregatorSpec.scala b/akka-distributed-data/src/test/scala/akka/cluster/ddata/WriteAggregatorSpec.scala index 5ce047ddcf..9b8cb45a9d 100644 --- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/WriteAggregatorSpec.scala +++ b/akka-distributed-data/src/test/scala/akka/cluster/ddata/WriteAggregatorSpec.scala @@ -50,7 +50,7 @@ object WriteAggregatorSpec { } class WriteAggregatorSpec extends AkkaSpec(""" - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" akka.remote.netty.tcp.port=0 """) with ImplicitSender { diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatedDataSerializerSpec.scala b/akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatedDataSerializerSpec.scala index 3512224da2..e96cca39e1 100644 --- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatedDataSerializerSpec.scala +++ b/akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatedDataSerializerSpec.scala @@ -28,7 +28,7 @@ import com.typesafe.config.ConfigFactory class ReplicatedDataSerializerSpec extends TestKit(ActorSystem( "ReplicatedDataSerializerSpec", ConfigFactory.parseString(""" - akka.actor.provider=akka.cluster.ClusterActorRefProvider + akka.actor.provider=cluster akka.remote.netty.tcp.port=0 """))) with WordSpecLike with Matchers with BeforeAndAfterAll { diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatorMessageSerializerSpec.scala b/akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatorMessageSerializerSpec.scala index 7206a7d11f..314e1f34b9 100644 --- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatorMessageSerializerSpec.scala +++ b/akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatorMessageSerializerSpec.scala @@ -26,7 +26,7 @@ import com.typesafe.config.ConfigFactory class ReplicatorMessageSerializerSpec extends TestKit(ActorSystem( "ReplicatorMessageSerializerSpec", ConfigFactory.parseString(""" - akka.actor.provider=akka.cluster.ClusterActorRefProvider + akka.actor.provider=cluster akka.remote.netty.tcp.port=0 """))) with WordSpecLike with Matchers with BeforeAndAfterAll { diff --git a/akka-docs/rst/general/configuration.rst b/akka-docs/rst/general/configuration.rst index 1fd9624337..c8df1b3a2e 100644 --- a/akka-docs/rst/general/configuration.rst +++ b/akka-docs/rst/general/configuration.rst @@ -153,7 +153,7 @@ A custom ``application.conf`` might look like this:: logging-filter = "akka.event.slf4j.Slf4jLoggingFilter" actor { - provider = "akka.cluster.ClusterActorRefProvider" + provider = "cluster" default-dispatcher { # Throughput for default Dispatcher, set to 1 for as fair as possible diff --git a/akka-docs/rst/java/cluster-client.rst b/akka-docs/rst/java/cluster-client.rst index 29aa4413a6..8f95e46d0c 100644 --- a/akka-docs/rst/java/cluster-client.rst +++ b/akka-docs/rst/java/cluster-client.rst @@ -19,8 +19,8 @@ i.e. not necessarily the initial contact points. provided in a more efficient way by :ref:`distributed-pub-sub-java` for actors that belong to the same cluster. -Also, note it's necessary to change ``akka.actor.provider`` from ``akka.actor.LocalActorRefProvider`` -to ``akka.remote.RemoteActorRefProvider`` or ``akka.cluster.ClusterActorRefProvider`` when using +Also, note it's necessary to change ``akka.actor.provider`` from ``local`` +to ``remote`` or ``cluster`` when using the cluster client. The receptionist is supposed to be started on all nodes, or all nodes with specified role, diff --git a/akka-docs/rst/java/cluster-usage.rst b/akka-docs/rst/java/cluster-usage.rst index a5c8598d02..169917f11d 100644 --- a/akka-docs/rst/java/cluster-usage.rst +++ b/akka-docs/rst/java/cluster-usage.rst @@ -31,7 +31,7 @@ The ``application.conf`` configuration looks like this: .. includecode:: ../../../akka-samples/akka-sample-cluster-java/src/main/resources/application.conf#snippet To enable cluster capabilities in your Akka project you should, at a minimum, add the :ref:`remoting-java` -settings, but with ``akka.cluster.ClusterActorRefProvider``. +settings, but with ``cluster``. The ``akka.cluster.seed-nodes`` should normally also be added to your ``application.conf`` file. .. note:: diff --git a/akka-docs/rst/java/remoting.rst b/akka-docs/rst/java/remoting.rst index 7fb1cbc8e4..02ec42a18e 100644 --- a/akka-docs/rst/java/remoting.rst +++ b/akka-docs/rst/java/remoting.rst @@ -31,7 +31,7 @@ to your ``application.conf`` file:: akka { actor { - provider = "akka.remote.RemoteActorRefProvider" + provider = remote } remote { enabled-transports = ["akka.remote.netty.tcp"] @@ -44,7 +44,7 @@ to your ``application.conf`` file:: As you can see in the example above there are four things you need to add to get started: -* Change provider from ``akka.actor.LocalActorRefProvider`` to ``akka.remote.RemoteActorRefProvider`` +* Change provider from ``local`` to ``remote`` * Add host name - the machine you want to run the actor system on; this host name is exactly what is passed to remote systems in order to identify this system and consequently used for connecting back to this system if need be, diff --git a/akka-docs/rst/scala/cluster-client.rst b/akka-docs/rst/scala/cluster-client.rst index 1289f325b4..b6a65bec1f 100644 --- a/akka-docs/rst/scala/cluster-client.rst +++ b/akka-docs/rst/scala/cluster-client.rst @@ -19,8 +19,8 @@ i.e. not necessarily the initial contact points. provided in a more efficient way by :ref:`distributed-pub-sub-scala` for actors that belong to the same cluster. -Also, note it's necessary to change ``akka.actor.provider`` from ``akka.actor.LocalActorRefProvider`` -to ``akka.remote.RemoteActorRefProvider`` or ``akka.cluster.ClusterActorRefProvider`` when using +Also, note it's necessary to change ``akka.actor.provider`` from ``local`` +to ``remote`` or ``cluster`` when using the cluster client. The receptionist is supposed to be started on all nodes, or all nodes with specified role, diff --git a/akka-docs/rst/scala/cluster-usage.rst b/akka-docs/rst/scala/cluster-usage.rst index eeca0c151f..058b17a472 100644 --- a/akka-docs/rst/scala/cluster-usage.rst +++ b/akka-docs/rst/scala/cluster-usage.rst @@ -25,7 +25,7 @@ The ``application.conf`` configuration looks like this: .. includecode:: ../../../akka-samples/akka-sample-cluster-scala/src/main/resources/application.conf#snippet To enable cluster capabilities in your Akka project you should, at a minimum, add the :ref:`remoting-scala` -settings, but with ``akka.cluster.ClusterActorRefProvider``. +settings, but with ``cluster``. The ``akka.cluster.seed-nodes`` should normally also be added to your ``application.conf`` file. .. note:: diff --git a/akka-docs/rst/scala/code/docs/cluster/ClusterDocSpec.scala b/akka-docs/rst/scala/code/docs/cluster/ClusterDocSpec.scala index 22cedd56c1..8680cd9406 100644 --- a/akka-docs/rst/scala/code/docs/cluster/ClusterDocSpec.scala +++ b/akka-docs/rst/scala/code/docs/cluster/ClusterDocSpec.scala @@ -10,7 +10,7 @@ object ClusterDocSpec { val config = """ - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" akka.remote.netty.tcp.port = 0 """ } diff --git a/akka-docs/rst/scala/code/docs/ddata/DistributedDataDocSpec.scala b/akka-docs/rst/scala/code/docs/ddata/DistributedDataDocSpec.scala index 9da5fd3901..75c2f5211a 100644 --- a/akka-docs/rst/scala/code/docs/ddata/DistributedDataDocSpec.scala +++ b/akka-docs/rst/scala/code/docs/ddata/DistributedDataDocSpec.scala @@ -19,7 +19,7 @@ object DistributedDataDocSpec { val config = """ - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" akka.remote.netty.tcp.port = 0 #//#serializer-config diff --git a/akka-docs/rst/scala/code/docs/remoting/RemoteDeploymentDocSpec.scala b/akka-docs/rst/scala/code/docs/remoting/RemoteDeploymentDocSpec.scala index f331ff38c5..3f25fb38b7 100644 --- a/akka-docs/rst/scala/code/docs/remoting/RemoteDeploymentDocSpec.scala +++ b/akka-docs/rst/scala/code/docs/remoting/RemoteDeploymentDocSpec.scala @@ -19,7 +19,7 @@ object RemoteDeploymentDocSpec { } class RemoteDeploymentDocSpec extends AkkaSpec(""" - akka.actor.provider = "akka.remote.RemoteActorRefProvider" + akka.actor.provider = remote akka.remote.netty.tcp { port = 0 } diff --git a/akka-docs/rst/scala/remoting.rst b/akka-docs/rst/scala/remoting.rst index ea9e449dc9..7cc6437a08 100644 --- a/akka-docs/rst/scala/remoting.rst +++ b/akka-docs/rst/scala/remoting.rst @@ -27,7 +27,7 @@ to your ``application.conf`` file:: akka { actor { - provider = "akka.remote.RemoteActorRefProvider" + provider = remote } remote { enabled-transports = ["akka.remote.netty.tcp"] @@ -40,7 +40,7 @@ to your ``application.conf`` file:: As you can see in the example above there are four things you need to add to get started: -* Change provider from ``akka.actor.LocalActorRefProvider`` to ``akka.remote.RemoteActorRefProvider`` +* Change provider from ``local`` to ``remote`` * Add host name - the machine you want to run the actor system on; this host name is exactly what is passed to remote systems in order to identify this system and consequently used for connecting back to this system if need be, diff --git a/akka-multi-node-testkit/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala b/akka-multi-node-testkit/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala index cad8949dfa..9e637341c1 100644 --- a/akka-multi-node-testkit/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala +++ b/akka-multi-node-testkit/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala @@ -196,7 +196,7 @@ object MultiNodeSpec { require(selfIndex >= 0 && selfIndex < maxNodes, "multinode.index is out of bounds: " + selfIndex) private[testkit] val nodeConfig = mapToConfig(Map( - "akka.actor.provider" → "akka.remote.RemoteActorRefProvider", + "akka.actor.provider" → "remote", "akka.remote.artery.hostname" → selfName, "akka.remote.netty.tcp.hostname" → selfName, "akka.remote.netty.tcp.port" → selfPort, diff --git a/akka-persistence-shared/src/test/scala/akka/persistence/journal/leveldb/PersistencePluginProxySpec.scala b/akka-persistence-shared/src/test/scala/akka/persistence/journal/leveldb/PersistencePluginProxySpec.scala index 6e53e17bdb..7e8e57d462 100644 --- a/akka-persistence-shared/src/test/scala/akka/persistence/journal/leveldb/PersistencePluginProxySpec.scala +++ b/akka-persistence-shared/src/test/scala/akka/persistence/journal/leveldb/PersistencePluginProxySpec.scala @@ -15,7 +15,7 @@ object PersistencePluginProxySpec { """ akka { actor { - provider = "akka.remote.RemoteActorRefProvider" + provider = remote } persistence { journal { diff --git a/akka-persistence-shared/src/test/scala/akka/persistence/journal/leveldb/SharedLeveldbJournalSpec.scala b/akka-persistence-shared/src/test/scala/akka/persistence/journal/leveldb/SharedLeveldbJournalSpec.scala index 308e4a067b..6d3609372f 100644 --- a/akka-persistence-shared/src/test/scala/akka/persistence/journal/leveldb/SharedLeveldbJournalSpec.scala +++ b/akka-persistence-shared/src/test/scala/akka/persistence/journal/leveldb/SharedLeveldbJournalSpec.scala @@ -13,7 +13,7 @@ object SharedLeveldbJournalSpec { """ akka { actor { - provider = "akka.remote.RemoteActorRefProvider" + provider = remote } persistence { journal { diff --git a/akka-persistence-shared/src/test/scala/akka/persistence/serialization/SerializerSpec.scala b/akka-persistence-shared/src/test/scala/akka/persistence/serialization/SerializerSpec.scala index 7e9ef28bde..8a2bfffa2f 100644 --- a/akka-persistence-shared/src/test/scala/akka/persistence/serialization/SerializerSpec.scala +++ b/akka-persistence-shared/src/test/scala/akka/persistence/serialization/SerializerSpec.scala @@ -44,7 +44,7 @@ object SerializerSpecConfigs { """ akka { actor { - provider = "akka.remote.RemoteActorRefProvider" + provider = remote } remote { enabled-transports = ["akka.remote.netty.tcp"] diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/AeronStreamConcistencySpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/AeronStreamConcistencySpec.scala index 9f92fdd8ec..bdd82c4061 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/AeronStreamConcistencySpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/AeronStreamConcistencySpec.scala @@ -37,7 +37,7 @@ object AeronStreamConsistencySpec extends MultiNodeConfig { akka { loglevel = INFO actor { - provider = "akka.remote.RemoteActorRefProvider" + provider = remote } remote.artery.enabled = off } diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/AeronStreamLatencySpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/AeronStreamLatencySpec.scala index 5f5a77b950..8c9c504fe5 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/AeronStreamLatencySpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/AeronStreamLatencySpec.scala @@ -48,7 +48,7 @@ object AeronStreamLatencySpec extends MultiNodeConfig { loglevel = ERROR testconductor.barrier-timeout = ${barrierTimeout.toSeconds}s actor { - provider = "akka.remote.RemoteActorRefProvider" + provider = remote serialize-creators = false serialize-messages = false } diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/AeronStreamMaxThroughputSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/AeronStreamMaxThroughputSpec.scala index 49e8e6abb5..eca9bf7af4 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/AeronStreamMaxThroughputSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/AeronStreamMaxThroughputSpec.scala @@ -41,7 +41,7 @@ object AeronStreamMaxThroughputSpec extends MultiNodeConfig { loglevel = ERROR testconductor.barrier-timeout = ${barrierTimeout.toSeconds}s actor { - provider = "akka.remote.RemoteActorRefProvider" + provider = remote serialize-creators = false serialize-messages = false } diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/HandshakeRestartReceiverSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/HandshakeRestartReceiverSpec.scala index 7084c138ce..648c4e41ff 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/HandshakeRestartReceiverSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/HandshakeRestartReceiverSpec.scala @@ -24,7 +24,7 @@ object HandshakeRestartReceiverSpec extends MultiNodeConfig { ConfigFactory.parseString(s""" akka { loglevel = INFO - actor.provider = "akka.remote.RemoteActorRefProvider" + actor.provider = remote remote.artery { enabled = on } diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/LatencySpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/LatencySpec.scala index 602b4b5edc..1ee34ee518 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/LatencySpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/LatencySpec.scala @@ -47,7 +47,7 @@ object LatencySpec extends MultiNodeConfig { loggers = ["akka.event.Logging$$DefaultLogger"] testconductor.barrier-timeout = ${barrierTimeout.toSeconds}s actor { - provider = "akka.remote.RemoteActorRefProvider" + provider = remote serialize-creators = false serialize-messages = false } diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/MaxThroughputSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/MaxThroughputSpec.scala index f7c5dc823d..65f966091d 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/MaxThroughputSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/MaxThroughputSpec.scala @@ -36,7 +36,7 @@ object MaxThroughputSpec extends MultiNodeConfig { loggers = ["akka.event.Logging$$DefaultLogger"] testconductor.barrier-timeout = ${barrierTimeout.toSeconds}s actor { - provider = "akka.remote.RemoteActorRefProvider" + provider = remote serialize-creators = false serialize-messages = false diff --git a/akka-remote-tests/src/test/scala/akka/remote/testconductor/BarrierSpec.scala b/akka-remote-tests/src/test/scala/akka/remote/testconductor/BarrierSpec.scala index de2b5d36f3..78a5a295f6 100644 --- a/akka-remote-tests/src/test/scala/akka/remote/testconductor/BarrierSpec.scala +++ b/akka-remote-tests/src/test/scala/akka/remote/testconductor/BarrierSpec.scala @@ -14,7 +14,7 @@ object BarrierSpec { final case class Failed(ref: ActorRef, thr: Throwable) val config = """ akka.testconductor.barrier-timeout = 5s - akka.actor.provider = akka.remote.RemoteActorRefProvider + akka.actor.provider = remote akka.actor.debug.fsm = on akka.actor.debug.lifecycle = on """ diff --git a/akka-remote-tests/src/test/scala/akka/remote/testconductor/ControllerSpec.scala b/akka-remote-tests/src/test/scala/akka/remote/testconductor/ControllerSpec.scala index 9ac87f6736..f904c46bdf 100644 --- a/akka-remote-tests/src/test/scala/akka/remote/testconductor/ControllerSpec.scala +++ b/akka-remote-tests/src/test/scala/akka/remote/testconductor/ControllerSpec.scala @@ -13,7 +13,7 @@ import java.net.InetAddress object ControllerSpec { val config = """ akka.testconductor.barrier-timeout = 5s - akka.actor.provider = akka.remote.RemoteActorRefProvider + akka.actor.provider = remote akka.actor.debug.fsm = on akka.actor.debug.lifecycle = on """ diff --git a/akka-remote/src/test/scala/akka/remote/ActorsLeakSpec.scala b/akka-remote/src/test/scala/akka/remote/ActorsLeakSpec.scala index ba38dd29ab..409891d001 100644 --- a/akka-remote/src/test/scala/akka/remote/ActorsLeakSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/ActorsLeakSpec.scala @@ -20,7 +20,7 @@ object ActorsLeakSpec { val config = ConfigFactory.parseString( """ - | akka.actor.provider = "akka.remote.RemoteActorRefProvider" + | akka.actor.provider = remote | #akka.loglevel = DEBUG | akka.remote.netty.tcp.applied-adapters = ["trttl"] | #akka.remote.log-lifecycle-events = on diff --git a/akka-remote/src/test/scala/akka/remote/DaemonicSpec.scala b/akka-remote/src/test/scala/akka/remote/DaemonicSpec.scala index 70085256bb..5a8abcebf3 100644 --- a/akka-remote/src/test/scala/akka/remote/DaemonicSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/DaemonicSpec.scala @@ -32,7 +32,7 @@ class DaemonicSpec extends AkkaSpec { // create a separate actor system that we can check the threads for val daemonicSystem = ActorSystem("daemonic", ConfigFactory.parseString(""" akka.daemonic = on - akka.actor.provider = "akka.remote.RemoteActorRefProvider" + akka.actor.provider = remote akka.remote.netty.tcp.transport-class = "akka.remote.transport.netty.NettyTransport" akka.remote.netty.tcp.port = 0 akka.log-dead-letters-during-shutdown = off diff --git a/akka-remote/src/test/scala/akka/remote/LogSourceSpec.scala b/akka-remote/src/test/scala/akka/remote/LogSourceSpec.scala index 22757a42fa..24bb7c9e5b 100644 --- a/akka-remote/src/test/scala/akka/remote/LogSourceSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/LogSourceSpec.scala @@ -25,7 +25,7 @@ object LogSourceSpec { class LogSourceSpec extends AkkaSpec( """ akka.loglevel = INFO - akka.actor.provider = "akka.remote.RemoteActorRefProvider" + akka.actor.provider = remote akka.remote.netty.tcp.port = 0 """) { diff --git a/akka-remote/src/test/scala/akka/remote/RemoteActorMailboxSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteActorMailboxSpec.scala index beba7dbfd5..9c98860c44 100644 --- a/akka-remote/src/test/scala/akka/remote/RemoteActorMailboxSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/RemoteActorMailboxSpec.scala @@ -4,7 +4,7 @@ import akka.actor.ActorMailboxSpec import com.typesafe.config.ConfigFactory class RemoteActorMailboxSpec extends ActorMailboxSpec( - ConfigFactory.parseString("""akka.actor.provider = "akka.remote.RemoteActorRefProvider""""). + ConfigFactory.parseString("""akka.actor.provider = remote"""). withFallback(ActorMailboxSpec.mailboxConf)) { } \ No newline at end of file diff --git a/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala index 75f6781108..626dbf7bc2 100644 --- a/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala @@ -13,7 +13,7 @@ import akka.remote.transport.netty.{ NettyTransportSettings, SSLSettings } class RemoteConfigSpec extends AkkaSpec( """ - akka.actor.provider = "akka.remote.RemoteActorRefProvider" + akka.actor.provider = remote akka.remote.netty.tcp.port = 0 """) { diff --git a/akka-remote/src/test/scala/akka/remote/RemoteConsistentHashingRouterSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteConsistentHashingRouterSpec.scala index a3f49a32c3..7611e850db 100644 --- a/akka-remote/src/test/scala/akka/remote/RemoteConsistentHashingRouterSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/RemoteConsistentHashingRouterSpec.scala @@ -10,7 +10,7 @@ import akka.routing.ConsistentRoutee import akka.routing.ConsistentHash class RemoteConsistentHashingRouterSpec extends AkkaSpec(""" - akka.actor.provider = "akka.remote.RemoteActorRefProvider" """) { + akka.actor.provider = remote """) { "ConsistentHashingGroup" must { diff --git a/akka-remote/src/test/scala/akka/remote/RemoteDeathWatchSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteDeathWatchSpec.scala index f3a76782b3..2528408023 100644 --- a/akka-remote/src/test/scala/akka/remote/RemoteDeathWatchSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/RemoteDeathWatchSpec.scala @@ -14,7 +14,7 @@ import akka.event.Logging.Warning class RemoteDeathWatchSpec extends AkkaSpec(ConfigFactory.parseString(""" akka { actor { - provider = "akka.remote.RemoteActorRefProvider" + provider = remote deployment { /watchers.remote = "akka.tcp://other@localhost:2666" } diff --git a/akka-remote/src/test/scala/akka/remote/RemoteDeployerSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteDeployerSpec.scala index 8265261856..2eed9b809f 100644 --- a/akka-remote/src/test/scala/akka/remote/RemoteDeployerSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/RemoteDeployerSpec.scala @@ -11,7 +11,7 @@ import akka.ConfigurationException object RemoteDeployerSpec { val deployerConf = ConfigFactory.parseString(""" - akka.actor.provider = "akka.remote.RemoteActorRefProvider" + akka.actor.provider = remote akka.actor.deployment { /service2 { router = round-robin-pool diff --git a/akka-remote/src/test/scala/akka/remote/RemoteInitErrorSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteInitErrorSpec.scala index fe86653f6b..98886e6407 100644 --- a/akka-remote/src/test/scala/akka/remote/RemoteInitErrorSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/RemoteInitErrorSpec.scala @@ -24,7 +24,7 @@ class RemoteInitErrorSpec extends FlatSpec with Matchers { """ akka { actor { - provider = "akka.remote.RemoteActorRefProvider" + provider = remote } remote { enabled-transports = ["akka.remote.netty.tcp"] diff --git a/akka-remote/src/test/scala/akka/remote/RemoteRouterSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteRouterSpec.scala index c574e94c21..1b51e68455 100644 --- a/akka-remote/src/test/scala/akka/remote/RemoteRouterSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/RemoteRouterSpec.scala @@ -21,7 +21,7 @@ object RemoteRouterSpec { } class RemoteRouterSpec extends AkkaSpec(""" - akka.actor.provider = "akka.remote.RemoteActorRefProvider" + akka.actor.provider = remote akka.remote.netty.tcp { hostname = localhost port = 0 diff --git a/akka-remote/src/test/scala/akka/remote/RemoteWatcherSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteWatcherSpec.scala index 23d1072c51..59f23d4398 100644 --- a/akka-remote/src/test/scala/akka/remote/RemoteWatcherSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/RemoteWatcherSpec.scala @@ -66,7 +66,7 @@ class RemoteWatcherSpec extends AkkaSpec( """akka { loglevel = INFO log-dead-letters-during-shutdown = false - actor.provider = "akka.remote.RemoteActorRefProvider" + actor.provider = remote remote.netty.tcp { hostname = localhost port = 0 diff --git a/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala b/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala index 8799e47f6b..67769be238 100644 --- a/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala @@ -79,7 +79,7 @@ object RemotingSpec { } akka { - actor.provider = "akka.remote.RemoteActorRefProvider" + actor.provider = remote remote { retry-gate-closed-for = 1 s diff --git a/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala b/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala index eb25421863..78a9d1389b 100644 --- a/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala @@ -26,7 +26,7 @@ object Configuration { private val keyStore = getClass.getClassLoader.getResource("keystore").getPath private val conf = """ akka { - actor.provider = "akka.remote.RemoteActorRefProvider" + actor.provider = remote test { single-expect-default = 10s filter-leeway = 10s diff --git a/akka-remote/src/test/scala/akka/remote/TypedActorRemoteDeploySpec.scala b/akka-remote/src/test/scala/akka/remote/TypedActorRemoteDeploySpec.scala index 0f080db7b6..0bbf76b43a 100644 --- a/akka-remote/src/test/scala/akka/remote/TypedActorRemoteDeploySpec.scala +++ b/akka-remote/src/test/scala/akka/remote/TypedActorRemoteDeploySpec.scala @@ -12,7 +12,7 @@ import scala.concurrent.duration._ object TypedActorRemoteDeploySpec { val conf = ConfigFactory.parseString(""" - akka.actor.provider = "akka.remote.RemoteActorRefProvider" + akka.actor.provider = remote akka.remote.netty.tcp.port = 0 """) diff --git a/akka-remote/src/test/scala/akka/remote/UntrustedSpec.scala b/akka-remote/src/test/scala/akka/remote/UntrustedSpec.scala index d893cd93a6..b278d062ec 100644 --- a/akka-remote/src/test/scala/akka/remote/UntrustedSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/UntrustedSpec.scala @@ -60,7 +60,7 @@ object UntrustedSpec { } class UntrustedSpec extends AkkaSpec(""" -akka.actor.provider = akka.remote.RemoteActorRefProvider +akka.actor.provider = remote akka.remote.untrusted-mode = on akka.remote.trusted-selection-paths = ["/user/receptionist", ] akka.remote.netty.tcp.port = 0 @@ -70,7 +70,7 @@ akka.loglevel = DEBUG import UntrustedSpec._ val client = ActorSystem("UntrustedSpec-client", ConfigFactory.parseString(""" - akka.actor.provider = akka.remote.RemoteActorRefProvider + akka.actor.provider = remote akka.remote.netty.tcp.port = 0 """)) val addr = system.asInstanceOf[ExtendedActorSystem].provider.getDefaultAddress diff --git a/akka-remote/src/test/scala/akka/remote/artery/HandshakeFailureSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/HandshakeFailureSpec.scala index 9a368c8404..ce8126368a 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/HandshakeFailureSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/HandshakeFailureSpec.scala @@ -18,7 +18,7 @@ object HandshakeFailureSpec { val commonConfig = ConfigFactory.parseString(s""" akka { - actor.provider = "akka.remote.RemoteActorRefProvider" + actor.provider = remote remote.artery.enabled = on remote.artery.hostname = localhost remote.artery.port = 0 diff --git a/akka-remote/src/test/scala/akka/remote/artery/HandshakeRetrySpec.scala b/akka-remote/src/test/scala/akka/remote/artery/HandshakeRetrySpec.scala index 1b90d60611..44c79967b3 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/HandshakeRetrySpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/HandshakeRetrySpec.scala @@ -18,7 +18,7 @@ object HandshakeRetrySpec { val commonConfig = ConfigFactory.parseString(s""" akka { - actor.provider = "akka.remote.RemoteActorRefProvider" + actor.provider = remote remote.artery.enabled = on remote.artery.hostname = localhost remote.artery.port = 0 diff --git a/akka-remote/src/test/scala/akka/remote/artery/LargeMessagesStreamSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/LargeMessagesStreamSpec.scala index 7a8343099b..d52e28da67 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/LargeMessagesStreamSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/LargeMessagesStreamSpec.scala @@ -32,7 +32,7 @@ class LargeMessagesStreamSpec extends WordSpec with ShouldMatchers with ScalaFut akka { loglevel = ERROR actor { - provider = "akka.remote.RemoteActorRefProvider" + provider = remote } remote.artery { enabled = on diff --git a/akka-remote/src/test/scala/akka/remote/artery/RemoteActorRefProviderSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/RemoteActorRefProviderSpec.scala index 3d0614dc79..fcfe56ba6f 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/RemoteActorRefProviderSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/RemoteActorRefProviderSpec.scala @@ -17,7 +17,7 @@ object RemoteActorRefProviderSpec { val config = ConfigFactory.parseString(s""" akka { - actor.provider = "akka.remote.RemoteActorRefProvider" + actor.provider = remote remote.artery.enabled = on remote.artery.hostname = localhost remote.artery.port = 0 diff --git a/akka-remote/src/test/scala/akka/remote/artery/RemoteDeathWatchSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/RemoteDeathWatchSpec.scala index 297cb9fcc0..8b8ec6a37e 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/RemoteDeathWatchSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/RemoteDeathWatchSpec.scala @@ -20,7 +20,7 @@ object RemoteDeathWatchSpec { val config = ConfigFactory.parseString(s""" akka { actor { - provider = "akka.remote.RemoteActorRefProvider" + provider = remote deployment { /watchers.remote = "artery://other@localhost:$otherPort" } diff --git a/akka-remote/src/test/scala/akka/remote/artery/RemoteDeployerSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/RemoteDeployerSpec.scala index 9020f1951a..5c95b122e8 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/RemoteDeployerSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/RemoteDeployerSpec.scala @@ -12,7 +12,7 @@ import akka.remote.RemoteScope object RemoteDeployerSpec { val deployerConf = ConfigFactory.parseString(""" - akka.actor.provider = "akka.remote.RemoteActorRefProvider" + akka.actor.provider = remote akka.actor.deployment { /service2 { router = round-robin-pool diff --git a/akka-remote/src/test/scala/akka/remote/artery/RemoteDeploymentSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/RemoteDeploymentSpec.scala index 8f89196a68..c314cd5e0a 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/RemoteDeploymentSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/RemoteDeploymentSpec.scala @@ -34,7 +34,7 @@ object RemoteDeploymentSpec { class RemoteDeploymentSpec extends AkkaSpec(""" #akka.loglevel=DEBUG - akka.actor.provider = "akka.remote.RemoteActorRefProvider" + akka.actor.provider = remote akka.remote.artery.enabled = on akka.remote.artery.hostname = localhost akka.remote.artery.port = 0 diff --git a/akka-remote/src/test/scala/akka/remote/artery/RemoteRouterSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/RemoteRouterSpec.scala index 3700df47c8..6ce9ba3004 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/RemoteRouterSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/RemoteRouterSpec.scala @@ -23,7 +23,7 @@ object RemoteRouterSpec { class RemoteRouterSpec extends AkkaSpec(""" akka.loglevel=DEBUG - akka.actor.provider = "akka.remote.RemoteActorRefProvider" + akka.actor.provider = remote akka.remote.artery.enabled = on akka.remote.artery.hostname = localhost akka.remote.artery.port = 0 diff --git a/akka-remote/src/test/scala/akka/remote/artery/RemoteSendConsistencySpec.scala b/akka-remote/src/test/scala/akka/remote/artery/RemoteSendConsistencySpec.scala index d14861415f..3abbbb7309 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/RemoteSendConsistencySpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/RemoteSendConsistencySpec.scala @@ -13,7 +13,7 @@ object RemoteSendConsistencySpec { val config = ConfigFactory.parseString(s""" akka { - actor.provider = "akka.remote.RemoteActorRefProvider" + actor.provider = remote remote.artery.enabled = on remote.artery.hostname = localhost remote.artery.port = 0 diff --git a/akka-remote/src/test/scala/akka/remote/artery/RemoteWatcherSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/RemoteWatcherSpec.scala index 9a5f11d1f3..7f4027f62a 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/RemoteWatcherSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/RemoteWatcherSpec.scala @@ -67,7 +67,7 @@ class RemoteWatcherSpec extends AkkaSpec( """akka { loglevel = INFO log-dead-letters-during-shutdown = false - actor.provider = "akka.remote.RemoteActorRefProvider" + actor.provider = remote remote.artery.enabled = on remote.artery.hostname = localhost remote.artery.port = 0 diff --git a/akka-remote/src/test/scala/akka/remote/artery/SerializationErrorSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/SerializationErrorSpec.scala index 5c3364da39..d997cf08fd 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/SerializationErrorSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/SerializationErrorSpec.scala @@ -14,7 +14,7 @@ object SerializationErrorSpec { val config = ConfigFactory.parseString(s""" akka { - actor.provider = "akka.remote.RemoteActorRefProvider" + actor.provider = remote remote.artery.enabled = on remote.artery.hostname = localhost remote.artery.port = 0 diff --git a/akka-remote/src/test/scala/akka/remote/artery/SystemMessageDeliverySpec.scala b/akka-remote/src/test/scala/akka/remote/artery/SystemMessageDeliverySpec.scala index 5f9a3e0b50..b964a1c741 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/SystemMessageDeliverySpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/SystemMessageDeliverySpec.scala @@ -37,7 +37,7 @@ object SystemMessageDeliverySpec { val config = ConfigFactory.parseString(s""" akka { - actor.provider = "akka.remote.RemoteActorRefProvider" + actor.provider = remote remote.artery.enabled = on remote.artery.hostname = localhost remote.artery.port = 0 diff --git a/akka-remote/src/test/scala/akka/remote/artery/UntrustedSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/UntrustedSpec.scala index 65798d6956..9b353a3be8 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/UntrustedSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/UntrustedSpec.scala @@ -60,7 +60,7 @@ object UntrustedSpec { } class UntrustedSpec extends AkkaSpec(""" - akka.actor.provider = akka.remote.RemoteActorRefProvider + akka.actor.provider = remote akka.remote.untrusted-mode = on akka.remote.trusted-selection-paths = ["/user/receptionist", ] akka.remote.artery.enabled = on @@ -72,7 +72,7 @@ class UntrustedSpec extends AkkaSpec(""" import UntrustedSpec._ val client = ActorSystem("UntrustedSpec-client", ConfigFactory.parseString(""" - akka.actor.provider = akka.remote.RemoteActorRefProvider + akka.actor.provider = remote akka.remote.artery.enabled = on akka.remote.artery.hostname = localhost akka.remote.artery.port = 0 diff --git a/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolSpec.scala b/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolSpec.scala index 3825bba924..0f283aeb2d 100644 --- a/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolSpec.scala @@ -30,7 +30,7 @@ object AkkaProtocolSpec { } -class AkkaProtocolSpec extends AkkaSpec("""akka.actor.provider = "akka.remote.RemoteActorRefProvider" """) with ImplicitSender { +class AkkaProtocolSpec extends AkkaSpec("""akka.actor.provider = remote """) with ImplicitSender { val conf = ConfigFactory.parseString( """ diff --git a/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala b/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala index e8deaa2a83..18fb7f800f 100644 --- a/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala +++ b/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala @@ -15,7 +15,7 @@ object AkkaProtocolStressTest { akka { #loglevel = DEBUG actor.serialize-messages = off - actor.provider = "akka.remote.RemoteActorRefProvider" + actor.provider = remote remote.log-remote-lifecycle-events = on diff --git a/akka-remote/src/test/scala/akka/remote/transport/GenericTransportSpec.scala b/akka-remote/src/test/scala/akka/remote/transport/GenericTransportSpec.scala index ee16681b7e..61da926b3f 100644 --- a/akka-remote/src/test/scala/akka/remote/transport/GenericTransportSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/transport/GenericTransportSpec.scala @@ -11,7 +11,7 @@ import akka.remote.RemoteActorRefProvider import akka.remote.transport.TestTransport.{ DisassociateAttempt, WriteAttempt, ListenAttempt, AssociateAttempt } abstract class GenericTransportSpec(withAkkaProtocol: Boolean = false) - extends AkkaSpec("""akka.actor.provider = "akka.remote.RemoteActorRefProvider" """) + extends AkkaSpec("""akka.actor.provider = remote """) with DefaultTimeout with ImplicitSender { def transportName: String diff --git a/akka-remote/src/test/scala/akka/remote/transport/SystemMessageDeliveryStressTest.scala b/akka-remote/src/test/scala/akka/remote/transport/SystemMessageDeliveryStressTest.scala index b459d701bb..cebf7e8cc0 100644 --- a/akka-remote/src/test/scala/akka/remote/transport/SystemMessageDeliveryStressTest.scala +++ b/akka-remote/src/test/scala/akka/remote/transport/SystemMessageDeliveryStressTest.scala @@ -36,7 +36,7 @@ object SystemMessageDeliveryStressTest { val baseConfig: Config = ConfigFactory parseString (s""" akka { #loglevel = DEBUG - actor.provider = "akka.remote.RemoteActorRefProvider" + actor.provider = remote actor.serialize-messages = off remote.log-remote-lifecycle-events = on diff --git a/akka-remote/src/test/scala/akka/remote/transport/ThrottlerTransportAdapterSpec.scala b/akka-remote/src/test/scala/akka/remote/transport/ThrottlerTransportAdapterSpec.scala index a1e131f553..8667a0a4c8 100644 --- a/akka-remote/src/test/scala/akka/remote/transport/ThrottlerTransportAdapterSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/transport/ThrottlerTransportAdapterSpec.scala @@ -15,7 +15,7 @@ import akka.remote.EndpointException object ThrottlerTransportAdapterSpec { val configA: Config = ConfigFactory parseString (""" akka { - actor.provider = "akka.remote.RemoteActorRefProvider" + actor.provider = remote remote.netty.tcp.hostname = "localhost" remote.log-remote-lifecycle-events = off diff --git a/akka-remote/src/test/scala/akka/remote/transport/netty/NettyTransportSpec.scala b/akka-remote/src/test/scala/akka/remote/transport/netty/NettyTransportSpec.scala index 00cb0900b2..8f1c182211 100644 --- a/akka-remote/src/test/scala/akka/remote/transport/netty/NettyTransportSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/transport/netty/NettyTransportSpec.scala @@ -13,7 +13,7 @@ import scala.concurrent.duration.Duration object NettyTransportSpec { val commonConfig = ConfigFactory.parseString(""" - akka.actor.provider = "akka.remote.RemoteActorRefProvider" + akka.actor.provider = remote """) def getInternal()(implicit sys: ActorSystem) = diff --git a/akka-samples/akka-sample-cluster-java/src/main/resources/application.conf b/akka-samples/akka-sample-cluster-java/src/main/resources/application.conf index 4b2b44c9e9..5077fd7ae5 100644 --- a/akka-samples/akka-sample-cluster-java/src/main/resources/application.conf +++ b/akka-samples/akka-sample-cluster-java/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-java/src/multi-jvm/scala/sample/cluster/stats/StatsSampleSingleMasterSpec.scala b/akka-samples/akka-sample-cluster-java/src/multi-jvm/scala/sample/cluster/stats/StatsSampleSingleMasterSpec.scala index 68e0bb0e71..dd4701ae34 100644 --- a/akka-samples/akka-sample-cluster-java/src/multi-jvm/scala/sample/cluster/stats/StatsSampleSingleMasterSpec.scala +++ b/akka-samples/akka-sample-cluster-java/src/multi-jvm/scala/sample/cluster/stats/StatsSampleSingleMasterSpec.scala @@ -49,7 +49,7 @@ object StatsSampleSingleMasterSpecConfig extends MultiNodeConfig { // note that no fixed host names and ports are used commonConfig(ConfigFactory.parseString(""" akka.loglevel = INFO - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" akka.remote.log-remote-lifecycle-events = off akka.cluster.roles = [compute] #//#router-deploy-config diff --git a/akka-samples/akka-sample-cluster-java/src/multi-jvm/scala/sample/cluster/stats/StatsSampleSpec.scala b/akka-samples/akka-sample-cluster-java/src/multi-jvm/scala/sample/cluster/stats/StatsSampleSpec.scala index e2bb09ab3e..3bdbbbca9d 100644 --- a/akka-samples/akka-sample-cluster-java/src/multi-jvm/scala/sample/cluster/stats/StatsSampleSpec.scala +++ b/akka-samples/akka-sample-cluster-java/src/multi-jvm/scala/sample/cluster/stats/StatsSampleSpec.scala @@ -44,7 +44,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-java/src/multi-jvm/scala/sample/cluster/transformation/TransformationSampleSpec.scala b/akka-samples/akka-sample-cluster-java/src/multi-jvm/scala/sample/cluster/transformation/TransformationSampleSpec.scala index 331cbb8580..58f8aadec2 100644 --- a/akka-samples/akka-sample-cluster-java/src/multi-jvm/scala/sample/cluster/transformation/TransformationSampleSpec.scala +++ b/akka-samples/akka-sample-cluster-java/src/multi-jvm/scala/sample/cluster/transformation/TransformationSampleSpec.scala @@ -43,7 +43,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/akka-samples/akka-sample-cluster-java/tutorial/index.html b/akka-samples/akka-sample-cluster-java/tutorial/index.html index d2a88b01fb..6af2d05293 100644 --- a/akka-samples/akka-sample-cluster-java/tutorial/index.html +++ b/akka-samples/akka-sample-cluster-java/tutorial/index.html @@ -27,7 +27,7 @@ Open applic

To enable cluster capabilities in your Akka project you should, at a minimum, add the remote settings, -and use akka.cluster.ClusterActorRefProvider. The akka.cluster.seed-nodes should +and use cluster for akka.actor.provider. The akka.cluster.seed-nodes should normally also be added to your application.conf file.

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 58195b14b4..0d00e9b66d 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.artery { enabled = on diff --git a/akka-samples/akka-sample-cluster-scala/src/multi-jvm/scala/sample/cluster/stats/StatsSampleSingleMasterSpec.scala b/akka-samples/akka-sample-cluster-scala/src/multi-jvm/scala/sample/cluster/stats/StatsSampleSingleMasterSpec.scala index e22a1a281f..dbbdd32e11 100644 --- a/akka-samples/akka-sample-cluster-scala/src/multi-jvm/scala/sample/cluster/stats/StatsSampleSingleMasterSpec.scala +++ b/akka-samples/akka-sample-cluster-scala/src/multi-jvm/scala/sample/cluster/stats/StatsSampleSingleMasterSpec.scala @@ -48,7 +48,7 @@ object StatsSampleSingleMasterSpecConfig extends MultiNodeConfig { // note that no fixed host names and ports are used commonConfig(ConfigFactory.parseString(""" akka.loglevel = INFO - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" akka.remote.log-remote-lifecycle-events = off akka.cluster.roles = [compute] #//#router-deploy-config 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..9421e17cbc 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..0eb2469d1a 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/akka-samples/akka-sample-cluster-scala/tutorial/index.html b/akka-samples/akka-sample-cluster-scala/tutorial/index.html index 1628cb5970..0567e6685f 100644 --- a/akka-samples/akka-sample-cluster-scala/tutorial/index.html +++ b/akka-samples/akka-sample-cluster-scala/tutorial/index.html @@ -27,7 +27,7 @@ Open applic

To enable cluster capabilities in your Akka project you should, at a minimum, add the remote settings, -and use akka.cluster.ClusterActorRefProvider. The akka.cluster.seed-nodes should +and use cluster for akka.actor.provider. The akka.cluster.seed-nodes should normally also be added to your application.conf file.

diff --git a/akka-samples/akka-sample-distributed-data-java/src/main/resources/application.conf b/akka-samples/akka-sample-distributed-data-java/src/main/resources/application.conf index 5bdd1d8522..b7f09dfe48 100644 --- a/akka-samples/akka-sample-distributed-data-java/src/main/resources/application.conf +++ b/akka-samples/akka-sample-distributed-data-java/src/main/resources/application.conf @@ -1,6 +1,6 @@ akka { actor { - provider = "akka.cluster.ClusterActorRefProvider" + provider = "cluster" } remote { log-remote-lifecycle-events = off diff --git a/akka-samples/akka-sample-distributed-data-java/src/multi-jvm/scala/sample/distributeddata/ReplicatedCacheSpec.scala b/akka-samples/akka-sample-distributed-data-java/src/multi-jvm/scala/sample/distributeddata/ReplicatedCacheSpec.scala index 9144f10f41..b5d2980b15 100644 --- a/akka-samples/akka-sample-distributed-data-java/src/multi-jvm/scala/sample/distributeddata/ReplicatedCacheSpec.scala +++ b/akka-samples/akka-sample-distributed-data-java/src/multi-jvm/scala/sample/distributeddata/ReplicatedCacheSpec.scala @@ -19,7 +19,7 @@ object ReplicatedCacheSpec extends MultiNodeConfig { commonConfig(ConfigFactory.parseString(""" akka.loglevel = INFO - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" akka.log-dead-letters-during-shutdown = off """)) diff --git a/akka-samples/akka-sample-distributed-data-java/src/multi-jvm/scala/sample/distributeddata/ReplicatedMetricsSpec.scala b/akka-samples/akka-sample-distributed-data-java/src/multi-jvm/scala/sample/distributeddata/ReplicatedMetricsSpec.scala index 2f3d0b78a0..61049162b1 100644 --- a/akka-samples/akka-sample-distributed-data-java/src/multi-jvm/scala/sample/distributeddata/ReplicatedMetricsSpec.scala +++ b/akka-samples/akka-sample-distributed-data-java/src/multi-jvm/scala/sample/distributeddata/ReplicatedMetricsSpec.scala @@ -19,7 +19,7 @@ object ReplicatedMetricsSpec extends MultiNodeConfig { commonConfig(ConfigFactory.parseString(""" akka.loglevel = INFO - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" akka.log-dead-letters-during-shutdown = off """)) diff --git a/akka-samples/akka-sample-distributed-data-java/src/multi-jvm/scala/sample/distributeddata/ServiceRegistrySpec.scala b/akka-samples/akka-sample-distributed-data-java/src/multi-jvm/scala/sample/distributeddata/ServiceRegistrySpec.scala index b7f13f9e1b..2cf248ca25 100644 --- a/akka-samples/akka-sample-distributed-data-java/src/multi-jvm/scala/sample/distributeddata/ServiceRegistrySpec.scala +++ b/akka-samples/akka-sample-distributed-data-java/src/multi-jvm/scala/sample/distributeddata/ServiceRegistrySpec.scala @@ -22,7 +22,7 @@ object ServiceRegistrySpec extends MultiNodeConfig { commonConfig(ConfigFactory.parseString(""" akka.loglevel = INFO - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" akka.log-dead-letters-during-shutdown = off """)) diff --git a/akka-samples/akka-sample-distributed-data-java/src/multi-jvm/scala/sample/distributeddata/ShoppingCartSpec.scala b/akka-samples/akka-sample-distributed-data-java/src/multi-jvm/scala/sample/distributeddata/ShoppingCartSpec.scala index 432dbc95da..ef5e302405 100644 --- a/akka-samples/akka-sample-distributed-data-java/src/multi-jvm/scala/sample/distributeddata/ShoppingCartSpec.scala +++ b/akka-samples/akka-sample-distributed-data-java/src/multi-jvm/scala/sample/distributeddata/ShoppingCartSpec.scala @@ -19,7 +19,7 @@ object ShoppingCartSpec extends MultiNodeConfig { commonConfig(ConfigFactory.parseString(""" akka.loglevel = INFO - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" akka.log-dead-letters-during-shutdown = off """)) diff --git a/akka-samples/akka-sample-distributed-data-java/src/multi-jvm/scala/sample/distributeddata/VotingServiceSpec.scala b/akka-samples/akka-sample-distributed-data-java/src/multi-jvm/scala/sample/distributeddata/VotingServiceSpec.scala index 6ae3471c49..8f16dfbe86 100644 --- a/akka-samples/akka-sample-distributed-data-java/src/multi-jvm/scala/sample/distributeddata/VotingServiceSpec.scala +++ b/akka-samples/akka-sample-distributed-data-java/src/multi-jvm/scala/sample/distributeddata/VotingServiceSpec.scala @@ -20,7 +20,7 @@ object VotingServiceSpec extends MultiNodeConfig { commonConfig(ConfigFactory.parseString(""" akka.loglevel = INFO - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" akka.log-dead-letters-during-shutdown = off """)) diff --git a/akka-samples/akka-sample-distributed-data-scala/src/main/resources/application.conf b/akka-samples/akka-sample-distributed-data-scala/src/main/resources/application.conf index 5bdd1d8522..b7f09dfe48 100644 --- a/akka-samples/akka-sample-distributed-data-scala/src/main/resources/application.conf +++ b/akka-samples/akka-sample-distributed-data-scala/src/main/resources/application.conf @@ -1,6 +1,6 @@ akka { actor { - provider = "akka.cluster.ClusterActorRefProvider" + provider = "cluster" } remote { log-remote-lifecycle-events = off diff --git a/akka-samples/akka-sample-distributed-data-scala/src/multi-jvm/scala/sample/distributeddata/ReplicatedCacheSpec.scala b/akka-samples/akka-sample-distributed-data-scala/src/multi-jvm/scala/sample/distributeddata/ReplicatedCacheSpec.scala index 33551afd2a..6a61450fc3 100644 --- a/akka-samples/akka-sample-distributed-data-scala/src/multi-jvm/scala/sample/distributeddata/ReplicatedCacheSpec.scala +++ b/akka-samples/akka-sample-distributed-data-scala/src/multi-jvm/scala/sample/distributeddata/ReplicatedCacheSpec.scala @@ -18,7 +18,7 @@ object ReplicatedCacheSpec extends MultiNodeConfig { commonConfig(ConfigFactory.parseString(""" akka.loglevel = INFO - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" akka.log-dead-letters-during-shutdown = off """)) diff --git a/akka-samples/akka-sample-distributed-data-scala/src/multi-jvm/scala/sample/distributeddata/ReplicatedMetricsSpec.scala b/akka-samples/akka-sample-distributed-data-scala/src/multi-jvm/scala/sample/distributeddata/ReplicatedMetricsSpec.scala index dea81b1884..e590c0cf12 100644 --- a/akka-samples/akka-sample-distributed-data-scala/src/multi-jvm/scala/sample/distributeddata/ReplicatedMetricsSpec.scala +++ b/akka-samples/akka-sample-distributed-data-scala/src/multi-jvm/scala/sample/distributeddata/ReplicatedMetricsSpec.scala @@ -18,7 +18,7 @@ object ReplicatedMetricsSpec extends MultiNodeConfig { commonConfig(ConfigFactory.parseString(""" akka.loglevel = INFO - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" akka.log-dead-letters-during-shutdown = off """)) diff --git a/akka-samples/akka-sample-distributed-data-scala/src/multi-jvm/scala/sample/distributeddata/ServiceRegistrySpec.scala b/akka-samples/akka-sample-distributed-data-scala/src/multi-jvm/scala/sample/distributeddata/ServiceRegistrySpec.scala index 8f216849bc..dcecbf68c7 100644 --- a/akka-samples/akka-sample-distributed-data-scala/src/multi-jvm/scala/sample/distributeddata/ServiceRegistrySpec.scala +++ b/akka-samples/akka-sample-distributed-data-scala/src/multi-jvm/scala/sample/distributeddata/ServiceRegistrySpec.scala @@ -21,7 +21,7 @@ object ServiceRegistrySpec extends MultiNodeConfig { commonConfig(ConfigFactory.parseString(""" akka.loglevel = INFO - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" akka.log-dead-letters-during-shutdown = off """)) diff --git a/akka-samples/akka-sample-distributed-data-scala/src/multi-jvm/scala/sample/distributeddata/ShoppingCartSpec.scala b/akka-samples/akka-sample-distributed-data-scala/src/multi-jvm/scala/sample/distributeddata/ShoppingCartSpec.scala index 600cfc1ffd..81f64f8dff 100644 --- a/akka-samples/akka-sample-distributed-data-scala/src/multi-jvm/scala/sample/distributeddata/ShoppingCartSpec.scala +++ b/akka-samples/akka-sample-distributed-data-scala/src/multi-jvm/scala/sample/distributeddata/ShoppingCartSpec.scala @@ -18,7 +18,7 @@ object ShoppingCartSpec extends MultiNodeConfig { commonConfig(ConfigFactory.parseString(""" akka.loglevel = INFO - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" akka.log-dead-letters-during-shutdown = off """)) diff --git a/akka-samples/akka-sample-distributed-data-scala/src/multi-jvm/scala/sample/distributeddata/VotingServiceSpec.scala b/akka-samples/akka-sample-distributed-data-scala/src/multi-jvm/scala/sample/distributeddata/VotingServiceSpec.scala index 693d10ad42..3b0a22894e 100644 --- a/akka-samples/akka-sample-distributed-data-scala/src/multi-jvm/scala/sample/distributeddata/VotingServiceSpec.scala +++ b/akka-samples/akka-sample-distributed-data-scala/src/multi-jvm/scala/sample/distributeddata/VotingServiceSpec.scala @@ -19,7 +19,7 @@ object VotingServiceSpec extends MultiNodeConfig { commonConfig(ConfigFactory.parseString(""" akka.loglevel = INFO - akka.actor.provider = "akka.cluster.ClusterActorRefProvider" + akka.actor.provider = "cluster" akka.log-dead-letters-during-shutdown = off """)) diff --git a/akka-samples/akka-sample-osgi-dining-hakkers/core/src/main/resources/application.conf b/akka-samples/akka-sample-osgi-dining-hakkers/core/src/main/resources/application.conf index ae8ca13b32..368dcb8e60 100644 --- a/akka-samples/akka-sample-osgi-dining-hakkers/core/src/main/resources/application.conf +++ b/akka-samples/akka-sample-osgi-dining-hakkers/core/src/main/resources/application.conf @@ -4,7 +4,7 @@ akka { logging-filter = "akka.event.slf4j.Slf4jLoggingFilter" actor { - provider = "akka.cluster.ClusterActorRefProvider" + provider = "cluster" serialize-messages = on diff --git a/akka-samples/akka-sample-remote-java/src/main/resources/common.conf b/akka-samples/akka-sample-remote-java/src/main/resources/common.conf index 2c8f881372..9e99e7ab6f 100644 --- a/akka-samples/akka-sample-remote-java/src/main/resources/common.conf +++ b/akka-samples/akka-sample-remote-java/src/main/resources/common.conf @@ -1,7 +1,7 @@ akka { actor { - provider = "akka.remote.RemoteActorRefProvider" + provider = remote } remote { diff --git a/akka-samples/akka-sample-remote-scala/src/main/resources/common.conf b/akka-samples/akka-sample-remote-scala/src/main/resources/common.conf index 2c8f881372..9e99e7ab6f 100644 --- a/akka-samples/akka-sample-remote-scala/src/main/resources/common.conf +++ b/akka-samples/akka-sample-remote-scala/src/main/resources/common.conf @@ -1,7 +1,7 @@ akka { actor { - provider = "akka.remote.RemoteActorRefProvider" + provider = remote } remote {