From 59bb23206147a0d10e5fe84c7dc16a484a548448 Mon Sep 17 00:00:00 2001
From: jboner <jboner@darkstar.lan>
Date: Fri, 30 Oct 2009 22:39:26 +0100
Subject: [PATCH] refactored and cleaned up

---
 .../main/scala/stm/TransactionalState.scala   |   3 -
 .../scalablesolutions/akka/api/RestTest.java  |   2 +-
 akka-kernel/src/main/scala/AkkaServlet.scala  |  84 +--
 akka-kernel/src/main/scala/Kernel.scala       |  11 +-
 .../src/main/scala/CassandraSession.scala     |   8 +-
 .../src/main/scala/CassandraStorage.scala     |   6 -
 .../scala/ActorComponentProviderFactory.scala |   6 +-
 akka.iws                                      | 578 +++++++++++++-----
 config/akka-reference.conf                    |   4 +-
 config/storage-conf.xml                       | 476 +++++++--------
 10 files changed, 733 insertions(+), 445 deletions(-)

diff --git a/akka-actors/src/main/scala/stm/TransactionalState.scala b/akka-actors/src/main/scala/stm/TransactionalState.scala
index 2081e04fdd..6a0e7af2e1 100644
--- a/akka-actors/src/main/scala/stm/TransactionalState.scala
+++ b/akka-actors/src/main/scala/stm/TransactionalState.scala
@@ -4,12 +4,9 @@
 
 package se.scalablesolutions.akka.state
 
-import se.scalablesolutions.akka.stm.TransactionManagement
 import se.scalablesolutions.akka.stm.Transaction.atomic
 import se.scalablesolutions.akka.collection._
 
-import org.multiverse.templates.AtomicTemplate
-import org.multiverse.api.Transaction
 import org.multiverse.datastructures.refs.manual.Ref;
 
 import org.codehaus.aspectwerkz.proxy.Uuid
