CassandraStorage is now working with external Cassandra cluster + added CassandraSession for pooled client connections and a nice Scala/Java API

akka.ipr

@@ -917,17 +917,6 @@
         <root url="jar://$MAVEN_REPOSITORY$/com/sun/xml/bind/jaxb-impl/2.1.10/jaxb-impl-2.1.10-sources.jar!/" />
       </SOURCES>
     </library>
-    <library name="Maven: org.jboss.netty:netty:3.1.0.CR1">
-      <CLASSES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/jboss/netty/netty/3.1.0.CR1/netty-3.1.0.CR1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://$MAVEN_REPOSITORY$/org/jboss/netty/netty/3.1.0.CR1/netty-3.1.0.CR1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/jboss/netty/netty/3.1.0.CR1/netty-3.1.0.CR1-sources.jar!/" />
-      </SOURCES>
-    </library>
     <library name="Maven: com.sun.grizzly:grizzly-servlet-webserver:1.9.9">
       <CLASSES>
         <root url="jar://$MAVEN_REPOSITORY$/com/sun/grizzly/grizzly-servlet-webserver/1.9.9/grizzly-servlet-webserver-1.9.9.jar!/" />
@@ -1316,28 +1305,6 @@
         <root url="jar://$MAVEN_REPOSITORY$/org/apache/camel/camel-core/2.0-SNAPSHOT/camel-core-2.0-SNAPSHOT-sources.jar!/" />
       </SOURCES>
     </library>
-    <library name="Maven: commons-logging:commons-logging-api:1.1">
-      <CLASSES>
-        <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging-api/1.1/commons-logging-api-1.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging-api/1.1/commons-logging-api-1.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.sun.xml.bind:jaxb-impl:2.1.6">
-      <CLASSES>
-        <root url="jar://$MAVEN_REPOSITORY$/com/sun/xml/bind/jaxb-impl/2.1.6/jaxb-impl-2.1.6.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://$MAVEN_REPOSITORY$/com/sun/xml/bind/jaxb-impl/2.1.6/jaxb-impl-2.1.6-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://$MAVEN_REPOSITORY$/com/sun/xml/bind/jaxb-impl/2.1.6/jaxb-impl-2.1.6-sources.jar!/" />
-      </SOURCES>
-    </library>
     <library name="Maven: org.codehaus.:jackson:3.1.0">
       <CLASSES>
         <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/3.1.0/jackson-3.1.0.jar!/" />
@@ -1809,6 +1776,50 @@
         <root url="jar://$MAVEN_REPOSITORY$/commons-pool/commons-pool/1.5.1/commons-pool-1.5.1-sources.jar!/" />
       </SOURCES>
     </library>
+    <library name="Maven: commons-logging:commons-logging-api:1.1">
+      <CLASSES>
+        <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging-api/1.1/commons-logging-api-1.1-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging-api/1.1/commons-logging-api-1.1-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Maven: com.sun.xml.bind:jaxb-impl:2.1.6">
+      <CLASSES>
+        <root url="jar://$MAVEN_REPOSITORY$/com/sun/xml/bind/jaxb-impl/2.1.6/jaxb-impl-2.1.6.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$MAVEN_REPOSITORY$/com/sun/xml/bind/jaxb-impl/2.1.6/jaxb-impl-2.1.6-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$MAVEN_REPOSITORY$/com/sun/xml/bind/jaxb-impl/2.1.6/jaxb-impl-2.1.6-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Maven: org.scala-tools:javautils:2.7.4-0.1">
+      <CLASSES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/scala-tools/javautils/2.7.4-0.1/javautils-2.7.4-0.1.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$MAVEN_REPOSITORY$/org/scala-tools/javautils/2.7.4-0.1/javautils-2.7.4-0.1-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/scala-tools/javautils/2.7.4-0.1/javautils-2.7.4-0.1-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Maven: org.jboss.netty:netty:3.1.0.GA">
+      <CLASSES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/jboss/netty/netty/3.1.0.GA/netty-3.1.0.GA.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$MAVEN_REPOSITORY$/org/jboss/netty/netty/3.1.0.GA/netty-3.1.0.GA-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/jboss/netty/netty/3.1.0.GA/netty-3.1.0.GA-sources.jar!/" />
+      </SOURCES>
+    </library>
   </component>
   <UsedPathMacros>
     <macro name="MAVEN_REPOSITORY" description="Maven Local Repostiry" />

akka.iws

@@ -7,11 +7,26 @@
   <component name="ChangeListManager">
     <list default="true" id="212ccd86-01aa-4780-a2f0-0d130be5abd2" name="Test" comment="Test">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/akka-kernel.iml" afterPath="$PROJECT_DIR$/kernel/akka-kernel.iml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/config/akka-reference.conf" afterPath="$PROJECT_DIR$/config/akka-reference.conf" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/fun-test-java/akka-fun-test-java.iml" afterPath="$PROJECT_DIR$/fun-test-java/akka-fun-test-java.iml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/main/scala/state/Pool.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/state/Pool.scala" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/main/scala/state/CassandraStorage.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/state/CassandraStorage.scala" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/main/scala/Kernel.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/Kernel.scala" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/samples-scala/akka-samples-scala.iml" afterPath="$PROJECT_DIR$/samples-scala/akka-samples-scala.iml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/samples-lift/akka-samples-lift.iml" afterPath="$PROJECT_DIR$/samples-lift/akka-samples-lift.iml" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/kernel/src/main/scala/state/CassandraSession.scala" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/embedded-repo/org/apache/cassandra/cassandra/0.4.0-dev/cassandra-0.4.0-dev.jar" afterPath="$PROJECT_DIR$/embedded-repo/org/apache/cassandra/cassandra/0.4.0-dev/cassandra-0.4.0-dev.jar" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/akka.ipr" afterPath="$PROJECT_DIR$/akka.ipr" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/akka.iws" afterPath="$PROJECT_DIR$/akka.iws" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/bin/start-akka-server.sh" afterPath="$PROJECT_DIR$/bin/start-akka-server.sh" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/main/scala/state/State.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/state/State.scala" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/main/scala/serialization/Serializer.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/serialization/Serializer.scala" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/pom.xml" afterPath="$PROJECT_DIR$/kernel/pom.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/cassandra-0.4.0-dev.jar" afterPath="$PROJECT_DIR$/lib/cassandra-0.4.0-dev.jar" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/lib/netty-3.1.0.CR1.jar" afterPath="" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/samples-java/akka-samples-java.iml" afterPath="$PROJECT_DIR$/samples-java/akka-samples-java.iml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/main/scala/util/Helpers.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/util/Helpers.scala" />
     </list>
     <list readonly="true" id="6e842704-fac6-40e9-8a67-d02385f87db9" name="Default" comment="&#10;# Brief commit desciption here&#10;&#10;# Full commit description here (comment lines starting with '#' will not be included)&#10;&#10;" />
     <ignored path=".idea/workspace.xml" />
@@ -71,7 +86,7 @@
         <option name="CONDITION" value="" />
         <option name="LOG_MESSAGE" value="" />
       </breakpoint>
-      <breakpoint url="file://$PROJECT_DIR$/kernel/src/main/scala/Kernel.scala" line="126" class="Class at Kernel.scala:117" package="">
+      <breakpoint url="file://$PROJECT_DIR$/kernel/src/main/scala/Kernel.scala" line="126" class="Class at Kernel.scala:126" package="">
         <option name="ENABLED" value="true" />
         <option name="LOG_ENABLED" value="false" />
         <option name="LOG_EXPRESSION_ENABLED" value="false" />
@@ -147,10 +162,91 @@
   <component name="FileColors" enabled="false" enabledForTabs="false" />
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="CassandraStorage.scala" pinned="false" current="true" current-in-tab="true">
+      <file leaf-file-name="CassandraStorage.scala" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/state/CassandraStorage.scala">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="298" column="128" selection-start="13007" selection-end="13007" vertical-scroll-proportion="0.5060729">
+            <state line="22" column="0" selection-start="0" selection-end="470" vertical-scroll-proportion="0.0">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="CassandraSession.scala" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/state/CassandraSession.scala">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="165" column="39" selection-start="8123" selection-end="8123" vertical-scroll-proportion="3.3240998">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PersistentStateful.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateful.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="19" column="42" selection-start="764" selection-end="764" vertical-scroll-proportion="0.0">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PersistentActorSpec.scala" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/kernel/src/test/scala/PersistentActorSpec.scala">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="101" column="6" selection-start="3487" selection-end="3487" vertical-scroll-proportion="0.0">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Kernel.scala" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/Kernel.scala">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="14" column="77" selection-start="408" selection-end="408" vertical-scroll-proportion="0.0">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Pool.scala" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/state/Pool.scala">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="90" column="32" selection-start="3306" selection-end="3306" vertical-scroll-proportion="0.0">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="akka-reference.conf" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/config/akka-reference.conf">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="57" column="34" selection-start="2152" selection-end="2152" vertical-scroll-proportion="0.0">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pom.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="55" column="20" selection-start="1626" selection-end="1626" vertical-scroll-proportion="0.0">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/kernel/pom.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="48" column="5" selection-start="1464" selection-end="1464" vertical-scroll-proportion="0.0">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="State.scala" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/state/State.scala">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="394" column="43" selection-start="11110" selection-end="11110" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
@@ -169,22 +265,22 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/kernel/src/main/scala/serialization/Serializable.scala" />
-        <option value="$PROJECT_DIR$/kernel/src/main/scala/reactor/MessageDispatcherBase.scala" />
-        <option value="$PROJECT_DIR$/kernel/src/main/scala/actor/Actor.scala" />
-        <option value="$PROJECT_DIR$/kernel/src/test/scala/EventBasedThreadPoolDispatcherTest.scala" />
-        <option value="$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/ActiveObjectGuiceConfiguratorTest.java" />
-        <option value="$PROJECT_DIR$/kernel/src/main/scala/reactor/Dispatchers.scala" />
-        <option value="$PROJECT_DIR$/kernel/src/main/scala/reactor/Reactor.scala" />
-        <option value="$PROJECT_DIR$/kernel/src/main/scala/reactor/EventBasedThreadPoolDispatcher.scala" />
         <option value="$PROJECT_DIR$/samples-java/src/main/java/sample/java/SimpleService.java" />
         <option value="$PROJECT_DIR$/kernel/src/main/scala/jersey/AkkaServlet.scala" />
         <option value="$PROJECT_DIR$/samples-scala/src/main/scala/SimpleService.scala" />
         <option value="$PROJECT_DIR$/kernel/src/main/scala/Boot.scala" />
-        <option value="$PROJECT_DIR$/config/akka-reference.conf" />
         <option value="$PROJECT_DIR$/kernel/src/main/scala/actor/ActiveObject.scala" />
+        <option value="$PROJECT_DIR$/kernel/src/main/scala/serialization/Serializer.scala" />
+        <option value="$PROJECT_DIR$/kernel/src/main/scala/util/Helpers.scala" />
+        <option value="$PROJECT_DIR$/kernel/src/main/scala/state/State.scala" />
+        <option value="$PROJECT_DIR$/kernel/pom.xml" />
+        <option value="$PROJECT_DIR$/pom.xml" />
+        <option value="$PROJECT_DIR$/kernel/src/main/scala/state/Pool.scala" />
         <option value="$PROJECT_DIR$/kernel/src/main/scala/Kernel.scala" />
