merged in teigen's persistence structure refactoring

akka-persistence-cassandra/pom.xml

@@ -0,0 +1,51 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>akka-persistence-cassandra</artifactId>
+  <name>Akka Persistence Cassandra Module</name>
+
+  <packaging>jar</packaging>
+
+  <parent>
+    <artifactId>akka</artifactId>
+    <groupId>se.scalablesolutions.akka</groupId>
+    <version>0.6</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <dependencies>
+    <dependency>
+      <artifactId>akka-persistence-common</artifactId>
+      <groupId>${project.groupId}</groupId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <!-- For Cassandra -->
+    <dependency>
+      <groupId>org.apache.cassandra</groupId>
+      <artifactId>cassandra</artifactId>
+      <version>0.4.1</version>
+    </dependency>
+     <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.13</version>
+    </dependency>
+    
+    <!-- For Testing -->
+    <dependency>
+      <groupId>org.scalatest</groupId>
+      <artifactId>scalatest</artifactId>
+      <version>1.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.5</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+</project>

akka-persistence-cassandra/src/main/scala/CassandraStorage.scala

@@ -0,0 +1,49 @@
+/**
+ * Copyright (C) 2009 Scalable Solutions.
+ */
+
+package se.scalablesolutions.akka.state
+
+import org.codehaus.aspectwerkz.proxy.Uuid
+
+object CassandraStorage extends Storage {
+  type ElementType = Array[Byte]
+
+  def newMap: PersistentMap[ElementType, ElementType] = newMap(Uuid.newUuid.toString)
+  def newVector: PersistentVector[ElementType] = newVector(Uuid.newUuid.toString)
+  def newRef: PersistentRef[ElementType] = newRef(Uuid.newUuid.toString)
+
+  def getMap(id: String): PersistentMap[ElementType, ElementType] = newMap(id)
+  def getVector(id: String): PersistentVector[ElementType] = newVector(id)
+  def getRef(id: String): PersistentRef[ElementType] = newRef(id)
+
+  def newMap(id: String): PersistentMap[ElementType, ElementType] = new CassandraPersistentMap(id)
+  def newVector(id: String): PersistentVector[ElementType] = new CassandraPersistentVector(id)
+  def newRef(id: String): PersistentRef[ElementType] = new CassandraPersistentRef(id)
+}
+
+/**
+ * Implements a persistent transactional map based on the Cassandra distributed P2P key-value storage.
+ *
+ * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
+ */
+class CassandraPersistentMap(id: String) extends PersistentMap[Array[Byte], Array[Byte]] {
+  val uuid = id
+  val storage = CassandraStorageBackend
+}
+
+/**
+ * Implements a persistent transactional vector based on the Cassandra
+ * distributed P2P key-value storage.
+ *
+ * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
+ */
+class CassandraPersistentVector(id: String) extends PersistentVector[Array[Byte]] {
+  val uuid = id
+  val storage = CassandraStorageBackend
+}
+
+class CassandraPersistentRef(id: String) extends PersistentRef[Array[Byte]] {
+  val uuid = id
+  val storage = CassandraStorageBackend
+}

akka-persistence-common/pom.xml

@@ -2,8 +2,8 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>akka-persistence</artifactId>
-  <name>Akka Persistence Module</name>
+  <artifactId>akka-persistence-common</artifactId>
+  <name>Akka Persistence Common Module</name>
 
   <packaging>jar</packaging>
 
@@ -26,19 +26,6 @@
       <version>${project.version}</version>
     </dependency>
 
-   <!-- For Mongo -->
-    <dependency>
-      <groupId>org.mongodb</groupId>
-      <artifactId>mongo-java-driver</artifactId>
-      <version>1.1</version>
-    </dependency>
-
-    <!-- For Cassandra -->
-    <dependency>
-      <groupId>org.apache.cassandra</groupId>
-      <artifactId>cassandra</artifactId>
-      <version>0.4.1</version>
-    </dependency>
     <dependency>
       <groupId>com.facebook</groupId>
       <artifactId>thrift</artifactId>
@@ -49,11 +36,6 @@
       <artifactId>commons-pool</artifactId>
       <version>1.5.1</version>
     </dependency>
-     <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.13</version>
-    </dependency>
     
     <!-- For Testing -->
     <dependency>

akka-persistence-common/src/main/scala/Storage.scala

@@ -58,37 +58,9 @@ trait Storage {
   def newRef(id: String): PersistentRef[ElementType]
 }
 
