From d138560f37f8573945a9b7fb33420362f827164f Mon Sep 17 00:00:00 2001
From: jboner <jboner@c-8b78e055.427-1-64736c11.cust.bredbandsbolaget.se>
Date: Mon, 17 Aug 2009 20:39:14 +0200
Subject: [PATCH] added scheduler test

---
 akka.ipr                                   |  22 +-
 akka.iws                                   | 535 +++++++++++----------
 kernel/akka-kernel.iml                     |  29 +-
 kernel/src/main/scala/Kernel.scala         | 184 +++----
 kernel/src/main/scala/util/Scheduler.scala |  14 +-
 kernel/src/test/scala/AllTest.scala        |   3 +
 kernel/src/test/scala/SchedulerSpec.scala  |  25 +
 samples-java/akka-samples-java.iml         |   4 +-
 samples-scala/akka-samples-scala.iml       |   4 +-
 util-java/akka-util-java.iml               |   3 +-
 10 files changed, 431 insertions(+), 392 deletions(-)
 mode change 100755 => 100644 kernel/src/main/scala/Kernel.scala
 create mode 100644 kernel/src/test/scala/SchedulerSpec.scala

diff --git a/akka.ipr b/akka.ipr
index 226c8db6c4..ab65121d85 100644
--- a/akka.ipr
+++ b/akka.ipr
@@ -1869,17 +1869,6 @@
         <root url="jar://$MAVEN_REPOSITORY$/se/scalablesolutions/akka/akka-util-java/0.5/akka-util-java-0.5-sources.jar!/" />
       </SOURCES>
     </library>
-    <library name="Maven: org.multiverse:multiverse:0.3">
-      <CLASSES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/multiverse/multiverse/0.3/multiverse-0.3.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://$MAVEN_REPOSITORY$/org/multiverse/multiverse/0.3/multiverse-0.3-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/multiverse/multiverse/0.3/multiverse-0.3-sources.jar!/" />
-      </SOURCES>
-    </library>
     <library name="Maven: org.codehaus.aspectwerkz:aspectwerkz-jdk5:2.1">
       <CLASSES>
         <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/aspectwerkz/aspectwerkz-jdk5/2.1/aspectwerkz-jdk5-2.1.jar!/" />
@@ -1924,6 +1913,17 @@
         <root url="jar://$MAVEN_REPOSITORY$/org/apache/cassandra/cassandra/0.4.0-trunk/cassandra-0.4.0-trunk-sources.jar!/" />
       </SOURCES>
     </library>
+    <library name="Maven: org.multiverse:multiverse:0.3">
+      <CLASSES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/multiverse/multiverse/0.3/multiverse-0.3.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$MAVEN_REPOSITORY$/org/multiverse/multiverse/0.3/multiverse-0.3-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/multiverse/multiverse/0.3/multiverse-0.3-sources.jar!/" />
+      </SOURCES>
+    </library>
   </component>
   <UsedPathMacros>
     <macro name="MAVEN_REPOSITORY" description="Maven Local Repostiry" />
diff --git a/akka.iws b/akka.iws
index 9b399760a0..ade494ece3 100644
--- a/akka.iws
+++ b/akka.iws
@@ -6,12 +6,16 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="212ccd86-01aa-4780-a2f0-0d130be5abd2" name="Test" comment="Test">
-      <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$/akka.iml" afterPath="$PROJECT_DIR$/akka.iml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/kernel/src/main/scala/util/Scheduler.scala" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/samples-lift/akka-samples-lift.iml" afterPath="$PROJECT_DIR$/samples-lift/akka-samples-lift.iml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/test/scala/AllTest.scala" afterPath="$PROJECT_DIR$/kernel/src/test/scala/AllTest.scala" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/akka-kernel.iml" afterPath="$PROJECT_DIR$/kernel/akka-kernel.iml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/util-java/akka-util-java.iml" afterPath="$PROJECT_DIR$/util-java/akka-util-java.iml" />
+      <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$/kernel/src/main/scala/util/Scheduler.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/util/Scheduler.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-java/akka-samples-java.iml" afterPath="$PROJECT_DIR$/samples-java/akka-samples-java.iml" />
       <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="NEW" beforePath="" afterPath="$PROJECT_DIR$/kernel/src/test/scala/SchedulerSpec.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" />
@@ -96,17 +100,113 @@
       <file leaf-file-name="Scheduler.scala" pinned="false" current="true" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/util/Scheduler.scala">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="55" column="23" selection-start="1677" selection-end="1685" vertical-scroll-proportion="0.8095238">
+            <state line="11" column="12" selection-start="299" selection-end="299" vertical-scroll-proportion="0.06685633">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="SchedulerSpec.scala" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/kernel/src/test/scala/SchedulerSpec.scala">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="18" column="18" selection-start="441" selection-end="441" vertical-scroll-proportion="0.0">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="ActorSpec.scala" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/kernel/src/test/scala/ActorSpec.scala">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="6" column="6" selection-start="119" selection-end="119" vertical-scroll-proportion="0.0">
+              <folding>
+                <marker date="1250375169000" expanded="true" signature="55:111" placeholder="..." />
+                <marker date="1250375169000" expanded="true" signature="162:1491" placeholder="{...}" />
+                <marker date="1250375169000" expanded="true" signature="240:415" placeholder="{...}" />
+                <marker date="1250375169000" expanded="true" signature="288:411" placeholder="{...}" />
+                <marker date="1250375169000" expanded="true" signature="442:765" placeholder="{...}" />
+                <marker date="1250375169000" expanded="true" signature="527:637" placeholder="{...}" />
+                <marker date="1250375169000" expanded="true" signature="577:631" placeholder="{...}" />
+                <marker date="1250375169000" expanded="true" signature="793:968" placeholder="{...}" />
+                <marker date="1250375169000" expanded="true" signature="997:1189" placeholder="{...}" />
+                <marker date="1250375169000" expanded="true" signature="1224:1489" placeholder="{...}" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="AllTest.scala" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/kernel/src/test/scala/AllTest.scala">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="10" column="7" selection-start="363" selection-end="363" vertical-scroll-proportion="0.0">
+              <folding>
+                <marker date="1250533019000" expanded="true" signature="49:354" placeholder="..." />
+                <marker date="1250533019000" expanded="true" signature="388:1092" placeholder="{...}" />
+                <marker date="1250533019000" expanded="true" signature="412:1020" placeholder="{...}" />
+              </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="39" column="57" selection-start="1237" selection-end="1237" vertical-scroll-proportion="0.0">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="akka-kernel.iml" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/kernel/akka-kernel.iml">
+          <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>
+      </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="55" column="1" selection-start="1940" selection-end="1979" vertical-scroll-proportion="0.0">
+              <folding>
+                <marker date="1250531843000" expanded="true" signature="0:49" placeholder="/**...*/" />
+                <marker date="1250531843000" expanded="true" signature="100:577" placeholder="..." />
+                <marker date="1250531843000" expanded="true" signature="579:650" placeholder="/**...*/" />
+                <marker date="1250531843000" expanded="true" signature="681:9468" placeholder="{...}" />
+                <marker date="1250531843000" expanded="true" signature="3283:4457" placeholder="{...}" />
+                <marker date="1250531843000" expanded="true" signature="4507:5664" placeholder="{...}" />
+                <marker date="1250531843000" expanded="true" signature="5707:5944" placeholder="{...}" />
+                <marker date="1250531843000" expanded="true" signature="5826:5887" placeholder="{...}" />
+                <marker date="1250531843000" expanded="true" signature="5991:6108" placeholder="{...}" />
+                <marker date="1250531843000" expanded="true" signature="6693:7900" placeholder="{...}" />
+                <marker date="1250531843000" expanded="true" signature="7930:8292" placeholder="{...}" />
+                <marker date="1250531843000" expanded="true" signature="8329:9466" placeholder="{...}" />
+                <marker date="1250531843000" expanded="true" signature="9473:9780" placeholder="/.../" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="CassandraSession.scala" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/state/CassandraSession.scala">
           <provider selected="true" editor-type-id="text-editor">
             <state line="23" column="37" selection-start="565" selection-end="565" vertical-scroll-proportion="-2.4615386">
