From f1bc34cad72ac323694c0c667a143bc245ba51d6 Mon Sep 17 00:00:00 2001
From: Peter Veentjer <alarmnmmer@gmail.com>
Date: Tue, 9 Aug 2011 13:19:59 +0300
Subject: [PATCH] ticket 989 #Allow specifying preferred-nodes of other type
 than node:<name>/ currently the task has been downscoped to only allow
 node:name since we need to rethink this part. Metadata is going to make it /
 it possible to deal with way more nodes

---
 .../src/main/scala/akka/actor/Deployer.scala     |  6 +++---
 .../main/scala/akka/actor/DeploymentConfig.scala | 16 ++++++++--------
 config/akka-reference.conf                       |  6 +++---
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/akka-actor/src/main/scala/akka/actor/Deployer.scala b/akka-actor/src/main/scala/akka/actor/Deployer.scala
index 3e98716722..63bdcbe826 100644
--- a/akka-actor/src/main/scala/akka/actor/Deployer.scala
+++ b/akka-actor/src/main/scala/akka/actor/Deployer.scala
@@ -21,7 +21,7 @@ import akka.AkkaException
  */
 object Deployer {
 
-  val defaultAddress = Host(Config.hostname)
+//  val defaultAddress = Node(Config.nodename)
 
   lazy val instance: ClusterModule.ClusterDeployer = {
     val deployer =
@@ -191,9 +191,9 @@ object Deployer {
                   val address = tokenizer.nextElement.asInstanceOf[String]
 
                   protocol match {
-                    case "host" ⇒ Host(address)
+                    //case "host" ⇒ Host(address)
                     case "node" ⇒ Node(address)
-                    case "ip"   ⇒ IP(address)
+                    //case "ip"   ⇒ IP(address)
                     case _      ⇒ raiseHomeConfigError()
                   }
                 }
diff --git a/akka-actor/src/main/scala/akka/actor/DeploymentConfig.scala b/akka-actor/src/main/scala/akka/actor/DeploymentConfig.scala
index f5206b7668..8f3b4504ce 100644
--- a/akka-actor/src/main/scala/akka/actor/DeploymentConfig.scala
+++ b/akka-actor/src/main/scala/akka/actor/DeploymentConfig.scala
@@ -51,7 +51,7 @@ object DeploymentConfig {
   // --------------------------------
   sealed trait Scope
   case class Clustered(
-    preferredNodes: Iterable[Home] = Vector(Host("localhost")),
+    preferredNodes: Iterable[Home] = Vector(Node(Config.nodename)),
     replicas: ReplicationFactor = ZeroReplicationFactor,
     replication: ReplicationScheme = Transient) extends Scope
 
@@ -65,9 +65,9 @@ object DeploymentConfig {
   // --- Home
   // --------------------------------
   sealed trait Home
-  case class Host(hostName: String) extends Home
+//  case class Host(hostName: String) extends Home
   case class Node(nodeName: String) extends Home
-  case class IP(ipAddress: String) extends Home
+//  case class IP(ipAddress: String) extends Home
 
   // --------------------------------
   // --- Replicas
@@ -130,11 +130,11 @@ object DeploymentConfig {
 
   def nodeNameFor(home: Home): String = home match {
     case Node(nodename)    ⇒ nodename
-    case Host("localhost") ⇒ Config.nodename
-    case IP("0.0.0.0")     ⇒ Config.nodename
-    case IP("127.0.0.1")   ⇒ Config.nodename
-    case Host(hostname)    ⇒ throw new UnsupportedOperationException("Specifying preferred node name by 'hostname' is not yet supported. Use the node name like: preferred-nodes = [\"node:node1\"]")
-    case IP(address)       ⇒ throw new UnsupportedOperationException("Specifying preferred node name by 'IP address' is not yet supported. Use the node name like: preferred-nodes = [\"node:node1\"]")
+//    case Host("localhost") ⇒ Config.nodename
+//    case IP("0.0.0.0")     ⇒ Config.nodename
+//    case IP("127.0.0.1")   ⇒ Config.nodename
+//    case Host(hostname)    ⇒ throw new UnsupportedOperationException("Specifying preferred node name by 'hostname' is not yet supported. Use the node name like: preferred-nodes = [\"node:node1\"]")
+//    case IP(address)       ⇒ throw new UnsupportedOperationException("Specifying preferred node name by 'IP address' is not yet supported. Use the node name like: preferred-nodes = [\"node:node1\"]")
   }
 
   def isHomeNode(homes: Iterable[Home]): Boolean = homes exists (home ⇒ nodeNameFor(home) == Config.nodename)
diff --git a/config/akka-reference.conf b/config/akka-reference.conf
index 218a824220..cbd2e5113e 100644
--- a/config/akka-reference.conf
+++ b/config/akka-reference.conf
@@ -51,9 +51,9 @@ akka {
                                                       #     default (if omitted) is local non-clustered actor
 
           preferred-nodes = ["node:node1"]            # a list of preferred nodes for instantiating the actor instances on
-                                                      #     defined as: hostname, IP-address or node name
-                                                      #     available: "host:<hostname>", "ip:<ip address>" and "node:<node name>"
-                                                      #     default is "host:localhost"
+                                                      #     defined as node name
+                                                      #     available:
+                                                      #         "node:<node name>"
 
           replication-factor = 3                      # number of actor instances in the cluster
                                                       #     available: positive integer (0-N) or the string "auto" for auto-scaling