+        <option value="$PROJECT_DIR$/config/akka-reference.conf" />
         <option value="$PROJECT_DIR$/kernel/src/main/scala/state/CassandraStorage.scala" />
+        <option value="$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateful.java" />
+        <option value="$PROJECT_DIR$/kernel/src/main/scala/state/CassandraSession.scala" />
       </list>
     </option>
   </component>
@@ -222,7 +318,7 @@
         </expanded-state>
         <selected-state>
           <State>
-            <id>Inspections</id>
+            <id>AOP</id>
           </State>
         </selected-state>
       </profile-state>
@@ -408,6 +504,352 @@
           <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.LibraryGroupNode" />
         </PATH_ELEMENT>
       </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="akka" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="akka-kernel" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="Libraries" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.LibraryGroupNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="Maven: org.apache.cassandra:cassandra:0.4.0-dev" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="cassandra-0.4.0-dev.jar" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+      </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="akka" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="akka-kernel" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="Libraries" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.LibraryGroupNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="Maven: org.apache.cassandra:cassandra:0.4.0-dev" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="cassandra-0.4.0-dev.jar" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="service" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+      </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="akka" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="akka-kernel" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="Libraries" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.LibraryGroupNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="Maven: org.apache.cassandra:cassandra:0.4.0-dev" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="cassandra-0.4.0-dev.jar" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="service" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="Cassandra" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ClassTreeNode" />
+        </PATH_ELEMENT>
+      </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="akka" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="akka-kernel" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="Libraries" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.LibraryGroupNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="Maven: commons-pool:commons-pool:1.5.1" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="commons-pool-1.5.1.jar" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="impl" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+      </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="akka" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="akka-kernel" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="Libraries" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.LibraryGroupNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="Maven: commons-pool:commons-pool:1.5.1" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="commons-pool-1.5.1.jar" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="impl" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="StackObjectPool" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ClassTreeNode" />
+        </PATH_ELEMENT>
+      </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="akka" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="akka-kernel" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="Libraries" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.LibraryGroupNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="Maven: commons-pool:commons-pool:1.5.1" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="commons-pool-1.5.1.jar" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="pool" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+      </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="akka" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="akka-kernel" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="Libraries" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.LibraryGroupNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="Maven: commons-pool:commons-pool:1.5.1" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="commons-pool-1.5.1.jar" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+      </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="akka" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="akka-kernel" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="Libraries" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.LibraryGroupNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="Maven: com.facebook:thrift:1.0" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="thrift-1.0.jar" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+      </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="akka" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="akka-kernel" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="Libraries" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.LibraryGroupNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="Maven: com.facebook:thrift:1.0" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="thrift-1.0.jar" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="protocol" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+      </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="akka" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="akka-kernel" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="Libraries" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.LibraryGroupNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="Maven: com.facebook:thrift:1.0" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="thrift-1.0.jar" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="protocol" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="TBinaryProtocol" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ClassTreeNode" />
+        </PATH_ELEMENT>
+      </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="akka" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="akka-kernel" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="Libraries" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.LibraryGroupNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="Maven: com.facebook:thrift:1.0" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="thrift-1.0.jar" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="protocol" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="TProtocol" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ClassTreeNode" />
+        </PATH_ELEMENT>
+      </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="akka" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="akka-kernel" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="Libraries" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.LibraryGroupNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="Maven: com.facebook:thrift:1.0" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="thrift-1.0.jar" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="protocol" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="TProtocolFactory" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ClassTreeNode" />
+        </PATH_ELEMENT>
+      </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="akka" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="akka-kernel" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="Libraries" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.LibraryGroupNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="Maven: com.facebook:thrift:1.0" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="thrift-1.0.jar" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="thrift" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+      </PATH>
       <PATH>
         <PATH_ELEMENT>
           <option name="myItemId" value="akka" />
@@ -439,6 +881,14 @@
           <option name="myItemId" value="src" />
           <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="test" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="scala" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
       </PATH>
       <PATH>
         <PATH_ELEMENT>
@@ -466,6 +916,36 @@
           <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
       </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="akka" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="akka-kernel" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="kernel" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="src" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="main" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="scala" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="util" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+      </PATH>
       <PATH>
         <PATH_ELEMENT>
           <option name="myItemId" value="akka" />
@@ -496,66 +976,6 @@
           <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
       </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka-kernel" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="kernel" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="src" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="main" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="scala" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="jersey" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka-kernel" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="kernel" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="src" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="main" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="scala" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="actor" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-      </PATH>
       <PATH>
         <PATH_ELEMENT>
           <option name="myItemId" value="akka" />
@@ -662,41 +1082,7 @@
           <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
         <PATH_ELEMENT>
-          <option name="myItemId" value="InMemoryStateTest" />
+          <option name="myItemId" value="PersistentStateful" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ClassTreeNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka-fun-test-java" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="fun-test-java" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="src" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="test" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="java" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="api" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="ActiveObjectGuiceConfiguratorTest" />
           <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ClassTreeNode" />
         </PATH_ELEMENT>
       </PATH>
@@ -831,7 +1217,7 @@
     </subPane>
   </component>
   <component name="ProjectReloadState">
-    <option name="STATE" value="2" />
+    <option name="STATE" value="0" />
   </component>
   <component name="ProjectView">
     <navigator currentView="ProjectPane" proportions="" version="1" splitterProportion="0.5">
@@ -877,7 +1263,7 @@
       <recent name="stm" />
     </key>
   </component>
-  <component name="RunManager" selected="JUnit.InMemoryStateTest">
+  <component name="RunManager" selected="JUnit.PersistentActorSpec">
     <configuration default="false" name="InMemoryStateTest.testRefShouldRollbackStateForStatefulServerInCaseOfFailure" type="JUnit" factoryName="JUnit" temporary="true" enabled="false" merge="false" sample_coverage="true" runner="emma">
       <pattern>
         <option name="PATTERN" value="se.scalablesolutions.akka.api.*" />
@@ -2046,16 +2432,17 @@
     <frame x="4" y="22" width="1436" height="878" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3294881" sideWeight="0.5212177" order="5" side_tool="false" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3294881" sideWeight="0.6619898" order="5" side_tool="false" />
       <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="15" side_tool="false" />
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24906267" sideWeight="0.5212177" order="1" side_tool="false" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32749078" sideWeight="0.5" order="9" side_tool="false" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.601476" sideWeight="0.0" order="2" side_tool="false" x="4" y="22" width="1436" height="878" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.28316328" sideWeight="0.0" order="2" side_tool="false" x="4" y="22" width="1436" height="878" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32749078" sideWeight="0.5" order="6" side_tool="false" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.1744773" sideWeight="0.6721939" order="1" side_tool="false" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.1744773" sideWeight="0.6619898" order="1" side_tool="false" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39668366" sideWeight="0.5" order="3" side_tool="false" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.16818425" sideWeight="0.24354243" order="0" side_tool="true" x="1609" y="144" width="252" height="862" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32908162" sideWeight="0.0" order="14" side_tool="false" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3265306" sideWeight="0.5" order="13" side_tool="false" />
       <window_info id="Web Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32822478" sideWeight="0.5" order="16" side_tool="false" />
       <window_info id="Dataflow to this" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="17" side_tool="false" />
@@ -2066,8 +2453,7 @@
       <window_info id="Clojure REPL" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32749078" sideWeight="0.5" order="8" side_tool="false" />
       <window_info id="Data Sources" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3294881" sideWeight="0.6875" order="3" side_tool="false" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.26479077" sideWeight="0.24617347" order="2" side_tool="true" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.31887755" sideWeight="0.5" order="1" side_tool="false" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.31887755" sideWeight="0.5" order="1" side_tool="false" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3265306" sideWeight="0.0" order="14" side_tool="false" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" />
       <window_info id="FindBugs-IDEA" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32976654" sideWeight="0.5" order="12" side_tool="false" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" />
@@ -2110,114 +2496,114 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/reactor/MessageDispatcherBase.scala">
+    <entry file="jar:///System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home/../Classes/classes.jar!/java/io/Flushable.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="13" column="0" selection-start="398" selection-end="398" vertical-scroll-proportion="0.0">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/actor/Actor.scala">
+    <entry file="jar://$MAVEN_REPOSITORY$/com/facebook/thrift/1.0/thrift-1.0.jar!/org/apache/thrift/protocol/TProtocolFactory.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="33" column="131" selection-start="1265" selection-end="1265" vertical-scroll-proportion="0.0">
+        <state line="7" column="34" selection-start="227" selection-end="227" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/jersey/AkkaServlet.scala">
+    <entry file="jar://$MAVEN_REPOSITORY$/com/facebook/thrift/1.0/thrift-1.0.jar!/org/apache/thrift/transport/TIOStreamTransport.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="60" column="80" selection-start="2412" selection-end="2412" vertical-scroll-proportion="0.0">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/kernel/src/test/scala/EventBasedThreadPoolDispatcherTest.scala">
+    <entry file="jar://$MAVEN_REPOSITORY$/com/facebook/thrift/1.0/thrift-1.0.jar!/org/apache/thrift/transport/TSocket.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="2" column="189" selection-start="113" selection-end="113" vertical-scroll-proportion="0.0">
+        <state line="5" column="64" selection-start="216" selection-end="216" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/reactor/Future.scala">
+    <entry file="jar://$MAVEN_REPOSITORY$/com/facebook/thrift/1.0/thrift-1.0.jar!/org/apache/thrift/protocol/TProtocol.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="14" column="13" selection-start="411" selection-end="411" vertical-scroll-proportion="0.0">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/reactor/Reactor.scala">
+    <entry file="jar://$MAVEN_REPOSITORY$/com/facebook/thrift/1.0/thrift-1.0.jar!/org/apache/thrift/protocol/TBinaryProtocol.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="43" column="0" selection-start="1056" selection-end="1056" vertical-scroll-proportion="0.0">
+        <state line="5" column="60" selection-start="211" selection-end="211" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/ActiveObjectGuiceConfiguratorTest.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/apache/cassandra/cassandra/0.4.0-dev/cassandra-0.4.0-dev.jar!/org/apache/cassandra/service/Cassandra.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="23" column="77" selection-start="822" selection-end="822" vertical-scroll-proportion="0.0">
+        <state line="2686" column="57" selection-start="135796" selection-end="135796" vertical-scroll-proportion="0.4197031">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/Boot.scala">
+    <entry file="jar://$MAVEN_REPOSITORY$/net/lag/configgy/1.3/configgy-1.3.jar!/net/lag/configgy/ParseException.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="24" column="31" selection-start="741" selection-end="757" vertical-scroll-proportion="0.0">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/net/lag/configgy/1.3/configgy-1.3.jar!/net/lag/configgy/Configgy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="17" column="27" selection-start="1329" selection-end="1350" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/samples-scala/src/main/scala/SimpleService.scala">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="1" column="0" selection-start="4" selection-end="4" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/config/akka-reference.conf">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="19" column="3" selection-start="474" selection-end="474" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/codehaus/aspectwerkz/aspectwerkz-nodeps-jdk5/2.1/aspectwerkz-nodeps-jdk5-2.1.jar!/org/codehaus/aspectwerkz/proxy/Proxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="17" column="35" selection-start="770" selection-end="770" vertical-scroll-proportion="0.35457063">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar:///System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home/../Classes/classes.jar!/java/lang/ClassLoader.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="117" column="31" selection-start="6805" selection-end="6805" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/actor/ActiveObject.scala">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="226" column="65" selection-start="11072" selection-end="11072" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/Kernel.scala">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="133" column="0" selection-start="5539" selection-end="5539" vertical-scroll-proportion="0.3678161">
+        <state line="14" column="77" selection-start="408" selection-end="408" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/kernel/src/test/scala/PersistentActorSpec.scala">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="101" column="6" selection-start="3487" selection-end="3487" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="55" column="20" selection-start="1626" selection-end="1626" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/config/akka-reference.conf">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="57" column="34" selection-start="2152" selection-end="2152" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/state/State.scala">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="394" column="43" selection-start="11110" selection-end="11110" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/state/CassandraStorage.scala">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="298" column="128" selection-start="13007" selection-end="13007" vertical-scroll-proportion="0.5060729">
+        <state line="22" column="0" selection-start="0" selection-end="470" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateful.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="19" column="42" selection-start="764" selection-end="764" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/state/CassandraSession.scala">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="165" column="39" selection-start="8123" selection-end="8123" vertical-scroll-proportion="3.3240998">
           <folding />
         </state>
       </provider>

