1. Makes sure to check if 'akka.enabled-modules=["cluster"]' is set before checking if the akka-cluster.jar is on the classpath, allowing non-cluster deployment even with the JAR on the classpath

2. Fixed bug with duplicate entries in replica set for an actor address
3. Turned on clustering for all Multi JVM tests

Signed-off-by: Jonas Bonér <jonas@jonasboner.com>

akka-actor/src/main/scala/akka/actor/Deployer.scala

@@ -150,7 +150,7 @@ object DeploymentConfig {
     }
   }
 
-  def isHomeNode(home: Home): Boolean = nodeNameFor(home) == Config.nodeName
+  def isHomeNode(home: Home): Boolean = nodeNameFor(home) == Config.nodename
 
   def replicaValueFor(replicas: Replicas): Int = replicas match {
     case Replicate(replicas) ⇒ replicas

akka-actor/src/main/scala/akka/actor/Supervisor.scala

@@ -48,7 +48,7 @@ class SupervisorException private[akka] (message: String, cause: Throwable = nul
  *       ..
  *   ))
  * </pre>
-
+ *
  * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
  */
 object Supervisor {

akka-actor/src/main/scala/akka/config/Config.scala

@@ -96,6 +96,8 @@ object Config {
 
   val TIME_UNIT = config.getString("akka.time-unit", "seconds")
 
+  val isClusterEnabled = config.getList("akka.enabled-modules").exists(_ == "cluster")
+
   lazy val nodename = System.getProperty("akka.cluster.nodename") match {
     case null | "" ⇒ new UUID().toString
     case value     ⇒ value

akka-actor/src/main/scala/akka/util/ReflectiveAccess.scala

@@ -30,12 +30,12 @@ object ReflectiveAccess {
    * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
    */
   object ClusterModule {
-    lazy val isEnabled = clusterInstance.isDefined
+    lazy val isEnabled = Config.isClusterEnabled && clusterInstance.isDefined
 
     def ensureEnabled() {
       if (!isEnabled) {
         val e = new ModuleNotAvailableException(
-          "Can't load the cluster module, make sure that akka-cluster.jar is on the classpath")
+          "Can't load the cluster module, make sure it is enabled in the config ('akka.enabled-modules = [\"cluster\"])' and that akka-cluster.jar is on the classpath")
         EventHandler.debug(this, e.toString)
         throw e
       }

akka-cluster/src/main/scala/akka/cluster/Cluster.scala

@@ -1273,10 +1273,10 @@ class DefaultClusterNode private[akka] (
 
   /**
    * Returns a random set with node names of size 'replicationFactor'.
-   * Default replicationFactor is 0, which returns the empty Vector.
+   * Default replicationFactor is 0, which returns the empty Set.
    */
-  private def nodesForReplicationFactor(replicationFactor: Int = 0, actorAddress: Option[String] = None): Vector[String] = {
+  private def nodesForReplicationFactor(replicationFactor: Int = 0, actorAddress: Option[String] = None): Set[String] = {
-    var replicaNames = Vector.empty[String]
+    var replicaNames = Set.empty[String]
     val nrOfClusterNodes = nodeConnections.size
 
     if (replicationFactor < 1) return replicaNames
@@ -1288,7 +1288,7 @@ class DefaultClusterNode private[akka] (
       if (actorAddress.isDefined) { // use 'preferred-nodes' in deployment config for the actor
         Deployer.deploymentFor(actorAddress.get) match {
           case Deploy(_, _, _, Clustered(nodes, _, _)) ⇒
-            nodes map (node ⇒ Deployer.nodeNameFor(node)) take replicationFactor
+            nodes map (node ⇒ DeploymentConfig.nodeNameFor(node)) take replicationFactor
           case _ ⇒
             throw new ClusterException("Actor [" + actorAddress.get + "] is not configured as clustered")
         }
@@ -1298,7 +1298,7 @@ class DefaultClusterNode private[akka] (
       nodeName ← preferredNodes
       key ← nodeConnections.keys
       if key == nodeName
-    } replicaNames = replicaNames :+ nodeName
+    } replicaNames = replicaNames + nodeName
 
     val nrOfCurrentReplicaNames = replicaNames.size
 
@@ -1308,7 +1308,7 @@ class DefaultClusterNode private[akka] (
       else {
         val random = new java.util.Random(System.currentTimeMillis)
         while (replicaNames.size < replicationFactor) {
-          replicaNames = replicaNames :+ membershipNodes(random.nextInt(nrOfClusterNodes))
+          replicaNames = replicaNames + membershipNodes(random.nextInt(nrOfClusterNodes))
         }
         replicaNames
       }
@@ -1321,9 +1321,9 @@ class DefaultClusterNode private[akka] (
 
   /**
    * Returns a random set with replica connections of size 'replicationFactor'.
-   * Default replicationFactor is 0, which returns the empty Vector.
+   * Default replicationFactor is 0, which returns the empty Set.
    */
-  private def nodeConnectionsForReplicationFactor(replicationFactor: Int = 0, actorAddress: Option[String] = None): Vector[ActorRef] = {
+  private def nodeConnectionsForReplicationFactor(replicationFactor: Int = 0, actorAddress: Option[String] = None): Set[ActorRef] = {
     for {
       node ← nodesForReplicationFactor(replicationFactor, actorAddress)
       connectionOption ← nodeConnections.get(node)

akka-cluster/src/test/scala/akka/cluster/api/changelisteners/newleader/NewLeaderChangeListenerMultiJvmNode1.conf

@@ -1 +1,2 @@
+akka.enabled-modules = ["cluster"]
 akka.event-handler-level = "DEBUG"

akka-cluster/src/test/scala/akka/cluster/api/changelisteners/newleader/NewLeaderChangeListenerMultiJvmNode2.conf

@@ -1 +1,2 @@
+akka.enabled-modules = ["cluster"]
 akka.event-handler-level = "DEBUG"

akka-cluster/src/test/scala/akka/cluster/api/changelisteners/nodeconnected/NodeConnectedChangeListenerMultiJvmNode1.conf

@@ -1 +1,2 @@
+akka.enabled-modules = ["cluster"]
 akka.event-handler-level = "DEBUG"

akka-cluster/src/test/scala/akka/cluster/api/changelisteners/nodeconnected/NodeConnectedChangeListenerMultiJvmNode2.conf

@@ -1 +1,2 @@
+akka.enabled-modules = ["cluster"]
 akka.event-handler-level = "DEBUG"

akka-cluster/src/test/scala/akka/cluster/api/changelisteners/nodedisconnected/NodeDisconnectedChangeListenerMultiJvmNode1.conf

@@ -1 +1,2 @@
+akka.enabled-modules = ["cluster"]
 akka.event-handler-level = "DEBUG"

akka-cluster/src/test/scala/akka/cluster/api/changelisteners/nodedisconnected/NodeDisconnectedChangeListenerMultiJvmNode2.conf

@@ -1 +1,2 @@
+akka.enabled-modules = ["cluster"]
 akka.event-handler-level = "DEBUG"

akka-cluster/src/test/scala/akka/cluster/api/configuration/ConfigurationStorageMultiJvmNode1.conf

@@ -1 +1,2 @@
+akka.enabled-modules = ["cluster"]
 akka.event-handler-level = "DEBUG"

akka-cluster/src/test/scala/akka/cluster/api/configuration/ConfigurationStorageMultiJvmNode2.conf

@@ -1 +1,2 @@
+akka.enabled-modules = ["cluster"]
 akka.event-handler-level = "DEBUG"

akka-cluster/src/test/scala/akka/cluster/api/leader/election/LeaderElectionMultiJvmNode1.conf

@@ -1 +1,2 @@
+akka.enabled-modules = ["cluster"]
 akka.event-handler-level = "DEBUG"

akka-cluster/src/test/scala/akka/cluster/api/leader/election/LeaderElectionMultiJvmNode2.conf

@@ -1 +1,2 @@
+akka.enabled-modules = ["cluster"]
 akka.event-handler-level = "DEBUG"

akka-cluster/src/test/scala/akka/cluster/api/migration/automatic/MigrationAutomaticMultiJvmNode1.conf

@@ -1 +1,2 @@
+akka.enabled-modules = ["cluster"]
 akka.event-handler-level = "DEBUG"

akka-cluster/src/test/scala/akka/cluster/api/migration/automatic/MigrationAutomaticMultiJvmNode2.conf

@@ -1 +1,2 @@
+akka.enabled-modules = ["cluster"]
 akka.event-handler-level = "DEBUG"

akka-cluster/src/test/scala/akka/cluster/api/migration/automatic/MigrationAutomaticMultiJvmNode3.conf

@@ -1 +1,2 @@
+akka.enabled-modules = ["cluster"]
 akka.event-handler-level = "DEBUG"

akka-cluster/src/test/scala/akka/cluster/api/migration/explicit/MigrationExplicitMultiJvmNode1.conf

@@ -1 +1,2 @@
+akka.enabled-modules = ["cluster"]
 akka.event-handler-level = "DEBUG"

akka-cluster/src/test/scala/akka/cluster/api/migration/explicit/MigrationExplicitMultiJvmNode2.conf

@@ -1 +1,2 @@
+akka.enabled-modules = ["cluster"]
 akka.event-handler-level = "DEBUG"

akka-cluster/src/test/scala/akka/cluster/api/registry/RegistryStoreMultiJvmNode1.conf

@@ -1 +1,2 @@
+akka.enabled-modules = ["cluster"]
 akka.event-handler-level = "DEBUG"

akka-cluster/src/test/scala/akka/cluster/api/registry/RegistryStoreMultiJvmNode2.conf

@@ -1 +1,2 @@
+akka.enabled-modules = ["cluster"]
 akka.event-handler-level = "DEBUG"

akka-cluster/src/test/scala/akka/cluster/deployment/DeploymentMultiJvmNode1.conf

@@ -1,4 +1,4 @@
+akka.enabled-modules = ["cluster"]
 akka.event-handler-level = "DEBUG"
 akka.actor.deployment.service-hello.router = "round-robin"
-akka.actor.deployment.service-hello.clustered.home = "node:node1"
 akka.actor.deployment.service-hello.clustered.replicas = 1

akka-cluster/src/test/scala/akka/cluster/deployment/DeploymentMultiJvmNode2.conf

@@ -1,4 +1,4 @@
+akka.enabled-modules = ["cluster"]
 akka.event-handler-level = "DEBUG"
 akka.actor.deployment.service-hello.router = "round-robin"
-akka.actor.deployment.service-hello.clustered.home = "node:node1"
 akka.actor.deployment.service-hello.clustered.replicas = 1

akka-cluster/src/test/scala/akka/cluster/routing/homenode/HomeNodeMultiJvmNode1.conf

@@ -1,3 +1,4 @@
+akka.enabled-modules = ["cluster"]
 akka.event-handler-level = "DEBUG"
 akka.actor.deployment.service-hello.router = "round-robin"
 akka.actor.deployment.service-hello.clustered.preferred-nodes = ["host:node1"]

akka-cluster/src/test/scala/akka/cluster/routing/homenode/HomeNodeMultiJvmNode2.conf

@@ -1,3 +1,4 @@
+akka.enabled-modules = ["cluster"]
 akka.event-handler-level = "DEBUG"
 akka.actor.deployment.service-hello.router = "round-robin"
 akka.actor.deployment.service-hello.clustered.preferred-nodes = ["node:node1"]

akka-cluster/src/test/scala/akka/cluster/routing/roundrobin_1_replica/RoundRobin1ReplicaMultiJvmNode1.conf

@@ -1,4 +1,4 @@
+akka.enabled-modules = ["cluster"]
 akka.event-handler-level = "DEBUG"
 akka.actor.deployment.service-hello.router = "round-robin"
-akka.actor.deployment.service-hello.clustered.home = "node:node1"
 akka.actor.deployment.service-hello.clustered.replicas = 1

akka-cluster/src/test/scala/akka/cluster/routing/roundrobin_2_replicas/RoundRobin2ReplicasMultiJvmNode1.conf

@@ -1,5 +1,5 @@
+akka.enabled-modules = ["cluster"]
 akka.event-handler-level = "DEBUG"
 akka.actor.deployment.service-hello.router = "round-robin"
-akka.actor.deployment.service-hello.clustered.home = "node:node1"
+akka.actor.deployment.service-hello.clustered.preferred-nodes = ["node:node1","node:node2"]
 akka.actor.deployment.service-hello.clustered.replicas = 2
-akka.actor.deployment.service-hello.clustered.stateless = on

akka-cluster/src/test/scala/akka/cluster/routing/roundrobin_2_replicas/RoundRobin2ReplicasMultiJvmNode2.conf

@@ -1,5 +1,5 @@
+akka.enabled-modules = ["cluster"]
 akka.event-handler-level = "DEBUG"
 akka.actor.deployment.service-hello.router = "round-robin"
-akka.actor.deployment.service-hello.clustered.home = "node:node1"
+akka.actor.deployment.service-hello.clustered.preferred-nodes = ["node:node1","node:node2"]
 akka.actor.deployment.service-hello.clustered.replicas = 2
-akka.actor.deployment.service-hello.clustered.stateless = on

akka-cluster/src/test/scala/akka/cluster/routing/roundrobin_3_replicas/RoundRobin3ReplicasMultiJvmNode1.conf

@@ -1,5 +1,4 @@
+akka.enabled-modules = ["cluster"]
 akka.event-handler-level = "DEBUG"
 akka.actor.deployment.service-hello.router = "round-robin"
-akka.actor.deployment.service-hello.clustered.home = "node:node1"
 akka.actor.deployment.service-hello.clustered.replicas = 3
-akka.actor.deployment.service-hello.clustered.stateless = on

akka-cluster/src/test/scala/akka/cluster/routing/roundrobin_3_replicas/RoundRobin3ReplicasMultiJvmNode2.conf

@@ -1,5 +1,4 @@
+akka.enabled-modules = ["cluster"]
 akka.event-handler-level = "DEBUG"
 akka.actor.deployment.service-hello.router = "round-robin"
-akka.actor.deployment.service-hello.clustered.home = "node:node1"
 akka.actor.deployment.service-hello.clustered.replicas = 3
-akka.actor.deployment.service-hello.clustered.stateless = on

akka-cluster/src/test/scala/akka/cluster/routing/roundrobin_3_replicas/RoundRobin3ReplicasMultiJvmNode3.conf

@@ -1,5 +1,4 @@
+akka.enabled-modules = ["cluster"]
 akka.event-handler-level = "DEBUG"
 akka.actor.deployment.service-hello.router = "round-robin"
-akka.actor.deployment.service-hello.clustered.home = "node:node1"
 akka.actor.deployment.service-hello.clustered.replicas = 3
-akka.actor.deployment.service-hello.clustered.stateless = on

akka-cluster/src/test/scala/akka/cluster/routing/roundrobin_failover/RoundRobinFailoverMultiJvmNode1.conf

@@ -1,4 +1,5 @@
+akka.enabled-modules = ["cluster"]
 akka.event-handler-level = "DEBUG"
 akka.actor.deployment.service-hello.router = "round-robin"
-akka.actor.deployment.service-hello.clustered.home = "node:node1"
+akka.actor.deployment.service-hello.clustered.preferred-nodes = ["node:node1"]
 akka.actor.deployment.service-hello.clustered.replicas = 1

akka-cluster/src/test/scala/akka/cluster/routing/roundrobin_failover/RoundRobinFailoverMultiJvmNode2.conf

@@ -1,4 +1,5 @@
+akka.enabled-modules = ["cluster"]
 akka.event-handler-level = "DEBUG"
 akka.actor.deployment.service-hello.router = "round-robin"
-akka.actor.deployment.service-hello.clustered.home = "node:node1"
+akka.actor.deployment.service-hello.clustered.preferred-nodes = ["node:node1"]
 akka.actor.deployment.service-hello.clustered.replicas = 1

akka-cluster/src/test/scala/akka/cluster/routing/roundrobin_failover/RoundRobinFailoverMultiJvmNode3.conf

@@ -1,4 +1,5 @@
+akka.enabled-modules = ["cluster"]
 akka.event-handler-level = "DEBUG"
 akka.actor.deployment.service-hello.router = "round-robin"
-akka.actor.deployment.service-hello.clustered.home = "node:node1"
+akka.actor.deployment.service-hello.clustered.preferred-nodes = ["node:node1"]
 akka.actor.deployment.service-hello.clustered.replicas = 1

akka-cluster/src/test/scala/akka/cluster/routing/roundrobin_failover/RoundRobinFailoverMultiJvmNode4.conf

@@ -1,4 +1,5 @@
+akka.enabled-modules = ["cluster"]
 akka.event-handler-level = "DEBUG"
 akka.actor.deployment.service-hello.router = "round-robin"
-akka.actor.deployment.service-hello.clustered.home = "node:node1"
+akka.actor.deployment.service-hello.clustered.preferred-nodes = ["node:node1"]
 akka.actor.deployment.service-hello.clustered.replicas = 1

akka-cluster/src/test/scala/akka/cluster/routing/roundrobin_failover/testing-design-improvements.txt

@@ -4,7 +4,7 @@ object SomeNode extends ClusterNodeWithConf{
     def config() = "
         akka.event-handler-level = "DEBUG"
         akka.actor.deployment.service-hello.router = "round-robin"
-        akka.actor.deployment.service-hello.clustered.home = "node:node1"
+        akka.actor.deployment.service-hello.clustered.preferred-nodes = ["node:node1"]
         akka.actor.deployment.service-hello.clustered.replicas = 1"
     }
 }