Cleanup

akka-cluster/pom.xml

@@ -15,8 +15,8 @@
 
   <modules>
     <module>akka-cluster-jgroups</module>
-    <module>akka-cluster-tribes</module>
-    <module>akka-cluster-shoal</module>
+    <!--module>akka-cluster-tribes</module>
+    <module>akka-cluster-shoal</module-->
   </modules>
 
   <dependencies>

akka-core/src/main/scala/remote/Cluster.scala

@@ -6,10 +6,9 @@ package se.scalablesolutions.akka.remote
 
 import se.scalablesolutions.akka.Config.config
 import se.scalablesolutions.akka.config.ScalaConfig._
-import se.scalablesolutions.akka.remote.Cluster.{Node, RelayedMessage}
 import se.scalablesolutions.akka.serialization.Serializer
 import se.scalablesolutions.akka.actor.{Supervisor, SupervisorFactory, Actor, ActorRegistry}
-
+import se.scalablesolutions.akka.util.Logging
 import scala.collection.immutable.{Map, HashMap}
 
 /**
@@ -41,18 +40,23 @@ abstract class ClusterActor extends Actor with Cluster {
  * <p/>
  * Loads a specified ClusterActor and delegates to that instance.
  */
-object Cluster extends Cluster {
+object Cluster extends Cluster with Logging {
   private[remote] sealed trait ClusterMessage
   private[remote] case class Node(endpoints: List[RemoteAddress]) extends ClusterMessage
   private[remote] case class RelayedMessage(actorClassFQN: String, msg: AnyRef) extends ClusterMessage
 
-  private[remote] val clusterActor: Option[ClusterActor] =
-    config.getString("akka.remote.cluster.actor") map { name =>
-      val a = Class.forName(name).newInstance.asInstanceOf[ClusterActor]
-      a.start
-      a
-    }
-
+  private[remote] val clusterActor: Option[ClusterActor] = {
+    val name = config.getString("akka.remote.cluster.actor","not defined")
+    try { 
+        val a = Class.forName(name).newInstance.asInstanceOf[ClusterActor]
+        a.start
+        Some(a)
+      } 
+      catch { 
+        case e => log.error(e,"Couldn't load Cluster provider: [%s]",name)
+                  None
+      }
+  }
 
   private[remote] val supervisor: Option[Supervisor] = if (clusterActor.isDefined) {
     val sup = SupervisorFactory(

config/akka-reference.conf

@@ -48,7 +48,7 @@
 
     <cluster>
       name = "default"                                                       # The name of the cluster
-      #actor = "se.scalablesolutions.akka.remote.JGroupsClusterActor"         # FQN of an implementation of ClusterActor
+      actor = "se.scalablesolutions.akka.remote.JGroupsClusterActor"         # FQN of an implementation of ClusterActor
       serializer = "se.scalablesolutions.akka.serialization.Serializer$Java" # FQN of the serializer class
     </cluster>
     

pom.xml

@@ -50,9 +50,9 @@
   <modules>
     <module>akka-util-java</module>
     <module>akka-util</module>
+    <module>akka-cluster</module>
     <module>akka-core</module>
     <module>akka-persistence</module>
-    <module>akka-cluster</module>
     <module>akka-rest</module>
     <module>akka-comet</module>
     <module>akka-amqp</module>