bin/start-akka-server.sh

@@ -47,6 +47,7 @@ CLASSPATH=$CLASSPATH:$LIB_DIR/guice-jsr250-2.0-SNAPSHOT.jar
 CLASSPATH=$CLASSPATH:$LIB_DIR/high-scale-lib.jar
 CLASSPATH=$CLASSPATH:$LIB_DIR/jackson-core-asl-1.1.0.jar
 CLASSPATH=$CLASSPATH:$LIB_DIR/jackson-mapper-asl-1.1.0.jar
+CLASSPATH=$CLASSPATH:$LIB_DIR/javautils-2.7.4-0.1.jar
 CLASSPATH=$CLASSPATH:$LIB_DIR/jersey-client-1.1.1-ea.jar
 CLASSPATH=$CLASSPATH:$LIB_DIR/jersey-core-1.1.1-ea.jar
 CLASSPATH=$CLASSPATH:$LIB_DIR/jersey-json-1.1.1-ea.jar
@@ -59,7 +60,7 @@ CLASSPATH=$CLASSPATH:$LIB_DIR/libfb303.jar
 CLASSPATH=$CLASSPATH:$LIB_DIR/libthrift.jar
 CLASSPATH=$CLASSPATH:$LIB_DIR/log4j-1.2.15.jar
 CLASSPATH=$CLASSPATH:$LIB_DIR/lucene-core-2.2.0.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/netty-3.1.0.CR1.jar
+CLASSPATH=$CLASSPATH:$LIB_DIR/netty-3.1.0.GA.jar
 CLASSPATH=$CLASSPATH:$LIB_DIR/providerutil.jar
 CLASSPATH=$CLASSPATH:$LIB_DIR/protobuf-java-2.1.0.jar
 CLASSPATH=$CLASSPATH:$LIB_DIR/scala-library-2.7.5.jar

config/akka-reference.conf

@@ -52,10 +52,10 @@
 
     <cassandra>
       service = on
-      hostname = "localhost"    # ip address or hostname of one of the Cassandra cluster's seeds
+      hostname = "127.0.0.1"    # ip address or hostname of one of the Cassandra cluster's seeds
       port = 9160
-      storage-format = "binary" # Options: binary, json, simple-json
+      storage-format = "java"   # Options: java, scala-json, java-json, protobuf
-      blocking = false          # inserts and queries should be blocking or not
+      consistency-level = 1     # 
     </cassandra>
   </rest>
 </akka>

fun-test-java/akka-fun-test-java.iml

@@ -32,8 +32,9 @@
     <orderEntry type="library" exported="" name="Maven: asm:asm:3.1" level="project" />
     <orderEntry type="library" exported="" name="Maven: aopalliance:aopalliance:1.0" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.apache.camel:camel-core:2.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" exported="" name="Maven: org.jboss.netty:netty:3.1.0.CR1" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.jboss.netty:netty:3.1.0.GA" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.apache:zookeeper:3.1.0" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.scala-tools:javautils:2.7.4-0.1" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.codehaus.jackson:jackson-core-asl:1.1.0" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.1.0" level="project" />
     <orderEntry type="library" exported="" name="Maven: sbinary:sbinary:0.3" level="project" />

kernel/akka-kernel.iml

@@ -48,8 +48,9 @@
     <orderEntry type="library" exported="" name="Maven: asm:asm:3.1" level="project" />
     <orderEntry type="library" exported="" name="Maven: aopalliance:aopalliance:1.0" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.apache.camel:camel-core:2.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" exported="" name="Maven: org.jboss.netty:netty:3.1.0.CR1" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.jboss.netty:netty:3.1.0.GA" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.apache:zookeeper:3.1.0" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.scala-tools:javautils:2.7.4-0.1" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.codehaus.jackson:jackson-core-asl:1.1.0" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.1.0" level="project" />
     <orderEntry type="library" exported="" name="Maven: sbinary:sbinary:0.3" level="project" />

kernel/pom.xml

@@ -54,13 +54,18 @@
     <dependency>
       <groupId>org.jboss.netty</groupId>
       <artifactId>netty</artifactId>
-      <version>3.1.0.CR1</version>
+      <version>3.1.0.GA</version>
     </dependency>
     <dependency>
       <groupId>org.apache</groupId>
       <artifactId>zookeeper</artifactId>
       <version>3.1.0</version>
     </dependency>
+    <dependency>
+      <groupId>org.scala-tools</groupId>
+      <artifactId>javautils</artifactId>
+      <version>2.7.4-0.1</version>
+    </dependency>
 
     <!-- For Protocol/Serialization -->
     <dependency>

kernel/src/main/scala/Kernel.scala

@@ -12,11 +12,11 @@ import javax.ws.rs.core.UriBuilder
 import java.io.File
 import java.net.URLClassLoader
 
-import net.lag.configgy.{Config, Configgy, RuntimeEnvironment}
+import net.lag.configgy.{Config, Configgy, RuntimeEnvironment, ParseException}
 
 import kernel.jersey.AkkaCometServlet
 import kernel.nio.RemoteServer