-              <folding />
+              <folding>
+                <marker date="1250524255000" expanded="false" signature="0:49" placeholder="/**...*/" />
+                <marker date="1250524255000" expanded="true" signature="106:396" placeholder="..." />
+                <marker date="1250524255000" expanded="true" signature="398:469" placeholder="/**...*/" />
+                <marker date="1250524255000" expanded="true" signature="526:9332" placeholder="{...}" />
+                <marker date="1250524255000" expanded="true" signature="537:649" placeholder="..." />
+                <marker date="1250524255000" expanded="true" signature="829:1263" placeholder="/**...*/" />
+                <marker date="1250524255000" expanded="true" signature="9528:10730" placeholder="{...}" />
+                <marker date="1250524255000" expanded="true" signature="9815:10474" placeholder="{...}" />
+                <marker date="1250524255000" expanded="true" signature="10047:10470" placeholder="{...}" />
+                <marker date="1250524255000" expanded="true" signature="10528:10693" placeholder="{...}" />
+                <marker date="1250524255000" expanded="true" signature="10794:10865" placeholder="{...}" />
+                <marker date="1250524255000" expanded="true" signature="10883:11076" placeholder="{...}" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -114,7 +214,7 @@
       <file leaf-file-name="Actor.scala" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/actor/Actor.scala">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="192" column="16" selection-start="6539" selection-end="6539" vertical-scroll-proportion="0.0">
+            <state line="345" column="7" selection-start="12841" selection-end="12841" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
@@ -124,7 +224,18 @@
         <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/actor/Supervisor.scala">
           <provider selected="true" editor-type-id="text-editor">
             <state line="28" column="11" selection-start="952" selection-end="952" vertical-scroll-proportion="0.0">
-              <folding />
+              <folding>
+                <marker date="1250375169000" expanded="false" signature="0:49" placeholder="/**...*/" />
+                <marker date="1250375169000" expanded="true" signature="106:337" placeholder="..." />
+                <marker date="1250375169000" expanded="true" signature="342:473" placeholder="/**...*/" />
+                <marker date="1250375169000" expanded="true" signature="1044:2034" placeholder="/**...*/" />
+                <marker date="1250375169000" expanded="true" signature="2084:2941" placeholder="{...}" />
+                <marker date="1250375169000" expanded="true" signature="2421:2533" placeholder="/**...*/" />
+                <marker date="1250375169000" expanded="true" signature="2943:3474" placeholder="/**...*/" />
+                <marker date="1250375169000" expanded="true" signature="3603:5271" placeholder="{...}" />
+                <marker date="1250375169000" expanded="true" signature="3991:4137" placeholder="{...}" />
+                <marker date="1250375169000" expanded="true" signature="4241:4624" placeholder="{...}" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -142,11 +253,8 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <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" />
@@ -157,6 +265,9 @@
         <option value="$PROJECT_DIR$/util-java/src/main/java/se/scalablesolutions/akka/kernel/stm/Ref.java" />
         <option value="$PROJECT_DIR$/kernel/src/main/scala/actor/Actor.scala" />
         <option value="$PROJECT_DIR$/kernel/src/main/scala/state/CassandraSession.scala" />
+        <option value="$PROJECT_DIR$/kernel/src/main/scala/Kernel.scala" />
+        <option value="$PROJECT_DIR$/kernel/src/test/scala/AllTest.scala" />
+        <option value="$PROJECT_DIR$/kernel/src/test/scala/SchedulerSpec.scala" />
         <option value="$PROJECT_DIR$/kernel/src/main/scala/util/Scheduler.scala" />
       </list>
     </option>
@@ -296,58 +407,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-samples-lift" />
-          <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.scala-tools:javautils:2.7.4-0.1" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="javautils-2.7.4-0.1.jar" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="j2s" />
-          <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-samples-lift" />
-          <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.scala-tools:javautils:2.7.4-0.1" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="javautils-2.7.4-0.1.jar" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="javautils" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-      </PATH>
       <PATH>
         <PATH_ELEMENT>
           <option name="myItemId" value="akka" />
@@ -445,6 +504,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>
@@ -694,88 +761,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.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="&lt; 1.6 &gt;" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="classes.jar" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="concurrent" />
-          <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.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="&lt; 1.6 &gt;" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="classes.jar" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="concurrent" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="ConcurrentHashMap" />
-          <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" />
-          <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="&lt; 1.6 &gt;" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="classes.jar" />
-          <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" />
@@ -807,7 +792,7 @@
   <component name="PropertiesComponent">
     <property name="project.structure.proportion" value="0.15" />
     <property name="GoToClass.includeJavaFiles" value="false" />
-    <property name="project.structure.last.edited" value="Libraries" />
+    <property name="project.structure.last.edited" value="Modules" />
     <property name="MemberChooser.copyJavadoc" value="false" />
     <property name="options.splitter.main.proportions" value="0.3" />
     <property name="options.searchVisible" value="true" />
@@ -835,7 +820,7 @@
       <recent name="stm" />
     </key>
   </component>
-  <component name="RunManager" selected="JUnit.InMemoryActorSpec">
+  <component name="RunManager" selected="JUnit.SchedulerSpec">
     <configuration default="false" name="PersistentActorSpec.testMapShouldNotRollbackStateForStatefulServerInCaseOfSuccess" type="JUnit" factoryName="JUnit" temporary="true" enabled="false" merge="false" sample_coverage="true" runner="emma">
       <pattern>
         <option name="PATTERN" value="se.scalablesolutions.akka.kernel.actor.*" />
@@ -1030,6 +1015,17 @@
         <option name="Maven.BeforeRunTask" enabled="false" />
       </method>
     </configuration>