-object CassandraStorage extends Storage {
-  type ElementType = Array[Byte]
 
-  def newMap: PersistentMap[ElementType, ElementType] = newMap(Uuid.newUuid.toString)
-  def newVector: PersistentVector[ElementType] = newVector(Uuid.newUuid.toString)
-  def newRef: PersistentRef[ElementType] = newRef(Uuid.newUuid.toString)
 
-  def getMap(id: String): PersistentMap[ElementType, ElementType] = newMap(id)
-  def getVector(id: String): PersistentVector[ElementType] = newVector(id)
-  def getRef(id: String): PersistentRef[ElementType] = newRef(id)
 
-  def newMap(id: String): PersistentMap[ElementType, ElementType] = new CassandraPersistentMap(id)
-  def newVector(id: String): PersistentVector[ElementType] = new CassandraPersistentVector(id)
-  def newRef(id: String): PersistentRef[ElementType] = new CassandraPersistentRef(id)
-}
-
-object MongoStorage extends Storage {
-  type ElementType = AnyRef
-
-  def newMap: PersistentMap[ElementType, ElementType] = newMap(Uuid.newUuid.toString)
-  def newVector: PersistentVector[ElementType] = newVector(Uuid.newUuid.toString)
-  def newRef: PersistentRef[ElementType] = newRef(Uuid.newUuid.toString)
-
-  def getMap(id: String): PersistentMap[ElementType, ElementType] = newMap(id)
-  def getVector(id: String): PersistentVector[ElementType] = newVector(id)
-  def getRef(id: String): PersistentRef[ElementType] = newRef(id)
-
-  def newMap(id: String): PersistentMap[ElementType, ElementType] = new MongoPersistentMap(id)
-  def newVector(id: String): PersistentVector[ElementType] = new MongoPersistentVector(id)
-  def newRef(id: String): PersistentRef[ElementType] = new MongoPersistentRef(id)
-}
 
 /**
  * Implementation of <tt>PersistentMap</tt> for every concrete 
@@ -190,26 +162,6 @@ trait PersistentMap[K, V] extends scala.collection.mutable.Map[K, V]
   }
 }
 
-/**
- * Implements a persistent transactional map based on the Cassandra distributed P2P key-value storage.
- *
- * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
- */
-class CassandraPersistentMap(id: String) extends PersistentMap[Array[Byte], Array[Byte]] {
-  val uuid = id
-  val storage = CassandraStorageBackend
-}
-
-/**
- * Implements a persistent transactional map based on the MongoDB document storage.
- *
- * @author <a href="http://debasishg.blogspot.com">Debasish Ghosh</a>
- */
-class MongoPersistentMap(id: String) extends PersistentMap[AnyRef, AnyRef] {
-  val uuid = id
-  val storage = MongoStorageBackend
-}
-
 /**
  * Implements a template for a concrete persistent transactional vector based storage.
  *
@@ -286,28 +238,6 @@ trait PersistentVector[T] extends RandomAccessSeq[T] with Transactional with Com
   }
 }
 
-/**
- * Implements a persistent transactional vector based on the Cassandra
- * distributed P2P key-value storage.
- *
- * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
- */
-class CassandraPersistentVector(id: String) extends PersistentVector[Array[Byte]] {
-  val uuid = id
-  val storage = CassandraStorageBackend
-}
-
-/**                                                                                                                                           
- * Implements a persistent transactional vector based on the MongoDB
- * document  storage.
- *
- * @author <a href="http://debasishg.blogspot.com">Debaissh Ghosh</a>
- */
-class MongoPersistentVector(id: String) extends PersistentVector[AnyRef] {
-  val uuid = id
-  val storage = MongoStorageBackend
-} 
-
 /**
  * Implements a persistent reference with abstract storage.
  *
@@ -343,13 +273,3 @@ trait PersistentRef[T] extends Transactional with Committable {
     currentTransaction.get.get.register(uuid, this)
   }
 }
-
-class CassandraPersistentRef(id: String) extends PersistentRef[Array[Byte]] {
-  val uuid = id
-  val storage = CassandraStorageBackend
-}
-
-class MongoPersistentRef(id: String) extends PersistentRef[AnyRef] {
-  val uuid = id
-  val storage = MongoStorageBackend
-}

akka-persistence-mongo/pom.xml

@@ -0,0 +1,46 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>akka-persistence-mongo</artifactId>
+  <name>Akka Persistence Mongo Module</name>
+
+  <packaging>jar</packaging>
+
+  <parent>
+    <artifactId>akka</artifactId>
+    <groupId>se.scalablesolutions.akka</groupId>
+    <version>0.6</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <dependencies>
+    <dependency>
+      <artifactId>akka-persistence-common</artifactId>
+      <groupId>${project.groupId}</groupId>
+      <version>${project.version}</version>
+    </dependency>
+
+   <!-- For Mongo -->
+    <dependency>
+      <groupId>org.mongodb</groupId>
+      <artifactId>mongo-java-driver</artifactId>
+      <version>1.1</version>
+    </dependency>
+
+    <!-- For Testing -->
+    <dependency>
+      <groupId>org.scalatest</groupId>
+      <artifactId>scalatest</artifactId>
+      <version>1.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.5</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+</project>

akka-persistence-mongo/src/main/scala/MongoStorage.scala

@@ -0,0 +1,49 @@
+/**
+ * Copyright (C) 2009 Scalable Solutions.
+ */
+
+package se.scalablesolutions.akka.state
+
+import org.codehaus.aspectwerkz.proxy.Uuid
+
+object MongoStorage extends Storage {
+  type ElementType = AnyRef
+
+  def newMap: PersistentMap[ElementType, ElementType] = newMap(Uuid.newUuid.toString)
+  def newVector: PersistentVector[ElementType] = newVector(Uuid.newUuid.toString)
+  def newRef: PersistentRef[ElementType] = newRef(Uuid.newUuid.toString)
+
+  def getMap(id: String): PersistentMap[ElementType, ElementType] = newMap(id)
+  def getVector(id: String): PersistentVector[ElementType] = newVector(id)
+  def getRef(id: String): PersistentRef[ElementType] = newRef(id)
+
+  def newMap(id: String): PersistentMap[ElementType, ElementType] = new MongoPersistentMap(id)
+  def newVector(id: String): PersistentVector[ElementType] = new MongoPersistentVector(id)
+  def newRef(id: String): PersistentRef[ElementType] = new MongoPersistentRef(id)
+}
+
+/**
+ * Implements a persistent transactional map based on the MongoDB document storage.
+ *
+ * @author <a href="http://debasishg.blogspot.com">Debasish Ghosh</a>
+ */
+class MongoPersistentMap(id: String) extends PersistentMap[AnyRef, AnyRef] {
+  val uuid = id
+  val storage = MongoStorageBackend
+}
+
+/**
+ * Implements a persistent transactional vector based on the MongoDB
+ * document  storage.
+ *
+ * @author <a href="http://debasishg.blogspot.com">Debaissh Ghosh</a>
+ */
+class MongoPersistentVector(id: String) extends PersistentVector[AnyRef] {
+  val uuid = id
+  val storage = MongoStorageBackend
+}
+
+class MongoPersistentRef(id: String) extends PersistentRef[AnyRef] {
+  val uuid = id
+  val storage = MongoStorageBackend
+}