-import kernel.state.EmbeddedCassandraStorage
+import kernel.state.CassandraStorage
 import kernel.util.Logging
 
 /**
@@ -82,7 +82,7 @@ object Kernel extends Logging {
       Configgy.configureFromResource("akka.conf", getClass.getClassLoader)
       log.info("Config loaded from the application classpath.")
     } catch {
-      case e: Exception =>
+      case e: ParseException =>
         try {
           if (HOME.isDefined) {
             val configFile = HOME.get + "/config/akka.conf"
@@ -90,7 +90,7 @@ object Kernel extends Logging {
             Configgy.configure(configFile)
           } else throw new IllegalStateException("AKKA_HOME is not defined and no 'akka.conf' can be found on the classpath, aborting")
         } catch {
-          case e: net.lag.configgy.ParseException => throw new IllegalStateException("AKKA_HOME is not defined and no 'akka.conf' can be found on the classpath, aborting")
+          case e: ParseException => throw new IllegalStateException("AKKA_HOME is not defined and no 'akka.conf' can be found on the classpath, aborting")
         }
     }
     //val runtime = new RuntimeEnvironment(getClass)
@@ -178,7 +178,7 @@ object Kernel extends Logging {
 
     println("=================================================")
     var start = System.currentTimeMillis
-    for (i <- 1 to NR_ENTRIES) EmbeddedCassandraStorage.insertMapStorageEntryFor("test", i.toString, "data")
+    for (i <- 1 to NR_ENTRIES) CassandraStorage.insertMapStorageEntryFor("test", i.toString, "data")
     var end = System.currentTimeMillis
     println("Writes per second: " + NR_ENTRIES / ((end - start).toDouble / 1000))
 
@@ -186,13 +186,13 @@ object Kernel extends Logging {
     start = System.currentTimeMillis
     val entries = new scala.collection.mutable.ArrayBuffer[Tuple2[String, String]]
     for (i <- 1 to NR_ENTRIES) entries += (i.toString, "data")
-    EmbeddedCassandraStorage.insertMapStorageEntriesFor("test", entries.toList)
+    CassandraStorage.insertMapStorageEntriesFor("test", entries.toList)
     end = System.currentTimeMillis
     println("Writes per second - batch: " + NR_ENTRIES / ((end - start).toDouble / 1000))
     
     println("=================================================")
     start = System.currentTimeMillis
-    for (i <- 1 to NR_ENTRIES) EmbeddedCassandraStorage.getMapStorageEntryFor("test", i.toString)
+    for (i <- 1 to NR_ENTRIES) CassandraStorage.getMapStorageEntryFor("test", i.toString)
     end = System.currentTimeMillis
     println("Reads per second: " + NR_ENTRIES / ((end - start).toDouble / 1000))
 

kernel/src/main/scala/serialization/Serializer.scala

@@ -77,7 +77,6 @@ object Serializer {
       message.toBuilder().mergeFrom(bytes).build                                                                                  
     }
 
-    // For Java
     def in(bytes: Array[Byte], clazz: Class[_]): AnyRef = {
       if (clazz == null) throw new IllegalArgumentException("Protobuf message can't be null")
       in(bytes, Some(clazz))

kernel/src/main/scala/state/CassandraSession.scala

@@ -0,0 +1,240 @@
+/**
+ * Copyright (C) 2009 Scalable Solutions.
+ */
+
+package se.scalablesolutions.akka.kernel.state
+
+import java.io.{Flushable, Closeable}
+
+import util.Logging
+import util.Helpers._
+import serialization.Serializer
+import kernel.Kernel.config
+
+import org.apache.cassandra.db.ColumnFamily
+import org.apache.cassandra.service._
+
+import org.apache.thrift.transport._
+import org.apache.thrift.protocol._
+
+/**
+ * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
+ */
+trait CassandraSession extends Closeable with Flushable {
+  import scala.collection.jcl.Conversions._
+  import org.scala_tools.javautils.Imports._
+  import java.util.{Map => JMap}
+
+  protected val client: Cassandra.Client
+  protected val keyspace: String
+
+  val obtainedAt: Long
+  val consistencyLevel: Int
+  val schema: JMap[String, JMap[String, String]]
+
+  /**
+   * Count is always the max number of results to return.
+
+    So it means, starting with `start`, or the first one if start is
+    empty, go until you hit `finish` or `count`, whichever comes first.
+    Empty is not a legal column name so if finish is empty it is ignored
+    and only count is used.
+
+    We don't offer a numeric offset since that can't be supported
+    efficiently with a log-structured merge disk format.
+   */
+  def /(key: String, columnParent: ColumnParent, start: Array[Byte], end: Array[Byte], ascending: Boolean, count: Int): List[Column] =
+    /(key, columnParent, start, end, ascending, count, consistencyLevel)
+
+  def /(key: String, columnParent: ColumnParent, start: Array[Byte], end: Array[Byte], ascending: Boolean, count: Int, consistencyLevel: Int): List[Column] =
+    client.get_slice(keyspace, key, columnParent, start, end, ascending, count, consistencyLevel).toList
+
+  def /(key: String, columnParent: ColumnParent, colNames: List[Array[Byte]]): List[Column] =
+    /(key, columnParent, colNames, consistencyLevel)
+
+  def /(key: String, columnParent: ColumnParent, colNames: List[Array[Byte]], consistencyLevel: Int): List[Column] =
+    client.get_slice_by_names(keyspace, key, columnParent, colNames.asJava, consistencyLevel).toList
+
+  def |(key: String, colPath: ColumnPath): Option[Column] =
+    |(key, colPath, consistencyLevel)
+
+  def |(key: String, colPath: ColumnPath, consistencyLevel: Int): Option[Column] =
+    client.get_column(keyspace, key, colPath, consistencyLevel)
+
+  def |#(key: String, columnParent: ColumnParent): Int =
+    |#(key, columnParent, consistencyLevel)
+
+  def |#(key: String, columnParent: ColumnParent, consistencyLevel: Int): Int =
+    client.get_column_count(keyspace, key, columnParent, consistencyLevel)
+
+  def ++|(key: String, colPath: ColumnPath, value: Array[Byte]): Unit =
+    ++|(key, colPath, value, obtainedAt, consistencyLevel)
+
+  def ++|(key: String, colPath: ColumnPath, value: Array[Byte], timestamp: Long): Unit =
+    ++|(key, colPath, value, timestamp, consistencyLevel)
+
+  def ++|(key: String, colPath: ColumnPath, value: Array[Byte], timestamp: Long, consistencyLevel: Int) =
+    client.insert(keyspace, key, colPath, value, timestamp, consistencyLevel)
+
+  def ++|(batch: BatchMutation): Unit =
+    ++|(batch, consistencyLevel)
+
+  def ++|(batch: BatchMutation, consistencyLevel: Int): Unit =
+    client.batch_insert(keyspace, batch, consistencyLevel)
+
+  def --(key: String, columnPathOrParent: ColumnPathOrParent, timestamp: Long): Unit =
+    --(key, columnPathOrParent, timestamp, consistencyLevel)
+
+  def --(key: String, columnPathOrParent: ColumnPathOrParent, timestamp: Long, consistencyLevel: Int): Unit =
+    client.remove(keyspace, key, columnPathOrParent, timestamp, consistencyLevel)
+
+  def /^(key: String, columnFamily: String, start: Array[Byte], end: Array[Byte], ascending: Boolean, count: Int): List[SuperColumn] =
+    /^(key, columnFamily, start, end, ascending, count, consistencyLevel)
+
+  def /^(key: String, columnFamily: String, start: Array[Byte], end: Array[Byte], ascending: Boolean, count: Int, consistencyLevel: Int): List[SuperColumn] =
+    client.get_slice_super(keyspace, key, columnFamily, start, end, ascending, count, consistencyLevel).toList
+
+  def /^(key: String, columnFamily: String, superColNames: List[Array[Byte]]): List[SuperColumn] =
+    /^(key, columnFamily, superColNames, consistencyLevel)
+
+  def /^(key: String, columnFamily: String, superColNames: List[Array[Byte]], consistencyLevel: Int): List[SuperColumn] =
+    client.get_slice_super_by_names(keyspace, key, columnFamily, superColNames.asJava, consistencyLevel).toList
+
+  def |^(key: String, superColumnPath: SuperColumnPath): Option[SuperColumn] =
+    |^(key, superColumnPath, consistencyLevel)
+
+  def |^(key: String, superColumnPath: SuperColumnPath, consistencyLevel: Int): Option[SuperColumn] =
+    client.get_super_column(keyspace, key, superColumnPath, consistencyLevel)
+
+  def ++|^(batch: BatchMutationSuper): Unit =
+    ++|^(batch, consistencyLevel)
+
+  def ++|^(batch: BatchMutationSuper, consistencyLevel: Int): Unit =
+    client.batch_insert_super_column(keyspace, batch, consistencyLevel)
+
+  def getRange(key: String, columnParent: ColumnParent, start: Array[Byte], end: Array[Byte], ascending: Boolean, count: Int): List[Column] =
+    getRange(key, columnParent, start, end, ascending, count, consistencyLevel)
+
+  def getRange(key: String, columnParent: ColumnParent, start: Array[Byte], end: Array[Byte], ascending: Boolean, count: Int, consistencyLevel: Int): List[Column] =
+    client.get_slice(keyspace, key, columnParent, start, end, ascending, count, consistencyLevel).toList
+
+  def getRange(key: String, columnParent: ColumnParent, colNames: List[Array[Byte]]): List[Column] =
+    getRange(key, columnParent, colNames, consistencyLevel)
+
+  def getRange(key: String, columnParent: ColumnParent, colNames: List[Array[Byte]], consistencyLevel: Int): List[Column] =
+    client.get_slice_by_names(keyspace, key, columnParent, colNames.asJava, consistencyLevel).toList
+
+  def getColumn(key: String, colPath: ColumnPath): Option[Column] =
+    getColumn(key, colPath, consistencyLevel)
+
+  def getColumn(key: String, colPath: ColumnPath, consistencyLevel: Int): Option[Column] =
+    client.get_column(keyspace, key, colPath, consistencyLevel)
+
+  def getColumnCount(key: String, columnParent: ColumnParent): Int =
+    getColumnCount(key, columnParent, consistencyLevel)
+
+  def getColumnCount(key: String, columnParent: ColumnParent, consistencyLevel: Int): Int =
+    client.get_column_count(keyspace, key, columnParent, consistencyLevel)
+
+  def insertColumn(key: String, colPath: ColumnPath, value: Array[Byte]): Unit =
+    insertColumn(key, colPath, value, obtainedAt, consistencyLevel)
+
+  def insertColumn(key: String, colPath: ColumnPath, value: Array[Byte], timestamp: Long): Unit =
+    insertColumn(key, colPath, value, timestamp, consistencyLevel)
+
+  def insertColumn(key: String, colPath: ColumnPath, value: Array[Byte], timestamp: Long, consistencyLevel: Int) =
+    client.insert(keyspace, key, colPath, value, timestamp, consistencyLevel)
+
+  def insertColumn(batch: BatchMutation): Unit =
+    insertColumn(batch, consistencyLevel)
+
+  def insertColumn(batch: BatchMutation, consistencyLevel: Int): Unit =
+    client.batch_insert(keyspace, batch, consistencyLevel)
+
+  def removeColumn(key: String, columnPathOrParent: ColumnPathOrParent, timestamp: Long): Unit =
+    removeColumn(key, columnPathOrParent, timestamp, consistencyLevel)
+
+  def removeColumn(key: String, columnPathOrParent: ColumnPathOrParent, timestamp: Long, consistencyLevel: Int): Unit =
+    client.remove(keyspace, key, columnPathOrParent, timestamp, consistencyLevel)
+
+  def getSuperRange(key: String, columnFamily: String, start: Array[Byte], end: Array[Byte], ascending: Boolean, count: Int): List[SuperColumn] =
+    getSuperRange(key, columnFamily, start, end, ascending, count, consistencyLevel)
+
+  def getSuperRange(key: String, columnFamily: String, start: Array[Byte], end: Array[Byte], ascending: Boolean, count: Int, consistencyLevel: Int): List[SuperColumn] =
+    client.get_slice_super(keyspace, key, columnFamily, start, end, ascending, count, consistencyLevel).toList
+
+  def getSuperRange(key: String, columnFamily: String, superColNames: List[Array[Byte]]): List[SuperColumn] =
+    getSuperRange(key, columnFamily, superColNames, consistencyLevel)
+
+  def getSuperRange(key: String, columnFamily: String, superColNames: List[Array[Byte]], consistencyLevel: Int): List[SuperColumn] =
+    client.get_slice_super_by_names(keyspace, key, columnFamily, superColNames.asJava, consistencyLevel).toList
+
+  def getSuperColumn(key: String, superColumnPath: SuperColumnPath): Option[SuperColumn] =
+    getSuperColumn(key, superColumnPath, consistencyLevel)
+
+  def getSuperColumn(key: String, superColumnPath: SuperColumnPath, consistencyLevel: Int): Option[SuperColumn] =
+    client.get_super_column(keyspace, key, superColumnPath, consistencyLevel)
+
+  def insertSuperColumn(batch: BatchMutationSuper): Unit =
+    insertSuperColumn(batch, consistencyLevel)
+
+  def insertSuperColumn(batch: BatchMutationSuper, consistencyLevel: Int): Unit =
+    client.batch_insert_super_column(keyspace, batch, consistencyLevel)
+
+  def keys(columnFamily: String, startsWith: String, stopsAt: String, maxResults: Option[Int]): List[String] =
+    client.get_key_range(keyspace, columnFamily, startsWith, stopsAt, maxResults.getOrElse(-1)).toList
+}
+
+class CassandraSessionPool[T <: TTransport](
+  space: String,
+  transportPool: Pool[T],
+  inputProtocol: Protocol,
+  outputProtocol: Protocol,
+  consistency: Int) extends Closeable with Logging {
+
+  def this(space: String, transportPool: Pool[T], ioProtocol: Protocol, consistency: Int) =
+    this (space, transportPool, ioProtocol, ioProtocol, consistency)
+
+  def newSession: CassandraSession = newSession(consistency)
+
+  def newSession(consistencyLevel: Int): CassandraSession = {
+    val socket = transportPool.borrowObject
+    val cassandraClient = new Cassandra.Client(inputProtocol(socket), outputProtocol(socket))
+    val cassandraSchema = cassandraClient.describe_keyspace(space)
+    new CassandraSession {
+      val keyspace = space
+      val client = cassandraClient
+      val obtainedAt = System.currentTimeMillis
+      val consistencyLevel = consistency
+      val schema = cassandraSchema
+      log.debug("Creating %s", toString)
+
+      def flush = socket.flush
+      def close = transportPool.returnObject(socket)
+      override def toString = "[CassandraSession]\n\tkeyspace = " + keyspace + "\n\tschema = " + schema
+    }
+  }
+
+  def withSession[T](body: CassandraSession => T) = {
+    val session = newSession(consistency)
+    try {
+      val result = body(session)
+      session.flush
+      result
+    } finally {
+      session.close
+    }
+  }
+
+  def close = transportPool.close
+}
+
+sealed abstract class Protocol(val factory: TProtocolFactory) {
+  def apply(transport: TTransport) = factory.getProtocol(transport)
+}
+
+object Protocol {
+  object Binary extends Protocol(new TBinaryProtocol.Factory)
+  object SimpleJSON extends Protocol(new TSimpleJSONProtocol.Factory)
+  object JSON extends Protocol(new TJSONProtocol.Factory)
+}

kernel/src/main/scala/state/CassandraStorage.scala

@@ -4,63 +4,68 @@
 
 package se.scalablesolutions.akka.kernel.state
 
-import java.io.{File, Flushable, Closeable}
+import java.io.{Flushable, Closeable}
 
-import kernel.util.Logging
+import util.Logging
-import serialization.{Serializer, Serializable, SerializationProtocol}
+import util.Helpers._
+import serialization.Serializer
+import kernel.Kernel.config
 
-import org.apache.cassandra.db._
+import org.apache.cassandra.db.ColumnFamily
-import org.apache.cassandra.config.DatabaseDescriptor
 import org.apache.cassandra.service._
 