+    <configuration default="true" type="ScalaScriptRunConfiguration" factoryName="Scala Script">
+      <module name="" />
+      <setting name="path" value="" />
+      <setting name="vmparams" value="" />
+      <setting name="params" value="" />
+      <method>
+        <option name="AntTarget" enabled="false" />
+        <option name="Make" enabled="true" />
+        <option name="Maven.BeforeRunTask" enabled="false" />
+      </method>
+    </configuration>
     <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false" runner="emma">
       <module name="" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -1233,34 +1229,6 @@
         <option name="Maven.BeforeRunTask" enabled="false" />
       </method>
     </configuration>
-    <configuration default="false" name="JerseySpec" type="JUnit" factoryName="JUnit" enabled="false" merge="false" sample_coverage="true" runner="emma">
-      <module name="akka-kernel" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" value="" />
-      <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="se.scalablesolutions.akka.kernel.JerseySpec" />
-      <option name="METHOD_NAME" value="" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" value="" />
-      <option name="PARAMETERS" value="" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="ADDITIONAL_CLASS_PATH" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="moduleWithDependencies" />
-      </option>
-      <envs>
-        <env name="AKKA_HOME" value="$PROJECT_DIR$" />
-      </envs>
-      <RunnerSettings RunnerId="Run" />
-      <ConfigurationWrapper RunnerId="Run" />
-      <method>
-        <option name="AntTarget" enabled="false" />
-        <option name="Make" enabled="false" />
-        <option name="Maven.BeforeRunTask" enabled="false" />
-      </method>
-    </configuration>
     <configuration default="false" name="EventBasedSingleThreadDispatcherTest" type="JUnit" factoryName="JUnit" enabled="false" merge="false" sample_coverage="true" runner="emma">
       <module name="akka-kernel" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -1843,17 +1811,23 @@
         <option name="Maven.BeforeRunTask" enabled="false" />
       </method>
     </configuration>
-    <configuration default="false" name="Kernel" type="Application" factoryName="Application" enabled="false" merge="false" sample_coverage="true" runner="emma">
-      <option name="MAIN_CLASS_NAME" value="se.scalablesolutions.akka.kernel.Kernel" />
-      <option name="VM_PARAMETERS" value="-Dcassandra -Dstorage-config=config/ -Dpidfile=akka.pid" />
-      <option name="PROGRAM_PARAMETERS" value="" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
+    <configuration default="false" name="SchedulerSpec" type="JUnit" factoryName="JUnit" enabled="false" merge="false" sample_coverage="true" runner="emma">
+      <module name="akka-kernel" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" value="" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
+      <option name="PACKAGE_NAME" value="" />
+      <option name="MAIN_CLASS_NAME" value="se.scalablesolutions.akka.kernel.util.SchedulerSpec" />
+      <option name="METHOD_NAME" value="" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" value="" />
+      <option name="PARAMETERS" value="" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
       <option name="ENV_VARIABLES" />
       <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="akka-kernel" />
+      <option name="ADDITIONAL_CLASS_PATH" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="moduleWithDependencies" />
+      </option>
       <envs>
         <env name="AKKA_HOME" value="$PROJECT_DIR$" />
       </envs>
@@ -1895,7 +1869,7 @@
         <option name="Maven.BeforeRunTask" enabled="false" />
       </method>
     </configuration>
-    <list size="29">
+    <list size="28">
       <item index="0" class="java.lang.String" itemvalue="JUnit.PersistentActorSpec.testMapShouldNotRollbackStateForStatefulServerInCaseOfSuccess" />
       <item index="1" class="java.lang.String" itemvalue="JUnit.InMemoryActorSpec.testOneWayVectorShouldRollbackStateForStatefulServerInCaseOfFailure" />
       <item index="2" class="java.lang.String" itemvalue="JUnit.InMemoryActorSpec.testOneWayRefShouldRollbackStateForStatefulServerInCaseOfFailure" />
@@ -1903,28 +1877,27 @@
       <item index="4" class="java.lang.String" itemvalue="JUnit.All Tests Java" />
       <item index="5" class="java.lang.String" itemvalue="JUnit.RemoteActorSpec" />
       <item index="6" class="java.lang.String" itemvalue="JUnit.All Tests Scala" />
-      <item index="7" class="java.lang.String" itemvalue="JUnit.JerseySpec" />
-      <item index="8" class="java.lang.String" itemvalue="JUnit.EventBasedSingleThreadDispatcherTest" />
-      <item index="9" class="java.lang.String" itemvalue="JUnit.CamelSpec" />
-      <item index="10" class="java.lang.String" itemvalue="JUnit.InMemoryActorSpec" />
-      <item index="11" class="java.lang.String" itemvalue="JUnit.RemoteSupervisorSpec" />
-      <item index="12" class="java.lang.String" itemvalue="JUnit.ActorSpec" />
-      <item index="13" class="java.lang.String" itemvalue="JUnit.TransactionClasherSpec" />
-      <item index="14" class="java.lang.String" itemvalue="JUnit.PersistentNestedStateTest" />
-      <item index="15" class="java.lang.String" itemvalue="JUnit.InMemNestedStateTest" />
-      <item index="16" class="java.lang.String" itemvalue="JUnit.SupervisorSpec" />
-      <item index="17" class="java.lang.String" itemvalue="JUnit.ThreadBasedDispatcherTest" />
-      <item index="18" class="java.lang.String" itemvalue="JUnit.RemoteInMemoryStateTest" />
-      <item index="19" class="java.lang.String" itemvalue="JUnit.PersistentActorSpec" />
-      <item index="20" class="java.lang.String" itemvalue="JUnit.ActiveObjectGuiceConfiguratorTest" />
-      <item index="21" class="java.lang.String" itemvalue="JUnit.RemotePersistentStateTest" />
-      <item index="22" class="java.lang.String" itemvalue="JUnit.InMemoryStateTest" />
-      <item index="23" class="java.lang.String" itemvalue="JUnit.RestTest" />
-      <item index="24" class="java.lang.String" itemvalue="JUnit.PersistentStateTest" />
-      <item index="25" class="java.lang.String" itemvalue="JUnit.EventBasedThreadPoolDispatcherTest" />
-      <item index="26" class="java.lang.String" itemvalue="Application.Kernel" />
-      <item index="27" class="java.lang.String" itemvalue="Remote.Unnamed" />
-      <item index="28" class="java.lang.String" itemvalue="Scala Console.Scala Console" />
+      <item index="7" class="java.lang.String" itemvalue="JUnit.EventBasedSingleThreadDispatcherTest" />
+      <item index="8" class="java.lang.String" itemvalue="JUnit.CamelSpec" />
+      <item index="9" class="java.lang.String" itemvalue="JUnit.InMemoryActorSpec" />
+      <item index="10" class="java.lang.String" itemvalue="JUnit.RemoteSupervisorSpec" />
+      <item index="11" class="java.lang.String" itemvalue="JUnit.ActorSpec" />
+      <item index="12" class="java.lang.String" itemvalue="JUnit.TransactionClasherSpec" />
+      <item index="13" class="java.lang.String" itemvalue="JUnit.PersistentNestedStateTest" />
+      <item index="14" class="java.lang.String" itemvalue="JUnit.InMemNestedStateTest" />
+      <item index="15" class="java.lang.String" itemvalue="JUnit.SupervisorSpec" />
+      <item index="16" class="java.lang.String" itemvalue="JUnit.ThreadBasedDispatcherTest" />
+      <item index="17" class="java.lang.String" itemvalue="JUnit.RemoteInMemoryStateTest" />
+      <item index="18" class="java.lang.String" itemvalue="JUnit.PersistentActorSpec" />
+      <item index="19" class="java.lang.String" itemvalue="JUnit.ActiveObjectGuiceConfiguratorTest" />
+      <item index="20" class="java.lang.String" itemvalue="JUnit.RemotePersistentStateTest" />
+      <item index="21" class="java.lang.String" itemvalue="JUnit.InMemoryStateTest" />
+      <item index="22" class="java.lang.String" itemvalue="JUnit.RestTest" />
+      <item index="23" class="java.lang.String" itemvalue="JUnit.PersistentStateTest" />
+      <item index="24" class="java.lang.String" itemvalue="JUnit.EventBasedThreadPoolDispatcherTest" />
+      <item index="25" class="java.lang.String" itemvalue="JUnit.SchedulerSpec" />
+      <item index="26" class="java.lang.String" itemvalue="Remote.Unnamed" />
+      <item index="27" class="java.lang.String" itemvalue="Scala Console.Scala Console" />
     </list>
     <configuration name="&lt;template&gt;" type="WebApp" default="true" selected="false">
       <Host>localhost</Host>