diff --git a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/RestTest.java b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/RestTest.java
index 0ba51ab239..c92735dba0 100644
--- a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/RestTest.java
+++ b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/RestTest.java
@@ -60,7 +60,7 @@ public class RestTest extends TestCase {
 */
   private static SelectorThread startJersey() {
     try {
-      Servlet servlet = new se.scalablesolutions.akka.rest.AkkaServlet();
+      Servlet servlet = new se.scalablesolutions.akka.AkkaServlet();
       ServletAdapter adapter = new ServletAdapter();
       adapter.setServletInstance(servlet);
       adapter.setContextPath(URI.getPath());
diff --git a/akka-kernel/src/main/scala/AkkaServlet.scala b/akka-kernel/src/main/scala/AkkaServlet.scala
index 46a26bfcd4..bbfecbaf7c 100755
--- a/akka-kernel/src/main/scala/AkkaServlet.scala
+++ b/akka-kernel/src/main/scala/AkkaServlet.scala
@@ -2,9 +2,10 @@
  * Copyright (C) 2009 Scalable Solutions.
  */
 
-package se.scalablesolutions.akka.rest
+package se.scalablesolutions.akka
 
 import se.scalablesolutions.akka.config.ConfiguratorRepository
+import se.scalablesolutions.akka.rest.ActorComponentProviderFactory
 import se.scalablesolutions.akka.util.Logging
 
 import com.sun.jersey.api.core.ResourceConfig
@@ -14,58 +15,63 @@ import com.sun.jersey.spi.container.WebApplication
 import javax.servlet.{ServletConfig}
 import javax.servlet.http.{HttpServletRequest, HttpServletResponse}
 
-import org.atmosphere.cpr.{AtmosphereServletProcessor, AtmosphereResource, AtmosphereResourceEvent}
-import org.atmosphere.cpr.AtmosphereServlet.AtmosphereHandlerWrapper
-import org.atmosphere.container.GrizzlyCometSupport
+import org.atmosphere.cpr.{AtmosphereServlet, AtmosphereServletProcessor, AtmosphereResource, AtmosphereResourceEvent}
 import org.atmosphere.handler.{ReflectorServletProcessor, AbstractReflectorAtmosphereHandler}
-import org.atmosphere.core.{JerseyBroadcaster}
-
-import java.net.URLClassLoader
-import java.io.InputStream
-
-import scala.collection.jcl.Conversions._
+import org.atmosphere.core.JerseyBroadcaster
 
 /**
+ * Akka's servlet to be used when deploying actors exposed as REST services in a standard servlet container,
+ * e.g. not using the Akka Kernel.
+ *
  * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
  */
 class AkkaServlet extends ServletContainer with Logging {
-  override def initiate(rc: ResourceConfig, wa: WebApplication) = {
-    akka.Kernel.boot // will boot if not already booted by 'main'
+  import org.scala_tools.javautils.Imports._
+
+  override def initiate(resourceConfig: ResourceConfig, webApplication: WebApplication) = {
+    Kernel.boot // will boot if not already booted by 'main'
+
     val configurators = ConfiguratorRepository.getConfigurators
 
-    rc.getClasses.addAll(configurators.flatMap(_.getComponentInterfaces))
-    rc.getProperties.put("com.sun.jersey.spi.container.ResourceFilters", akka.Config.config.getString("akka.rest.filters").getOrElse(""))
+    resourceConfig.getClasses.addAll(configurators.flatMap(_.getComponentInterfaces).asJava)
+    resourceConfig.getProperties.put(
+      "com.sun.jersey.spi.container.ResourceFilters",
+      Config.config.getList("akka.rest.filters").mkString(","))
 
-    wa.initiate(rc, new ActorComponentProviderFactory(configurators))
+    webApplication.initiate(resourceConfig, new ActorComponentProviderFactory(configurators))
   }
 }
 
+/**
+ * Akka's Comet servlet to be used when deploying actors exposed as Comet (and REST) services in a
+ * standard servlet container, e.g. not using the Akka Kernel.
+ * <p/>
+ * Used by the Akka Kernel to bootstrap REST and Comet.
+ */
 class AkkaCometServlet extends org.atmosphere.cpr.AtmosphereServlet {
-    val servlet = new AkkaServlet with AtmosphereServletProcessor {
+  val servlet = new AkkaServlet with AtmosphereServletProcessor {
 
-            //Delegate to implement the behavior for AtmosphereHandler
-            private val handler = new AbstractReflectorAtmosphereHandler {
-                override def onRequest(event: AtmosphereResource[HttpServletRequest, HttpServletResponse]) {
-                    if(event ne null)
-                    {
-                        event.getRequest.setAttribute(ReflectorServletProcessor.ATMOSPHERE_RESOURCE, event)
-                        event.getRequest.setAttribute(ReflectorServletProcessor.ATMOSPHERE_HANDLER, this)
-                        service(event.getRequest, event.getResponse)
-                    }
-                }
-            }
-
-            override def onStateChange(event : AtmosphereResourceEvent[HttpServletRequest, HttpServletResponse] ) {
-                if(event ne null)
-                   handler onStateChange event
-            }
-
-            override def onRequest(resource: AtmosphereResource[HttpServletRequest, HttpServletResponse]) {
-                   handler onRequest resource
-            }
+    //Delegate to implement the behavior for AtmosphereHandler
+    private val handler = new AbstractReflectorAtmosphereHandler {
+      override def onRequest(event: AtmosphereResource[HttpServletRequest, HttpServletResponse]) {
+        if (event ne null) {
+          event.getRequest.setAttribute(ReflectorServletProcessor.ATMOSPHERE_RESOURCE, event)
+          event.getRequest.setAttribute(ReflectorServletProcessor.ATMOSPHERE_HANDLER, this)
+          service(event.getRequest, event.getResponse)
         }
-
-    override def loadConfiguration(sc : ServletConfig) {
-        atmosphereHandlers.put("/*", new AtmosphereHandlerWrapper(servlet, new JerseyBroadcaster))
+      }
     }
+
+    override def onStateChange(event: AtmosphereResourceEvent[HttpServletRequest, HttpServletResponse]) {
+      if (event ne null) handler onStateChange event
+    }
+
+    override def onRequest(resource: AtmosphereResource[HttpServletRequest, HttpServletResponse]) {
+      handler onRequest resource
+    }
+  }
+
+  override def loadConfiguration(sc: ServletConfig) {
+    atmosphereHandlers.put("/*", new AtmosphereServlet.AtmosphereHandlerWrapper(servlet, new JerseyBroadcaster))
+  }
 }
diff --git a/akka-kernel/src/main/scala/Kernel.scala b/akka-kernel/src/main/scala/Kernel.scala
index c607fbe375..e5d85fb4df 100644
--- a/akka-kernel/src/main/scala/Kernel.scala
+++ b/akka-kernel/src/main/scala/Kernel.scala
@@ -12,10 +12,8 @@ import javax.ws.rs.core.UriBuilder
 import java.io.File
 import java.net.URLClassLoader
 
-import rest.AkkaCometServlet
-import nio.RemoteServer
-import state.CassandraStorage
-import util.Logging
+import se.scalablesolutions.akka.nio.RemoteServer
+import se.scalablesolutions.akka.util.Logging
 
 /**
  * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
@@ -112,19 +110,20 @@ object Kernel extends Logging {
 
   private def printBanner = {
     log.info(
-      """==============================
+"""==============================
               __    __
        _____  |  | _|  | _______
        \__  \ |  |/ /  |/ /\__  \
         / __ \|    <|    <  / __ \_
        (____  /__|_ \__|_ \(____  /
             \/     \/    \/     \/
-      """)
+""")
     log.info("     Running version " + VERSION)
     log.info("==============================")
   }
 
   private def cassandraBenchmark = {
+    import se.scalablesolutions.akka.state.CassandraStorage
     val NR_ENTRIES = 100000
 
     println("=================================================")
diff --git a/akka-persistence/src/main/scala/CassandraSession.scala b/akka-persistence/src/main/scala/CassandraSession.scala
index 359b15619d..6a98228421 100644
--- a/akka-persistence/src/main/scala/CassandraSession.scala
+++ b/akka-persistence/src/main/scala/CassandraSession.scala
@@ -6,10 +6,10 @@ package se.scalablesolutions.akka.state
 
 import java.io.{Flushable, Closeable}
 
-import util.Logging
-import util.Helpers._
-import serialization.Serializer
-import akka.Config.config
+import se.scalablesolutions.akka.util.Logging
+import se.scalablesolutions.akka.util.Helpers._
+import se.scalablesolutions.akka.serialization.Serializer
+import se.scalablesolutions.akka.Config.config
 
 import scala.collection.mutable.Map
 
diff --git a/akka-persistence/src/main/scala/CassandraStorage.scala b/akka-persistence/src/main/scala/CassandraStorage.scala
index 370f573934..0769053909 100644
--- a/akka-persistence/src/main/scala/CassandraStorage.scala
+++ b/akka-persistence/src/main/scala/CassandraStorage.scala
@@ -4,21 +4,15 @@
 
 package se.scalablesolutions.akka.state
 
-import java.io.{Flushable, Closeable}
-
 import se.scalablesolutions.akka.util.Logging
 import se.scalablesolutions.akka.util.Helpers._
 import se.scalablesolutions.akka.serialization.Serializer
 import se.scalablesolutions.akka.Config.config
 
-import org.apache.cassandra.db.ColumnFamily
 import org.apache.cassandra.service._
-
 import org.apache.thrift.transport._
 import org.apache.thrift.protocol._
 
-import scala.collection.mutable.ArrayBuffer
-
 /**
  * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
  */
diff --git a/akka-rest/src/main/scala/ActorComponentProviderFactory.scala b/akka-rest/src/main/scala/ActorComponentProviderFactory.scala
index 5917ea2ea8..7a56cdf76d 100755
--- a/akka-rest/src/main/scala/ActorComponentProviderFactory.scala
+++ b/akka-rest/src/main/scala/ActorComponentProviderFactory.scala
@@ -4,13 +4,11 @@
 
 package se.scalablesolutions.akka.rest
 
-import javax.ws.rs.core.Context
-
 import com.sun.jersey.core.spi.component.ioc.{IoCComponentProvider,IoCComponentProviderFactory}
 import com.sun.jersey.core.spi.component.{ComponentContext}
 
-import config.Configurator
-import util.Logging
+import se.scalablesolutions.akka.config.Configurator
+import se.scalablesolutions.akka.util.Logging
 
 class ActorComponentProviderFactory(val configurators: List[Configurator])
 extends IoCComponentProviderFactory with Logging {
diff --git a/akka.iws b/akka.iws
index a51ef5ae12..99032215d7 100644
--- a/akka.iws
+++ b/akka.iws
@@ -5,14 +5,16 @@
   </component>
   <component name="ChangeListManager" verified="true">
     <list default="true" readonly="true" id="188c966f-a83c-4d3a-9128-54d5a2947a12" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/akka-actors/src/main/scala/actor/Actor.scala" afterPath="$PROJECT_DIR$/akka-actors/src/main/scala/actor/Actor.scala" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/akka-rest/src/main/scala/ActorComponentProviderFactory.scala" afterPath="$PROJECT_DIR$/akka-rest/src/main/scala/ActorComponentProviderFactory.scala" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/config/akka-reference.conf" afterPath="$PROJECT_DIR$/config/akka-reference.conf" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/config/akka.conf" afterPath="$PROJECT_DIR$/config/akka.conf" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/akka-kernel/src/main/scala/AkkaServlet.scala" afterPath="$PROJECT_DIR$/akka-kernel/src/main/scala/AkkaServlet.scala" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/akka-persistence/src/main/scala/CassandraStorage.scala" afterPath="$PROJECT_DIR$/akka-persistence/src/main/scala/CassandraStorage.scala" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/akka.ipr" afterPath="$PROJECT_DIR$/akka.ipr" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/akka-kernel/src/main/scala/Kernel.scala" afterPath="$PROJECT_DIR$/akka-kernel/src/main/scala/Kernel.scala" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/RestTest.java" afterPath="$PROJECT_DIR$/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/RestTest.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/config/storage-conf.xml" afterPath="$PROJECT_DIR$/config/storage-conf.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/akka.iws" afterPath="$PROJECT_DIR$/akka.iws" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/akka-persistence/src/main/scala/CassandraSession.scala" afterPath="$PROJECT_DIR$/akka-persistence/src/main/scala/CassandraSession.scala" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/akka-persistence/src/main/scala/PersistentState.scala" afterPath="$PROJECT_DIR$/akka-persistence/src/main/scala/PersistentState.scala" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/akka-actors/src/main/scala/stm/TransactionalState.scala" afterPath="$PROJECT_DIR$/akka-actors/src/main/scala/stm/TransactionalState.scala" />
     </list>
     <ignored path=".idea/workspace.xml" />
     <ignored path="akka.iws" />
@@ -100,26 +102,8 @@
   <component name="FileColors" enabled="false" enabledForTabs="false" />
   <component name="FileEditorManager">
     <leaf>
-      <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="45" column="67" selection-start="1639" selection-end="1639" vertical-scroll-proportion="0.0">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="state.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/akka-util-java/src/main/java/se/scalablesolutions/akka/annotation/state.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="10" column="18" selection-start="211" selection-end="211" vertical-scroll-proportion="0.0">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="PersistentState.scala" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/akka-persistence/src/main/scala/PersistentState.scala">
+      <file leaf-file-name="testng.xml" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/akka-fun-test-java/testng.xml">
           <provider selected="true" editor-type-id="text-editor">
             <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
               <folding />
@@ -127,37 +111,37 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="TransactionalState.scala" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/akka-actors/src/main/scala/stm/TransactionalState.scala">
+      <file leaf-file-name="jndi.properties" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/config/jndi.properties">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.071969695">
+            <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="CassandraStorage.scala" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/akka-persistence/src/main/scala/CassandraStorage.scala">
+      <file leaf-file-name="log4j.properties" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/config/log4j.properties">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="28" column="6" selection-start="787" selection-end="787" 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>
       </file>
-      <file leaf-file-name="CassandraSession.scala" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/akka-persistence/src/main/scala/CassandraSession.scala">
+      <file leaf-file-name="multiverse-properties-reference.txt" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/config/multiverse-properties-reference.txt">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="61" column="79" selection-start="2219" selection-end="2249" 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>
       </file>
-      <file leaf-file-name="akka.conf" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/config/akka.conf">
+      <file leaf-file-name="storage-conf.xml" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/config/storage-conf.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="5" column="82" selection-start="255" selection-end="255" vertical-scroll-proportion="0.0">
+            <state line="269" column="0" selection-start="12455" selection-end="12455" vertical-scroll-proportion="0.89204544">
               <folding />
             </state>
           </provider>
@@ -178,22 +162,22 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/akka-actors/src/main/scala/stm/Transaction.scala" />
-        <option value="$PROJECT_DIR$/akka-actors/src/test/scala/InMemoryActorSpec.scala" />
-        <option value="$PROJECT_DIR$/akka-actors/src/main/scala/stm/TransactionalState.scala" />
-        <option value="$PROJECT_DIR$/akka-actors/src/main/scala/nio/RemoteServer.scala" />
-        <option value="$PROJECT_DIR$/akka-actors/src/main/scala/nio/RemoteClient.scala" />
-        <option value="$PROJECT_DIR$/akka-amqp/src/main/scala/AMQP.scala" />
-        <option value="$PROJECT_DIR$/akka-actors/pom.xml" />
         <option value="$PROJECT_DIR$/config/multiverse-properties-reference.txt" />
         <option value="$PROJECT_DIR$/akka-util/src/main/scala/Config.scala" />
         <option value="$PROJECT_DIR$/pom.xml" />
         <option value="$PROJECT_DIR$/akka-actors/src/main/scala/actor/Actor.scala" />
         <option value="$PROJECT_DIR$/config/akka.conf" />
-        <option value="$PROJECT_DIR$/config/akka-reference.conf" />
-        <option value="$PROJECT_DIR$/akka-persistence/src/main/scala/CassandraStorage.scala" />
-        <option value="$PROJECT_DIR$/akka-persistence/src/main/scala/CassandraSession.scala" />
         <option value="$PROJECT_DIR$/akka-persistence/src/main/scala/PersistentState.scala" />
+        <option value="$PROJECT_DIR$/akka-actors/src/main/scala/stm/TransactionalState.scala" />
+        <option value="$PROJECT_DIR$/akka-persistence/src/main/scala/CassandraStorage.scala" />
+        <option value="$PROJECT_DIR$/akka-rest/src/main/scala/AkkaServlet.scala" />
+        <option value="$PROJECT_DIR$/config/akka-reference.conf" />
+        <option value="$PROJECT_DIR$/akka-kernel/src/main/scala/Kernel.scala" />
+        <option value="$PROJECT_DIR$/akka-rest/src/main/scala/ActorComponentProviderFactory.scala" />
+        <option value="$PROJECT_DIR$/akka-kernel/src/main/scala/AkkaServlet.scala" />
+        <option value="$PROJECT_DIR$/akka-persistence/src/main/scala/CassandraSession.scala" />
+        <option value="$PROJECT_DIR$/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/RestTest.java" />
+        <option value="$PROJECT_DIR$/config/storage-conf.xml" />
       </list>
     </option>
   </component>
@@ -244,8 +228,8 @@
       <showLibraryContents />
       <hideEmptyPackages />
       <abbreviatePackageNames />
-      <autoscrollToSource />
-      <autoscrollFromSource />
+      <autoscrollToSource ProjectPane="true" />
+      <autoscrollFromSource ProjectPane="true" />
       <sortByType />
     </navigator>
     <panes>
@@ -267,38 +251,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" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="docs" />
-              <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" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="docs" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="images" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="akka" />
@@ -313,6 +265,242 @@
               <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" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="akka-util" />
+              <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" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="akka-util" />
+              <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>
+          <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" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="akka-rest" />
+              <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" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="akka-rest" />
+              <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>
+          <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" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="akka-persistence" />
+              <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" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="akka-persistence" />
+              <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>
+          <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" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="akka-persistence" />
+              <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>
+          <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" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="akka-kernel" />
+              <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" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="akka-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>
+          <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" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="akka-fun-test-java" />
+              <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" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="akka-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>
+          <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" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="akka-amqp" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="akka" />
@@ -327,6 +515,102 @@
               <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" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="akka-actors" />
+              <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>
+          <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" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="akka-actors" />
+              <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>
+          <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" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="akka-actors" />
+              <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" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="akka" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="akka-actors" />
+              <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>
         </subPane>
       </pane>
       <pane id="Favorites" />
@@ -385,7 +669,7 @@
     <property name="GoToClass.toSaveIncludeLibraries" value="false" />
     <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder0" value="0" />
     <property name="RunManagerConfig.showSettingsBeforeRunnig" value="false" />
-    <property name="project.structure.last.edited" value="Facets" />
+    <property name="project.structure.last.edited" value="Modules" />
     <property name="MemberChooser.sorted" value="false" />
     <property name="options.searchVisible" value="true" />
     <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" />
@@ -803,11 +1087,11 @@
     <list size="7">
       <item index="0" class="java.lang.String" itemvalue="JUnit.InMemNestedStateTest.testMapShouldNotRollbackStateForStatefulServerInCaseOfSuccess" />
       <item index="1" class="java.lang.String" itemvalue="JUnit.InMemNestedStateTest.testRefShouldNotRollbackStateForStatefulServerInCaseOfSuccess" />
-      <item index="2" class="java.lang.String" itemvalue="JUnit.InMemoryStateTest.testMapShouldRollbackStateForStatefulServerInCaseOfFailure" />
-      <item index="3" class="java.lang.String" itemvalue="JUnit.RemoteInMemoryStateTest" />
-      <item index="4" class="java.lang.String" itemvalue="JUnit.InMemoryActorSpec" />
-      <item index="5" class="java.lang.String" itemvalue="JUnit.InMemoryStateTest" />
-      <item index="6" class="java.lang.String" itemvalue="JUnit.InMemNestedStateTest" />
+      <item index="2" class="java.lang.String" itemvalue="JUnit.RemoteInMemoryStateTest" />
+      <item index="3" class="java.lang.String" itemvalue="JUnit.InMemoryActorSpec" />
+      <item index="4" class="java.lang.String" itemvalue="JUnit.InMemoryStateTest" />
+      <item index="5" class="java.lang.String" itemvalue="JUnit.InMemNestedStateTest" />
+      <item index="6" class="java.lang.String" itemvalue="JUnit.InMemoryStateTest.testMapShouldRollbackStateForStatefulServerInCaseOfFailure" />
     </list>
     <configuration name="&lt;template&gt;" type="WebApp" default="true" selected="false">
       <Host>localhost</Host>
@@ -848,15 +1132,17 @@
     </option>
   </component>
   <component name="ToolWindowManager">
-    <frame x="4" y="22" width="1916" height="1178" extended-state="6" />
+    <frame x="3" y="22" width="1916" height="1178" 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.33" sideWeight="0.5" order="3" side_tool="false" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" 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.2561629" sideWeight="0.6989796" order="0" side_tool="false" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2561629" sideWeight="0.7020295" order="0" side_tool="false" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2915129" sideWeight="0.5" order="1" side_tool="false" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="true" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32564574" sideWeight="0.5" order="12" 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="7" 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="4" side_tool="false" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" />
@@ -868,8 +1154,6 @@
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32908162" sideWeight="0.5" order="11" side_tool="false" />
       <window_info id="Web Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.29209185" 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.32564574" sideWeight="0.5" order="12" 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="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" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" />
@@ -907,106 +1191,116 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/config/jndi.properties">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/scala-tools/javautils/2.7.4-0.1/javautils-2.7.4-0.1.jar!/org/scala_tools/javautils/Implicits.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/akka-amqp/src/main/scala/AMQP.scala">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="394" column="0" selection-start="14757" selection-end="14757" vertical-scroll-proportion="0.0">
+        <state line="1" column="79" selection-start="113" selection-end="113" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/akka-samples-lift/pom.xml">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/scala-tools/javautils/2.7.4-0.1/javautils-2.7.4-0.1.jar!/org/scala_tools/javautils/Imports.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/akka-actors/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="60" column="0" selection-start="1852" selection-end="1852" vertical-scroll-proportion="0.0" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/config/multiverse-properties-reference.txt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="37" column="30" selection-start="1630" selection-end="1688" vertical-scroll-proportion="0.0" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/akka-util/src/main/scala/Config.scala">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="21" column="30" selection-start="578" selection-end="578" vertical-scroll-proportion="0.0">
+        <state line="1" column="72" selection-start="106" selection-end="106" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
+    <entry file="file://$PROJECT_DIR$/akka-kernel/src/main/scala/Kernel.scala">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="195" column="0" selection-start="5602" selection-end="6048" vertical-scroll-proportion="0.0">
+        <state line="112" column="0" selection-start="4153" selection-end="4153" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/akka-actors/src/main/scala/actor/Actor.scala">
+    <entry file="file://$PROJECT_DIR$/akka-rest/src/main/scala/ActorComponentProviderFactory.scala">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="37" column="0" selection-start="1569" selection-end="1569" vertical-scroll-proportion="0.25552353">
+        <state line="6" column="0" selection-start="91" selection-end="91" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/config/akka.conf">
+    <entry file="file://$PROJECT_DIR$/akka-kernel/src/main/scala/AkkaServlet.scala">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="5" column="82" selection-start="255" selection-end="255" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/apache/cassandra/cassandra/0.4.1/cassandra-0.4.1.jar!/org/apache/cassandra/service/Cassandra.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <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$/akka-persistence/src/main/scala/CassandraStorage.scala">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="28" column="6" selection-start="787" selection-end="787" vertical-scroll-proportion="0.0">
+        <state line="35" column="91" selection-start="1421" selection-end="1421" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/akka-persistence/src/main/scala/CassandraSession.scala">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="61" column="79" selection-start="2219" selection-end="2249" vertical-scroll-proportion="0.0">
+        <state line="11" column="28" selection-start="311" selection-end="311" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/config/akka-reference.conf">
+    <entry file="file://$PROJECT_DIR$/akka-actors/src/main/scala/actor/Actor.scala">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="45" column="67" selection-start="1639" selection-end="1639" vertical-scroll-proportion="0.0">
+        <state line="155" column="51" selection-start="5945" selection-end="5984" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/akka-util-java/src/main/java/se/scalablesolutions/akka/annotation/state.java">
+    <entry file="file://$PROJECT_DIR$/akka-amqp/src/main/scala/AMQP.scala">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="10" column="18" selection-start="211" selection-end="211" vertical-scroll-proportion="0.0">
+        <state line="424" column="47" selection-start="15894" selection-end="15925" vertical-scroll-proportion="0.96241343">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/akka-persistence/src/main/scala/PersistentState.scala">
+    <entry file="file://$PROJECT_DIR$/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/RestTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="62" column="53" selection-start="1723" selection-end="1723" vertical-scroll-proportion="0.57575756">
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/RemotePersistentStateTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="11" column="13" selection-start="243" selection-end="243" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/ProtobufProtocol.proto">
       <provider selected="true" editor-type-id="text-editor">
         <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$/akka-actors/src/main/scala/stm/TransactionalState.scala">
+    <entry file="file://$PROJECT_DIR$/akka-fun-test-java/testng.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.071969695">
+        <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$/config/jndi.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <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$/config/log4j.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <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$/config/multiverse-properties-reference.txt">
+      <provider selected="true" editor-type-id="text-editor">
+        <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$/config/storage-conf.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="269" column="0" selection-start="12455" selection-end="12455" vertical-scroll-proportion="0.89204544">
           <folding />
         </state>
       </provider>
diff --git a/config/akka-reference.conf b/config/akka-reference.conf
index 2018edd7ff..c9394e2748 100644
--- a/config/akka-reference.conf
+++ b/config/akka-reference.conf
@@ -53,8 +53,8 @@
     service = on
     hostname = "localhost"
     port = 9998
-    filters = "se.scalablesolutions.akka.security.AkkaSecurityFilterFactory"
-    authenticator = "se.scalablesolutions.akka.security.samples.BasicAuthenticationService"
+    filters = "[se.scalablesolutions.akka.security.AkkaSecurityFilterFactory]"              # List with all servlet filters to use
+    authenticator = "se.scalablesolutions.akka.security.samples.BasicAuthenticationService" # The authentication service to use
   </rest>
   
   <storage>
diff --git a/config/storage-conf.xml b/config/storage-conf.xml
index 86f933936f..9deee41c42 100644
--- a/config/storage-conf.xml
+++ b/config/storage-conf.xml
@@ -17,253 +17,253 @@
  ~ under the License.
  -->
 <Storage>
-    <!--======================================================================-->
-    <!-- Basic Configuration                                                  -->
-    <!--======================================================================-->
+  <!--======================================================================-->
+  <!-- Basic Configuration                                                  -->
+  <!--======================================================================-->
 
-    <!-- The name of this cluster. This is mainly used to prevent machines in 
-         one logical cluster from joining any other cluster. -->
-    <ClusterName>akka</ClusterName>
+  <!-- The name of this cluster. This is mainly used to prevent machines in
+one logical cluster from joining any other cluster. -->
+  <ClusterName>akka</ClusterName>
 
-    <!-- Keyspaces and ColumnFamilies                                            
-         A ColumnFamily is the Cassandra concept closest to a relational table.
-         Keyspaces are separate groups of ColumnFamilies.  Except in very
-         unusual circumstances you will have one Keyspace per application.
+  <!-- Keyspaces and ColumnFamilies
+       A ColumnFamily is the Cassandra concept closest to a relational table.
+       Keyspaces are separate groups of ColumnFamilies.  Except in very
+       unusual circumstances you will have one Keyspace per application.
 
-         There is an implicit keyspace named 'system' for Cassandra internals.
+       There is an implicit keyspace named 'system' for Cassandra internals.
 
-         The default ColumnSort is Time for standard column families.
-         For super column families, specifying ColumnSort is not supported;
-         the supercolumns themselves are always name-sorted and their subcolumns
-         are always time-sorted.
-    -->
-    <Keyspaces>
-        <Keyspace Name="akka">
-            <!-- The fraction of keys per sstable whose locations we
-                 keep in memory in "mostly LRU" order.  (JUST the key
-                 locations, NOT any column values.)
+       The default ColumnSort is Time for standard column families.
+       For super column families, specifying ColumnSort is not supported;
+       the supercolumns themselves are always name-sorted and their subcolumns
+       are always time-sorted.
+  -->
+  <Keyspaces>
+    <Keyspace Name="akka">
+      <!-- The fraction of keys per sstable whose locations we
+           keep in memory in "mostly LRU" order.  (JUST the key
+           locations, NOT any column values.)
 
-                 The amount of memory used by the default setting of
-                 0.01 is comparable to the amount used by the internal
-                 per-sstable key index. Consider increasing this is
-                 fine if you have fewer, wider rows.  Set to 0 to
-                 disable entirely.
-            -->
-            <KeysCachedFraction>0.01</KeysCachedFraction>
-            <!-- 
-                 The CompareWith attribute tells Cassandra how to sort the columns
-                 for slicing operations.  For backwards compatibility, the default 
-                 is to use AsciiType, which is probably NOT what you want.
-                 Other options are BytesType, UTF8Type, LexicalUUIDType, TimeUUIDType, and LongType.
-                 You can also specify the fully-qualified class name to a class
-                 of your choice implementing org.apache.cassandra.db.marshal.IType.
-
-                 SuperColumns have a similar CompareSubcolumnsWith attribute.
-
-                 ByteType: simple sort by byte value.  No validation is performed.
-                 AsciiType: like BytesType, but validates that the input can be parsed as US-ASCII.
-                 UTF8Type: A string encoded as UTF8
-                 LongType: A 64bit long
-                 LexicalUUIDType: a 128bit UUID, compared lexically (by byte value)
-                 TimeUUIDType: a 128bit version 1 UUID, compared by timestamp
-
-                 (To get the closest approximation to 0.3-style supercolumns,
-                 you would use CompareWith=UTF8Type CompareSubcolumnsWith=LongType.)
-
-                 if FlushPeriodInMinutes is configured and positive, it will be
-                 flushed to disk with that period whether it is dirty or not.
-                 This is intended for lightly-used columnfamilies so that they
-                 do not prevent commitlog segments from being purged. 
-
-            -->
-            <ColumnFamily CompareWith="UTF8Type" Name="map" />
-            <!-- FIXME: change vector to a super column -->
-            <ColumnFamily CompareWith="UTF8Type" Name="vector"/>
-            <ColumnFamily CompareWith="UTF8Type" Name="ref"/>
-
-            <!--ColumnFamily CompareWith="UTF8Type" Name="Standard1" FlushPeriodInMinutes="60"/>
-            <ColumnFamily CompareWith="TimeUUIDType" Name="StandardByUUID1"/>
-            <ColumnFamily ColumnType="Super" CompareWith="UTF8Type" CompareSubcolumnsWith="UTF8Type" Name="Super1"/-->
-        </Keyspace>
-    </Keyspaces>
-
-    <!-- Partitioner: any IPartitioner may be used, including your own
-         as long as it is on the classpath.  Out of the box,
-         Cassandra provides
-         org.apache.cassandra.dht.RandomPartitioner,
-         org.apache.cassandra.dht.OrderPreservingPartitioner, and
-         org.apache.cassandra.dht.CollatingOrderPreservingPartitioner.
-         (CollatingOPP colates according to EN,US rules, not naive byte ordering.
-         Use this as an example if you need locale-aware collation.)
-         Range queries require using OrderPreservingPartitioner or a subclass.
-
-         Achtung!  Changing this parameter requires wiping your data directories,
-         since the partitioner can modify the sstable on-disk format.
-    -->
-    <Partitioner>org.apache.cassandra.dht.RandomPartitioner</Partitioner>
-
-    <!-- If you are using the OrderPreservingPartitioner and you know your key
-         distribution, you can specify the token for this node to use.
-         (Keys are sent to the node with the "closest" token, so distributing
-         your tokens equally along the key distribution space will spread
-         keys evenly across your cluster.)  This setting is only checked the
-         first time a node is started. 
-
-         This can also be useful with RandomPartitioner to force equal
-         spacing of tokens around the hash space, especially for
-         clusters with a small number of nodes. -->
-    <InitialToken></InitialToken>
-
-	
-    <!-- EndPointSnitch: Setting this to the class that implements IEndPointSnitch
-	     which will see if two endpoints are in the same data center or on the same rack.
-         Out of the box, Cassandra provides
-         org.apache.cassandra.locator.EndPointSnitch
-    -->
-    <EndPointSnitch>org.apache.cassandra.locator.EndPointSnitch</EndPointSnitch>
-
-    <!-- Strategy: Setting this to the class that implements IReplicaPlacementStrategy
-	     will change the way the node picker works.
-         Out of the box, Cassandra provides
-         org.apache.cassandra.locator.RackUnawareStrategy
-         org.apache.cassandra.locator.RackAwareStrategy 
-		 (place one replica in a different datacenter, and the
-         others on different racks in the same one.)
-    -->
-    <ReplicaPlacementStrategy>org.apache.cassandra.locator.RackUnawareStrategy</ReplicaPlacementStrategy>
-
-    <!-- Number of replicas of the data-->
-    <ReplicationFactor>1</ReplicationFactor>
-
-    <!-- Directories: Specify where Cassandra should store different data on disk
-         Keep the data disks and the CommitLog disks separate for best performance
-    -->
-    <CommitLogDirectory>cassandra/commitlog</CommitLogDirectory>
-    <DataFileDirectories>
-        <DataFileDirectory>cassandra/data</DataFileDirectory>
-    </DataFileDirectories>
-    <CalloutLocation>cassandra/callouts</CalloutLocation>
-    <BootstrapFileDirectory>cassandra/bootstrap</BootstrapFileDirectory>
-    <StagingFileDirectory>cassandra/staging</StagingFileDirectory>
-
-
-    <!-- Addresses of hosts that are deemed contact points. Cassandra nodes use
-         this list of hosts to find each other and learn the topology of the ring.
-         You must change this if you are running multiple nodes!
-    -->
-    <Seeds>
-        <Seed>127.0.0.1</Seed>
-    </Seeds>
-
-
-    <!-- Miscellaneous -->
-
-    <!-- time to wait for a reply from other nodes before failing the command -->
-    <RpcTimeoutInMillis>5000</RpcTimeoutInMillis>
-    <!-- size to allow commitlog to grow to before creating a new segment -->
-    <CommitLogRotationThresholdInMB>128</CommitLogRotationThresholdInMB>
-
-
-    <!-- Local hosts and ports -->
-
-    <!-- Address to bind to and tell other nodes to connect to.  
-         You _must_ change this if you want multiple nodes to be able
-         to communicate!  
-
-         Leaving it blank leaves it up to InetAddress.getLocalHost(). 
-         This will always do the Right Thing *if* the node is properly
-         configured (hostname, name resolution, etc), and the Right
-         Thing is to use the address associated with the hostname (it
-         might not be). -->
-    <ListenAddress>localhost</ListenAddress>
-    <!-- TCP port, for commands and data -->
-    <StoragePort>7000</StoragePort>
-    <!-- UDP port, for membership communications (gossip) -->
-    <ControlPort>7001</ControlPort>
-
-    <!-- The address to bind the Thrift RPC service to. Unlike 
-         ListenAddress above, you *can* specify 0.0.0.0 here if you want
-         Thrift to listen on all interfaces.
-         
-         Leaving this blank has the same effect it does for ListenAddress,
-         (i.e. it will be based on the configured hostname of the node).
-    -->
-    <ThriftAddress>localhost</ThriftAddress>
-    <!-- Thrift RPC port (the port clients connect to). -->
-    <ThriftPort>9160</ThriftPort>
-
-
-    <!--======================================================================-->
-    <!-- Memory, Disk, and Performance                                        -->
-    <!--======================================================================-->
-
-    <!-- Buffer size to use when flushing memtables to disk.
-         (Only one memtable is ever flushed at a time.)
-         Increase (decrease) the index buffer size relative to the data buffer
-         if you have few (many) columns per key. 
-         Bigger is only better _if_ your memtables get large enough to use the space.
-         (Check in your data directory after your app has been running long enough.)
+           The amount of memory used by the default setting of
+           0.01 is comparable to the amount used by the internal
+           per-sstable key index. Consider increasing this is
+           fine if you have fewer, wider rows.  Set to 0 to
+           disable entirely.
       -->
-    <FlushDataBufferSizeInMB>32</FlushDataBufferSizeInMB>
-    <FlushIndexBufferSizeInMB>8</FlushIndexBufferSizeInMB>
+      <KeysCachedFraction>0.01</KeysCachedFraction>
+      <!--
+           The CompareWith attribute tells Cassandra how to sort the columns
+           for slicing operations.  For backwards compatibility, the default
+           is to use AsciiType, which is probably NOT what you want.
+           Other options are BytesType, UTF8Type, LexicalUUIDType, TimeUUIDType, and LongType.
+           You can also specify the fully-qualified class name to a class
+           of your choice implementing org.apache.cassandra.db.marshal.IType.
 
-    <!-- Add column indexes to a row after its contents reach this size.
-         Increase if your column values are large, or if you have a very large
-         number of columns.  The competing causes are, Cassandra has to
-         deserialize this much of the row to read a single column, so you
-         want it to be small - at least if you do many partial-row reads
-         - but all the index data is read for each access, so
-         you don't want to generate that wastefully either. -->
-    <ColumnIndexSizeInKB>64</ColumnIndexSizeInKB>
+           SuperColumns have a similar CompareSubcolumnsWith attribute.
 
-    <!--
-      The maximum amount of data to store in memory per ColumnFamily before flushing to
-      disk. Note: There is one memtable per column family, and this threshold
-      is based solely on the amount of data stored, not actual heap memory
-      usage (there is some overhead in indexing the columns).
-    -->
-    <MemtableSizeInMB>64</MemtableSizeInMB>
-    <!--
-      The maximum number of columns in millions to store in memory per ColumnFamily
-      before flushing to disk.  This is also a per-memtable setting.
-      Use with MemtableSizeInMB to tune memory usage.
-    -->
-    <MemtableObjectCountInMillions>0.1</MemtableObjectCountInMillions>
+           ByteType: simple sort by byte value.  No validation is performed.
+           AsciiType: like BytesType, but validates that the input can be parsed as US-ASCII.
+           UTF8Type: A string encoded as UTF8
+           LongType: A 64bit long
+           LexicalUUIDType: a 128bit UUID, compared lexically (by byte value)
+           TimeUUIDType: a 128bit version 1 UUID, compared by timestamp
 
-    <!-- Unlike most systems, in Cassandra writes are faster than
-         reads, so you can afford more of those in parallel.
-	 A good rule of thumb is 2 concurrent reads per processor core.
-         Increase ConcurrentWrites to the number of clients writing
-         at once if you enable CommitLogSync + CommitLogSyncDelay. -->
-    <ConcurrentReads>8</ConcurrentReads>
-    <ConcurrentWrites>32</ConcurrentWrites>
+           (To get the closest approximation to 0.3-style supercolumns,
+           you would use CompareWith=UTF8Type CompareSubcolumnsWith=LongType.)
 
-    <!-- Turn on CommitLogSync to improve durability.
-         When enabled, Cassandra won't ack writes until the commit log
-         has been synced to disk.  This is less necessary in Cassandra
-         than in traditional databases since replication reduces the
-         odds of losing data from a failure after writing the log
-         entry but before it actually reaches the disk.
-    -->
-    <CommitLogSync>false</CommitLogSync>
-    <!-- Delay (in microseconds) during which additional commit log
-         entries may be written before fsync.  This will increase
-         latency slightly, but can vastly improve throughput where
-         there are many writers.  Set to zero to disable
-         (each entry will be synced individually).
-	 Reasonable values range from a minimal 100 to even 10000
-         if throughput matters more than latency.  (10000us = 10ms
-         write latency isn't even that bad by traditional db
-         standards.)
-    -->
-    <CommitLogSyncDelay>1000</CommitLogSyncDelay>
-         
+           if FlushPeriodInMinutes is configured and positive, it will be
+           flushed to disk with that period whether it is dirty or not.
+           This is intended for lightly-used columnfamilies so that they
+           do not prevent commitlog segments from being purged.
 
-    <!-- Time to wait before garbage-collection deletion markers.
-         Set this to a large enough value that you are confident
-         that the deletion marker will be propagated to all replicas
-         by the time this many seconds has elapsed, even in the
-         face of hardware failures.  The default value is ten days.
-    -->
-    <GCGraceSeconds>864000</GCGraceSeconds>
+      -->
+      <ColumnFamily CompareWith="UTF8Type" Name="map"/>
+      <!-- FIXME: change vector to a super column -->
+      <ColumnFamily CompareWith="UTF8Type" Name="vector"/>
+      <ColumnFamily CompareWith="UTF8Type" Name="ref"/>
+
+      <!--ColumnFamily CompareWith="UTF8Type" Name="Standard1" FlushPeriodInMinutes="60"/>
+  <ColumnFamily CompareWith="TimeUUIDType" Name="StandardByUUID1"/>
+  <ColumnFamily ColumnType="Super" CompareWith="UTF8Type" CompareSubcolumnsWith="UTF8Type" Name="Super1"/-->
+    </Keyspace>
+  </Keyspaces>
+
+  <!-- Partitioner: any IPartitioner may be used, including your own
+       as long as it is on the classpath.  Out of the box,
+       Cassandra provides
+       org.apache.cassandra.dht.RandomPartitioner,
+       org.apache.cassandra.dht.OrderPreservingPartitioner, and
+       org.apache.cassandra.dht.CollatingOrderPreservingPartitioner.
+       (CollatingOPP colates according to EN,US rules, not naive byte ordering.
+       Use this as an example if you need locale-aware collation.)
+       Range queries require using OrderPreservingPartitioner or a subclass.
+
+       Achtung!  Changing this parameter requires wiping your data directories,
+       since the partitioner can modify the sstable on-disk format.
+  -->
+  <Partitioner>org.apache.cassandra.dht.RandomPartitioner</Partitioner>
+
+  <!-- If you are using the OrderPreservingPartitioner and you know your key
+distribution, you can specify the token for this node to use.
+(Keys are sent to the node with the "closest" token, so distributing
+your tokens equally along the key distribution space will spread
+keys evenly across your cluster.)  This setting is only checked the
+first time a node is started.
+
+This can also be useful with RandomPartitioner to force equal
+spacing of tokens around the hash space, especially for
+clusters with a small number of nodes. -->
+  <InitialToken></InitialToken>
+
+
+  <!-- EndPointSnitch: Setting this to the class that implements IEndPointSnitch
+       which will see if two endpoints are in the same data center or on the same rack.
+       Out of the box, Cassandra provides
+       org.apache.cassandra.locator.EndPointSnitch
+  -->
+  <EndPointSnitch>org.apache.cassandra.locator.EndPointSnitch</EndPointSnitch>
+
+  <!-- Strategy: Setting this to the class that implements IReplicaPlacementStrategy
+       will change the way the node picker works.
+       Out of the box, Cassandra provides
+       org.apache.cassandra.locator.RackUnawareStrategy
+       org.apache.cassandra.locator.RackAwareStrategy
+       (place one replica in a different datacenter, and the
+       others on different racks in the same one.)
+  -->
+  <ReplicaPlacementStrategy>org.apache.cassandra.locator.RackUnawareStrategy</ReplicaPlacementStrategy>
+
+  <!-- Number of replicas of the data-->
+  <ReplicationFactor>1</ReplicationFactor>
+
+  <!-- Directories: Specify where Cassandra should store different data on disk
+       Keep the data disks and the CommitLog disks separate for best performance
+  -->
+  <CommitLogDirectory>cassandra/commitlog</CommitLogDirectory>
+  <DataFileDirectories>
+    <DataFileDirectory>cassandra/data</DataFileDirectory>
+  </DataFileDirectories>
+  <CalloutLocation>cassandra/callouts</CalloutLocation>
+  <BootstrapFileDirectory>cassandra/bootstrap</BootstrapFileDirectory>
+  <StagingFileDirectory>cassandra/staging</StagingFileDirectory>
+
+
+  <!-- Addresses of hosts that are deemed contact points. Cassandra nodes use
+       this list of hosts to find each other and learn the topology of the ring.
+       You must change this if you are running multiple nodes!
+  -->
+  <Seeds>
+    <Seed>127.0.0.1</Seed>
+  </Seeds>
+
+
+  <!-- Miscellaneous -->
+
+  <!-- time to wait for a reply from other nodes before failing the command -->
+  <RpcTimeoutInMillis>5000</RpcTimeoutInMillis>
+  <!-- size to allow commitlog to grow to before creating a new segment -->
+  <CommitLogRotationThresholdInMB>128</CommitLogRotationThresholdInMB>
+
+
+  <!-- Local hosts and ports -->
+
+  <!-- Address to bind to and tell other nodes to connect to.
+You _must_ change this if you want multiple nodes to be able
+to communicate!
+
+Leaving it blank leaves it up to InetAddress.getLocalHost().
+This will always do the Right Thing *if* the node is properly
+configured (hostname, name resolution, etc), and the Right
+Thing is to use the address associated with the hostname (it
+might not be). -->
+  <ListenAddress>localhost</ListenAddress>
+  <!-- TCP port, for commands and data -->
+  <StoragePort>7000</StoragePort>
+  <!-- UDP port, for membership communications (gossip) -->
+  <ControlPort>7001</ControlPort>
+
+  <!-- The address to bind the Thrift RPC service to. Unlike
+       ListenAddress above, you *can* specify 0.0.0.0 here if you want
+       Thrift to listen on all interfaces.
+
+       Leaving this blank has the same effect it does for ListenAddress,
+       (i.e. it will be based on the configured hostname of the node).
+  -->
+  <ThriftAddress>localhost</ThriftAddress>
+  <!-- Thrift RPC port (the port clients connect to). -->
+  <ThriftPort>9160</ThriftPort>
+
+
+  <!--======================================================================-->
+  <!-- Memory, Disk, and Performance                                        -->
+  <!--======================================================================-->
+
+  <!-- Buffer size to use when flushing memtables to disk.
+     (Only one memtable is ever flushed at a time.)
+     Increase (decrease) the index buffer size relative to the data buffer
+     if you have few (many) columns per key.
+     Bigger is only better _if_ your memtables get large enough to use the space.
+     (Check in your data directory after your app has been running long enough.)
+  -->
+  <FlushDataBufferSizeInMB>32</FlushDataBufferSizeInMB>
+  <FlushIndexBufferSizeInMB>8</FlushIndexBufferSizeInMB>
+
+  <!-- Add column indexes to a row after its contents reach this size.
+Increase if your column values are large, or if you have a very large
+number of columns.  The competing causes are, Cassandra has to
+deserialize this much of the row to read a single column, so you
+want it to be small - at least if you do many partial-row reads
+- but all the index data is read for each access, so
+you don't want to generate that wastefully either. -->
+  <ColumnIndexSizeInKB>64</ColumnIndexSizeInKB>
+
+  <!--
+    The maximum amount of data to store in memory per ColumnFamily before flushing to
+    disk. Note: There is one memtable per column family, and this threshold
+    is based solely on the amount of data stored, not actual heap memory
+    usage (there is some overhead in indexing the columns).
+  -->
+  <MemtableSizeInMB>64</MemtableSizeInMB>
+  <!--
+    The maximum number of columns in millions to store in memory per ColumnFamily
+    before flushing to disk.  This is also a per-memtable setting.
+    Use with MemtableSizeInMB to tune memory usage.
+  -->
+  <MemtableObjectCountInMillions>0.1</MemtableObjectCountInMillions>
+
+  <!-- Unlike most systems, in Cassandra writes are faster than
+reads, so you can afford more of those in parallel.
+A good rule of thumb is 2 concurrent reads per processor core.
+Increase ConcurrentWrites to the number of clients writing
+at once if you enable CommitLogSync + CommitLogSyncDelay. -->
+  <ConcurrentReads>8</ConcurrentReads>
+  <ConcurrentWrites>32</ConcurrentWrites>
+
+  <!-- Turn on CommitLogSync to improve durability.
+       When enabled, Cassandra won't ack writes until the commit log
+       has been synced to disk.  This is less necessary in Cassandra
+       than in traditional databases since replication reduces the
+       odds of losing data from a failure after writing the log
+       entry but before it actually reaches the disk.
+  -->
+  <CommitLogSync>false</CommitLogSync>
+  <!-- Delay (in microseconds) during which additional commit log
+       entries may be written before fsync.  This will increase
+       latency slightly, but can vastly improve throughput where
+       there are many writers.  Set to zero to disable
+       (each entry will be synced individually).
+   Reasonable values range from a minimal 100 to even 10000
+       if throughput matters more than latency.  (10000us = 10ms
+       write latency isn't even that bad by traditional db
+       standards.)
+  -->
+  <CommitLogSyncDelay>1000</CommitLogSyncDelay>
+
+
+  <!-- Time to wait before garbage-collection deletion markers.
+       Set this to a large enough value that you are confident
+       that the deletion marker will be propagated to all replicas
+       by the time this many seconds has elapsed, even in the
+       face of hardware failures.  The default value is ten days.
+  -->
+  <GCGraceSeconds>864000</GCGraceSeconds>
 </Storage>