From 2cbd033a45e0f91ae2d588586a88cd9cbfae6ed7 Mon Sep 17 00:00:00 2001
From: Peter Vlugter <peter@maka>
Date: Tue, 9 Nov 2010 15:16:38 +1300
Subject: [PATCH] Move Transactor and Coordinated to akka.transactor package

---
 .../src/main/scala/{stm => transactor}/Coordinated.scala   | 3 ++-
 .../src/main/scala/{actor => transactor}/Transactor.scala  | 7 ++++---
 .../{stm => transactor}/CoordinatedIncrementSpec.scala     | 3 ++-
 .../test/scala/{stm => transactor}/FickleFriendsSpec.scala | 3 ++-
 .../test/scala/{actor => transactor}/TransactorSpec.scala  | 5 +++--
 5 files changed, 13 insertions(+), 8 deletions(-)
 rename akka-stm/src/main/scala/{stm => transactor}/Coordinated.scala (97%)
 rename akka-stm/src/main/scala/{actor => transactor}/Transactor.scala (97%)
 rename akka-stm/src/test/scala/{stm => transactor}/CoordinatedIncrementSpec.scala (97%)
 rename akka-stm/src/test/scala/{stm => transactor}/FickleFriendsSpec.scala (98%)
 rename akka-stm/src/test/scala/{actor => transactor}/TransactorSpec.scala (96%)

diff --git a/akka-stm/src/main/scala/stm/Coordinated.scala b/akka-stm/src/main/scala/transactor/Coordinated.scala
similarity index 97%
rename from akka-stm/src/main/scala/stm/Coordinated.scala
rename to akka-stm/src/main/scala/transactor/Coordinated.scala
index 3a57fd0ffc..fa3274123e 100644
--- a/akka-stm/src/main/scala/stm/Coordinated.scala
+++ b/akka-stm/src/main/scala/transactor/Coordinated.scala
@@ -2,9 +2,10 @@
  * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
-package akka.stm
+package akka.transactor
 
 import akka.config.Config
+import akka.stm.{DefaultTransactionConfig, TransactionFactory}
 
 import org.multiverse.api.{Transaction => MultiverseTransaction}
 import org.multiverse.commitbarriers.CountDownCommitBarrier
diff --git a/akka-stm/src/main/scala/actor/Transactor.scala b/akka-stm/src/main/scala/transactor/Transactor.scala
similarity index 97%
rename from akka-stm/src/main/scala/actor/Transactor.scala
rename to akka-stm/src/main/scala/transactor/Transactor.scala
index b539439d68..1c87949ba1 100644
--- a/akka-stm/src/main/scala/actor/Transactor.scala
+++ b/akka-stm/src/main/scala/transactor/Transactor.scala
@@ -2,9 +2,10 @@
  * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
-package akka.actor
+package akka.transactor
 
-import akka.stm.{Coordinated, DefaultTransactionConfig, TransactionFactory}
+import akka.actor.{Actor, ActorRef}
+import akka.stm.{DefaultTransactionConfig, TransactionFactory}
 
 /**
  * Transactor. See companion class for information.
@@ -111,7 +112,7 @@ trait Transactor extends Actor {
   /**
    * Implement a general pattern for using coordinated transactions.
    */
-  def receive = {
+  final def receive = {
     case coordinated @ Coordinated(message) => {
       val others = (coordinate orElse alone)(message)
       for (sendTo <- others) {
diff --git a/akka-stm/src/test/scala/stm/CoordinatedIncrementSpec.scala b/akka-stm/src/test/scala/transactor/CoordinatedIncrementSpec.scala
similarity index 97%
rename from akka-stm/src/test/scala/stm/CoordinatedIncrementSpec.scala
rename to akka-stm/src/test/scala/transactor/CoordinatedIncrementSpec.scala
index fa2bd5c512..7f09b5d9bc 100644
--- a/akka-stm/src/test/scala/stm/CoordinatedIncrementSpec.scala
+++ b/akka-stm/src/test/scala/transactor/CoordinatedIncrementSpec.scala
@@ -1,8 +1,9 @@
-package akka.stm.test
+package akka.transactor.test
 
 import org.scalatest.WordSpec
 import org.scalatest.matchers.MustMatchers
 
+import akka.transactor.Coordinated
 import akka.actor.{Actor, ActorRef}
 import akka.stm._
 import akka.util.duration._
diff --git a/akka-stm/src/test/scala/stm/FickleFriendsSpec.scala b/akka-stm/src/test/scala/transactor/FickleFriendsSpec.scala
similarity index 98%
rename from akka-stm/src/test/scala/stm/FickleFriendsSpec.scala
rename to akka-stm/src/test/scala/transactor/FickleFriendsSpec.scala
index 297b5e31b9..80a6e0f081 100644
--- a/akka-stm/src/test/scala/stm/FickleFriendsSpec.scala
+++ b/akka-stm/src/test/scala/transactor/FickleFriendsSpec.scala
@@ -1,8 +1,9 @@
-package akka.stm.test
+package akka.transactor.test
 
 import org.scalatest.WordSpec
 import org.scalatest.matchers.MustMatchers
 
+import akka.transactor.Coordinated
 import akka.actor.{Actor, ActorRef}
 import akka.stm._
 import akka.util.duration._
diff --git a/akka-stm/src/test/scala/actor/TransactorSpec.scala b/akka-stm/src/test/scala/transactor/TransactorSpec.scala
similarity index 96%
rename from akka-stm/src/test/scala/actor/TransactorSpec.scala
rename to akka-stm/src/test/scala/transactor/TransactorSpec.scala
index 5fa4dbb200..aeb559c410 100644
--- a/akka-stm/src/test/scala/actor/TransactorSpec.scala
+++ b/akka-stm/src/test/scala/transactor/TransactorSpec.scala
@@ -1,9 +1,10 @@
-package akka.actor.test
+package akka.transactor.test
 
 import org.scalatest.WordSpec
 import org.scalatest.matchers.MustMatchers
 
-import akka.actor.{Transactor, Actor, ActorRef}
+import akka.transactor.Transactor
+import akka.actor.{Actor, ActorRef}
 import akka.stm._
 import akka.util.duration._