@@ -2005,7 +1978,7 @@
     <editor active="true" />
     <layout>
       <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="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3294881" sideWeight="0.70790815" order="5" side_tool="false" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.17015141" sideWeight="0.6619898" order="5" 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.3265306" sideWeight="0.5" order="9" side_tool="false" />
@@ -2013,7 +1986,8 @@
       <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.29127613" sideWeight="0.65561223" 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="true" weight="0.29127613" sideWeight="0.33545917" order="0" side_tool="true" x="1609" y="144" width="252" height="862" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.29127613" sideWeight="0.33545917" 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" />
@@ -2026,7 +2000,6 @@
       <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="false" weight="0.31887755" sideWeight="0.5" order="1" 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="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32908162" sideWeight="0.0" order="14" 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" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24965987" sideWeight="0.5" order="2" side_tool="false" />
@@ -2068,51 +2041,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/management/RestfulJMX.scala">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="33" column="0" selection-start="1120" selection-end="1191" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/multiverse/multiverse/0.3/multiverse-0.3.jar!/org/multiverse/utils/GlobalStmInstance.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="10" column="41" selection-start="429" selection-end="429" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/util/Helpers.scala">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="10" column="26" selection-start="261" selection-end="261" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/kernel/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="22" column="12" selection-start="704" selection-end="704" vertical-scroll-proportion="0.7457627">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/reactor/EventBasedThreadPoolDispatcher.scala">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="107" column="0" selection-start="4098" selection-end="4098" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/kernel/src/test/scala/InMemoryActorSpec.scala">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="216" column="64" selection-start="8506" selection-end="8506" vertical-scroll-proportion="0.0">
-          <folding>
-            <marker date="1250518101000" expanded="true" signature="834:928" placeholder="{...}" />
-            <marker date="1250518101000" expanded="true" signature="834:928" placeholder="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$MAVEN_REPOSITORY$/org/scala-lang/scala-library/2.7.5/scala-library-2.7.5-sources.jar!/scala/Predef.scala">
       <provider selected="true" editor-type-id="text-editor">
         <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
@@ -2123,7 +2051,18 @@
     <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/actor/Supervisor.scala">
       <provider selected="true" editor-type-id="text-editor">
         <state line="28" column="11" selection-start="952" selection-end="952" vertical-scroll-proportion="0.0">
-          <folding />
+          <folding>
+            <marker date="1250375169000" expanded="false" signature="0:49" placeholder="/**...*/" />
+            <marker date="1250375169000" expanded="true" signature="106:337" placeholder="..." />
+            <marker date="1250375169000" expanded="true" signature="342:473" placeholder="/**...*/" />
+            <marker date="1250375169000" expanded="true" signature="1044:2034" placeholder="/**...*/" />
+            <marker date="1250375169000" expanded="true" signature="2084:2941" placeholder="{...}" />
+            <marker date="1250375169000" expanded="true" signature="2421:2533" placeholder="/**...*/" />
+            <marker date="1250375169000" expanded="true" signature="2943:3474" placeholder="/**...*/" />
+            <marker date="1250375169000" expanded="true" signature="3603:5271" placeholder="{...}" />
+            <marker date="1250375169000" expanded="true" signature="3991:4137" placeholder="{...}" />
+            <marker date="1250375169000" expanded="true" signature="4241:4624" placeholder="{...}" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -2165,20 +2104,104 @@
     <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/state/CassandraSession.scala">
       <provider selected="true" editor-type-id="text-editor">
         <state line="23" column="37" selection-start="565" selection-end="565" vertical-scroll-proportion="-2.4615386">