-//import org.apache.thrift.server.TThreadPoolServer
-import org.apache.thrift.TProcessorFactory
-import org.apache.thrift.transport._
-import org.apache.thrift._
 import org.apache.thrift.transport._
 import org.apache.thrift.protocol._
 
 /**
- * NOTE: requires command line options:
- * <br/>
- *   <code>-Dcassandra -Dstorage-config=config/ -Dpidfile=akka.pid</code>
- * <p/>
  * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
  */
 object CassandraStorage extends Logging {
-  val TABLE_NAME = "akka"
+  val KEYSPACE = "akka"
-  val MAP_COLUMN_FAMILY = "map"
+  val MAP_COLUMN_PARENT = new ColumnParent("map", null)
-  val VECTOR_COLUMN_FAMILY = "vector"
+  val VECTOR_COLUMN_PARENT = new ColumnParent("vector", null)
-  val REF_COLUMN_FAMILY = "ref:item"
+  val REF_COLUMN_PARENT = new ColumnParent("ref", null)
-
+  val REF_KEY = "item".getBytes("UTF-8")
-  val DEFAULT_CONSISTENCY_LEVEL = 10 //What should the default be?
 
+  val CASSANDRA_SERVER_HOSTNAME = config.getString("akka.storage.cassandra.hostname", "127.0.0.1")
+  val CASSANDRA_SERVER_PORT = config.getInt("akka.storage.cassandra.port", 9160)
+  val CONSISTENCY_LEVEL = config.getInt("akka.storage.cassandra.consistency-level", 1)
   val IS_ASCENDING = true
 
-  import kernel.Kernel.config
-
-  val CASSANDRA_SERVER_HOSTNAME = config.getString("akka.storage.cassandra.hostname", "localhost")
-  val CASSANDRA_SERVER_PORT = config.getInt("akka.storage.cassandra.port", 9160)
-  val BLOCKING_CALL = if (config.getBool("akka.storage.cassandra.blocking", true)) 0
-  else 1
-
   @volatile private[this] var isRunning = false
-  private[this] val protocol: Protocol = {
+  private[this] val protocol: Protocol = Protocol.Binary
-    config.getString("akka.storage.cassandra.storage-format", "binary") match {
+/*   {
+     config.getString("akka.storage.cassandra.procotol", "binary") match {
       case "binary" => Protocol.Binary
       case "json" => Protocol.JSON
       case "simple-json" => Protocol.SimpleJSON
       case unknown => throw new UnsupportedOperationException("Unknown storage serialization protocol [" + unknown + "]")
     }
   }
+*/
 
+  private[this] val serializer: Serializer = {
+    kernel.Kernel.config.getString("akka.storage.cassandra.storage-format", "java") match {
+      case "scala-json" => Serializer.ScalaJSON
+      case "java-json" =>  Serializer.JavaJSON
+      case "protobuf" =>   Serializer.Protobuf
+      case "java" =>       Serializer.Java
+      case "sbinary" =>    throw new UnsupportedOperationException("SBinary serialization protocol is not yet supported for storage")
+      case "avro" =>       throw new UnsupportedOperationException("Avro serialization protocol is not yet supported for storage")
+      case unknown =>      throw new UnsupportedOperationException("Unknown storage serialization protocol [" + unknown + "]")
+    }
+  }
 
   private[this] var sessions: Option[CassandraSessionPool[_]] = None
 
   def start = synchronized {
     if (!isRunning) {
       try {
-        sessions = Some(new CassandraSessionPool(StackPool(SocketProvider(CASSANDRA_SERVER_HOSTNAME, CASSANDRA_SERVER_PORT)), protocol, DEFAULT_CONSISTENCY_LEVEL))
+        sessions = Some(new CassandraSessionPool(
+          KEYSPACE,
+          StackPool(SocketProvider(CASSANDRA_SERVER_HOSTNAME, CASSANDRA_SERVER_PORT)),
+          protocol,
+          CONSISTENCY_LEVEL))
         log.info("Cassandra persistent storage has started up successfully");
       } catch {
         case e =>
@@ -75,36 +80,27 @@ object CassandraStorage extends Logging {
     if (isRunning && sessions.isDefined) sessions.get.close
   }
 
-  //implicit def strToBytes(s: String) = s.getBytes("UTF-8")
-
-  /*
-    def insertRefStorageFor(name: String, element: AnyRef) = sessions.withSession { session => {
-      val user_id = "1"
-      session ++| ("users", user_id, "base_attributes:name", "Lord Foo Bar", false)
-      session ++| ("users", user_id, "base_attributes:age", "24", false)
-      for( i <- session / ("users", user_id, "base_attributes", None, None).toList) println(i)
-    }}
-  */
   // ===============================================================
   // For Ref
   // ===============================================================
 
-  def insertRefStorageFor(name: String, element: String) = if (sessions.isDefined) {
+  def insertRefStorageFor(name: String, element: AnyRef) = if (sessions.isDefined) {
     sessions.get.withSession {
-      _ ++| (
+      _ ++| (name,
-              TABLE_NAME,
+        new ColumnPath(REF_COLUMN_PARENT.getColumn_family, null, REF_KEY),
-              name,
+        serializer.out(element),
-              REF_COLUMN_FAMILY,
-              element,
         System.currentTimeMillis,
-              BLOCKING_CALL)
+        CONSISTENCY_LEVEL)
     }
   } else throw new IllegalStateException("CassandraStorage is not started")
 
-  def getRefStorageFor(name: String): Option[String] = if (sessions.isDefined) {
+  def getRefStorageFor(name: String): Option[AnyRef] = if (sessions.isDefined) {
     try {
-      val column = sessions.get.withSession {_ | (TABLE_NAME, name, REF_COLUMN_FAMILY)}
+      val column: Option[Column] = sessions.get.withSession {
-      Some(column.value)
+        _ | (name, new ColumnPath(REF_COLUMN_PARENT.getColumn_family, null, REF_KEY))
+      }
+      if (column.isDefined) Some(serializer.in(column.get.value, None))
+      else None
     } catch {
       case e =>
         e.printStackTrace
@@ -116,75 +112,77 @@ object CassandraStorage extends Logging {
   // For Vector
   // ===============================================================
 
-  def insertVectorStorageEntryFor(name: String, element: String) = if (sessions.isDefined) {
+  def insertVectorStorageEntryFor(name: String, element: AnyRef) = if (sessions.isDefined) {
     sessions.get.withSession {
-      _ ++| (
+      _ ++| (name,
-              TABLE_NAME,
+        new ColumnPath(VECTOR_COLUMN_PARENT.getColumn_family, null, intToBytes(getVectorStorageSizeFor(name))),
-              name,
+        serializer.out(element),
-              VECTOR_COLUMN_FAMILY + ":" + getVectorStorageSizeFor(name),
-              element,
         System.currentTimeMillis,
-              BLOCKING_CALL)
+        CONSISTENCY_LEVEL)
     }
   } else throw new IllegalStateException("CassandraStorage is not started")
 
-  def getVectorStorageEntryFor(name: String, index: Int): String = if (sessions.isDefined) {
+  def getVectorStorageEntryFor(name: String, index: Int): AnyRef = if (sessions.isDefined) {
-    try {
+    val column: Option[Column] = sessions.get.withSession {
-      val column = sessions.get.withSession {_ | (TABLE_NAME, name, VECTOR_COLUMN_FAMILY + ":" + index)}
+      _ | (name, new ColumnPath(VECTOR_COLUMN_PARENT.getColumn_family, null, intToBytes(index)))
-      column.value
-    } catch {
-      case e =>
-        e.printStackTrace
-        throw new NoSuchElementException(e.getMessage)
     }
+    if (column.isDefined) serializer.in(column.get.value, None)
+    else throw new NoSuchElementException("No element for vector [" + name + "] and index [" + index + "]")
   } else throw new IllegalStateException("CassandraStorage is not started")
 
-  def getVectorStorageRangeFor(name: String, start: Int, count: Int): List[String] = if (sessions.isDefined) {
+  def getVectorStorageRangeFor(name: String, start: Option[Int], finish: Option[Int], count: Int): List[AnyRef] = if (sessions.isDefined) {
-    sessions.get.withSession {_ / (TABLE_NAME, name, VECTOR_COLUMN_FAMILY, IS_ASCENDING, count)}.map(_.value)
+    val startBytes = if (start.isDefined) intToBytes(start.get) else null
+    val finishBytes = if (finish.isDefined) intToBytes(finish.get) else null
+    val columns: List[Column] = sessions.get.withSession {
+      _ / (name,
+        VECTOR_COLUMN_PARENT,
+        startBytes, finishBytes,
+        IS_ASCENDING,
+        count,
+        CONSISTENCY_LEVEL)
+    }
+    columns.map(column => serializer.in(column.value, None))
   } else throw new IllegalStateException("CassandraStorage is not started")
 
   def getVectorStorageSizeFor(name: String): Int = if (sessions.isDefined) {
-    sessions.get.withSession {_ |# (TABLE_NAME, name, VECTOR_COLUMN_FAMILY)}
+    sessions.get.withSession {
+      _ |# (name, VECTOR_COLUMN_PARENT)
+    }
   } else throw new IllegalStateException("CassandraStorage is not started")
 
   // ===============================================================
   // For Map
   // ===============================================================
 
-  def insertMapStorageEntryFor(name: String, key: String, value: String) = if (sessions.isDefined) {
+  def insertMapStorageEntryFor(name: String, key: AnyRef, element: AnyRef) = if (sessions.isDefined) {
     sessions.get.withSession {
-      _ ++| (
+      _ ++| (name,
-              TABLE_NAME,
+        new ColumnPath(MAP_COLUMN_PARENT.getColumn_family, null, serializer.out(key)),
-              name,
+        serializer.out(element),
-              MAP_COLUMN_FAMILY + ":" + key,
-              value,
         System.currentTimeMillis,
-              BLOCKING_CALL)
+        CONSISTENCY_LEVEL)
     }
   } else throw new IllegalStateException("CassandraStorage is not started")
 
-  def insertMapStorageEntriesFor(name: String, entries: List[Tuple2[String, String]]) = if (sessions.isDefined) {
+  def insertMapStorageEntriesFor(name: String, entries: List[Tuple2[AnyRef, AnyRef]]) = if (sessions.isDefined) {
-    import java.util.{Map, HashMap, List, ArrayList}
+    val cf2columns: java.util.Map[String, java.util.List[Column]] = new java.util.HashMap
-    val columns: Map[String, List[column_t]] = new HashMap
     for (entry <- entries) {
-      val cls: List[column_t] = new ArrayList
+      val columns: java.util.List[Column] = new java.util.ArrayList
-      cls.add(new column_t(entry._1, entry._2, System.currentTimeMillis))
+      columns.add(new Column(serializer.out(entry._1), serializer.out(entry._2), System.currentTimeMillis))
-      columns.put(MAP_COLUMN_FAMILY, cls)
+      cf2columns.put(MAP_COLUMN_PARENT.getColumn_family, columns)
     }
     sessions.get.withSession {
-      _ ++| (
+      _ ++| (new BatchMutation(name, cf2columns), CONSISTENCY_LEVEL)
-              new batch_mutation_t(
-                TABLE_NAME,
-                name,
-                columns),
-              BLOCKING_CALL)
     }
   } else throw new IllegalStateException("CassandraStorage is not started")
 
-  def getMapStorageEntryFor(name: String, key: String): Option[String] = if (sessions.isDefined) {
+  def getMapStorageEntryFor(name: String, key: AnyRef): Option[AnyRef] = if (sessions.isDefined) {
     try {
-      val column = sessions.get.withSession {_ | (TABLE_NAME, name, MAP_COLUMN_FAMILY + ":" + key)}
+      val column: Option[Column] = sessions.get.withSession {
-      Some(column.value)
+        _ | (name, new ColumnPath(MAP_COLUMN_PARENT.getColumn_family, null, serializer.out(key)))
+      }
+      if (column.isDefined) Some(serializer.in(column.get.value, None))
+      else None
     } catch {
       case e =>
         e.printStackTrace
@@ -192,163 +190,47 @@ object CassandraStorage extends Logging {
     }
   } else throw new IllegalStateException("CassandraStorage is not started")
 
+  def getMapStorageFor(name: String): List[Tuple2[AnyRef, AnyRef]]  = if (sessions.isDefined) {
+    throw new UnsupportedOperationException
     /*
-  def getMapStorageFor(name: String): List[Tuple2[String, String]]  = if (sessions.isDefined) {
+    val columns = server.get_columns_since(name, MAP_COLUMN_FAMILY, -1)
-    val columns = server.get_columns_since(TABLE_NAME, name, MAP_COLUMN_FAMILY, -1)
       .toArray.toList.asInstanceOf[List[org.apache.cassandra.service.column_t]]
     for {
       column <- columns
       col = (column.columnName, column.value)
     } yield col
-  } else throw new IllegalStateException("CassandraStorage is not started")
   */
+  } else throw new IllegalStateException("CassandraStorage is not started")
 
   def getMapStorageSizeFor(name: String): Int = if (sessions.isDefined) {
-    sessions.get.withSession {_ |# (TABLE_NAME, name, MAP_COLUMN_FAMILY)}
+    sessions.get.withSession {
+      _ |# (name, MAP_COLUMN_PARENT)
+    }
   } else throw new IllegalStateException("CassandraStorage is not started")
 
-  def removeMapStorageFor(name: String) = if (sessions.isDefined) {
+  def removeMapStorageFor(name: String): Unit = removeMapStorageFor(name, null)
-    sessions.get.withSession {_ -- (TABLE_NAME, name, MAP_COLUMN_FAMILY, System.currentTimeMillis, BLOCKING_CALL)}
+
+  def removeMapStorageFor(name: String, key: AnyRef): Unit = if (sessions.isDefined) {
+    val keyBytes = if (key == null) null else serializer.out(key)
+    sessions.get.withSession {
+      _ -- (name,
+        new ColumnPathOrParent(MAP_COLUMN_PARENT.getColumn_family, null, keyBytes),
+        System.currentTimeMillis,
+        CONSISTENCY_LEVEL)
+    }
   } else throw new IllegalStateException("CassandraStorage is not started")
 
-  def getMapStorageRangeFor(name: String, start: Int, count: Int): List[Tuple2[String, String]] = if (sessions.isDefined) {
+  def getMapStorageRangeFor(name: String, start: Option[AnyRef], finish: Option[AnyRef], count: Int):
-    sessions.get.withSession {_ / (TABLE_NAME, name, MAP_COLUMN_FAMILY, IS_ASCENDING, count)}.toArray.toList.asInstanceOf[List[Tuple2[String, String]]]
+  List[Tuple2[AnyRef, AnyRef]] = if (sessions.isDefined) {
+    val startBytes = if (start.isDefined) serializer.out(start.get) else null
+    val finishBytes = if (finish.isDefined) serializer.out(finish.get) else null
+    val columns: List[Column] = sessions.get.withSession {
+      _ / (name, MAP_COLUMN_PARENT, startBytes, finishBytes, IS_ASCENDING, count, CONSISTENCY_LEVEL)
+    }
+    columns.map(column => (column.name, serializer.in(column.value, None)))
   } else throw new IllegalStateException("CassandraStorage is not started")
 }
 
-trait CassandraSession extends Closeable with Flushable {
-  import scala.collection.jcl.Conversions._
-  import org.scala_tools.javautils.Imports._
-
-  private implicit def null2Option[T](t: T): Option[T] = if (t != null) Some(t) else None
-
-  protected val client: Cassandra.Client
-
-  val obtainedAt: Long
-  val consistencyLevel: Int
-
-  def /(keyspace: String, key: String, columnParent: ColumnParent, start: Array[Byte], end: Array[Byte], ascending: Boolean, count: Int): List[Column] =
-    /(keyspace, key, columnParent, start, end, ascending, count, consistencyLevel)
-
-  def /(keyspace: String, key: String, columnParent: ColumnParent, start: Array[Byte], end: Array[Byte], ascending: Boolean, count: Int, consistencyLevel: Int): List[Column] =
-    client.get_slice(keyspace, key, columnParent, start, end, ascending, count, consistencyLevel).toList
-
-  def /(keyspace: String, key: String, columnParent: ColumnParent, colNames: List[Array[Byte]]): List[Column] =
-    /(keyspace, key, columnParent, colNames, consistencyLevel)
-
-  def /(keyspace: String, key: String, columnParent: ColumnParent, colNames: List[Array[Byte]], consistencyLevel: Int): List[Column] =
-    client.get_slice_by_names(keyspace, key, columnParent, colNames.asJava, consistencyLevel).toList
-
-  def |(keyspace: String, key: String, colPath: ColumnPath): Option[Column] =
-    |(keyspace, key, colPath, consistencyLevel)
-
-  def |(keyspace: String, key: String, colPath: ColumnPath, consistencyLevel: Int): Option[Column] =
-    client.get_column(keyspace, key, colPath, consistencyLevel)
-
-  def |#(keyspace: String, key: String, columnParent: ColumnParent): Int =
-    |#(keyspace, key, columnParent, consistencyLevel)
-
-  def |#(keyspace: String, key: String, columnParent: ColumnParent, consistencyLevel: Int): Int =
-    client.get_column_count(keyspace, key, columnParent, consistencyLevel)
-
-  def ++|(keyspace: String, key: String, columnPath: ColumnPath, value: Array[Byte]): Unit =
-    ++|(keyspace, key, columnPath, value, obtainedAt, consistencyLevel)
-
-  def ++|(keyspace: String, key: String, columnPath: ColumnPath, value: Array[Byte], timestamp: Long): Unit =
-    ++|(keyspace, key, columnPath, value, timestamp, consistencyLevel)
-
-  def ++|(keyspace: String, key: String, columnPath: ColumnPath, value: Array[Byte], timestamp: Long, consistencyLevel: Int) =
-    client.insert(keyspace, key, columnPath, value, timestamp, consistencyLevel)
-
-  def ++|(keyspace: String, batch: BatchMutation): Unit =
-    ++|(keyspace, batch, consistencyLevel)
-
-  def ++|(keyspace: String, batch: BatchMutation, consistencyLevel: Int): Unit =
-    client.batch_insert(keyspace, batch, consistencyLevel)
-
-  def --(keyspace: String, key: String, columnPathOrParent: ColumnPathOrParent, timestamp: Long): Unit =
-    --(keyspace, key, columnPathOrParent, timestamp, consistencyLevel)
-
-  def --(keyspace: String, key: String, columnPathOrParent: ColumnPathOrParent, timestamp: Long, consistencyLevel: Int): Unit =
-    client.remove(keyspace, key, columnPathOrParent, timestamp, consistencyLevel)
-
-  def /^(keyspace: String, key: String, columnFamily: String, start: Array[Byte], end: Array[Byte], ascending: Boolean, count: Int): List[SuperColumn] =
-    /^(keyspace, key, columnFamily, start, end, ascending, count, consistencyLevel)
-
-  def /^(keyspace: String, key: String, columnFamily: String, start: Array[Byte], end: Array[Byte], ascending: Boolean, count: Int, consistencyLevel: Int): List[SuperColumn] =
-    client.get_slice_super(keyspace, key, columnFamily, start, end, ascending, count, consistencyLevel).toList
-
-  def /^(keyspace: String, key: String, columnFamily: String, superColNames: List[Array[Byte]]): List[SuperColumn] =
-    /^(keyspace, key, columnFamily, superColNames, consistencyLevel)
-
-  def /^(keyspace: String, key: String, columnFamily: String, superColNames: List[Array[Byte]], consistencyLevel: Int): List[SuperColumn] =
-    client.get_slice_super_by_names(keyspace, key, columnFamily, superColNames.asJava, consistencyLevel).toList
-
-  def |^(keyspace: String, key: String, superColumnPath: SuperColumnPath): Option[SuperColumn] =
-    |^(keyspace, key, superColumnPath, consistencyLevel)
-
-  def |^(keyspace: String, key: String, superColumnPath: SuperColumnPath, consistencyLevel: Int): Option[SuperColumn] =
-    client.get_super_column(keyspace, key, superColumnPath, consistencyLevel)
-
-  def ++|^(keyspace: String, batch: BatchMutationSuper): Unit =
-    ++|^(keyspace, batch, consistencyLevel)
-
-  def ++|^(keyspace: String, batch: BatchMutationSuper, consistencyLevel: Int): Unit =
-    client.batch_insert_super_column(keyspace, batch, consistencyLevel)
-
-  def keys(keyspace: String, columnFamily: String, startsWith: String, stopsAt: String, maxResults: Option[Int]): List[String] =
-    client.get_key_range(keyspace, columnFamily, startsWith, stopsAt, maxResults.getOrElse(-1)).toList
-
-  def property(name: String): String = client.get_string_property(name)
-
-  def properties(name: String): List[String] = client.get_string_list_property(name).toList
-
-  def describeTable(keyspace: String) = client.describe_keyspace(keyspace)
-
-  def ?(query: String) = client.execute_query(query)
-}
-
-class CassandraSessionPool[T <: TTransport](transportPool: Pool[T], inputProtocol: Protocol, outputProtocol: Protocol, defConsistencyLvl: Int) extends Closeable {
-  def this(transportPool: Pool[T], ioProtocol: Protocol, defConsistencyLvl: Int) = this (transportPool, ioProtocol, ioProtocol, defConsistencyLvl)
-
-  def newSession: CassandraSession = newSession(defConsistencyLvl)
-
-  def newSession(consistencyLvl: Int): CassandraSession = {
-    val t = transportPool.borrowObject
-    val c = new Cassandra.Client(inputProtocol(t), outputProtocol(t))
-    new CassandraSession {
-      val client = c
-      val obtainedAt = System.currentTimeMillis
-      val consistencyLevel = consistencyLvl
-      def flush = t.flush
-      def close = transportPool.returnObject(t)
-    }
-  }
-
-  def withSession[R](body: CassandraSession => R) = {
-    val session = newSession(defConsistencyLvl)
-    try {
-      val result = body(session)
-      session.flush
-      result
-    } finally {
-      session.close
-    }
-  }
-
-  def close = transportPool.close
-}
-
-sealed abstract class Protocol(val factory: TProtocolFactory) {
-  def apply(transport: TTransport) = factory.getProtocol(transport)
-}
-
-object Protocol {
-  object Binary extends Protocol(new TBinaryProtocol.Factory)
-  object SimpleJSON extends Protocol(new TSimpleJSONProtocol.Factory)
-  object JSON extends Protocol(new TJSONProtocol.Factory)
-}
-
 /**
  * NOTE: requires command line options:
  * <br/>
@@ -357,7 +239,7 @@ object Protocol {
  * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
  *
 object EmbeddedCassandraStorage extends Logging  {
-val TABLE_NAME = "akka"
+val KEYSPACE = "akka"
 val MAP_COLUMN_FAMILY = "map"
 val VECTOR_COLUMN_FAMILY = "vector"
 val REF_COLUMN_FAMILY = "ref:item"
@@ -365,7 +247,7 @@ val REF_COLUMN_FAMILY = "ref:item"
 val IS_ASCENDING = true
 
 val RUN_THRIFT_SERVICE = kernel.Kernel.config.getBool("akka.storage.cassandra.thrift-server.service", false)
-val BLOCKING_CALL =  {
+val CONSISTENCY_LEVEL =  {
 if (kernel.Kernel.config.getBool("akka.storage.cassandra.blocking", true)) 0
 else 1 }
 
@@ -416,17 +298,17 @@ if (RUN_THRIFT_SERVICE) thriftServer.stop
 
 def insertRefStorageFor(name: String, element: AnyRef) =  {
 server.insert(
-TABLE_NAME,
+KEYSPACE,
 name,
 REF_COLUMN_FAMILY,
 element,
 System.currentTimeMillis,
-BLOCKING_CALL)
+CONSISTENCY_LEVEL)
 }
 
 def getRefStorageFor(name: String): Option[AnyRef] =  {
 try  {
-val column = server.get_column(TABLE_NAME, name, REF_COLUMN_FAMILY)
+val column = server.get_column(KEYSPACE, name, REF_COLUMN_FAMILY)
 Some(serializer.in(column.value, None))
 } catch  {
 case e =>
@@ -440,17 +322,17 @@ None }
 
 def insertVectorStorageEntryFor(name: String, element: AnyRef) =  {
 server.insert(
-TABLE_NAME,
+KEYSPACE,
 name,
 VECTOR_COLUMN_FAMILY + ":" + getVectorStorageSizeFor(name),
 element,
 System.currentTimeMillis,
-BLOCKING_CALL)
+CONSISTENCY_LEVEL)
 }
 
 def getVectorStorageEntryFor(name: String, index: Int): AnyRef =  {
 try  {
-val column = server.get_column(TABLE_NAME, name, VECTOR_COLUMN_FAMILY + ":" + index)
+val column = server.get_column(KEYSPACE, name, VECTOR_COLUMN_FAMILY + ":" + index)
 serializer.in(column.value, None)
 } catch  {
 case e =>
@@ -460,11 +342,11 @@ throw new Predef.NoSuchElementException(e.getMessage)
 }
 
 def getVectorStorageRangeFor(name: String, start: Int, count: Int): List[AnyRef]  =
-server.get_slice(TABLE_NAME, name, VECTOR_COLUMN_FAMILY, IS_ASCENDING, count)
+server.get_slice(KEYSPACE, name, VECTOR_COLUMN_FAMILY, IS_ASCENDING, count)
 .toArray.toList.asInstanceOf[List[Tuple2[String, AnyRef]]].map(tuple => tuple._2)
 
 def getVectorStorageSizeFor(name: String): Int =
-server.get_column_count(TABLE_NAME, name, VECTOR_COLUMN_FAMILY)
+server.get_column_count(KEYSPACE, name, VECTOR_COLUMN_FAMILY)
 
 // ===============================================================
 // For Map
@@ -472,11 +354,11 @@ server.get_column_count(TABLE_NAME, name, VECTOR_COLUMN_FAMILY)
 
 def insertMapStorageEntryFor(name: String, key: String, value: AnyRef) =  {
 server.insert(
-TABLE_NAME, name,
+KEYSPACE, name,
 MAP_COLUMN_FAMILY + ":" + key,
 serializer.out(value),
 System.currentTimeMillis,
-BLOCKING_CALL)
+CONSISTENCY_LEVEL)
 }
 
 def insertMapStorageEntriesFor(name: String, entries: List[Tuple2[String, AnyRef]]) =  {
@@ -487,15 +369,15 @@ val cls: List[column_t] = new ArrayList
 cls.add(new column_t(entry._1, serializer.out(entry._2), System.currentTimeMillis))
 columns.put(MAP_COLUMN_FAMILY, cls)
 }
-server.batch_insert(new batch_mutation_t(
+server.batch_insert(new BatchMutation(
-TABLE_NAME, name,
+KEYSPACE, name,
 columns),
-BLOCKING_CALL)
+CONSISTENCY_LEVEL)
 }
 
 def getMapStorageEntryFor(name: String, key: AnyRef): Option[AnyRef] =  {
 try  {
-val column = server.get_column(TABLE_NAME, name, MAP_COLUMN_FAMILY + ":" + key)
+val column = server.get_column(KEYSPACE, name, MAP_COLUMN_FAMILY + ":" + key)
 Some(serializer.in(column.value, None))
 } catch  {
 case e =>
@@ -505,7 +387,7 @@ None
 }
 
 def getMapStorageFor(name: String): List[Tuple2[String, AnyRef]]  =  {
-val columns = server.get_columns_since(TABLE_NAME, name, MAP_COLUMN_FAMILY, -1)
+val columns = server.get_columns_since(KEYSPACE, name, MAP_COLUMN_FAMILY, -1)
 .toArray.toList.asInstanceOf[List[org.apache.cassandra.service.column_t]]
 for  {
 column <- columns
@@ -514,13 +396,13 @@ col = (column.columnName, serializer.in(column.value, None))
 }
 
 def getMapStorageSizeFor(name: String): Int =
-server.get_column_count(TABLE_NAME, name, MAP_COLUMN_FAMILY)
+server.get_column_count(KEYSPACE, name, MAP_COLUMN_FAMILY)
 
 def removeMapStorageFor(name: String) =
-server.remove(TABLE_NAME, name, MAP_COLUMN_FAMILY, System.currentTimeMillis, BLOCKING_CALL)
+server.remove(KEYSPACE, name, MAP_COLUMN_FAMILY, System.currentTimeMillis, CONSISTENCY_LEVEL)
 
 def getMapStorageRangeFor(name: String, start: Int, count: Int): List[Tuple2[String, AnyRef]] =  {
-server.get_slice(TABLE_NAME, name, MAP_COLUMN_FAMILY, IS_ASCENDING, count)
+server.get_slice(KEYSPACE, name, MAP_COLUMN_FAMILY, IS_ASCENDING, count)
 .toArray.toList.asInstanceOf[List[Tuple2[String, AnyRef]]]
 }
 }

kernel/src/main/scala/state/Pool.scala

@@ -7,6 +7,8 @@ package se.scalablesolutions.akka.kernel.state
 import org.apache.commons.pool._
 import org.apache.commons.pool.impl._
 
+import org.apache.thrift.transport._
+
 trait Pool[T] extends java.io.Closeable {
   def borrowObject: T
   def returnObject(t: T): Unit

kernel/src/main/scala/state/State.scala

@@ -37,7 +37,7 @@ object TransactionalState extends TransactionalState
  * </pre>
  */
 class TransactionalState {
-  def newPersistentMap(config: PersistentStorageConfig): TransactionalMap[String, AnyRef] = config match {
+  def newPersistentMap(config: PersistentStorageConfig): TransactionalMap[AnyRef, AnyRef] = config match {
     case CassandraStorageConfig() => new CassandraPersistentTransactionalMap
     case TerracottaStorageConfig() => throw new UnsupportedOperationException
     case TokyoCabinetStorageConfig() => throw new UnsupportedOperationException
@@ -174,7 +174,7 @@ abstract class PersistentTransactionalMap[K, V] extends TransactionalMap[K, V] {
   // FIXME: need to handle remove in another changeSet
   protected[kernel] val changeSet = new HashMap[K, V]
 
-  def getRange(start: Int, count: Int)
+  def getRange(start: Option[AnyRef], count: Int)
 
   // ---- For Transactional ----
   override def begin = {}
@@ -188,11 +188,6 @@ abstract class PersistentTransactionalMap[K, V] extends TransactionalMap[K, V] {
     None // always return None to speed up writes (else need to go to DB to get
   }
 
-  override def remove(key: K) = {
-    verifyTransaction
-    changeSet -= key
-  }
-
   override def -=(key: K) = remove(key)
 
   override def update(key: K, value: V) = put(key, value)
@@ -203,12 +198,21 @@ abstract class PersistentTransactionalMap[K, V] extends TransactionalMap[K, V] {
  *
  * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
  */
-class CassandraPersistentTransactionalMap extends PersistentTransactionalMap[String, AnyRef] {
+class CassandraPersistentTransactionalMap extends PersistentTransactionalMap[AnyRef, AnyRef] {
 
-  override def getRange(start: Int, count: Int) = {
+  override def remove(key: AnyRef) = {
+    verifyTransaction
+    if (changeSet.contains(key)) changeSet -= key
+    else CassandraStorage.removeMapStorageFor(uuid, key)
+  }
+
+  override def getRange(start: Option[AnyRef], count: Int) =
+    getRange(start, None, count)
+
+  def getRange(start: Option[AnyRef], finish: Option[AnyRef], count: Int) = {
     verifyTransaction
     try {
-      CassandraStorage.getMapStorageRangeFor(uuid, start, count)
+      CassandraStorage.getMapStorageRangeFor(uuid, start, finish, count)
     } catch {
       case e: Exception => Nil
     }
@@ -230,7 +234,7 @@ class CassandraPersistentTransactionalMap extends PersistentTransactionalMap[Str
     }
   }
 
-  override def contains(key: String): Boolean = {
+  override def contains(key: AnyRef): Boolean = {
     try {
       verifyTransaction
       CassandraStorage.getMapStorageEntryFor(uuid, key).isDefined
@@ -249,7 +253,7 @@ class CassandraPersistentTransactionalMap extends PersistentTransactionalMap[Str
   }
 
   // ---- For scala.collection.mutable.Map ----
-  override def get(key: String): Option[AnyRef] = {
+  override def get(key: AnyRef): Option[AnyRef] = {
     verifyTransaction
    // if (changeSet.contains(key)) changeSet.get(key)
    // else {
@@ -262,16 +266,16 @@ class CassandraPersistentTransactionalMap extends PersistentTransactionalMap[Str
     //}
   }
   
-  override def elements: Iterator[Tuple2[String, AnyRef]]  = {
+  override def elements: Iterator[Tuple2[AnyRef, AnyRef]]  = {
     //verifyTransaction
-    new Iterator[Tuple2[String, AnyRef]] {
+    new Iterator[Tuple2[AnyRef, AnyRef]] {
-      private val originalList: List[Tuple2[String, AnyRef]] = try {
+      private val originalList: List[Tuple2[AnyRef, AnyRef]] = try {
         CassandraStorage.getMapStorageFor(uuid)
       } catch {
         case e: Throwable => Nil
       }
       private var elements = originalList.reverse
-      override def next: Tuple2[String, AnyRef]= synchronized {
+      override def next: Tuple2[AnyRef, AnyRef]= synchronized {
         val element = elements.head
         elements = elements.tail
         element
@@ -391,9 +395,12 @@ class CassandraPersistentTransactionalVector extends PersistentTransactionalVect
     else CassandraStorage.getVectorStorageEntryFor(uuid, index)
   }
 
-  override def getRange(start: Int, count: Int): List[AnyRef] = {
+  override def getRange(start: Int, count: Int): List[AnyRef] =
+    getRange(Some(start), None, count)
+  
+  def getRange(start: Option[Int], finish: Option[Int], count: Int): List[AnyRef] = {
     verifyTransaction
-    CassandraStorage.getVectorStorageRangeFor(uuid, start, count)
+    CassandraStorage.getVectorStorageRangeFor(uuid, start, finish, count)
   }
 
   override def length: Int = {

kernel/src/main/scala/util/Helpers.scala

@@ -4,15 +4,9 @@
 
 package se.scalablesolutions.akka.kernel.util
 
-import java.io.UnsupportedEncodingException
+import java.security.MessageDigest
-import java.security.{NoSuchAlgorithmException, MessageDigest}
 import java.util.concurrent.locks.ReentrantReadWriteLock
 
-import scala.actors._
-import scala.actors.Actor._
-
-import net.lag.logging.Logger
-
 class SystemFailure(cause: Throwable) extends RuntimeException(cause)
 
 /**
@@ -20,7 +14,18 @@ class SystemFailure(cause: Throwable) extends RuntimeException(cause)
  */
 object Helpers extends Logging {
 
-  def getDigestFor(s: String) = {
+  implicit def null2Option[T](t: T): Option[T] = if (t != null) Some(t) else None
+
+  def intToBytes(value: Int): Array[Byte] = {
+    val bytes = new Array[Byte](4)
+    bytes(0) = (value >>> 24).asInstanceOf[Byte]
+    bytes(1) = (value >>> 16).asInstanceOf[Byte]
+    bytes(2) = (value >>> 8).asInstanceOf[Byte]
+    bytes(3) = value.asInstanceOf[Byte]
+    bytes
+  }
+
+  def getMD5For(s: String) = {
     val digest = MessageDigest.getInstance("MD5")
     digest.update(s.getBytes("ASCII"))
     val bytes = digest.digest
@@ -59,51 +64,5 @@ object Helpers extends Logging {
       }
     }
   }
-
-  // ================================================
-  // implicit conversion between regular actor and actor with a type future
-  implicit def actorWithFuture(a: Actor) = new ActorWithTypedFuture(a)
-
-  abstract class FutureWithTimeout[T](ch: InputChannel[T]) extends Future[T](ch) {
-    def receiveWithin(timeout: Int) : Option[T]
-    override def respond(f: T => Unit): Unit = throw new UnsupportedOperationException("Does not support the Responder API") 
-  }
-
-  def receiveOrFail[T](future: => FutureWithTimeout[T], timeout: Int, errorHandler: => T): T = {
-    future.receiveWithin(timeout) match {
-      case None => errorHandler
-      case Some(reply) => reply
-    }
-  }
-
-  class ActorWithTypedFuture(a: Actor) {
-    require(a != null)
-
-    def !!![A](msg: Any): FutureWithTimeout[A] = {
-      val ftch = new Channel[A](Actor.self)
-      a.send(msg, ftch.asInstanceOf[OutputChannel[Any]])
-      new FutureWithTimeout[A](ftch) {
-        def apply() =
-          if (isSet) value.get.asInstanceOf[A]
-          else ch.receive {
-            case a =>
-              value = Some(a)
-              value.get.asInstanceOf[A]
-          }
-        def isSet = receiveWithin(0).isDefined
-        def receiveWithin(timeout: Int): Option[A] = value match {
-          case None => ch.receiveWithin(timeout) {
-            case TIMEOUT =>
-              log.debug("Future timed out while waiting for actor [%s]", a)
-              None
-            case a =>
-              value = Some(a)
-              value.asInstanceOf[Option[A]]
-          }
-          case a => a.asInstanceOf[Option[A]]
-        }
-      }
-    }
-  }
 }
 

pom.xml

@@ -26,6 +26,38 @@
     <module>samples-java</module>
   </modules>
 
+  <organization>
+    <name>Scalable Solutions AB</name>
+    <url>http://scalablesolutions.se</url>
+  </organization>
+
+  <scm>
+    <connection>scm:git:git://github.com/jboner/akka.git</connection>
+    <developerConnection>scm:git:git@github.com:jboner/akka.git</developerConnection>
+    <url>http://github.com/jboner/akka</url>
+  </scm>
+
+  <licenses>
+    <license>
+      <name>the Apache License, ASL Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+    </license>
+  </licenses>
+
+  <developers>
+    <developer>
+      <id>jboner</id>
+      <name>Jonas Bon&#233;r</name>
+      <timezone>+1</timezone>
+      <email>jonas AT jonasboner DOTCOM</email>
+      <roles>
+        <role>Founder</role>
+        <role>Hacker</role>
+        <role>Despot</role>
+      </roles>
+    </developer>
+  </developers>
+
   <repositories>
     <repository>
       <id>repo1.maven</id>

samples-java/akka-samples-java.iml

@@ -32,13 +32,9 @@
     <orderEntry type="library" exported="" name="Maven: asm:asm:3.1" level="project" />
     <orderEntry type="library" exported="" name="Maven: aopalliance:aopalliance:1.0" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.apache.camel:camel-core:2.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" exported="" name="Maven: commons-logging:commons-logging-api:1.1" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.jboss.netty:netty:3.1.0.GA" level="project" />
-    <orderEntry type="library" exported="" name="Maven: javax.xml.bind:jaxb-api:2.1" level="project" />
-    <orderEntry type="library" exported="" name="Maven: javax.xml.stream:stax-api:1.0-2" level="project" />
-    <orderEntry type="library" exported="" name="Maven: javax.activation:activation:1.1" level="project" />
-    <orderEntry type="library" exported="" name="Maven: com.sun.xml.bind:jaxb-impl:2.1.6" level="project" />
-    <orderEntry type="library" exported="" name="Maven: org.jboss.netty:netty:3.1.0.CR1" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.apache:zookeeper:3.1.0" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.scala-tools:javautils:2.7.4-0.1" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.codehaus.jackson:jackson-core-asl:1.1.0" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.1.0" level="project" />
     <orderEntry type="library" exported="" name="Maven: sbinary:sbinary:0.3" level="project" />
@@ -67,6 +63,10 @@
     <orderEntry type="library" exported="" name="Maven: com.sun.jersey:jersey-json:1.1.1-ea" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.codehaus.jettison:jettison:1.1" level="project" />
     <orderEntry type="library" exported="" name="Maven: stax:stax-api:1.0.1" level="project" />
+    <orderEntry type="library" exported="" name="Maven: com.sun.xml.bind:jaxb-impl:2.1.12" level="project" />
+    <orderEntry type="library" exported="" name="Maven: javax.xml.bind:jaxb-api:2.1" level="project" />
+    <orderEntry type="library" exported="" name="Maven: javax.xml.stream:stax-api:1.0-2" level="project" />
+    <orderEntry type="library" exported="" name="Maven: javax.activation:activation:1.1" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.codehaus.jackson:jackson-asl:0.9.4" level="project" />
     <orderEntry type="library" exported="" name="Maven: com.sun.jersey.contribs:jersey-scala:1.1.2-ea-SNAPSHOT" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.atmosphere:atmosphere-core:0.3" level="project" />

samples-lift/akka-samples-lift.iml

@@ -39,8 +39,14 @@
     <orderEntry type="library" exported="" name="Maven: asm:asm:3.1" level="project" />
     <orderEntry type="library" exported="" name="Maven: aopalliance:aopalliance:1.0" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.apache.camel:camel-core:2.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" exported="" name="Maven: org.jboss.netty:netty:3.1.0.CR1" level="project" />
+    <orderEntry type="library" exported="" name="Maven: commons-logging:commons-logging-api:1.1" level="project" />
+    <orderEntry type="library" exported="" name="Maven: javax.xml.bind:jaxb-api:2.1" level="project" />
+    <orderEntry type="library" exported="" name="Maven: javax.xml.stream:stax-api:1.0-2" level="project" />
+    <orderEntry type="library" exported="" name="Maven: javax.activation:activation:1.1" level="project" />
+    <orderEntry type="library" exported="" name="Maven: com.sun.xml.bind:jaxb-impl:2.1.6" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.jboss.netty:netty:3.1.0.GA" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.apache:zookeeper:3.1.0" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.scala-tools:javautils:2.7.4-0.1" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.codehaus.jackson:jackson-core-asl:1.1.0" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.1.0" level="project" />
     <orderEntry type="library" exported="" name="Maven: sbinary:sbinary:0.3" level="project" />
@@ -69,10 +75,6 @@
     <orderEntry type="library" exported="" name="Maven: com.sun.jersey:jersey-json:1.1.1-ea" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.codehaus.jettison:jettison:1.1" level="project" />
     <orderEntry type="library" exported="" name="Maven: stax:stax-api:1.0.1" level="project" />
-    <orderEntry type="library" exported="" name="Maven: com.sun.xml.bind:jaxb-impl:2.1.12" level="project" />
-    <orderEntry type="library" exported="" name="Maven: javax.xml.bind:jaxb-api:2.1" level="project" />
-    <orderEntry type="library" exported="" name="Maven: javax.xml.stream:stax-api:1.0-2" level="project" />
-    <orderEntry type="library" exported="" name="Maven: javax.activation:activation:1.1" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.codehaus.jackson:jackson-asl:0.9.4" level="project" />
     <orderEntry type="library" exported="" name="Maven: com.sun.jersey.contribs:jersey-scala:1.1.2-ea-SNAPSHOT" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.atmosphere:atmosphere-core:0.3" level="project" />

samples-scala/akka-samples-scala.iml

@@ -37,8 +37,14 @@
     <orderEntry type="library" exported="" name="Maven: asm:asm:3.1" level="project" />
     <orderEntry type="library" exported="" name="Maven: aopalliance:aopalliance:1.0" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.apache.camel:camel-core:2.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" exported="" name="Maven: org.jboss.netty:netty:3.1.0.CR1" level="project" />
+    <orderEntry type="library" exported="" name="Maven: commons-logging:commons-logging-api:1.1" level="project" />
+    <orderEntry type="library" exported="" name="Maven: javax.xml.bind:jaxb-api:2.1" level="project" />
+    <orderEntry type="library" exported="" name="Maven: javax.xml.stream:stax-api:1.0-2" level="project" />
+    <orderEntry type="library" exported="" name="Maven: javax.activation:activation:1.1" level="project" />
+    <orderEntry type="library" exported="" name="Maven: com.sun.xml.bind:jaxb-impl:2.1.6" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.jboss.netty:netty:3.1.0.GA" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.apache:zookeeper:3.1.0" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.scala-tools:javautils:2.7.4-0.1" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.codehaus.jackson:jackson-core-asl:1.1.0" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.1.0" level="project" />
     <orderEntry type="library" exported="" name="Maven: sbinary:sbinary:0.3" level="project" />
@@ -67,10 +73,6 @@
     <orderEntry type="library" exported="" name="Maven: com.sun.jersey:jersey-json:1.1.1-ea" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.codehaus.jettison:jettison:1.1" level="project" />
     <orderEntry type="library" exported="" name="Maven: stax:stax-api:1.0.1" level="project" />
-    <orderEntry type="library" exported="" name="Maven: com.sun.xml.bind:jaxb-impl:2.1.12" level="project" />
-    <orderEntry type="library" exported="" name="Maven: javax.xml.bind:jaxb-api:2.1" level="project" />
-    <orderEntry type="library" exported="" name="Maven: javax.xml.stream:stax-api:1.0-2" level="project" />
-    <orderEntry type="library" exported="" name="Maven: javax.activation:activation:1.1" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.codehaus.jackson:jackson-asl:0.9.4" level="project" />
     <orderEntry type="library" exported="" name="Maven: com.sun.jersey.contribs:jersey-scala:1.1.2-ea-SNAPSHOT" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.atmosphere:atmosphere-core:0.3" level="project" />