diff --git a/akka-cluster/src/main/scala/Cluster.scala b/akka-actors/src/main/scala/nio/Cluster.scala similarity index 98% rename from akka-cluster/src/main/scala/Cluster.scala rename to akka-actors/src/main/scala/nio/Cluster.scala index 91b5ac78f6..7afd7b9d4d 100644 --- a/akka-cluster/src/main/scala/Cluster.scala +++ b/akka-actors/src/main/scala/nio/Cluster.scala @@ -1,7 +1,6 @@ -package se.scalablesolutions.akka.cluster +package se.scalablesolutions.akka.actor import se.scalablesolutions.akka.Config.config -import se.scalablesolutions.akka.actor.Actor import se.scalablesolutions.akka.util.Logging import org.jgroups.{JChannel,View,Address,Message,ExtendedMembershipListener,Receiver,SetStateEvent} import se.scalablesolutions.akka.serialization.Serializer.Protobuf diff --git a/akka-cluster/pom.xml b/akka-cluster/pom.xml deleted file mode 100644 index abf62fe317..0000000000 --- a/akka-cluster/pom.xml +++ /dev/null @@ -1,72 +0,0 @@ - - 4.0.0 - - akka-cluster - Akka Cluster Module - - jar - - - akka - se.scalablesolutions.akka - 0.6 - ../pom.xml - - - - - org.scala-lang - scala-library - ${scala.version} - - - org.scala-tools - javautils - 2.7.4-0.1 - - - akka-actors - ${project.groupId} - ${project.version} - - - akka-util - ${project.groupId} - ${project.version} - - - jgroups - jgroups - 2.8.0.CR7 - - - net.liftweb - lift-util - 1.1-M6 - - - - - org.scalatest - scalatest - 1.0 - test - - - junit - junit - 4.5 - test - - - org.mockito - mockito-all - 1.8.0 - test - - - - - - diff --git a/pom.xml b/pom.xml index 03a88bb56e..f7cca33ba2 100755 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,6 @@ akka-persistence akka-rest akka-camel - akka-cluster akka-amqp akka-security akka-kernel