+          <folding>
+            <marker date="1250524255000" expanded="false" signature="0:49" placeholder="/**...*/" />
+            <marker date="1250524255000" expanded="true" signature="106:396" placeholder="..." />
+            <marker date="1250524255000" expanded="true" signature="398:469" placeholder="/**...*/" />
+            <marker date="1250524255000" expanded="true" signature="526:9332" placeholder="{...}" />
+            <marker date="1250524255000" expanded="true" signature="537:649" placeholder="..." />
+            <marker date="1250524255000" expanded="true" signature="829:1263" placeholder="/**...*/" />
+            <marker date="1250524255000" expanded="true" signature="9528:10730" placeholder="{...}" />
+            <marker date="1250524255000" expanded="true" signature="9815:10474" placeholder="{...}" />
+            <marker date="1250524255000" expanded="true" signature="10047:10470" placeholder="{...}" />
+            <marker date="1250524255000" expanded="true" signature="10528:10693" placeholder="{...}" />
+            <marker date="1250524255000" expanded="true" signature="10794:10865" placeholder="{...}" />
+            <marker date="1250524255000" expanded="true" signature="10883:11076" placeholder="{...}" />
+          </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="55" column="1" selection-start="1940" selection-end="1979" vertical-scroll-proportion="0.0">
+          <folding>
+            <marker date="1250531843000" expanded="true" signature="0:49" placeholder="/**...*/" />
+            <marker date="1250531843000" expanded="true" signature="100:577" placeholder="..." />
+            <marker date="1250531843000" expanded="true" signature="579:650" placeholder="/**...*/" />
+            <marker date="1250531843000" expanded="true" signature="681:9468" placeholder="{...}" />
+            <marker date="1250531843000" expanded="true" signature="3283:4457" placeholder="{...}" />
+            <marker date="1250531843000" expanded="true" signature="4507:5664" placeholder="{...}" />
+            <marker date="1250531843000" expanded="true" signature="5707:5944" placeholder="{...}" />
+            <marker date="1250531843000" expanded="true" signature="5826:5887" placeholder="{...}" />
+            <marker date="1250531843000" expanded="true" signature="5991:6108" placeholder="{...}" />
+            <marker date="1250531843000" expanded="true" signature="6693:7900" placeholder="{...}" />
+            <marker date="1250531843000" expanded="true" signature="7930:8292" placeholder="{...}" />
+            <marker date="1250531843000" expanded="true" signature="8329:9466" placeholder="{...}" />
+            <marker date="1250531843000" expanded="true" signature="9473:9780" placeholder="/.../" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/kernel/akka-kernel.iml">
+      <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$/kernel/src/test/scala/ActorSpec.scala">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="6" column="6" selection-start="119" selection-end="119" vertical-scroll-proportion="0.0">
+          <folding>
+            <marker date="1250375169000" expanded="true" signature="55:111" placeholder="..." />
+            <marker date="1250375169000" expanded="true" signature="162:1491" placeholder="{...}" />
+            <marker date="1250375169000" expanded="true" signature="240:415" placeholder="{...}" />
+            <marker date="1250375169000" expanded="true" signature="288:411" placeholder="{...}" />
+            <marker date="1250375169000" expanded="true" signature="442:765" placeholder="{...}" />
+            <marker date="1250375169000" expanded="true" signature="527:637" placeholder="{...}" />
+            <marker date="1250375169000" expanded="true" signature="577:631" placeholder="{...}" />
+            <marker date="1250375169000" expanded="true" signature="793:968" placeholder="{...}" />
+            <marker date="1250375169000" expanded="true" signature="997:1189" placeholder="{...}" />
+            <marker date="1250375169000" expanded="true" signature="1224:1489" placeholder="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/kernel/src/test/scala/AllTest.scala">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="10" column="7" selection-start="363" selection-end="363" vertical-scroll-proportion="0.0">
+          <folding>
+            <marker date="1250533019000" expanded="true" signature="49:354" placeholder="..." />
+            <marker date="1250533019000" expanded="true" signature="388:1092" placeholder="{...}" />
+            <marker date="1250533019000" expanded="true" signature="412:1020" placeholder="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/kernel/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="39" column="57" selection-start="1237" selection-end="1237" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/kernel/src/test/scala/SchedulerSpec.scala">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="18" column="18" selection-start="441" selection-end="441" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/actor/Actor.scala">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="192" column="16" selection-start="6539" selection-end="6539" vertical-scroll-proportion="0.0">
+        <state line="345" column="7" selection-start="12841" selection-end="12841" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/util/Scheduler.scala">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="55" column="23" selection-start="1677" selection-end="1685" vertical-scroll-proportion="0.8095238">
+        <state line="11" column="12" selection-start="299" selection-end="299" vertical-scroll-proportion="0.06685633">
           <folding />
         </state>
       </provider>
diff --git a/kernel/akka-kernel.iml b/kernel/akka-kernel.iml
index 91e7a458e0..fb2fcb4f5b 100644
--- a/kernel/akka-kernel.iml
+++ b/kernel/akka-kernel.iml
@@ -5,12 +5,12 @@
       <configuration />
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/scala" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/scala" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
@@ -28,26 +28,27 @@
     <orderEntry type="library" name="Scala 2.7.5" level="application" />
     <orderEntry type="module" module-name="akka-util-java" exported="" />
     <orderEntry type="library" exported="" name="Maven: org.guiceyfruit:guice-core:2.0-beta-4" level="project" />
-    <orderEntry type="library" exported="" name="Maven: org.guiceyfruit:guice-jsr250:2.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" exported="" name="Maven: javax.annotation:jsr250-api:1.0" level="project" />
     <orderEntry type="library" exported="" name="Maven: com.google.protobuf:protobuf-java:2.1.0" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.scala-lang:scala-library:2.7.5" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.codehaus.aspectwerkz:aspectwerkz-nodeps-jdk5:2.1" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.codehaus.aspectwerkz:aspectwerkz-jdk5:2.1" level="project" />
+    <orderEntry type="library" exported="" name="Maven: com.twitter:scala-stats:1.0" level="project" />
     <orderEntry type="library" exported="" name="Maven: net.lag:configgy:1.3" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.scala-lang:scala-compiler:2.7.4" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.scala-tools:vscaladoc:1.1-md-3" level="project" />
     <orderEntry type="library" exported="" name="Maven: markdownj:markdownj:1.0.2b4-0.3.0" level="project" />
     <orderEntry type="library" name="Maven: junit:junit:4.5" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.scala-tools.testing:specs:1.4.4" level="project" />
-    <orderEntry type="library" exported="" name="Maven: org.guiceyfruit:guiceyfruit-core:2.0" level="project" />
-    <orderEntry type="library" exported="" name="Maven: org.guiceyfruit:guice-all:2.0" level="project" />
-    <orderEntry type="library" exported="" name="Maven: javax.annotation:com.springsource.javax.annotation:1.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Maven: org.aopalliance:com.springsource.org.aopalliance:1.0.0" level="project" />
     <orderEntry type="library" exported="" name="Maven: com.google.code.google-collections:google-collect:snapshot-20080530" level="project" />
     <orderEntry type="library" exported="" name="Maven: cglib:cglib:2.2" level="project" />
     <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: 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" />
@@ -55,13 +56,10 @@
     <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" />
     <orderEntry type="library" exported="" name="Maven: com.twitter:scala-json:1.0" level="project" />
-    <orderEntry type="library" exported="" name="Maven: org.apache.cassandra:cassandra:0.4.0-dev" level="project" />
+    <orderEntry type="library" exported="" name="Maven: com.mongodb:mongo:0.6" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.apache.cassandra:cassandra:0.4.0-trunk" level="project" />
     <orderEntry type="library" exported="" name="Maven: com.facebook:thrift:1.0" level="project" />
     <orderEntry type="library" exported="" name="Maven: com.facebook:fb303:1.0" level="project" />
-    <orderEntry type="library" exported="" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Maven: high-scale-lib:high-scale-lib:1.0" level="project" />
-    <orderEntry type="library" exported="" name="Maven: commons-lang:commons-lang:2.4" level="project" />
-    <orderEntry type="library" exported="" name="Maven: se.foldleft:cassidy:0.1" level="project" />
     <orderEntry type="library" exported="" name="Maven: commons-pool:commons-pool:1.5.1" level="project" />
     <orderEntry type="library" exported="" name="Maven: com.sun.grizzly:grizzly-comet-webserver:1.8.6.3" level="project" />
     <orderEntry type="library" exported="" name="Maven: com.sun.grizzly:grizzly-servlet-webserver:1.8.6.3" level="project" />