akka-persistence-mongo/src/test/scala/MongoPersistentActorSpec.scala

@@ -91,6 +91,14 @@ class BankAccountActor extends Actor {
   }
 }
 
+@serializable class PersistentFailerActor extends Actor {
+  makeTransactionRequired
+  def receive = {
+    case "Failure" =>
+      throw new RuntimeException("expected")
+  }
+}
+
 class MongoPersistentActorSpec extends TestCase {
   @Test
   def testSuccessfulDebit = {

akka-persistence/src/test/scala/AllTest.scala

@@ -1,18 +0,0 @@
-package se.scalablesolutions.akka
-
-import se.scalablesolutions.akka.state.{MongoStorageSpec, MongoPersistentActorSpec, CassandraPersistentActorSpec}
-import junit.framework.Test
-import junit.framework.TestCase
-import junit.framework.TestSuite
-
-object AllTest extends TestCase {
-  def suite(): Test = {
-    val suite = new TestSuite("All Scala tests")
-    //suite.addTestSuite(classOf[CassandraPersistentActorSpec])
-    //suite.addTestSuite(classOf[MongoPersistentActorSpec])
-    //suite.addTestSuite(classOf[MongoStorageSpec])
-    suite
-  }
-
-  def main(args: Array[String]) = junit.textui.TestRunner.run(suite)
-}

akka.iml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" relativePaths="false" type="JAVA_MODULE" version="4">
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>

pom.xml

@@ -51,7 +51,9 @@
     <module>akka-util-java</module>
     <module>akka-util</module>
     <module>akka-core</module>
-    <module>akka-persistence</module>
+    <module>akka-persistence-common</module>
+    <module>akka-persistence-cassandra</module>
+    <module>akka-persistence-mongo</module>
     <module>akka-rest</module>
     <module>akka-amqp</module>
     <module>akka-security</module>