@@ -79,10 +77,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" />
@@ -93,7 +87,6 @@
     <orderEntry type="library" exported="" name="Maven: log4j:log4j:1.2.13" level="project" />
     <orderEntry type="library" exported="" name="Maven: commons-logging:commons-logging:1.0.4" level="project" />
     <orderEntry type="library" name="Maven: org.scala-tools.testing:scalatest:0.9.5" level="project" />
-    <orderEntry type="library" exported="" name="Maven: com.sun.jersey:jersey-client:1.1.0-ea" level="project" />
   </component>
 </module>
 
diff --git a/kernel/src/main/scala/Kernel.scala b/kernel/src/main/scala/Kernel.scala
old mode 100755
new mode 100644
index 7ecfd61141..ada31e9f91
--- a/kernel/src/main/scala/Kernel.scala
+++ b/kernel/src/main/scala/Kernel.scala
@@ -32,7 +32,7 @@ object Kernel extends Logging {
   }
 
   val config = setupConfig
-  
+
   val CONFIG_VERSION = config.getString("akka.version", "0")
   if (VERSION != CONFIG_VERSION) throw new IllegalStateException("Akka JAR version [" + VERSION + "] is different than the provided config ('akka.conf') version [" + CONFIG_VERSION + "]")
 
@@ -51,7 +51,7 @@ object Kernel extends Logging {
   private var jerseySelectorThread: SelectorThread = _
   private val startTime = System.currentTimeMillis
   private var applicationLoader: Option[ClassLoader] = None
-  
+
   def main(args: Array[String]) = boot
 
   def boot = synchronized {
@@ -65,13 +65,13 @@ object Kernel extends Logging {
       if (RUN_MANAGEMENT_SERVICE) startManagementService
 
       STORAGE_SYSTEM match {
-        case "cassandra" =>     startCassandra
-        case "terracotta" =>    throw new UnsupportedOperationException("terracotta storage backend is not yet supported")
-        case "mongodb" =>       throw new UnsupportedOperationException("mongodb storage backend is not yet supported")
-        case "redis" =>         throw new UnsupportedOperationException("redis storage backend is not yet supported")
-        case "voldemort" =>     throw new UnsupportedOperationException("voldemort storage backend is not yet supported")
+        case "cassandra" => startCassandra
+        case "terracotta" => throw new UnsupportedOperationException("terracotta storage backend is not yet supported")
+        case "mongodb" => throw new UnsupportedOperationException("mongodb storage backend is not yet supported")
+        case "redis" => throw new UnsupportedOperationException("redis storage backend is not yet supported")
+        case "voldemort" => throw new UnsupportedOperationException("voldemort storage backend is not yet supported")
         case "tokyo-cabinet" => throw new UnsupportedOperationException("tokyo-cabinet storage backend is not yet supported")
-        case _ =>               throw new UnsupportedOperationException("Unknown storage system [" + STORAGE_SYSTEM + "]")
+        case _ => throw new UnsupportedOperationException("Unknown storage system [" + STORAGE_SYSTEM + "]")
       }
 
       if (RUN_REST_SERVICE) startREST
@@ -81,26 +81,26 @@ object Kernel extends Logging {
       hasBooted = true
     }
   }
-  
+
   def uptime = (System.currentTimeMillis - startTime) / 1000
 
   def setupConfig: Config = {
-      if (HOME.isDefined) {
-        try {
-          val configFile = HOME.get + "/config/akka.conf"
-          Configgy.configure(configFile)
-          log.info("AKKA_HOME is defined to [%s], config loaded from [%s].", HOME.get, configFile)
-        } catch {
-          case e: ParseException => throw new IllegalStateException("'akka.conf' config file can not be found in [" + HOME + "/config/akka.conf] - aborting. Either add it in the 'config' directory or add it to the classpath.")
-        }
-      } else {
-        try {
-          Configgy.configureFromResource("akka.conf", getClass.getClassLoader)
-          log.info("Config loaded from the application classpath.")
-        } catch {
-          case e: ParseException => throw new IllegalStateException("'$AKKA_HOME/config/akka.conf' could not be found and no 'akka.conf' can be found on the classpath - aborting. . Either add it in the '$AKKA_HOME/config' directory or add it to the classpath.")
-        }
+    if (HOME.isDefined) {
+      try {
+        val configFile = HOME.get + "/config/akka.conf"
+        Configgy.configure(configFile)
+        log.info("AKKA_HOME is defined to [%s], config loaded from [%s].", HOME.get, configFile)
+      } catch {
+        case e: ParseException => throw new IllegalStateException("'akka.conf' config file can not be found in [" + HOME + "/config/akka.conf] - aborting. Either add it in the 'config' directory or add it to the classpath.")
       }
+    } else {
+      try {
+        Configgy.configureFromResource("akka.conf", getClass.getClassLoader)
+        log.info("Config loaded from the application classpath.")
+      } catch {
+        case e: ParseException => throw new IllegalStateException("'$AKKA_HOME/config/akka.conf' could not be found and no 'akka.conf' can be found on the classpath - aborting. . Either add it in the '$AKKA_HOME/config' directory or add it to the classpath.")
+      }
+    }
     val config = Configgy.config
     config.registerWithJmx("com.scalablesolutions.akka")
     // FIXME fix Configgy JMX subscription to allow management
@@ -111,29 +111,29 @@ object Kernel extends Logging {
   private[akka] def runApplicationBootClasses = {
     new management.RestfulJMXBoot // add the REST/JMX service
     val loader =
-      if (HOME.isDefined) {
-        val CONFIG = HOME.get + "/config"
-        val DEPLOY = HOME.get + "/deploy"
-        val DEPLOY_DIR = new File(DEPLOY)
-        if (!DEPLOY_DIR.exists) { log.error("Could not find a deploy directory at [" + DEPLOY + "]"); System.exit(-1) }
-        val toDeploy = for (f <- DEPLOY_DIR.listFiles().toArray.toList.asInstanceOf[List[File]]) yield f.toURL
-        //val toDeploy = DEPLOY_DIR.toURL :: (for (f <- DEPLOY_DIR.listFiles().toArray.toList.asInstanceOf[List[File]]) yield f.toURL)
-        log.info("Deploying applications from [%s]: [%s]", DEPLOY, toDeploy.toArray.toList)
-        new URLClassLoader(toDeploy.toArray, getClass.getClassLoader)
-      } else if (getClass.getClassLoader.getResourceAsStream("akka.conf") != null) { 
-        getClass.getClassLoader
-      } else throw new IllegalStateException("AKKA_HOME is not defined and no 'akka.conf' can be found on the classpath, aborting")
+    if (HOME.isDefined) {
+      val CONFIG = HOME.get + "/config"
+      val DEPLOY = HOME.get + "/deploy"
+      val DEPLOY_DIR = new File(DEPLOY)
+      if (!DEPLOY_DIR.exists) {log.error("Could not find a deploy directory at [" + DEPLOY + "]"); System.exit(-1)}
+      val toDeploy = for (f <- DEPLOY_DIR.listFiles().toArray.toList.asInstanceOf[List[File]]) yield f.toURL
+      //val toDeploy = DEPLOY_DIR.toURL :: (for (f <- DEPLOY_DIR.listFiles().toArray.toList.asInstanceOf[List[File]]) yield f.toURL)
+      log.info("Deploying applications from [%s]: [%s]", DEPLOY, toDeploy.toArray.toList)
+      new URLClassLoader(toDeploy.toArray, getClass.getClassLoader)
+    } else if (getClass.getClassLoader.getResourceAsStream("akka.conf") != null) {
+      getClass.getClassLoader
+    } else throw new IllegalStateException("AKKA_HOME is not defined and no 'akka.conf' can be found on the classpath, aborting")
     for (clazz <- BOOT_CLASSES) {
       log.info("Loading boot class [%s]", clazz)
       loader.loadClass(clazz).newInstance
     }
     applicationLoader = Some(loader)
   }
-  
+
   private[akka] def startRemoteService = {
     // FIXME manage remote serve thread for graceful shutdown
     val remoteServerThread = new Thread(new Runnable() {
-       def run = RemoteServer.start(applicationLoader)
+      def run = RemoteServer.start(applicationLoader)
     }, "Akka Remote Service")
     remoteServerThread.start
   }
@@ -178,18 +178,18 @@ object Kernel extends Logging {
 
   private def printBanner = {
     log.info(
-"""==============================
-        __    __
- _____  |  | _|  | _______
- \__  \ |  |/ /  |/ /\__  \
-  / __ \|    <|    <  / __ \_
- (____  /__|_ \__|_ \(____  /
-      \/     \/    \/     \/
-""")
+      """==============================
+              __    __
+       _____  |  | _|  | _______
+       \__  \ |  |/ /  |/ /\__  \
+        / __ \|    <|    <  / __ \_
+       (____  /__|_ \__|_ \(____  /
+            \/     \/    \/     \/
+      """)
     log.info("     Running version " + VERSION)
     log.info("==============================")
   }
-  
+
   private def cassandraBenchmark = {
     val NR_ENTRIES = 100000
 
@@ -206,7 +206,7 @@ object Kernel extends Logging {
     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) CassandraStorage.getMapStorageEntryFor("test", i.toString)
@@ -219,15 +219,15 @@ object Kernel extends Logging {
 
 
 
-  
-/*
-  //import voldemort.client.{SocketStoreClientFactory, StoreClient, StoreClientFactory}
-  //import voldemort.server.{VoldemortConfig, VoldemortServer}
-  //import voldemort.versioning.Versioned
 
-    private[this] var storageFactory: StoreClientFactory = _
-    private[this] var storageServer: VoldemortServer = _
-  */
+/*
+//import voldemort.client.{SocketStoreClientFactory, StoreClient, StoreClientFactory}
+//import voldemort.server.{VoldemortConfig, VoldemortServer}
+//import voldemort.versioning.Versioned
+
+  private[this] var storageFactory: StoreClientFactory = _
+  private[this] var storageServer: VoldemortServer = _
+*/
 
 //  private[akka] def startVoldemort = {
 //  val VOLDEMORT_SERVER_URL = "tcp://" + SERVER_URL
@@ -263,39 +263,39 @@ object Kernel extends Logging {
 //  private[akka] def getStorageFor(storageName: String): StoreClient[String, String] =
 //    storageFactory.getStoreClient(storageName)
 
-   // private[akka] def startZooKeeper = {
-  //import org.apache.zookeeper.jmx.ManagedUtil
-  //import org.apache.zookeeper.server.persistence.FileTxnSnapLog
-  //import org.apache.zookeeper.server.ServerConfig
-  //import org.apache.zookeeper.server.NIOServerCnxn
-  //  val ZOO_KEEPER_SERVER_URL = SERVER_URL
-  //  val ZOO_KEEPER_SERVER_PORT = 9898
-  //   try {
-  //     ManagedUtil.registerLog4jMBeans
-  //     ServerConfig.parse(args)
-  //   } catch {
-  //     case e: JMException => log.warning("Unable to register log4j JMX control: s%", e)
-  //     case e => log.fatal("Error in ZooKeeper config: s%", e)
-  //   }
-  //   val factory = new ZooKeeperServer.Factory() {
-  //     override def createConnectionFactory = new NIOServerCnxn.Factory(ServerConfig.getClientPort)
-  //     override def createServer = {
-  //       val server = new ZooKeeperServer
-  //       val txLog = new FileTxnSnapLog(
-  //         new File(ServerConfig.getDataLogDir),
-  //         new File(ServerConfig.getDataDir))
-  //       server.setTxnLogFactory(txLog)
-  //       server
-  //     }
-  //   }
-  //   try {
-  //     val zooKeeper = factory.createServer
-  //     zooKeeper.startup
-  //     log.info("ZooKeeper started")
-  //     // TODO: handle clean shutdown as below in separate thread
-  //     // val cnxnFactory = serverFactory.createConnectionFactory
-  //     // cnxnFactory.setZooKeeperServer(zooKeeper)
-  //     // cnxnFactory.join
-  //     // if (zooKeeper.isRunning) zooKeeper.shutdown
-  //   } catch { case e => log.fatal("Unexpected exception: s%",e) }
-  // }
+// private[akka] def startZooKeeper = {
+//import org.apache.zookeeper.jmx.ManagedUtil
+//import org.apache.zookeeper.server.persistence.FileTxnSnapLog
+//import org.apache.zookeeper.server.ServerConfig
+//import org.apache.zookeeper.server.NIOServerCnxn
+//  val ZOO_KEEPER_SERVER_URL = SERVER_URL
+//  val ZOO_KEEPER_SERVER_PORT = 9898
+//   try {
+//     ManagedUtil.registerLog4jMBeans
+//     ServerConfig.parse(args)
+//   } catch {
+//     case e: JMException => log.warning("Unable to register log4j JMX control: s%", e)
+//     case e => log.fatal("Error in ZooKeeper config: s%", e)
+//   }
+//   val factory = new ZooKeeperServer.Factory() {
+//     override def createConnectionFactory = new NIOServerCnxn.Factory(ServerConfig.getClientPort)
+//     override def createServer = {
+//       val server = new ZooKeeperServer
+//       val txLog = new FileTxnSnapLog(
+//         new File(ServerConfig.getDataLogDir),
+//         new File(ServerConfig.getDataDir))
+//       server.setTxnLogFactory(txLog)
+//       server
+//     }
+//   }
+//   try {
+//     val zooKeeper = factory.createServer
+//     zooKeeper.startup
+//     log.info("ZooKeeper started")
+//     // TODO: handle clean shutdown as below in separate thread
+//     // val cnxnFactory = serverFactory.createConnectionFactory
+//     // cnxnFactory.setZooKeeperServer(zooKeeper)
+//     // cnxnFactory.join
+//     // if (zooKeeper.isRunning) zooKeeper.shutdown
+//   } catch { case e => log.fatal("Unexpected exception: s%",e) }
+// }
diff --git a/kernel/src/main/scala/util/Scheduler.scala b/kernel/src/main/scala/util/Scheduler.scala
index b292039446..95e9378de6 100644
--- a/kernel/src/main/scala/util/Scheduler.scala
+++ b/kernel/src/main/scala/util/Scheduler.scala
@@ -1,7 +1,3 @@
-/**
- *  Copyright (C) 2009 Scalable Solutions.
- */
-
 package se.scalablesolutions.akka.kernel.util
 
 import java.util.concurrent._
@@ -9,17 +5,14 @@ import kernel.actor.{OneForOneStrategy, Actor}
 
 import org.scala_tools.javautils.Imports._
 
-case object Schedule
 case object UnSchedule
 case class SchedulerException(msg: String, e: Throwable) extends RuntimeException(msg, e)
 
 /**
- * Based on David Pollak's ActorPing class in the Lift Project.
- * Licensed under Apache 2 License.
+ * Rework of David Pollak's ActorPing class in the Lift Project
+ * which is licensed under the Apache 2 License.
  */
 class ScheduleActor(val receiver: Actor, val future: ScheduledFuture[AnyRef]) extends Actor with Logging {
-  receiver ! Schedule
-
   def receive: PartialFunction[Any, Unit] = {
     case UnSchedule =>
       Scheduler.stopSupervising(this)
@@ -33,6 +26,7 @@ object Scheduler extends Actor {
   private val schedulers = new ConcurrentHashMap[Actor, Actor]
   faultHandler = Some(OneForOneStrategy(5, 5000))
   trapExit = true
+  start
 
   def schedule(receiver: Actor, message: AnyRef, initialDelay: Long, delay: Long, timeUnit: TimeUnit) = {
     try {
@@ -73,3 +67,5 @@ private object SchedulerThreadFactory extends ThreadFactory {
     thread
   }
 }
+
+
diff --git a/kernel/src/test/scala/AllTest.scala b/kernel/src/test/scala/AllTest.scala
index a225bfb080..546f5cc446 100644
--- a/kernel/src/test/scala/AllTest.scala
+++ b/kernel/src/test/scala/AllTest.scala
@@ -6,6 +6,7 @@ import junit.framework.TestSuite
 
 import kernel.actor.{ActorSpec, RemoteActorSpec, PersistentActorSpec, InMemoryActorSpec}
 import kernel.reactor.{EventBasedSingleThreadDispatcherTest, EventBasedThreadPoolDispatcherTest}
+import kernel.util.SchedulerSpec
 
 object AllTest extends TestCase {
   def suite(): Test = {
@@ -18,6 +19,8 @@ object AllTest extends TestCase {
     suite.addTestSuite(classOf[RemoteActorSpec])
     //suite.addTestSuite(classOf[PersistentActorSpec])
     suite.addTestSuite(classOf[InMemoryActorSpec])
+    suite.addTestSuite(classOf[SchedulerSpec])
+
     //suite.addTestSuite(classOf[TransactionClasherSpec])
     suite
   }
diff --git a/kernel/src/test/scala/SchedulerSpec.scala b/kernel/src/test/scala/SchedulerSpec.scala
new file mode 100644
index 0000000000..bf763046fc
--- /dev/null
+++ b/kernel/src/test/scala/SchedulerSpec.scala
@@ -0,0 +1,25 @@
+package se.scalablesolutions.akka.kernel.util
+
+import se.scalablesolutions.akka.kernel.actor.Actor
+
+import java.util.concurrent.TimeUnit
+
+import org.junit.Assert._
+
+class SchedulerSpec extends junit.framework.TestCase {
+  
+  def testScheduler = {
+    var count = 0
+    case object Tick
+    val actor = new Actor() {
+      def receive: PartialFunction[Any, Unit] = {
+        case Tick => count += 1
+      }}
+    actor.start
+    Thread.sleep(1000)
+    Scheduler.schedule(actor, Tick, 0L, 1L, TimeUnit.SECONDS)
+    Thread.sleep(5000)
+    Scheduler.shutdown
+    assertTrue(count > 0)
+  }
+}
\ No newline at end of file
diff --git a/samples-java/akka-samples-java.iml b/samples-java/akka-samples-java.iml
index 5871ff71d7..243de784f2 100644
--- a/samples-java/akka-samples-java.iml
+++ b/samples-java/akka-samples-java.iml
@@ -9,8 +9,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="akka-kernel" exported="" />
-    <orderEntry type="module" module-name="akka-util-java" exported="" />
+    <orderEntry type="library" exported="" name="Maven: se.scalablesolutions.akka:akka-kernel:0.5" level="project" />
+    <orderEntry type="library" exported="" name="Maven: se.scalablesolutions.akka:akka-util-java:0.5" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.guiceyfruit:guice-core:2.0-beta-4" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.guiceyfruit:guice-jsr250:2.0-SNAPSHOT" level="project" />
     <orderEntry type="library" exported="" name="Maven: javax.annotation:jsr250-api:1.0" level="project" />
diff --git a/samples-scala/akka-samples-scala.iml b/samples-scala/akka-samples-scala.iml
index 955c18a9ce..b864b09ba5 100644
--- a/samples-scala/akka-samples-scala.iml
+++ b/samples-scala/akka-samples-scala.iml
@@ -14,8 +14,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="akka-kernel" exported="" />
-    <orderEntry type="module" module-name="akka-util-java" exported="" />
+    <orderEntry type="library" exported="" name="Maven: se.scalablesolutions.akka:akka-kernel:0.5" level="project" />
+    <orderEntry type="library" exported="" name="Maven: se.scalablesolutions.akka:akka-util-java:0.5" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.guiceyfruit:guice-core:2.0-beta-4" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.guiceyfruit:guice-jsr250:2.0-SNAPSHOT" level="project" />
     <orderEntry type="library" exported="" name="Maven: javax.annotation:jsr250-api:1.0" level="project" />
diff --git a/util-java/akka-util-java.iml b/util-java/akka-util-java.iml
index 1998394879..646310bd42 100644
--- a/util-java/akka-util-java.iml
+++ b/util-java/akka-util-java.iml
@@ -11,9 +11,8 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Protobuf" level="application" />
     <orderEntry type="library" exported="" name="Maven: org.guiceyfruit:guice-core:2.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" exported="" name="Maven: org.guiceyfruit:guice-jsr250:2.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" exported="" name="Maven: javax.annotation:jsr250-api:1.0" level="project" />
     <orderEntry type="library" exported="" name="Maven: com.google.protobuf:protobuf-java:2.1.0" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.multiverse:multiverse:0.3" level="project" />
   </component>
 </module>