From ff969047cc25ef40c6423c474b313a18b81f0858 Mon Sep 17 00:00:00 2001
From: Jonas Boner <jonas@jonasboner.com>
Date: Mon, 6 Jul 2009 23:45:15 +0200
Subject: [PATCH] fixed last stm issues and failing tests + added new
 thread-based dispatcher (plus test)

---
 akka.ipr                                      |   34 +-
 akka.iws                                      | 1744 ++++-------------
 .../scalablesolutions/akka/api/AllTest.java   |   24 +
 .../scalablesolutions/akka/api/AllTests.java  |   38 -
 .../akka/api/PersistenceManager.java          |   13 +
 .../akka/api/PersistentNestedStateTest.java   |    7 +-
 .../akka/api/PersistentStateTest.java         |    6 +-
 .../akka/api/RemoteInMemoryStateTest.java     |    2 -
 .../akka/api/RemotePersistentStateTest.java   |    7 +-
 .../scalablesolutions/akka/api/RestTest.java  |   11 +-
 kernel/pom.xml                                |   10 -
 kernel/src/main/resources/aop.xml             |    9 +
 .../src/main/scala/actor/ActiveObject.scala   |   10 +-
 kernel/src/main/scala/actor/Actor.scala       |  158 +-
 kernel/src/main/scala/actor/Supervisor.scala  |    6 +-
 kernel/src/main/scala/collection/Vector.scala |   10 +-
 .../ActiveObjectGuiceConfigurator.scala       |   10 +-
 kernel/src/main/scala/config/Config.scala     |   15 +-
 .../src/main/scala/config/Configuration.scala |    2 +-
 kernel/src/main/scala/nio/RemoteServer.scala  |    8 +-
 .../src/main/scala/reactor/Dispatchers.scala  |   44 +
 .../EventBasedSingleThreadDispatcher.scala    |   16 +-
 .../EventBasedThreadPoolDispatcher.scala      |   20 +-
 .../scala/reactor/MessageDispatcherBase.scala |   35 +-
 kernel/src/main/scala/reactor/Reactor.scala   |   76 +-
 .../scala/reactor/ThreadBasedDispatcher.scala |   55 +
 .../main/scala/state/CassandraStorage.scala   |   10 +-
 .../main/scala/state/DataFlowVariable.scala   |    4 +-
 kernel/src/main/scala/stm/Transaction.scala   |   24 +-
 .../scala/stm/TransactionManagement.scala     |   40 +-
 kernel/src/test/scala/AllTest.scala           |   26 +
 kernel/src/test/scala/AllTests.scala          |   22 -
 ...ventBasedSingleThreadDispatcherTest.scala} |   24 +-
 .../EventBasedThreadPoolDispatcherTest.scala  |  143 ++
 kernel/src/test/scala/InMemoryActorSpec.scala |    3 +-
 .../src/test/scala/RemoteSupervisorSpec.scala |   22 +-
 kernel/src/test/scala/SupervisorSpec.scala    |   22 +-
 .../scala/ThreadBasedDispatcherTest.scala     |  123 +-
 .../test/scala/TransactionClasherSpec.scala   |   56 +-
 .../akka/annotation/configuration.java        |   11 +
 40 files changed, 1063 insertions(+), 1837 deletions(-)
 create mode 100644 fun-test-java/src/test/java/se/scalablesolutions/akka/api/AllTest.java
 delete mode 100644 fun-test-java/src/test/java/se/scalablesolutions/akka/api/AllTests.java
 create mode 100644 fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistenceManager.java
 create mode 100644 kernel/src/main/resources/aop.xml
 mode change 100755 => 100644 kernel/src/main/scala/collection/Vector.scala
 mode change 100755 => 100644 kernel/src/main/scala/config/Configuration.scala
 create mode 100644 kernel/src/main/scala/reactor/Dispatchers.scala
 create mode 100644 kernel/src/main/scala/reactor/ThreadBasedDispatcher.scala
 create mode 100644 kernel/src/test/scala/AllTest.scala
 delete mode 100644 kernel/src/test/scala/AllTests.scala
 rename kernel/src/test/scala/{EventBasedDispatcherTest.scala => EventBasedSingleThreadDispatcherTest.scala} (81%)
 create mode 100644 kernel/src/test/scala/EventBasedThreadPoolDispatcherTest.scala
 create mode 100644 util-java/src/main/java/se/scalablesolutions/akka/annotation/configuration.java

diff --git a/akka.ipr b/akka.ipr
index 10621d8129..46fa8b50b5 100644
--- a/akka.ipr
+++ b/akka.ipr
@@ -9,19 +9,19 @@
   <component name="CodeStyleSettingsManager">
     <option name="PER_PROJECT_SETTINGS">
       <value>
-        <ADDITIONAL_INDENT_OPTIONS fileType="java">
-          <option name="INDENT_SIZE" value="4" />
+        <ADDITIONAL_INDENT_OPTIONS fileType="">
+          <option name="INDENT_SIZE" value="2" />
           <option name="CONTINUATION_INDENT_SIZE" value="8" />
-          <option name="TAB_SIZE" value="4" />
+          <option name="TAB_SIZE" value="2" />
           <option name="USE_TAB_CHARACTER" value="false" />
           <option name="SMART_TABS" value="false" />
           <option name="LABEL_INDENT_SIZE" value="0" />
           <option name="LABEL_INDENT_ABSOLUTE" value="false" />
         </ADDITIONAL_INDENT_OPTIONS>
-        <ADDITIONAL_INDENT_OPTIONS fileType="scala">
-          <option name="INDENT_SIZE" value="2" />
+        <ADDITIONAL_INDENT_OPTIONS fileType="java">
+          <option name="INDENT_SIZE" value="4" />
           <option name="CONTINUATION_INDENT_SIZE" value="8" />
-          <option name="TAB_SIZE" value="2" />
+          <option name="TAB_SIZE" value="4" />
           <option name="USE_TAB_CHARACTER" value="false" />
           <option name="SMART_TABS" value="false" />
           <option name="LABEL_INDENT_SIZE" value="0" />
@@ -735,17 +735,6 @@
         <root url="jar://$MAVEN_REPOSITORY$/org/guiceyfruit/guice-jsr250/2.0-beta-4/guice-jsr250-2.0-beta-4-sources.jar!/" />
       </SOURCES>
     </library>
-    <library name="Maven: org.codehaus.aspectwerkz:aspectwerkz-nodeps-jdk5:2.1">
-      <CLASSES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/aspectwerkz/aspectwerkz-nodeps-jdk5/2.1/aspectwerkz-nodeps-jdk5-2.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/aspectwerkz/aspectwerkz-nodeps-jdk5/2.1/aspectwerkz-nodeps-jdk5-2.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/aspectwerkz/aspectwerkz-nodeps-jdk5/2.1/aspectwerkz-nodeps-jdk5-2.1-sources.jar!/" />
-      </SOURCES>
-    </library>
     <library name="Maven: net.lag:configgy:1.3">
       <CLASSES>
         <root url="jar://$MAVEN_REPOSITORY$/net/lag/configgy/1.3/configgy-1.3.jar!/" />
@@ -1431,6 +1420,17 @@
         <root url="jar://$PROJECT_DIR$/util-java/pom-sources.jar!/" />
       </SOURCES>
     </library>
+    <library name="Maven: org.codehaus.aspectwerkz:aspectwerkz-nodeps-jdk5:2.1">
+      <CLASSES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/aspectwerkz/aspectwerkz-nodeps-jdk5/2.1/aspectwerkz-nodeps-jdk5-2.1.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/aspectwerkz/aspectwerkz-nodeps-jdk5/2.1/aspectwerkz-nodeps-jdk5-2.1-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/aspectwerkz/aspectwerkz-nodeps-jdk5/2.1/aspectwerkz-nodeps-jdk5-2.1-sources.jar!/" />
+      </SOURCES>
+    </library>
   </component>
   <UsedPathMacros>
     <macro name="MAVEN_REPOSITORY" description="Maven Local Repostiry" />
diff --git a/akka.iws b/akka.iws
index 688a8ac498..6af29de35c 100644
--- a/akka.iws
+++ b/akka.iws
@@ -1,17 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project relativePaths="false" version="4">
   <component name="BookmarkManager">
-    <editor_bookmark url="file://$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/RestTest.java" line="40" description="conf.configureActiveObjects(" />
+    <editor_bookmark url="file://$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/RestTest.java" line="41" description="conf.configureActiveObjects(" />
     <commander_bookmark type="package" url="file://$PROJECT_DIR$/kernel/src/main/scala/stm" />
     <commander_bookmark type="package" url="file://$PROJECT_DIR$/kernel/src/main/scala/actor" />
   </component>
   <component name="ChangeListManager">
     <list default="true" id="212ccd86-01aa-4780-a2f0-0d130be5abd2" name="Test" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/kernel/src/test/scala/TransactionClasherSpec.scala" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/main/scala/state/DataFlowVariable.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/state/DataFlowVariable.scala" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/kernel/src/test/scala/AllTest.scala" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/main/scala/actor/Supervisor.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/actor/Supervisor.scala" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentNestedStateTest.java" afterPath="$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentNestedStateTest.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistenceManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/main/scala/collection/Vector.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/collection/Vector.scala" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/main/scala/config/ActiveObjectGuiceConfigurator.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/config/ActiveObjectGuiceConfigurator.scala" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/AllTest.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/akka.ipr" afterPath="$PROJECT_DIR$/akka.ipr" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/RemoteInMemoryStateTest.java" afterPath="$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/RemoteInMemoryStateTest.java" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/kernel/src/test/scala/AllTests.scala" afterPath="" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/main/scala/config/Config.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/config/Config.scala" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateTest.java" afterPath="$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateTest.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/util-java/src/main/java/se/scalablesolutions/akka/annotation/configuration.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/pom.xml" afterPath="$PROJECT_DIR$/kernel/pom.xml" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/kernel/src/test/scala/EventBasedDispatcherTest.scala" afterPath="$PROJECT_DIR$/kernel/src/test/scala/EventBasedSingleThreadDispatcherTest.scala" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/main/scala/stm/Transaction.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/stm/Transaction.scala" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/main/scala/stm/TransactionManagement.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/stm/TransactionManagement.scala" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/main/scala/actor/ActiveObject.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/actor/ActiveObject.scala" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/kernel/src/main/resources/aop.xml" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/AllTests.java" afterPath="" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/main/scala/reactor/MessageDispatcherBase.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/reactor/MessageDispatcherBase.scala" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/main/scala/reactor/EventBasedThreadPoolDispatcher.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/reactor/EventBasedThreadPoolDispatcher.scala" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/main/scala/actor/Actor.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/actor/Actor.scala" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/test/scala/RemoteSupervisorSpec.scala" afterPath="$PROJECT_DIR$/kernel/src/test/scala/RemoteSupervisorSpec.scala" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/kernel/src/test/scala/EventBasedThreadPoolDispatcherTest.scala" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/main/scala/config/Configuration.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/config/Configuration.scala" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/main/scala/state/CassandraStorage.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/state/CassandraStorage.scala" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/test/scala/SupervisorSpec.scala" afterPath="$PROJECT_DIR$/kernel/src/test/scala/SupervisorSpec.scala" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/test/scala/ThreadBasedDispatcherTest.scala" afterPath="$PROJECT_DIR$/kernel/src/test/scala/ThreadBasedDispatcherTest.scala" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/akka.iws" afterPath="$PROJECT_DIR$/akka.iws" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/main/scala/nio/RemoteServer.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/nio/RemoteServer.scala" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/RemotePersistentStateTest.java" afterPath="$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/RemotePersistentStateTest.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/test/scala/InMemoryActorSpec.scala" afterPath="$PROJECT_DIR$/kernel/src/test/scala/InMemoryActorSpec.scala" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/kernel/src/main/scala/reactor/Dispatchers.scala" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/main/scala/reactor/EventBasedSingleThreadDispatcher.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/reactor/EventBasedSingleThreadDispatcher.scala" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/RestTest.java" afterPath="$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/RestTest.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/kernel/src/main/scala/reactor/ThreadBasedDispatcher.scala" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/main/scala/stm/TransactionManagement.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/stm/TransactionManagement.scala" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/test/scala/TransactionClasherSpec.scala" afterPath="$PROJECT_DIR$/kernel/src/test/scala/TransactionClasherSpec.scala" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/main/scala/reactor/Reactor.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/reactor/Reactor.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;" />
@@ -33,7 +67,7 @@
   </component>
   <component name="DebuggerManager">
     <line_breakpoints>
-      <breakpoint url="file://$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentNestedStateTest.java" line="71" class="se.scalablesolutions.akka.api.PersistentNestedStateTest" package="se.scalablesolutions.akka.api">
+      <breakpoint url="file://$PROJECT_DIR$/kernel/src/test/scala/InMemoryActorSpec.scala" line="74" class="Class at InMemoryActorSpec.scala:74" package="">
         <option name="ENABLED" value="true" />
         <option name="LOG_ENABLED" value="false" />
         <option name="LOG_EXPRESSION_ENABLED" value="false" />
@@ -46,150 +80,7 @@
         <option name="CONDITION" value="" />
         <option name="LOG_MESSAGE" value="" />
       </breakpoint>
-      <breakpoint url="file://$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/RemotePersistentStateTest.java" line="59" class="se.scalablesolutions.akka.api.RemotePersistentStateTest" package="se.scalablesolutions.akka.api">
-        <option name="ENABLED" value="true" />
-        <option name="LOG_ENABLED" value="false" />
-        <option name="LOG_EXPRESSION_ENABLED" value="false" />
-        <option name="SUSPEND_POLICY" value="SuspendAll" />
-        <option name="COUNT_FILTER_ENABLED" value="false" />
-        <option name="COUNT_FILTER" value="0" />
-        <option name="CONDITION_ENABLED" value="false" />
-        <option name="CLASS_FILTERS_ENABLED" value="false" />
-        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
-        <option name="CONDITION" value="" />
-        <option name="LOG_MESSAGE" value="" />
-      </breakpoint>
-      <breakpoint url="file://$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateful.java" line="50" class="se.scalablesolutions.akka.api.PersistentStateful" package="se.scalablesolutions.akka.api">
-        <option name="ENABLED" value="true" />
-        <option name="LOG_ENABLED" value="false" />
-        <option name="LOG_EXPRESSION_ENABLED" value="false" />
-        <option name="SUSPEND_POLICY" value="SuspendAll" />
-        <option name="COUNT_FILTER_ENABLED" value="false" />
-        <option name="COUNT_FILTER" value="0" />
-        <option name="CONDITION_ENABLED" value="false" />
-        <option name="CLASS_FILTERS_ENABLED" value="false" />
-        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
-        <option name="CONDITION" value="" />
-        <option name="LOG_MESSAGE" value="" />
-      </breakpoint>
-      <breakpoint url="file://$PROJECT_DIR$/kernel/src/main/scala/state/State.scala" line="356" class="Class at State.scala:356" package="">
-        <option name="ENABLED" value="true" />
-        <option name="LOG_ENABLED" value="false" />
-        <option name="LOG_EXPRESSION_ENABLED" value="false" />
-        <option name="SUSPEND_POLICY" value="SuspendAll" />
-        <option name="COUNT_FILTER_ENABLED" value="false" />
-        <option name="COUNT_FILTER" value="0" />
-        <option name="CONDITION_ENABLED" value="false" />
-        <option name="CLASS_FILTERS_ENABLED" value="false" />
-        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
-        <option name="CONDITION" value="" />
-        <option name="LOG_MESSAGE" value="" />
-      </breakpoint>
-      <breakpoint url="file://$PROJECT_DIR$/kernel/src/main/scala/state/State.scala" line="319" class="Class at State.scala:319" package="">
-        <option name="ENABLED" value="true" />
-        <option name="LOG_ENABLED" value="false" />
-        <option name="LOG_EXPRESSION_ENABLED" value="false" />
-        <option name="SUSPEND_POLICY" value="SuspendAll" />
-        <option name="COUNT_FILTER_ENABLED" value="false" />
-        <option name="COUNT_FILTER" value="0" />
-        <option name="CONDITION_ENABLED" value="false" />
-        <option name="CLASS_FILTERS_ENABLED" value="false" />
-        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
-        <option name="CONDITION" value="" />
-        <option name="LOG_MESSAGE" value="" />
-      </breakpoint>
-      <breakpoint url="file://$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/RemotePersistentStateTest.java" line="53" class="se.scalablesolutions.akka.api.RemotePersistentStateTest" package="se.scalablesolutions.akka.api">
-        <option name="ENABLED" value="true" />
-        <option name="LOG_ENABLED" value="false" />
-        <option name="LOG_EXPRESSION_ENABLED" value="false" />
-        <option name="SUSPEND_POLICY" value="SuspendAll" />
-        <option name="COUNT_FILTER_ENABLED" value="false" />
-        <option name="COUNT_FILTER" value="0" />
-        <option name="CONDITION_ENABLED" value="false" />
-        <option name="CLASS_FILTERS_ENABLED" value="false" />
-        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
-        <option name="CONDITION" value="" />
-        <option name="LOG_MESSAGE" value="" />
-      </breakpoint>
-      <breakpoint url="file://$PROJECT_DIR$/kernel/src/main/scala/stm/Transaction.scala" line="68" class="Class at Transaction.scala:68" package="">
-        <option name="ENABLED" value="true" />
-        <option name="LOG_ENABLED" value="false" />
-        <option name="LOG_EXPRESSION_ENABLED" value="false" />
-        <option name="SUSPEND_POLICY" value="SuspendAll" />
-        <option name="COUNT_FILTER_ENABLED" value="false" />
-        <option name="COUNT_FILTER" value="0" />
-        <option name="CONDITION_ENABLED" value="false" />
-        <option name="CLASS_FILTERS_ENABLED" value="false" />
-        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
-        <option name="CONDITION" value="" />
-        <option name="LOG_MESSAGE" value="" />
-      </breakpoint>
-      <breakpoint url="file://$PROJECT_DIR$/kernel/src/main/scala/stm/Transaction.scala" line="60" class="Class at Transaction.scala:60" package="">
-        <option name="ENABLED" value="true" />
-        <option name="LOG_ENABLED" value="false" />
-        <option name="LOG_EXPRESSION_ENABLED" value="false" />
-        <option name="SUSPEND_POLICY" value="SuspendAll" />
-        <option name="COUNT_FILTER_ENABLED" value="false" />
-        <option name="COUNT_FILTER" value="0" />
-        <option name="CONDITION_ENABLED" value="false" />
-        <option name="CLASS_FILTERS_ENABLED" value="false" />
-        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
-        <option name="CONDITION" value="" />
-        <option name="LOG_MESSAGE" value="" />
-      </breakpoint>
-      <breakpoint url="file://$PROJECT_DIR$/kernel/src/main/scala/stm/Transaction.scala" line="75" class="Class at Transaction.scala:75" package="">
-        <option name="ENABLED" value="true" />
-        <option name="LOG_ENABLED" value="false" />
-        <option name="LOG_EXPRESSION_ENABLED" value="false" />
-        <option name="SUSPEND_POLICY" value="SuspendAll" />
-        <option name="COUNT_FILTER_ENABLED" value="false" />
-        <option name="COUNT_FILTER" value="0" />
-        <option name="CONDITION_ENABLED" value="false" />
-        <option name="CLASS_FILTERS_ENABLED" value="false" />
-        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
-        <option name="CONDITION" value="" />
-        <option name="LOG_MESSAGE" value="" />
-      </breakpoint>
-      <breakpoint url="file://$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateful.java" line="57" class="se.scalablesolutions.akka.api.PersistentStateful" package="se.scalablesolutions.akka.api">
-        <option name="ENABLED" value="true" />
-        <option name="LOG_ENABLED" value="false" />
-        <option name="LOG_EXPRESSION_ENABLED" value="false" />
-        <option name="SUSPEND_POLICY" value="SuspendAll" />
-        <option name="COUNT_FILTER_ENABLED" value="false" />
-        <option name="COUNT_FILTER" value="0" />
-        <option name="CONDITION_ENABLED" value="false" />
-        <option name="CLASS_FILTERS_ENABLED" value="false" />
-        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
-        <option name="CONDITION" value="" />
-        <option name="LOG_MESSAGE" value="" />
-      </breakpoint>
-      <breakpoint url="file://$PROJECT_DIR$/kernel/src/test/scala/RemoteSupervisorSpec.scala" line="6" class="Class at RemoteSupervisorSpec.scala:6" package="">
-        <option name="ENABLED" value="true" />
-        <option name="LOG_ENABLED" value="false" />
-        <option name="LOG_EXPRESSION_ENABLED" value="false" />
-        <option name="SUSPEND_POLICY" value="SuspendAll" />
-        <option name="COUNT_FILTER_ENABLED" value="false" />
-        <option name="COUNT_FILTER" value="0" />
-        <option name="CONDITION_ENABLED" value="false" />
-        <option name="CLASS_FILTERS_ENABLED" value="false" />
-        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
-        <option name="CONDITION" value="" />
-        <option name="LOG_MESSAGE" value="" />
-      </breakpoint>
-      <breakpoint url="file://$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/ActiveObjectGuiceConfiguratorTest.java" line="89" class="se.scalablesolutions.akka.api.ActiveObjectGuiceConfiguratorTest" package="se.scalablesolutions.akka.api">
-        <option name="ENABLED" value="true" />
-        <option name="LOG_ENABLED" value="false" />
-        <option name="LOG_EXPRESSION_ENABLED" value="false" />
-        <option name="SUSPEND_POLICY" value="SuspendAll" />
-        <option name="COUNT_FILTER_ENABLED" value="false" />
-        <option name="COUNT_FILTER" value="0" />
-        <option name="CONDITION_ENABLED" value="false" />
-        <option name="CLASS_FILTERS_ENABLED" value="false" />
-        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
-        <option name="CONDITION" value="" />
-        <option name="LOG_MESSAGE" value="" />
-      </breakpoint>
-      <breakpoint url="file://$PROJECT_DIR$/kernel/src/main/scala/stm/Transaction.scala" line="55" class="Class at Transaction.scala:55" package="">
+      <breakpoint url="file://$PROJECT_DIR$/kernel/src/main/scala/actor/Actor.scala" line="452" class="Class at Actor.scala:452" package="">
         <option name="ENABLED" value="true" />
         <option name="LOG_ENABLED" value="false" />
         <option name="LOG_EXPRESSION_ENABLED" value="false" />
@@ -265,82 +156,66 @@
   <component name="FileColors" enabled="false" enabledForTabs="false" />
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="TransactionClasherSpec.scala" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/kernel/src/test/scala/TransactionClasherSpec.scala">
+      <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="52" column="6" selection-start="1136" selection-end="1136" vertical-scroll-proportion="0.0">
+            <state line="8" column="0" selection-start="322" selection-end="322" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="akka.conf" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/config/akka.conf">
+      <file leaf-file-name="RestTest.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/RestTest.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="17" column="55" selection-start="599" selection-end="599" vertical-scroll-proportion="0.3767313">
+            <state line="50" column="0" selection-start="1583" selection-end="1583" vertical-scroll-proportion="0.0">
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="AllTest.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/AllTest.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="16" column="6" selection-start="655" selection-end="655" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="InMemoryActorSpec.scala" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/kernel/src/test/scala/InMemoryActorSpec.scala">
+      <file leaf-file-name="CamelConfigurator.scala" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/config/CamelConfigurator.scala">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="202" column="6" selection-start="7881" selection-end="7881" vertical-scroll-proportion="0.0">
+            <state line="8" column="6" selection-start="164" selection-end="164" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="SupervisorSpec.scala" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/kernel/src/test/scala/SupervisorSpec.scala">
+      <file leaf-file-name="ActiveObjectGuiceConfigurator.scala" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/config/ActiveObjectGuiceConfigurator.scala">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="36" column="6" selection-start="852" selection-end="852" vertical-scroll-proportion="0.0">
+            <state line="61" column="6" selection-start="2502" selection-end="2502" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="RemoteSupervisorSpec.scala" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/kernel/src/test/scala/RemoteSupervisorSpec.scala">
+      <file leaf-file-name="ActiveObject.scala" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/actor/ActiveObject.scala">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="61" column="6" selection-start="1407" selection-end="1407" vertical-scroll-proportion="0.33114755">
+            <state line="103" column="7" selection-start="4077" selection-end="4077" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <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">
+      <file leaf-file-name="Config.scala" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/config/Config.scala">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="53" column="11" selection-start="2206" selection-end="2206" vertical-scroll-proportion="0.0">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Reactor.scala" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/reactor/Reactor.scala">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="36" column="6" selection-start="981" selection-end="981" vertical-scroll-proportion="0.0">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="TransactionManagement.scala" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/stm/TransactionManagement.scala">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="11" column="18" selection-start="236" selection-end="237" vertical-scroll-proportion="0.0">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Transaction.scala" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/stm/Transaction.scala">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="10" column="34" selection-start="228" selection-end="256" vertical-scroll-proportion="0.0">
+            <state line="96" column="64" selection-start="4214" selection-end="4214" vertical-scroll-proportion="0.65800864">
               <folding />
             </state>
           </provider>
@@ -359,28 +234,40 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/kernel/src/test/scala/SupervisorSpec.scala" />
-        <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/AllTests.java" />
         <option value="$PROJECT_DIR$/kernel/src/test/scala/EventBasedDispatcherTest.scala" />
-        <option value="$PROJECT_DIR$/kernel/src/test/scala/ActorTest.scala" />
-        <option value="$PROJECT_DIR$/kernel/src/test/scala/RemoteSupervisorSpec.scala" />
-        <option value="$PROJECT_DIR$/kernel/src/test/scala/ActorSpec.scala" />
-        <option value="$PROJECT_DIR$/kernel/src/test/scala/AllTests.scala" />
-        <option value="$PROJECT_DIR$/kernel/src/test/scala/PersistentActorSpec.scala" />
+        <option value="$PROJECT_DIR$/kernel/src/test/scala/EventBasedSingleThreadDispatcherTest.scala" />
+        <option value="$PROJECT_DIR$/kernel/src/test/scala/EventBasedThreadPoolDispatcherTest.scala" />
+        <option value="$PROJECT_DIR$/kernel/src/main/scala/reactor/ThreadBasedDispatcher.scala" />
+        <option value="$PROJECT_DIR$/kernel/src/main/scala/reactor/EventBasedThreadPoolDispatcher.scala" />
+        <option value="$PROJECT_DIR$/kernel/src/test/scala/ThreadBasedDispatcherTest.scala" />
+        <option value="$PROJECT_DIR$/kernel/src/main/scala/reactor/Dispatchers.scala" />
+        <option value="$PROJECT_DIR$/kernel/src/test/scala/AllTest.scala" />
+        <option value="$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/RestTest.java" />
+        <option value="$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/AllTest.java" />
+        <option value="$PROJECT_DIR$/kernel/src/main/scala/config/ConfigurationAspect.scala" />
+        <option value="$PROJECT_DIR$/kernel/src/main/resources/aop.xml" />
+        <option value="$PROJECT_DIR$/util-java/src/main/java/se/scalablesolutions/akka/annotation/configuration.java" />
         <option value="$PROJECT_DIR$/kernel/src/main/scala/actor/ActiveObject.scala" />
-        <option value="$PROJECT_DIR$/kernel/src/main/scala/reactor/Reactor.scala" />
-        <option value="$PROJECT_DIR$/kernel/src/main/scala/stm/Transaction.scala" />
-        <option value="$PROJECT_DIR$/kernel/src/main/scala/stm/TransactionManagement.scala" />
-        <option value="$PROJECT_DIR$/kernel/src/main/scala/actor/Actor.scala" />
-        <option value="$PROJECT_DIR$/kernel/src/test/scala/TransactionClasherSpec.scala" />
-        <option value="$PROJECT_DIR$/config/akka.conf" />
+        <option value="$PROJECT_DIR$/kernel/src/main/scala/config/Configurator.scala" />
+        <option value="$PROJECT_DIR$/kernel/src/main/scala/config/Config.scala" />
       </list>
     </option>
   </component>
+  <component name="MavenImportPreferences">
+    <option name="generalSettings">
+      <MavenGeneralSettings>
+        <option name="mavenHome" value="$PROJECT_DIR$/../../../bin/apache-maven-2.0.9" />
+        <option name="workOffline" value="true" />
+      </MavenGeneralSettings>
+    </option>
+    <option name="importingSettings">
+      <MavenImportingSettings>
+        <option name="createModuleGroups" value="true" />
+      </MavenImportingSettings>
+    </option>
+  </component>
   <component name="MavenRunner">
     <option name="jreName" value="#JAVA_INTERNAL" />
-    <option name="skipTests" value="true" />
   </component>
   <component name="ModuleEditorState">
     <option name="LAST_EDITED_MODULE_NAME" />
@@ -439,24 +326,10 @@
           <option name="myItemId" value="akka" />
           <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
         </PATH_ELEMENT>
-      </PATH>
-      <PATH>
         <PATH_ELEMENT>
-          <option name="myItemId" value="akka" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka-kernel" />
+          <option name="myItemId" value="akka-util-java" />
           <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="Scala 2.7.5" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
-        </PATH_ELEMENT>
       </PATH>
       <PATH>
         <PATH_ELEMENT>
@@ -464,12 +337,12 @@
           <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
         </PATH_ELEMENT>
         <PATH_ELEMENT>
-          <option name="myItemId" value="akka-kernel" />
+          <option name="myItemId" value="akka-util-java" />
           <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" />
+          <option name="myItemId" value="util-java" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
       </PATH>
       <PATH>
@@ -478,19 +351,57 @@
           <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
         </PATH_ELEMENT>
         <PATH_ELEMENT>
-          <option name="myItemId" value="akka-kernel" />
+          <option name="myItemId" value="akka-util-java" />
           <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" />
+          <option name="myItemId" value="util-java" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
         <PATH_ELEMENT>
-          <option name="myItemId" value="Maven: org.scala-tools.testing:scalatest:0.9.5" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
+          <option name="myItemId" value="src" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
         <PATH_ELEMENT>
-          <option name="myItemId" value="scalatest-0.9.5.jar" />
+          <option name="myItemId" value="main" />
+          <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="config" />
+          <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-util-java" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="util-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="main" />
+          <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="annotation" />
           <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
       </PATH>
@@ -503,226 +414,6 @@
           <option name="myItemId" value="akka-kernel" />
           <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
         </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="Libraries" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.LibraryGroupNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="Maven: org.scala-tools.testing:scalatest:0.9.5" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="scalatest-0.9.5.jar" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="scalatest" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka-kernel" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="Libraries" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.LibraryGroupNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="Maven: org.scala-lang:scala-library:2.7.5" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="scala-library-2.7.5.jar" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka-kernel" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="Libraries" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.LibraryGroupNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="Maven: org.codehaus.aspectwerkz:aspectwerkz-nodeps-jdk5:2.1" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="aspectwerkz-nodeps-jdk5-2.1.jar" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka-kernel" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="Libraries" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.LibraryGroupNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="Maven: org.codehaus.aspectwerkz:aspectwerkz-nodeps-jdk5:2.1" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="aspectwerkz-nodeps-jdk5-2.1.jar" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="proxy" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="Uuid" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ClassTreeNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka-kernel" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="Libraries" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.LibraryGroupNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="Maven: org.codehaus.aspectwerkz:aspectwerkz-nodeps-jdk5:2.1" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="aspectwerkz-nodeps-jdk5-2.1.jar" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="proxy" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka-kernel" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="Libraries" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.LibraryGroupNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="Maven: org.codehaus.aspectwerkz:aspectwerkz-nodeps-jdk5:2.1" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="aspectwerkz-nodeps-jdk5-2.1.jar" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="aspectwerkz" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka-kernel" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="Libraries" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.LibraryGroupNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="Maven: org.apache.cassandra:cassandra:0.4.0-dev" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="cassandra-0.4.0-dev.jar" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka-kernel" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="Libraries" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.LibraryGroupNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="Maven: org.apache.cassandra:cassandra:0.4.0-dev" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="cassandra-0.4.0-dev.jar" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="db" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka-kernel" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="Libraries" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.LibraryGroupNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="Maven: org.apache.cassandra:cassandra:0.4.0-dev" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="cassandra-0.4.0-dev.jar" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="db" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="SystemTable" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ClassTreeNode" />
-        </PATH_ELEMENT>
       </PATH>
       <PATH>
         <PATH_ELEMENT>
@@ -790,96 +481,6 @@
           <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
       </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka-kernel" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="kernel" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="src" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="main" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="scala" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="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-kernel" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="kernel" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="src" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="main" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="scala" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="stm" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka-kernel" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="kernel" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="src" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="main" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="scala" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="state" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-      </PATH>
       <PATH>
         <PATH_ELEMENT>
           <option name="myItemId" value="akka" />
@@ -910,66 +511,6 @@
           <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
       </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka-kernel" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="kernel" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="src" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="main" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="scala" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="nio" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka-kernel" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="kernel" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="src" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="main" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="scala" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="jersey" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-      </PATH>
       <PATH>
         <PATH_ELEMENT>
           <option name="myItemId" value="akka" />
@@ -1000,36 +541,6 @@
           <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
       </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka-kernel" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="kernel" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="src" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="main" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="scala" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="collection" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-      </PATH>
       <PATH>
         <PATH_ELEMENT>
           <option name="myItemId" value="akka" />
@@ -1081,6 +592,40 @@
           <option name="myItemId" value="main" />
           <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="resources" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+      </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="akka" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="akka-kernel" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="kernel" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="src" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="main" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="resources" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="component" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
       </PATH>
       <PATH>
         <PATH_ELEMENT>
@@ -1135,10 +680,6 @@
           <option name="myItemId" value="api" />
           <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="RestTest" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ClassTreeNode" />
-        </PATH_ELEMENT>
       </PATH>
       <PATH>
         <PATH_ELEMENT>
@@ -1174,108 +715,6 @@
           <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ClassTreeNode" />
         </PATH_ELEMENT>
       </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka-fun-test-java" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="fun-test-java" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="src" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="test" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="java" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="api" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="RemoteInMemoryStateTest" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ClassTreeNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka-fun-test-java" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="fun-test-java" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="src" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="test" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="java" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="api" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PersistentStateTest" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ClassTreeNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka-fun-test-java" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="fun-test-java" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="src" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="test" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="java" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="api" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PersistentNestedStateTest" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ClassTreeNode" />
-        </PATH_ELEMENT>
-      </PATH>
       <PATH>
         <PATH_ELEMENT>
           <option name="myItemId" value="akka" />
@@ -1340,7 +779,7 @@
           <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
         <PATH_ELEMENT>
-          <option name="myItemId" value="InMemNestedStateTest" />
+          <option name="myItemId" value="AllTest" />
           <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ClassTreeNode" />
         </PATH_ELEMENT>
       </PATH>
@@ -1349,566 +788,6 @@
           <option name="myItemId" value="akka" />
           <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
         </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka-fun-test-java" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="fun-test-java" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="src" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="test" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="java" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="api" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="AllTests" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ClassTreeNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka-fun-test-java" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="fun-test-java" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="src" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="test" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="java" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="api" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="ActiveObjectGuiceConfiguratorTest" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ClassTreeNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka-fun-test-java" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="fun-test-java" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="src" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="test" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="java" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="api" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PersistentStatefulNested" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ClassTreeNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka-fun-test-java" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="fun-test-java" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="src" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="test" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="java" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="api" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="PersistentStateful" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ClassTreeNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka-fun-test-java" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="fun-test-java" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="src" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="test" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="java" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="api" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-      </PATH>
-      <PATH>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka-fun-test-java" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="fun-test-java" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="src" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="test" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="java" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="api" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="Foo" />
-          <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>
-      <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>
-      <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="lang" />
-          <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="lang" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="RuntimeException" />
-          <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="akka" />
-          <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="akka" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="WEB-INF" />
-          <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="akka" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="WEB-INF" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="classes" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="se" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="scalablesolutions" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="akka" />
-          <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="akka" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="WEB-INF" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="classes" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="se" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="scalablesolutions" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </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="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.ProjectViewModuleNode" />
-        </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="WEB-INF" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="classes" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="se" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="scalablesolutions" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </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="kernel" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="stm" />
-          <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="akka" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="WEB-INF" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="classes" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="se" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="scalablesolutions" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </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="kernel" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="state" />
-          <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="akka" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="WEB-INF" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="classes" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="se" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="scalablesolutions" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </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="kernel" />
-          <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.ProjectViewModuleNode" />
-        </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="WEB-INF" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="classes" />
-          <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="akka" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="config" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
       </PATH>
     </subPane>
   </component>
@@ -1943,7 +822,7 @@
     <property name="dynamic.classpath" value="false" />
     <property name="MemberChooser.showClasses" value="true" />
     <property name="project.structure.side.proportion" value="0.2" />
-    <property name="options.lastSelected" value="preferences.pluginManager" />
+    <property name="options.lastSelected" value="reference.settingsdialog.IDE.editor.colors.Font" />
     <property name="GoToClass.toSaveIncludeLibraries" value="false" />
     <property name="RunManagerConfig.showSettingsBeforeRunnig" value="false" />
   </component>
@@ -1956,7 +835,7 @@
       <recent name="actor" />
     </key>
   </component>
-  <component name="RunManager" selected="JUnit.All Tests Scala">
+  <component name="RunManager" selected="JUnit.ThreadBasedDispatcherTest">
     <configuration default="false" name="InMemoryStateTest.testRefShouldRollbackStateForStatefulServerInCaseOfFailure" type="JUnit" factoryName="JUnit" temporary="true" enabled="false" merge="false" sample_coverage="true" runner="emma">
       <pattern>
         <option name="PATTERN" value="se.scalablesolutions.akka.api.*" />
@@ -1993,6 +872,76 @@
         <option name="Maven.BeforeRunTask" enabled="false" />
       </method>
     </configuration>
+    <configuration default="false" name="InMemoryActorSpec.testOneWayRefShouldRollbackStateForStatefulServerInCaseOfFailure" 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.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+      <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.actor.InMemoryActorSpec" />
+      <option name="METHOD_NAME" value="testOneWayRefShouldRollbackStateForStatefulServerInCaseOfFailure" />
+      <option name="TEST_OBJECT" value="method" />
+      <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="Debug">
+        <option name="DEBUG_PORT" value="55238" />
+        <option name="TRANSPORT" value="0" />
+        <option name="LOCAL" value="true" />
+      </RunnerSettings>
+      <RunnerSettings RunnerId="Run" />
+      <ConfigurationWrapper RunnerId="Debug" />
+      <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="InMemoryActorSpec.testOneWayVectorShouldRollbackStateForStatefulServerInCaseOfFailure" 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.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+      <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.actor.InMemoryActorSpec" />
+      <option name="METHOD_NAME" value="testOneWayVectorShouldRollbackStateForStatefulServerInCaseOfFailure" />
+      <option name="TEST_OBJECT" value="method" />
+      <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="true" type="Remote" factoryName="Remote">
       <option name="USE_SOCKET_TRANSPORT" value="true" />
       <option name="SERVER_MODE" value="false" />
@@ -2032,6 +981,17 @@
         <option name="Maven.BeforeRunTask" enabled="false" />
       </method>
     </configuration>
+    <configuration default="true" type="SpecsRunConfiguration" factoryName="Specs">
+      <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" sample_coverage="true" runner="emma">
       <module name="" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -2155,12 +1115,12 @@
         <option name="Maven.BeforeRunTask" enabled="false" />
       </method>
     </configuration>
-    <configuration default="false" name="AllTests Java" type="JUnit" factoryName="JUnit" enabled="false" merge="false" sample_coverage="true" runner="emma">
+    <configuration default="false" name="All Tests Java" type="JUnit" factoryName="JUnit" enabled="false" merge="false" sample_coverage="true" runner="emma">
       <module name="akka-fun-test-java" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" value="" />
       <option name="PACKAGE_NAME" value="se.scalablesolutions.akka.api" />
-      <option name="MAIN_CLASS_NAME" value="se.scalablesolutions.akka.api.AllTests" />
+      <option name="MAIN_CLASS_NAME" value="se.scalablesolutions.akka.api.AllTest" />
       <option name="METHOD_NAME" value="" />
       <option name="TEST_OBJECT" value="class" />
       <option name="VM_PARAMETERS" value="" />
@@ -2188,7 +1148,7 @@
       <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.AllTests" />
+      <option name="MAIN_CLASS_NAME" value="se.scalablesolutions.akka.kernel.AllTest" />
       <option name="METHOD_NAME" value="" />
       <option name="TEST_OBJECT" value="class" />
       <option name="VM_PARAMETERS" value="" />
@@ -2448,7 +1408,7 @@
       <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.reactor.EventBasedDispatcherTest" />
+      <option name="MAIN_CLASS_NAME" value="se.scalablesolutions.akka.kernel.reactor.EventBasedSingleThreadDispatcherTest" />
       <option name="METHOD_NAME" value="" />
       <option name="TEST_OBJECT" value="class" />
       <option name="VM_PARAMETERS" value="" />
@@ -2476,7 +1436,7 @@
       <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.reactor.ThreadBasedDispatcherTest" />
+      <option name="MAIN_CLASS_NAME" value="se.scalablesolutions.akka.kernel.reactor.EventBasedThreadPoolDispatcherTest" />
       <option name="METHOD_NAME" value="" />
       <option name="TEST_OBJECT" value="class" />
       <option name="VM_PARAMETERS" value="" />
@@ -2505,6 +1465,34 @@
         <option name="Maven.BeforeRunTask" enabled="false" />
       </method>
     </configuration>
+    <configuration default="false" name="ThreadBasedDispatcherTest" 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.reactor.ThreadBasedDispatcherTest" />
+      <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="SupervisorSpec" 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" />
@@ -2705,7 +1693,7 @@
       <option name="MAIN_CLASS_NAME" value="se.scalablesolutions.akka.api.RestTest" />
       <option name="METHOD_NAME" value="" />
       <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" value="-Djava.naming.factory.initial=org.apache.camel.util.jndi.CamelInitialContextFactory" />
+      <option name="VM_PARAMETERS" value="-Daspectwerkz.transform.dump=* -Djava.naming.factory.initial=org.apache.camel.util.jndi.CamelInitialContextFactory" />
       <option name="PARAMETERS" value="" />
       <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
       <option name="ENV_VARIABLES" />
@@ -2839,31 +1827,34 @@
         <option name="Maven.BeforeRunTask" enabled="false" />
       </method>
     </configuration>
-    <list size="24">
+    <list size="27">
       <item index="0" class="java.lang.String" itemvalue="Application.Kernel" />
-      <item index="1" class="java.lang.String" itemvalue="JUnit.AllTests Java" />
-      <item index="2" class="java.lang.String" itemvalue="JUnit.All Tests Scala" />
-      <item index="3" class="java.lang.String" itemvalue="JUnit.InMemoryStateTest" />
-      <item index="4" class="java.lang.String" itemvalue="JUnit.InMemNestedStateTest" />
-      <item index="5" class="java.lang.String" itemvalue="JUnit.PersistentStateTest" />
-      <item index="6" class="java.lang.String" itemvalue="JUnit.PersistentNestedStateTest" />
-      <item index="7" class="java.lang.String" itemvalue="JUnit.RemoteInMemoryStateTest" />
-      <item index="8" class="java.lang.String" itemvalue="JUnit.RemotePersistentStateTest" />
-      <item index="9" class="java.lang.String" itemvalue="JUnit.ActiveObjectGuiceConfiguratorTest" />
-      <item index="10" class="java.lang.String" itemvalue="JUnit.EventBasedSingleThreadDispatcherTest" />
-      <item index="11" class="java.lang.String" itemvalue="JUnit.EventBasedThreadPoolDispatcherTest" />
-      <item index="12" class="java.lang.String" itemvalue="JUnit.SupervisorSpec" />
-      <item index="13" class="java.lang.String" itemvalue="JUnit.ActorSpec" />
-      <item index="14" class="java.lang.String" itemvalue="JUnit.RemoteActorSpec" />
-      <item index="15" class="java.lang.String" itemvalue="JUnit.InMemoryActorSpec" />
-      <item index="16" class="java.lang.String" itemvalue="JUnit.PersistentActorSpec" />
-      <item index="17" class="java.lang.String" itemvalue="JUnit.CamelSpec" />
-      <item index="18" class="java.lang.String" itemvalue="JUnit.RestTest" />
-      <item index="19" class="java.lang.String" itemvalue="JUnit.JerseySpec" />
-      <item index="20" class="java.lang.String" itemvalue="JUnit.RemoteSupervisorSpec" />
-      <item index="21" class="java.lang.String" itemvalue="JUnit.InMemoryStateTest.testRefShouldRollbackStateForStatefulServerInCaseOfFailure" />
-      <item index="22" class="java.lang.String" itemvalue="JUnit.TransactionClasherSpec" />
-      <item index="23" class="java.lang.String" itemvalue="Scala Console.Scala Console" />
+      <item index="1" class="java.lang.String" itemvalue="JUnit.InMemoryStateTest.testRefShouldRollbackStateForStatefulServerInCaseOfFailure" />
+      <item index="2" class="java.lang.String" itemvalue="JUnit.InMemoryActorSpec.testOneWayRefShouldRollbackStateForStatefulServerInCaseOfFailure" />
+      <item index="3" class="java.lang.String" itemvalue="JUnit.InMemoryActorSpec.testOneWayVectorShouldRollbackStateForStatefulServerInCaseOfFailure" />
+      <item index="4" class="java.lang.String" itemvalue="JUnit.All Tests Java" />
+      <item index="5" class="java.lang.String" itemvalue="JUnit.All Tests Scala" />
+      <item index="6" class="java.lang.String" itemvalue="JUnit.InMemoryStateTest" />
+      <item index="7" class="java.lang.String" itemvalue="JUnit.InMemNestedStateTest" />
+      <item index="8" class="java.lang.String" itemvalue="JUnit.PersistentStateTest" />
+      <item index="9" class="java.lang.String" itemvalue="JUnit.PersistentNestedStateTest" />
+      <item index="10" class="java.lang.String" itemvalue="JUnit.RemoteInMemoryStateTest" />
+      <item index="11" class="java.lang.String" itemvalue="JUnit.RemotePersistentStateTest" />
+      <item index="12" class="java.lang.String" itemvalue="JUnit.ActiveObjectGuiceConfiguratorTest" />
+      <item index="13" class="java.lang.String" itemvalue="JUnit.EventBasedSingleThreadDispatcherTest" />
+      <item index="14" class="java.lang.String" itemvalue="JUnit.EventBasedThreadPoolDispatcherTest" />
+      <item index="15" class="java.lang.String" itemvalue="JUnit.ThreadBasedDispatcherTest" />
+      <item index="16" class="java.lang.String" itemvalue="JUnit.SupervisorSpec" />
+      <item index="17" class="java.lang.String" itemvalue="JUnit.ActorSpec" />
+      <item index="18" class="java.lang.String" itemvalue="JUnit.RemoteActorSpec" />
+      <item index="19" class="java.lang.String" itemvalue="JUnit.InMemoryActorSpec" />
+      <item index="20" class="java.lang.String" itemvalue="JUnit.PersistentActorSpec" />
+      <item index="21" class="java.lang.String" itemvalue="JUnit.CamelSpec" />
+      <item index="22" class="java.lang.String" itemvalue="JUnit.RestTest" />
+      <item index="23" class="java.lang.String" itemvalue="JUnit.JerseySpec" />
+      <item index="24" class="java.lang.String" itemvalue="JUnit.RemoteSupervisorSpec" />
+      <item index="25" class="java.lang.String" itemvalue="JUnit.TransactionClasherSpec" />
+      <item index="26" class="java.lang.String" itemvalue="Scala Console.Scala Console" />
     </list>
     <configuration name="&lt;template&gt;" type="WebApp" default="true" selected="false">
       <Host>localhost</Host>
@@ -2940,21 +1931,21 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="4" y="22" width="1436" height="878" extended-state="6" />
+    <frame x="4" y="22" width="1436" height="878" extended-state="0" />
     <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.22388859" sideWeight="0.6660517" order="5" side_tool="false" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.21917808" sideWeight="0.51785713" order="5" side_tool="false" />
       <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.23576063" sideWeight="0.4489796" order="1" side_tool="false" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.20908436" sideWeight="0.6683673" 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.16818425" sideWeight="0.24354243" order="0" side_tool="true" x="1609" y="144" width="252" height="862" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32380074" sideWeight="0.5" order="1" side_tool="false" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32270408" 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.32780612" sideWeight="0.0" order="14" side_tool="false" />
       <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="15" side_tool="false" />
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24906267" sideWeight="0.78228784" order="1" side_tool="false" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32749078" sideWeight="0.5" order="9" side_tool="false" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.54209185" sideWeight="0.0" order="2" side_tool="false" x="4" y="22" width="1436" height="878" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.36346865" sideWeight="0.5" order="3" side_tool="false" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4732143" sideWeight="0.0" order="2" side_tool="false" x="4" y="22" width="1436" height="878" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39923468" sideWeight="0.5" order="3" side_tool="false" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32694763" 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" />
@@ -3007,114 +1998,109 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="jar:///System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home/../Classes/classes.jar!/java/lang/Throwable.class">
+    <entry file="file://$PROJECT_DIR$/kernel/src/test/scala/ThreadBasedDispatcherTest.scala">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="5" column="47" selection-start="181" selection-end="181" vertical-scroll-proportion="0.0">
+        <state line="77" column="62" selection-start="2669" selection-end="2669" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="jar:///System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home/../Classes/classes.jar!/java/lang/Exception.class">
+    <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/reactor/ThreadBasedDispatcher.scala">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="5" column="47" selection-start="181" selection-end="181" vertical-scroll-proportion="0.0">
+        <state line="15" column="11" selection-start="515" selection-end="515" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="jar:///System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home/../Classes/classes.jar!/java/lang/RuntimeException.class">
+    <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/reactor/Dispatchers.scala">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="5" column="52" selection-start="186" selection-end="186" vertical-scroll-proportion="0.0">
+        <state line="42" column="78" selection-start="1281" selection-end="1281" vertical-scroll-proportion="0.0">
           <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">
+    <entry file="file://$PROJECT_DIR$/kernel/src/test/scala/AllTest.scala">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="50" column="57" selection-start="1905" selection-end="1905" vertical-scroll-proportion="0.0">
+        <state line="8" column="0" selection-start="322" selection-end="322" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/reactor/Reactor.scala">
+    <entry file="file://$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/RestTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="36" column="6" selection-start="981" selection-end="981" vertical-scroll-proportion="0.0">
+        <state line="50" column="0" selection-start="1583" selection-end="1583" vertical-scroll-proportion="0.0">
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/config/ActiveObjectConfigurator.scala">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="4" column="48" selection-start="59" selection-end="98" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/WEB-INF/classes/se/scalablesolutions/akka/kernel/state/InMemoryTransactionalVector.class">
+    <entry file="file://$PROJECT_DIR$/kernel/src/main/resources/aop.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">
+        <state line="7" column="0" selection-start="244" selection-end="244" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/WEB-INF/classes/se/scalablesolutions/akka/kernel/stm/Transaction.class">
+    <entry file="file://$PROJECT_DIR$/util-java/src/main/java/se/scalablesolutions/akka/annotation/configuration.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="26" column="0" selection-start="1694" selection-end="1694" vertical-scroll-proportion="0.7908497">
+        <state line="10" column="31" selection-start="223" selection-end="223" vertical-scroll-proportion="0.20624152">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/WEB-INF/classes/se/scalablesolutions/akka/kernel/stm/TransactionManagement.class">
+    <entry file="file://$PROJECT_DIR$/util-java/src/main/java/se/scalablesolutions/akka/annotation/transactionrequired.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="24" column="0" selection-start="1817" selection-end="1817" vertical-scroll-proportion="0.0">
+        <state line="11" column="0" selection-start="0" selection-end="233" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/actor/Actor.scala">
+    <entry file="file://$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemoryStateTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="53" column="11" selection-start="2206" selection-end="2206" vertical-scroll-proportion="0.0">
+        <state line="29" column="0" selection-start="425" selection-end="1166" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/stm/TransactionManagement.scala">
+    <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/config/ActiveObjectGuiceConfigurator.scala">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="11" column="18" selection-start="236" selection-end="237" vertical-scroll-proportion="0.0">
+        <state line="61" column="6" selection-start="2502" selection-end="2502" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/stm/Transaction.scala">
+    <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/actor/ActiveObject.scala">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="10" column="34" selection-start="228" selection-end="256" vertical-scroll-proportion="0.0">
+        <state line="103" column="7" selection-start="4077" selection-end="4077" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/kernel/src/test/scala/TransactionClasherSpec.scala">
+    <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/config/CamelConfigurator.scala">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="52" column="6" selection-start="1136" selection-end="1136" vertical-scroll-proportion="0.0">
+        <state line="8" column="6" selection-start="164" selection-end="164" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/kernel/src/test/scala/SupervisorSpec.scala">
+    <entry file="file://$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/AllTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="36" column="6" selection-start="852" selection-end="852" vertical-scroll-proportion="0.0">
+        <state line="16" column="6" selection-start="655" selection-end="655" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/kernel/src/test/scala/RemoteSupervisorSpec.scala">
+    <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/config/Config.scala">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="61" column="6" selection-start="1407" selection-end="1407" vertical-scroll-proportion="0.33114755">
-          <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="202" column="6" selection-start="7881" selection-end="7881" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/config/akka.conf">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="17" column="55" selection-start="599" selection-end="599" vertical-scroll-proportion="0.3767313">
+        <state line="96" column="64" selection-start="4214" selection-end="4214" vertical-scroll-proportion="0.65800864">
           <folding />
         </state>
       </provider>
diff --git a/fun-test-java/src/test/java/se/scalablesolutions/akka/api/AllTest.java b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/AllTest.java
new file mode 100644
index 0000000000..ede7cd0f02
--- /dev/null
+++ b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/AllTest.java
@@ -0,0 +1,24 @@
+package se.scalablesolutions.akka.api;
+
+import junit.framework.TestCase;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AllTest extends TestCase {
+  public static Test suite() {
+    TestSuite suite = new TestSuite("All Java tests");
+    suite.addTestSuite(InMemoryStateTest.class);
+    suite.addTestSuite(InMemNestedStateTest.class);
+    suite.addTestSuite(PersistentStateTest.class);
+    suite.addTestSuite(PersistentNestedStateTest.class);
+    suite.addTestSuite(RemoteInMemoryStateTest.class);
+    suite.addTestSuite(RemotePersistentStateTest.class);
+    suite.addTestSuite(ActiveObjectGuiceConfiguratorTest.class);
+    //suite.addTestSuite(RestTest.class);
+    return suite;
+  }
+
+  public static void main(String[] args) {
+    junit.textui.TestRunner.run(suite());
+  }
+}
\ No newline at end of file
diff --git a/fun-test-java/src/test/java/se/scalablesolutions/akka/api/AllTests.java b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/AllTests.java
deleted file mode 100644
index 866e4f53c0..0000000000
--- a/fun-test-java/src/test/java/se/scalablesolutions/akka/api/AllTests.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package se.scalablesolutions.akka.api;
-
-import junit.framework.TestCase;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllTests extends TestCase {
-  public static Test suite() {
-
-    TestSuite suite = new TestSuite("All tests");
-    // Java tests
-    suite.addTestSuite(InMemoryStateTest.class);
-    suite.addTestSuite(InMemNestedStateTest.class);
-    suite.addTestSuite(PersistentStateTest.class);
-    suite.addTestSuite(PersistentNestedStateTest.class);
-    suite.addTestSuite(RemoteInMemoryStateTest.class);
-    suite.addTestSuite(RemotePersistentStateTest.class);
-    suite.addTestSuite(ActiveObjectGuiceConfiguratorTest.class);
-    suite.addTestSuite(RestTest.class);
-
-    // Scala tests
-    //suite.addTestSuite(se.scalablesolutions.akka.kernel.SupervisorSpec.class);
-      /*
-    suite.addTestSuite(se.scalablesolutions.akka.kernel.RemoteSupervisorSpec.class);
-    suite.addTestSuite(se.scalablesolutions.akka.kernel.reactor.EventBasedDispatcherTest.class);
-    suite.addTestSuite(se.scalablesolutions.akka.kernel.reactor.ThreadBasedDispatcherTest.class);
-    suite.addTestSuite(se.scalablesolutions.akka.kernel.actor.ActorSpec.class);
-    suite.addTestSuite(se.scalablesolutions.akka.kernel.actor.RemoteActorSpec.class);
-    suite.addTestSuite(se.scalablesolutions.akka.kernel.actor.InMemStatefulActor.class);
-    suite.addTestSuite(se.scalablesolutions.akka.kernel.actor.PersistentActor.class);
-    */
-    return suite;
-  }
-
-  public static void main(String[] args) {
-    junit.textui.TestRunner.run(suite());
-  }
-}
\ No newline at end of file
diff --git a/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistenceManager.java b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistenceManager.java
new file mode 100644
index 0000000000..8e498368d5
--- /dev/null
+++ b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistenceManager.java
@@ -0,0 +1,13 @@
+package se.scalablesolutions.akka.api;
+
+public class PersistenceManager {
+  private static volatile boolean isRunning = false;
+  public static void init() {
+    if (!isRunning) {
+      se.scalablesolutions.akka.kernel.Kernel.config();
+        se.scalablesolutions.akka.kernel.Kernel.startCassandra();
+        se.scalablesolutions.akka.kernel.Kernel.startRemoteService();
+      isRunning = true;
+    }
+  }
+}
diff --git a/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentNestedStateTest.java b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentNestedStateTest.java
index 482478aa7c..9afaf8b625 100644
--- a/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentNestedStateTest.java
+++ b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentNestedStateTest.java
@@ -17,13 +17,8 @@ public class PersistentNestedStateTest extends TestCase {
   final private ActiveObjectGuiceConfiguratorForJava conf = new ActiveObjectGuiceConfiguratorForJava();
   final private ActiveObjectFactory factory = new ActiveObjectFactory();
 
-  static {
-      se.scalablesolutions.akka.kernel.Kernel$.MODULE$.config();
-    System.setProperty("storage-config", "config");
-    Kernel.startCassandra();
-  }
-  
   protected void setUp() {
+      PersistenceManager.init();
     conf.configureActiveObjects(
         new RestartStrategy(new AllForOne(), 3, 5000),
         new Component[]{
diff --git a/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateTest.java b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateTest.java
index 2668e980b7..ee1051ee8f 100644
--- a/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateTest.java
+++ b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateTest.java
@@ -14,14 +14,10 @@ import junit.framework.TestCase;
 public class PersistentStateTest extends TestCase {
   static String messageLog = "";
 
-  static {
-      se.scalablesolutions.akka.kernel.Kernel$.MODULE$.config();
-    System.setProperty("storage-config", "config");
-    Kernel.startCassandra();
-  }
   final private ActiveObjectGuiceConfiguratorForJava conf = new ActiveObjectGuiceConfiguratorForJava();
 
   protected void setUp() {
+    PersistenceManager.init();
     conf.configureActiveObjects(
         new RestartStrategy(new AllForOne(), 3, 5000),
         new Component[] {
diff --git a/fun-test-java/src/test/java/se/scalablesolutions/akka/api/RemoteInMemoryStateTest.java b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/RemoteInMemoryStateTest.java
index 3975c0366e..eb8fefb89e 100644
--- a/fun-test-java/src/test/java/se/scalablesolutions/akka/api/RemoteInMemoryStateTest.java
+++ b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/RemoteInMemoryStateTest.java
@@ -52,7 +52,6 @@ public class RemoteInMemoryStateTest extends TestCase {
     InMemStateful stateful = factory.newRemoteInstance(InMemStateful.class, 1000, "localhost", 9999);
     stateful.setVectorState("init"); // set init state
     stateful.success("testShouldNotRollbackStateForStatefulServerInCaseOfSuccess", "new state"); // transactionrequired
-    stateful.success("testShouldNotRollbackStateForStatefulServerInCaseOfSuccess", "new state"); // to trigger commit
     assertEquals("new state", stateful.getVectorState());
   }
 
@@ -72,7 +71,6 @@ public class RemoteInMemoryStateTest extends TestCase {
     InMemStateful stateful = factory.newRemoteInstance(InMemStateful.class, 1000, "localhost", 9999);
     stateful.setRefState("init"); // set init state
     stateful.success("testShouldNotRollbackStateForStatefulServerInCaseOfSuccess", "new state"); // transactionrequired
-    stateful.success("testShouldNotRollbackStateForStatefulServerInCaseOfSuccess", "new state"); // to trigger commit
     assertEquals("new state", stateful.getRefState());
   }
 
diff --git a/fun-test-java/src/test/java/se/scalablesolutions/akka/api/RemotePersistentStateTest.java b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/RemotePersistentStateTest.java
index e688ff0dd8..a0dda0acf3 100644
--- a/fun-test-java/src/test/java/se/scalablesolutions/akka/api/RemotePersistentStateTest.java
+++ b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/RemotePersistentStateTest.java
@@ -14,15 +14,10 @@ import junit.framework.TestCase;
 public class RemotePersistentStateTest extends TestCase {
   static String messageLog = "";
 
-  static {
-    Kernel.startCassandra();
-    Kernel.startRemoteService();
-  }
   final private ActiveObjectGuiceConfiguratorForJava conf = new ActiveObjectGuiceConfiguratorForJava();
 
-  final private ActiveObjectFactory factory = new ActiveObjectFactory();
-
   protected void setUp() {
+    PersistenceManager.init();
     conf.configureActiveObjects(
         new RestartStrategy(new AllForOne(), 3, 5000),
         new Component[] {
diff --git a/fun-test-java/src/test/java/se/scalablesolutions/akka/api/RestTest.java b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/RestTest.java
index 5b7de680a4..230b95899b 100644
--- a/fun-test-java/src/test/java/se/scalablesolutions/akka/api/RestTest.java
+++ b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/RestTest.java
@@ -28,6 +28,7 @@ import java.util.HashMap;
 import se.scalablesolutions.akka.kernel.config.*;
 import static se.scalablesolutions.akka.kernel.config.JavaConfig.*;
 
+/*
 public class RestTest extends TestCase {
 
   private static int PORT = 9998;
@@ -36,8 +37,8 @@ public class RestTest extends TestCase {
   private static ActiveObjectGuiceConfiguratorForJava conf = new ActiveObjectGuiceConfiguratorForJava();
 
   @BeforeClass
-  public static void initialize() throws IOException {
-      se.scalablesolutions.akka.kernel.Kernel$.MODULE$.config();
+  protected void setUp() {
+    se.scalablesolutions.akka.kernel.Kernel$.MODULE$.config();
     conf.configureActiveObjects(
         new RestartStrategy(new AllForOne(), 3, 5000),
         new Component[] {
@@ -50,8 +51,8 @@ public class RestTest extends TestCase {
   }
 
   @Test
-  public void simpleRequest() throws IOException, InstantiationException {
-    //selector.start();
+  public void testSimpleRequest() throws IOException, InstantiationException {
+    selector.listen();
     Client client = Client.create();
     WebResource webResource = client.resource(URI);
     String responseMsg = webResource.path("/foo").get(String.class);
@@ -79,7 +80,7 @@ public class RestTest extends TestCase {
     selectorThread.setAlgorithmClassName(StaticStreamAlgorithm.class.getName());
     selectorThread.setPort(port);
     selectorThread.setAdapter(adapter);
-    selectorThread.listen();
     return selectorThread;
   }
 }
+*/
diff --git a/kernel/pom.xml b/kernel/pom.xml
index 78a63ffd3c..52630c8907 100644
--- a/kernel/pom.xml
+++ b/kernel/pom.xml
@@ -245,16 +245,6 @@
                     </classpathContainers>
                 </configuration>
             </plugin>
-            <!--plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-surefire-plugin</artifactId>
-              <configuration>
-                <includes>
-                  <include>*Spec.scala</include>
-                </includes>
-                <junitArtifactName>junit:junit</junitArtifactName>
-              </configuration>
-            </plugin-->
         </plugins>
         <resources>
             <resource>
diff --git a/kernel/src/main/resources/aop.xml b/kernel/src/main/resources/aop.xml
new file mode 100644
index 0000000000..fe844fa481
--- /dev/null
+++ b/kernel/src/main/resources/aop.xml
@@ -0,0 +1,9 @@
+<!DOCTYPE aspectwerkz PUBLIC
+    "-//AspectWerkz//DTD 2.0//EN"
+    "http://aspectwerkz.codehaus.org/dtd/aspectwerkz_2_0.dtd">
+
+<aspectwerkz>
+  <system id="akka">
+    <aspect class="se.scalablesolutions.akka.kernel.config.ConfigurationAspect"/>
+  </system>
+</aspectwerkz>
diff --git a/kernel/src/main/scala/actor/ActiveObject.scala b/kernel/src/main/scala/actor/ActiveObject.scala
index 858d8cec0e..fbadeb6a38 100644
--- a/kernel/src/main/scala/actor/ActiveObject.scala
+++ b/kernel/src/main/scala/actor/ActiveObject.scala
@@ -80,7 +80,7 @@ class ActiveObjectFactory {
     ActiveObject.newInstance(intf, target, actor, remoteAddress, timeout)
   }
   
-  private[kernel] def supervise(restartStrategy: RestartStrategy, components: List[Worker]): Supervisor =
+  private[kernel] def supervise(restartStrategy: RestartStrategy, components: List[Supervise]): Supervisor =
     ActiveObject.supervise(restartStrategy, components)
 
   /*
@@ -160,7 +160,7 @@ object ActiveObject {
     proxy.asInstanceOf[T]
   }
 
-  private[kernel] def supervise(restartStrategy: RestartStrategy, components: List[Worker]): Supervisor = {
+  private[kernel] def supervise(restartStrategy: RestartStrategy, components: List[Supervise]): Supervisor = {
     object factory extends SupervisorFactory {
       override def getSupervisorConfig = SupervisorConfig(restartStrategy, components)
     }
@@ -176,7 +176,7 @@ object ActiveObject {
 @serializable
 sealed class ActorAroundAdvice(val target: Class[_],
                                val targetInstance: AnyRef,
-                               val actor: Dispatcher,
+                               val actor: Dispatcher,                
                                val remoteAddress: Option[InetSocketAddress],
                                val timeout: Long) extends AroundAdvice {
   val id = target.getName
@@ -293,11 +293,11 @@ private[kernel] class Dispatcher extends Actor {
   }
 
   override protected def preRestart(reason: AnyRef, config: Option[AnyRef]) {
-    if (preRestart.isDefined) preRestart.get.invoke(target.get, ZERO_ITEM_CLASS_ARRAY)
+    if (preRestart.isDefined) preRestart.get.invoke(target.get, ZERO_ITEM_CLASS_ARRAY: _*)
   }
 
   override protected def postRestart(reason: AnyRef, config: Option[AnyRef]) {
-    if (postRestart.isDefined) postRestart.get.invoke(target.get, ZERO_ITEM_CLASS_ARRAY)
+    if (postRestart.isDefined) postRestart.get.invoke(target.get, ZERO_ITEM_CLASS_ARRAY: _*)
   }
 }
 
diff --git a/kernel/src/main/scala/actor/Actor.scala b/kernel/src/main/scala/actor/Actor.scala
index fb05b02843..c245d6af7d 100644
--- a/kernel/src/main/scala/actor/Actor.scala
+++ b/kernel/src/main/scala/actor/Actor.scala
@@ -30,8 +30,8 @@ object DispatcherType {
   case object ThreadBasedDispatcher extends DispatcherType
 }
 
-class ActorMessageHandler(val actor: Actor) extends MessageHandler {
-  def handle(handle: MessageHandle) = actor.handle(handle)
+class ActorMessageInvoker(val actor: Actor) extends MessageInvoker {
+  def invoke(handle: MessageInvocation) = actor.invoke(handle)
 }
 
 object Actor {
@@ -53,9 +53,6 @@ trait Actor extends Logging with TransactionManagement {
   protected[this] val linkedActors = new CopyOnWriteArraySet[Actor]
   protected[actor] var lifeCycleConfig: Option[LifeCycle] = None
 
-  protected[this] var latestMessage: Option[MessageHandle] = None
-  protected[this] var messageToReschedule: Option[MessageHandle] = None
-
   // ====================================
   // ==== USER CALLBACKS TO OVERRIDE ====
   // ====================================
@@ -89,7 +86,7 @@ trait Actor extends Logging with TransactionManagement {
   protected[kernel] var dispatcher: MessageDispatcher = {
     val dispatcher = new EventBasedThreadPoolDispatcher
     mailbox = dispatcher.messageQueue
-    dispatcher.registerHandler(this, new ActorMessageHandler(this))
+    dispatcher.registerHandler(this, new ActorMessageInvoker(this))
     dispatcher
   }
 
@@ -202,10 +199,9 @@ trait Actor extends Logging with TransactionManagement {
   /**
    * Sends a one-way asynchronous message. E.g. fire-and-forget semantics.
    */
-  def !(message: AnyRef): Unit = if (isRunning) {
-    if (TransactionManagement.isTransactionalityEnabled) transactionalDispatch(message, timeout, false, true)
-    else postMessageToMailbox(message)
-  } else throw new IllegalStateException("Actor has not been started, you need to invoke 'actor.start' before using it")
+  def !(message: AnyRef): Unit =
+    if (isRunning) postMessageToMailbox(message)
+    else throw new IllegalStateException("Actor has not been started, you need to invoke 'actor.start' before using it")
 
   /**
    * Sends a message asynchronously and waits on a future for a reply message.
@@ -217,13 +213,9 @@ trait Actor extends Logging with TransactionManagement {
    * If not then the sender will unessecary block until the timeout expires.
    */
   def !![T](message: AnyRef, timeout: Long): Option[T] = if (isRunning) {
-    if (TransactionManagement.isTransactionalityEnabled) {
-      transactionalDispatch(message, timeout, false, false)
-    } else {
-      val future = postMessageToMailboxAndCreateFutureResultWithTimeout(message, timeout)
-      future.await
-      getResultOrThrowException(future)
-    }
+    val future = postMessageToMailboxAndCreateFutureResultWithTimeout(message, timeout)
+    future.await
+    getResultOrThrowException(future)
   } else throw new IllegalStateException("Actor has not been started, you need to invoke 'actor.start' before using it")
 
   /**
@@ -242,13 +234,9 @@ trait Actor extends Logging with TransactionManagement {
    * E.g. send-and-receive-eventually semantics.
    */
   def !?[T](message: AnyRef): T = if (isRunning) {
-    if (TransactionManagement.isTransactionalityEnabled) {
-      transactionalDispatch(message, 0, true, false).get
-    } else {
-      val future = postMessageToMailboxAndCreateFutureResultWithTimeout(message, 0)
-      future.awaitBlocking
-      getResultOrThrowException(future).get
-    }
+    val future = postMessageToMailboxAndCreateFutureResultWithTimeout(message, 0)
+    future.awaitBlocking
+    getResultOrThrowException(future).get
   } else throw new IllegalStateException("Actor has not been started, you need to invoke 'actor.start' before using it")
 
   /**
@@ -395,7 +383,7 @@ trait Actor extends Logging with TransactionManagement {
       val supervisorUuid = registerSupervisorAsRemoteActor
       RemoteClient.clientFor(remoteAddress.get).send(new RemoteRequest(true, message, null, this.getClass.getName, timeout, null, true, false, supervisorUuid))
     } else {
-      val handle = new MessageHandle(this, message, None, activeTx)
+      val handle = new MessageInvocation(this, message, None, TransactionManagement.threadBoundTx.get)
       mailbox.append(handle)
       latestMessage = Some(handle)
     }
@@ -409,87 +397,32 @@ trait Actor extends Logging with TransactionManagement {
       else throw new IllegalStateException("Expected a future from remote call to actor " + toString)
     } else {
       val future = new DefaultCompletableFutureResult(timeout)
-      val handle = new MessageHandle(this, message, Some(future), TransactionManagement.threadBoundTx.get)
+      val handle = new MessageInvocation(this, message, Some(future), TransactionManagement.threadBoundTx.get)
       mailbox.append(handle)
       latestMessage = Some(handle)
       future
     }
   }
 
-  private def transactionalDispatch[T](message: AnyRef, timeout: Long, blocking: Boolean, oneWay: Boolean): Option[T] = {
-    import TransactionManagement._
-    if (!tryToCommitTransaction) {
-      var nrRetries = 0           // FIXME only if top-level
-      var failed = true
-      do {
-        Thread.sleep(TIME_WAITING_FOR_COMPLETION)
-        nrRetries += 1
-        log.debug("Pending transaction [%s] not completed, waiting %s milliseconds. Attempt %s", activeTx.get, TIME_WAITING_FOR_COMPLETION, nrRetries)
-        failed = !tryToCommitTransaction
-      } while(nrRetries < NR_OF_TIMES_WAITING_FOR_COMPLETION && failed)
-      if (failed) {
-        log.debug("Pending transaction [%s] still not completed, aborting and rescheduling message [%s]", activeTx.get, latestMessage)
-        rollback(activeTx)
-        if (RESTART_TRANSACTION_ON_COLLISION) messageToReschedule = Some(latestMessage.get)
-        else throw new TransactionRollbackException("Conflicting transactions, rolling back transaction for message [" + latestMessage + "]")
-      }
-    }
-    if (isInExistingTransaction) joinExistingTransaction
-    else if (isTransactional) startNewTransaction
-    incrementTransaction
-    try {
-      if (oneWay) {
-        postMessageToMailbox(message)
-        None
-      } else {
-        val future = postMessageToMailboxAndCreateFutureResultWithTimeout(message, timeout)
-        if (blocking) future.awaitBlocking
-        else future.await
-        getResultOrThrowException(future)
-      }
-    } catch {
-      case e: TransactionAwareWrapperException =>
-        e.cause.printStackTrace
-        rollback(e.tx)
-        throw e.cause
-    } finally {
-      decrementTransaction
-      if (isTransactionAborted) removeTransactionIfTopLevel
-      else tryToPrecommitTransaction
-      TransactionManagement.threadBoundTx.set(None)
-      if (messageToReschedule.isDefined) {
-        val handle = messageToReschedule.get
-        val newTx = startNewTransaction
-        val clone = new MessageHandle(handle.sender, handle.message, handle.future, newTx)
-        log.debug("Rescheduling message %s", clone)
-        mailbox.append(clone) // FIXME append or prepend rescheduled messages?
-      }
-    }
-  }
-
-  private def getResultOrThrowException[T](future: FutureResult): Option[T] =
-    if (future.exception.isDefined) {
-      val (_, cause) = future.exception.get
-      if (TransactionManagement.isTransactionalityEnabled) throw new TransactionAwareWrapperException(cause, activeTx)
-      else throw cause
-    } else {
-      future.result.asInstanceOf[Option[T]]
-    }
-
   /**
    * Callback for the dispatcher. E.g. single entry point to the user code and all protected[this] methods
    */
-  private[kernel] def handle(messageHandle: MessageHandle) = synchronized {
+  private[kernel] def invoke(messageHandle: MessageInvocation) = synchronized {
+    if (TransactionManagement.isTransactionalityEnabled) transactionalDispatch(messageHandle)
+    else dispatch(messageHandle)
+  }
+
+  private def dispatch[T](messageHandle: MessageInvocation) = {
+    if (messageHandle.tx.isDefined) TransactionManagement.threadBoundTx.set(messageHandle.tx)
     val message = messageHandle.message
     val future = messageHandle.future
     try {
-      if (messageHandle.tx.isDefined) TransactionManagement.threadBoundTx.set(messageHandle.tx)
       senderFuture = future
       if (base.isDefinedAt(message)) base(message) // invoke user actor's receive partial function
       else throw new IllegalArgumentException("No handler matching message [" + message + "] in " + toString)
     } catch {
       case e =>
-        // FIXME to fix supervisor restart of actor for oneway calls, inject a supervisor proxy that can send notification back to client
+        // FIXME to fix supervisor restart of remote actor for oneway calls, inject a supervisor proxy that can send notification back to client
         if (supervisor.isDefined) supervisor.get ! Exit(this, e)
         if (future.isDefined) future.get.completeWithException(this, e)
         else e.printStackTrace
@@ -498,6 +431,51 @@ trait Actor extends Logging with TransactionManagement {
     }
   }
 
+  private def transactionalDispatch[T](messageHandle: MessageInvocation) = {
+    if (messageHandle.tx.isDefined) TransactionManagement.threadBoundTx.set(messageHandle.tx)
+    val message = messageHandle.message
+    val future = messageHandle.future
+    try {
+      if (!tryToCommitTransaction && isTransactionTopLevel) handleCollision
+
+      if (isInExistingTransaction) joinExistingTransaction
+      else if (isTransactional) startNewTransaction
+
+      incrementTransaction
+      senderFuture = future
+      if (base.isDefinedAt(message)) base(message) // invoke user actor's receive partial function
+      else throw new IllegalArgumentException("No handler matching message [" + message + "] in " + toString)
+    } catch {
+      case e =>
+        rollback(activeTx)
+        TransactionManagement.threadBoundTx.set(None) // need to clear threadBoundTx before call to supervisor 
+        // FIXME to fix supervisor restart of remote actor for oneway calls, inject a supervisor proxy that can send notification back to client
+        if (supervisor.isDefined) supervisor.get ! Exit(this, e)
+        if (future.isDefined) future.get.completeWithException(this, e)
+        else e.printStackTrace
+    } finally {
+      decrementTransaction
+      if (isTransactionAborted) removeTransactionIfTopLevel
+      else tryToPrecommitTransaction
+      rescheduleClashedMessages
+      TransactionManagement.threadBoundTx.set(None)
+    }
+  }
+
+  private def getResultOrThrowException[T](future: FutureResult): Option[T] =
+    if (future.exception.isDefined) {
+      val (_, cause) = future.exception.get
+      throw cause
+    } else future.result.asInstanceOf[Option[T]]
+
+  private def rescheduleClashedMessages = if (messageToReschedule.isDefined) {
+    val handle = messageToReschedule.get
+    val newTx = startNewTransaction
+    val clone = new MessageInvocation(handle.sender, handle.message, handle.future, newTx)
+    log.debug("Rescheduling message %s", clone)
+    mailbox.append(clone) // FIXME append or prepend rescheduled messages?
+  }
+
   private def base: PartialFunction[Any, Unit] = lifeCycle orElse (hotswap getOrElse receive)
 
   private val lifeCycle: PartialFunction[Any, Unit] = {
@@ -564,7 +542,7 @@ trait Actor extends Logging with TransactionManagement {
   private[kernel] def swapDispatcher(disp: MessageDispatcher) = {
     dispatcher = disp
     mailbox = dispatcher.messageQueue
-    dispatcher.registerHandler(this, new ActorMessageHandler(this))
+    dispatcher.registerHandler(this, new ActorMessageInvoker(this))
   }
 
   override def toString(): String = "Actor[" + uuid + ":" + id + "]"
diff --git a/kernel/src/main/scala/actor/Supervisor.scala b/kernel/src/main/scala/actor/Supervisor.scala
index a20e4be093..38b7e78e4c 100644
--- a/kernel/src/main/scala/actor/Supervisor.scala
+++ b/kernel/src/main/scala/actor/Supervisor.scala
@@ -34,11 +34,11 @@ case class OneForOneStrategy(maxNrOfRetries: Int, withinTimeRange: Int) extends
  *    override protected def getSupervisorConfig: SupervisorConfig = {
  *      SupervisorConfig(
  *        RestartStrategy(OneForOne, 3, 10),
- *        Worker(
+ *        Supervise(
  *          myFirstActor,
  *          LifeCycle(Permanent, 1000))
  *        ::
- *        Worker(
+ *        Supervise(
  *          mySecondActor,
  *          LifeCycle(Permanent, 1000))
  *        :: Nil)
@@ -123,7 +123,7 @@ class Supervisor(handler: FaultHandlingStrategy) extends Actor with Logging {
     case SupervisorConfig(_, servers) =>
       servers.map(server =>
         server match {
-          case Worker(actor, lifecycle) =>
+          case Supervise(actor, lifecycle) =>
             actor.lifeCycleConfig = Some(lifecycle)
             startLink(actor)
 
diff --git a/kernel/src/main/scala/collection/Vector.scala b/kernel/src/main/scala/collection/Vector.scala
old mode 100755
new mode 100644
index 437f263551..9ead78e3b5
--- a/kernel/src/main/scala/collection/Vector.scala
+++ b/kernel/src/main/scala/collection/Vector.scala
@@ -300,18 +300,18 @@ class Vector[+T] private (val length: Int, shift: Int, root: Array[AnyRef], tail
     case vec: Vector[T] => {
       var back = length == vec.length
       var i = 0
-      
+
       while (i < length) {
         back &&= apply(i) == vec.apply(i)
         i += 1
       }
-      
+
       back
     }
-    
+
     case _ => false
   }
-  
+
   override def hashCode = foldLeft(0) { _ ^ _.hashCode }
 }
 
@@ -326,7 +326,7 @@ object Vector {
   private[collection] def array(elems: AnyRef*) = {
     val back = new Array[AnyRef](elems.length)
     Array.copy(elems, 0, back, 0, back.length)
-    
+
     back
   }
 }
diff --git a/kernel/src/main/scala/config/ActiveObjectGuiceConfigurator.scala b/kernel/src/main/scala/config/ActiveObjectGuiceConfigurator.scala
index d8068975ab..fb5aa637f0 100644
--- a/kernel/src/main/scala/config/ActiveObjectGuiceConfigurator.scala
+++ b/kernel/src/main/scala/config/ActiveObjectGuiceConfigurator.scala
@@ -28,7 +28,7 @@ class ActiveObjectGuiceConfigurator extends ActiveObjectConfigurator with CamelC
   private var supervisor: Option[Supervisor]  = None
   private var restartStrategy: RestartStrategy  = _
   private var components: List[Component] = _
-  private var workers: List[Worker] = Nil
+  private var supervised: List[Supervise] = Nil
   private var bindings: List[DependencyBinding] = Nil
   private var configRegistry = new HashMap[Class[_], Component] // TODO is configRegistry needed?
   private var activeObjectRegistry = new HashMap[Class[_], Tuple3[AnyRef, AnyRef, Component]]
@@ -104,7 +104,7 @@ class ActiveObjectGuiceConfigurator extends ActiveObjectConfigurator with CamelC
       if (component.remoteAddress.isDefined) Some(new InetSocketAddress(component.remoteAddress.get.hostname, component.remoteAddress.get.port))
       else None
     val proxy = activeObjectFactory.newInstance(targetClass, actor, remoteAddress, component.timeout).asInstanceOf[AnyRef]
-    workers ::= Worker(actor, component.lifeCycle)
+    supervised ::= Supervise(actor, component.lifeCycle)
     activeObjectRegistry.put(targetClass, (proxy, proxy, component))
     new DependencyBinding(targetClass, proxy)
   }
@@ -112,14 +112,14 @@ class ActiveObjectGuiceConfigurator extends ActiveObjectConfigurator with CamelC
   private def newDelegatingProxy(component: Component): DependencyBinding = {
     val targetClass = component.intf.get
     val targetInstance = component.target.newInstance.asInstanceOf[AnyRef] // TODO: perhaps need to put in registry
-    component.target.getConstructor(Array[Class[_]]()).setAccessible(true)
+    component.target.getConstructor(Array[Class[_]](): _*).setAccessible(true)
     val actor = new Dispatcher
     if (component.dispatcher.isDefined) actor.swapDispatcher(component.dispatcher.get)
     val remoteAddress =
       if (component.remoteAddress.isDefined) Some(new InetSocketAddress(component.remoteAddress.get.hostname, component.remoteAddress.get.port))
       else None
     val proxy = activeObjectFactory.newInstance(targetClass, targetInstance, actor, remoteAddress, component.timeout).asInstanceOf[AnyRef]
-    workers ::= Worker(actor, component.lifeCycle)
+    supervised ::= Supervise(actor, component.lifeCycle)
     activeObjectRegistry.put(targetClass, (proxy, targetInstance, component))
     new DependencyBinding(targetClass, proxy)
   }
@@ -132,7 +132,7 @@ class ActiveObjectGuiceConfigurator extends ActiveObjectConfigurator with CamelC
 
   override def supervise: ActiveObjectConfigurator = synchronized {
     if (injector == null) inject
-    supervisor = Some(activeObjectFactory.supervise(restartStrategy, workers))
+    supervisor = Some(activeObjectFactory.supervise(restartStrategy, supervised))
     //camelContext.addComponent(AKKA_CAMEL_ROUTING_SCHEME, new ActiveObjectComponent(this))
     //camelContext.start
     supervisor.get.startSupervisor
diff --git a/kernel/src/main/scala/config/Config.scala b/kernel/src/main/scala/config/Config.scala
index 0fd2fb9c02..23e29b8e44 100644
--- a/kernel/src/main/scala/config/Config.scala
+++ b/kernel/src/main/scala/config/Config.scala
@@ -22,14 +22,16 @@ object ScalaConfig {
   abstract class Scope extends ConfigElement
 
   case class SupervisorConfig(restartStrategy: RestartStrategy, worker: List[Server]) extends Server
-  case class Worker(actor: Actor, lifeCycle: LifeCycle) extends Server
+  case class Supervise(actor: Actor, lifeCycle: LifeCycle) extends Server
 
   case class RestartStrategy(scheme: FailOverScheme, maxNrOfRetries: Int, withinTimeRange: Int) extends ConfigElement
 
   case object AllForOne extends FailOverScheme
   case object OneForOne extends FailOverScheme
 
-  case class LifeCycle(scope: Scope, shutdownTime: Int) extends ConfigElement
+  case class LifeCycle(scope: Scope, shutdownTime: Int) extends ConfigElement {
+    def this(scope: Scope) = this(scope, 0)
+  }
   case object Permanent extends Scope
   case object Transient extends Scope
   case object Temporary extends Scope
@@ -87,10 +89,13 @@ object JavaConfig {
     def transform = se.scalablesolutions.akka.kernel.config.ScalaConfig.RestartStrategy(
       scheme.transform, maxNrOfRetries, withinTimeRange)
   }
+//  class LifeCycle(@BeanProperty val scope: Scope, @BeanProperty val shutdownTime: Int, val callbacks: RestartCallbacks) extends ConfigElement {
   class LifeCycle(@BeanProperty val scope: Scope, @BeanProperty val shutdownTime: Int) extends ConfigElement {
     def transform = se.scalablesolutions.akka.kernel.config.ScalaConfig.LifeCycle(scope.transform, shutdownTime)
   }
 
+  class RestartCallbacks(val preRestart: String, val postRestart: String)
+
   abstract class Scope extends ConfigElement {
     def transform: se.scalablesolutions.akka.kernel.config.ScalaConfig.Scope
   }
@@ -115,7 +120,7 @@ object JavaConfig {
   }
 
   class RemoteAddress(@BeanProperty val hostname: String, @BeanProperty val port: Int)
-  
+
   abstract class Server extends ConfigElement
   class Component(@BeanProperty val intf: Class[_],
                   @BeanProperty val target: Class[_],
@@ -150,8 +155,8 @@ object JavaConfig {
       se.scalablesolutions.akka.kernel.config.ScalaConfig.Component(intf, target, lifeCycle.transform, timeout, dispatcher,
         if (remoteAddress != null) se.scalablesolutions.akka.kernel.config.ScalaConfig.RemoteAddress(remoteAddress.hostname, remoteAddress.port) else null)
 
-    def newWorker(actor: Actor) =
-      se.scalablesolutions.akka.kernel.config.ScalaConfig.Worker(actor, lifeCycle.transform)
+    def newSupervised(actor: Actor) =
+      se.scalablesolutions.akka.kernel.config.ScalaConfig.Supervise(actor, lifeCycle.transform)
   }
   
 }
\ No newline at end of file
diff --git a/kernel/src/main/scala/config/Configuration.scala b/kernel/src/main/scala/config/Configuration.scala
old mode 100755
new mode 100644
index 906f33cf01..d4e63123dc
--- a/kernel/src/main/scala/config/Configuration.scala
+++ b/kernel/src/main/scala/config/Configuration.scala
@@ -55,6 +55,6 @@ class Component(@BeanProperty val intf: Class[_],
                 @BeanProperty val target: Class[_],
                 @BeanProperty val lifeCycle: LifeCycle,
                 @BeanProperty val timeout: Int) extends Server {
-  def newWorker(proxy: ActiveObjectProxy) = se.scalablesolutions.akka.kernel.Worker(proxy.server, lifeCycle.transform)
+  def newWorker(proxy: ActiveObjectProxy) = se.scalablesolutions.akka.kernel.Supervise(proxy.server, lifeCycle.transform)
 }
 */
\ No newline at end of file
diff --git a/kernel/src/main/scala/nio/RemoteServer.scala b/kernel/src/main/scala/nio/RemoteServer.scala
index 5a23f3ea50..8ee7e57dda 100644
--- a/kernel/src/main/scala/nio/RemoteServer.scala
+++ b/kernel/src/main/scala/nio/RemoteServer.scala
@@ -123,12 +123,12 @@ class ObjectServerHandler extends SimpleChannelUpstreamHandler with Logging {
     val argClasses = args.map(_.getClass)
     val (unescapedArgs, unescapedArgClasses) = unescapeArgs(args, argClasses, request.timeout)
 
-    continueTransaction(request)
+    //continueTransaction(request)
     try {
-      val messageReceiver = activeObject.getClass.getDeclaredMethod(request.method, unescapedArgClasses)
-      if (request.isOneWay) messageReceiver.invoke(activeObject, unescapedArgs)
+      val messageReceiver = activeObject.getClass.getDeclaredMethod(request.method, unescapedArgClasses: _*)
+      if (request.isOneWay) messageReceiver.invoke(activeObject, unescapedArgs: _*)
       else {
-        val result = messageReceiver.invoke(activeObject, unescapedArgs)
+        val result = messageReceiver.invoke(activeObject, unescapedArgs: _*)
         log.debug("Returning result from remote active object invocation [%s]", result)
         //channel.write(request.newReplyWithMessage(result, TransactionManagement.threadBoundTx.get))
         channel.write(request.newReplyWithMessage(result, null))
diff --git a/kernel/src/main/scala/reactor/Dispatchers.scala b/kernel/src/main/scala/reactor/Dispatchers.scala
new file mode 100644
index 0000000000..15cf9a8501
--- /dev/null
+++ b/kernel/src/main/scala/reactor/Dispatchers.scala
@@ -0,0 +1,44 @@
+/**
+ *  Copyright (C) 2009 Scalable Solutions.
+ */
+
+package se.scalablesolutions.akka.kernel.reactor
+
+import kernel.actor.Actor
+
+/**
+ * Dispatcher factory.
+ * <p/>
+ * Example usage:
+ * <pre/>
+ *   val dispatcher = Dispatchers.newEventBasedThreadPoolDispatcher
+ *     .withNewThreadPoolWithBoundedBlockingQueue(100)
+ *     .setCorePoolSize(16)
+ *     .setMaxPoolSize(128)
+ *     .setKeepAliveTimeInMillis(60000)
+ *     .setRejectionPolicy(new CallerRunsPolicy)
+ *     .buildThreadPool
+ * </pre>
+ * <p/>
+ *
+ * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
+ */
+object Dispatchers {
+  
+  /**
+   * Creates an event based dispatcher serving multiple (millions) of actors through a thread pool.
+   * Has a fluent builder interface for configuring its semantics.
+   */
+  def newEventBasedThreadPoolDispatcher = new EventBasedThreadPoolDispatcher
+
+  /**
+   * Creates an event based dispatcher serving multiple (millions) of actors through a single thread.
+   */
+  def newEventBasedSingleThreadDispatcher = new EventBasedSingleThreadDispatcher
+
+  /**
+   * Creates an thread based dispatcher serving a single actor through the same single thread.
+   * E.g. each actor consumes its own thread.
+   */
+  def newThreadBasedDispatcher(actor: Actor) = new ThreadBasedDispatcher(actor)
+}
\ No newline at end of file
diff --git a/kernel/src/main/scala/reactor/EventBasedSingleThreadDispatcher.scala b/kernel/src/main/scala/reactor/EventBasedSingleThreadDispatcher.scala
index 303816d077..1884b10e24 100644
--- a/kernel/src/main/scala/reactor/EventBasedSingleThreadDispatcher.scala
+++ b/kernel/src/main/scala/reactor/EventBasedSingleThreadDispatcher.scala
@@ -13,18 +13,18 @@ package se.scalablesolutions.akka.kernel.reactor
 class EventBasedSingleThreadDispatcher extends MessageDispatcherBase {
   def start = if (!active) {
     active = true
-    val messageDemultiplexer = new EventBasedSingleThreadDemultiplexer(messageQueue)
+    val messageDemultiplexer = new EventBasedSingleThreadDemultiplexer(queue)
     selectorThread = new Thread {
       override def run = {
         while (active) {
           try {
             messageDemultiplexer.select
           } catch { case e: InterruptedException => active = false }
-          val queue = messageDemultiplexer.acquireSelectedQueue
-          for (index <- 0 until queue.size) {
-            val handle = queue.remove
+          val selectedQueue = messageDemultiplexer.acquireSelectedQueue
+          for (index <- 0 until selectedQueue.size) {
+            val handle = selectedQueue.remove
             val handler = messageHandlers.get(handle.sender)
-            if (handler != null) handler.handle(handle)
+            if (handler != null) handler.invoke(handle)
           }
         }
       }
@@ -33,14 +33,14 @@ class EventBasedSingleThreadDispatcher extends MessageDispatcherBase {
   }
 }
 
-class EventBasedSingleThreadDemultiplexer(private val messageQueue: MessageQueue) extends MessageDemultiplexer {
+class EventBasedSingleThreadDemultiplexer(private val messageQueue: ReactiveMessageQueue) extends MessageDemultiplexer {
   import java.util.{LinkedList, Queue}
 
-  private val selectedQueue: Queue[MessageHandle] = new LinkedList[MessageHandle]
+  private val selectedQueue: Queue[MessageInvocation] = new LinkedList[MessageInvocation]
 
   def select = messageQueue.read(selectedQueue)
 
-  def acquireSelectedQueue: Queue[MessageHandle] = selectedQueue
+  def acquireSelectedQueue: Queue[MessageInvocation] = selectedQueue
 
   def releaseSelectedQueue = throw new UnsupportedOperationException("EventBasedSingleThreadDemultiplexer can't release its queue")
 
diff --git a/kernel/src/main/scala/reactor/EventBasedThreadPoolDispatcher.scala b/kernel/src/main/scala/reactor/EventBasedThreadPoolDispatcher.scala
index 1efbe85fb3..4950cda4bf 100644
--- a/kernel/src/main/scala/reactor/EventBasedThreadPoolDispatcher.scala
+++ b/kernel/src/main/scala/reactor/EventBasedThreadPoolDispatcher.scala
@@ -77,7 +77,7 @@ class EventBasedThreadPoolDispatcher extends MessageDispatcherBase {
     /**
      * This dispatcher code is based on code from the actorom actor framework by Sergio Bossa [http://code.google.com/p/actorom/].
      */
-    val messageDemultiplexer = new EventBasedThreadPoolDemultiplexer(messageQueue)
+    val messageDemultiplexer = new EventBasedThreadPoolDemultiplexer(queue)
     selectorThread = new Thread {
       override def run = {
         while (active) {
@@ -86,19 +86,19 @@ class EventBasedThreadPoolDispatcher extends MessageDispatcherBase {
               guard.synchronized { /* empty */ } // prevents risk for deadlock as described in [http://developers.sun.com/learning/javaoneonline/2006/coreplatform/TS-1315.pdf]
               messageDemultiplexer.select
             } catch {case e: InterruptedException => active = false}
-            val queue = messageDemultiplexer.acquireSelectedQueue
-            for (index <- 0 until queue.size) {
-              val message = queue.peek
+            val selectedQueue = messageDemultiplexer.acquireSelectedQueue
+            for (index <- 0 until selectedQueue.size) {
+              val message = selectedQueue.peek
               val messageHandler = getIfNotBusy(message.sender)
               if (messageHandler.isDefined) {
                 executor.execute(new Runnable {
                   override def run = {
-                    messageHandler.get.handle(message)
+                    messageHandler.get.invoke(message)
                     free(message.sender)
                     messageDemultiplexer.wakeUp
                   }
                 })
-                queue.remove
+                selectedQueue.remove
               }
             }
           } finally {
@@ -112,7 +112,7 @@ class EventBasedThreadPoolDispatcher extends MessageDispatcherBase {
 
   override protected def doShutdown = executor.shutdownNow
 
-  private def getIfNotBusy(key: AnyRef): Option[MessageHandler] = guard.synchronized {
+  private def getIfNotBusy(key: AnyRef): Option[MessageInvoker] = guard.synchronized {
     if (CONCURRENT_MODE && messageHandlers.containsKey(key)) Some(messageHandlers.get(key))
     else if (!busyHandlers.contains(key) && messageHandlers.containsKey(key)) {
       busyHandlers.add(key)
@@ -240,8 +240,8 @@ class EventBasedThreadPoolDispatcher extends MessageDispatcherBase {
   private def ensureNotActive = if (active) throw new IllegalStateException("Can't build a new thread pool for a dispatcher that is already up and running")  
 }
 
-class EventBasedThreadPoolDemultiplexer(private val messageQueue: MessageQueue) extends MessageDemultiplexer {
-  private val selectedQueue: Queue[MessageHandle] = new LinkedList[MessageHandle]
+class EventBasedThreadPoolDemultiplexer(private val messageQueue: ReactiveMessageQueue) extends MessageDemultiplexer {
+  private val selectedQueue: Queue[MessageInvocation] = new LinkedList[MessageInvocation]
   private val selectedQueueLock = new ReentrantLock
 
   def select = try {
@@ -251,7 +251,7 @@ class EventBasedThreadPoolDemultiplexer(private val messageQueue: MessageQueue)
     selectedQueueLock.unlock
   }
 
-  def acquireSelectedQueue: Queue[MessageHandle] = {
+  def acquireSelectedQueue: Queue[MessageInvocation] = {
     selectedQueueLock.lock
     selectedQueue
   }
diff --git a/kernel/src/main/scala/reactor/MessageDispatcherBase.scala b/kernel/src/main/scala/reactor/MessageDispatcherBase.scala
index b85ccb13a2..8fb35d84b1 100644
--- a/kernel/src/main/scala/reactor/MessageDispatcherBase.scala
+++ b/kernel/src/main/scala/reactor/MessageDispatcherBase.scala
@@ -4,6 +4,7 @@
 
 package se.scalablesolutions.akka.kernel.reactor
 
+import java.util.{LinkedList, Queue}
 import java.util.concurrent.TimeUnit
 import java.util.HashMap
 
@@ -11,14 +12,16 @@ trait MessageDispatcherBase extends MessageDispatcher {
   val CONCURRENT_MODE = kernel.Kernel.config.getBool("akka.actor.concurrent-mode", false)
   val MILLISECONDS = TimeUnit.MILLISECONDS
 
-  val messageQueue = new MessageQueue
+  val queue = new ReactiveMessageQueue
 
   @volatile protected var active: Boolean = false
-  protected val messageHandlers = new HashMap[AnyRef, MessageHandler]
+  protected val messageHandlers = new HashMap[AnyRef, MessageInvoker]
   protected var selectorThread: Thread = _
   protected val guard = new Object
 
-  def registerHandler(key: AnyRef, handler: MessageHandler) = guard.synchronized {
+  def messageQueue = queue
+
+  def registerHandler(key: AnyRef, handler: MessageInvoker) = guard.synchronized {
     messageHandlers.put(key, handler)
   }
 
@@ -37,3 +40,29 @@ trait MessageDispatcherBase extends MessageDispatcher {
    */
   protected def doShutdown = {}
 }
+
+class ReactiveMessageQueue extends MessageQueue {
+  private[kernel] val queue: Queue[MessageInvocation] = new LinkedList[MessageInvocation]
+  @volatile private var interrupted = false
+
+  def append(handle: MessageInvocation) = queue.synchronized {
+    queue.offer(handle)
+    queue.notifyAll
+  }
+
+  def prepend(handle: MessageInvocation) = queue.synchronized {
+    queue.add(handle)
+    queue.notifyAll
+  }
+
+  def read(destination: Queue[MessageInvocation]) = queue.synchronized {
+    while (queue.isEmpty && !interrupted) queue.wait
+    if (!interrupted) while (!queue.isEmpty) destination.offer(queue.remove)
+    else interrupted = false
+  }
+
+  def interrupt = queue.synchronized {
+    interrupted = true
+    queue.notifyAll
+  }
+}
\ No newline at end of file
diff --git a/kernel/src/main/scala/reactor/Reactor.scala b/kernel/src/main/scala/reactor/Reactor.scala
index 98079d9952..cfc88b56ba 100644
--- a/kernel/src/main/scala/reactor/Reactor.scala
+++ b/kernel/src/main/scala/reactor/Reactor.scala
@@ -2,26 +2,24 @@
  * Copyright (C) 2009 Scalable Solutions.
  */
 
-/**
- * Implements the Reactor pattern as defined in: [http://www.cs.wustl.edu/~schmidt/PDF/reactor-siemens.pdf].
- * See also this article: [http://today.java.net/cs/user/print/a/350].
- *
- * Based on code from the actorom actor framework by Sergio Bossa [http://code.google.com/p/actorom/].
- */
 package se.scalablesolutions.akka.kernel.reactor
 
-import java.util.concurrent.atomic.AtomicInteger
-import java.util.concurrent.ThreadFactory
-import java.util.{LinkedList, Queue}
+import java.util.Queue
 import kernel.stm.Transaction
-import kernel.util.{Logging, HashCode}
-trait MessageHandler {
-  def handle(message: MessageHandle)
+import kernel.util.HashCode
+
+trait MessageQueue {
+  def append(handle: MessageInvocation)
+  def prepend(handle: MessageInvocation)
+}
+
+trait MessageInvoker {
+  def invoke(message: MessageInvocation)
 }
 
 trait MessageDispatcher {
   def messageQueue: MessageQueue
-  def registerHandler(key: AnyRef, handler: MessageHandler)
+  def registerHandler(key: AnyRef, handler: MessageInvoker)
   def unregisterHandler(key: AnyRef)
   def start
   def shutdown
@@ -29,15 +27,15 @@ trait MessageDispatcher {
 
 trait MessageDemultiplexer {
   def select
-  def acquireSelectedQueue: Queue[MessageHandle]
+  def acquireSelectedQueue: Queue[MessageInvocation]
   def releaseSelectedQueue
   def wakeUp
 }
 
-class MessageHandle(val sender: AnyRef,
-                    val message: AnyRef,
-                    val future: Option[CompletableFutureResult],
-                    val tx: Option[Transaction]) {
+class MessageInvocation(val sender: AnyRef,
+                        val message: AnyRef,
+                        val future: Option[CompletableFutureResult],
+                        val tx: Option[Transaction]) {
 
   override def hashCode(): Int = {
     var result = HashCode.SEED
@@ -50,39 +48,13 @@ class MessageHandle(val sender: AnyRef,
 
   override def equals(that: Any): Boolean =
     that != null &&
-    that.isInstanceOf[MessageHandle] &&
-    that.asInstanceOf[MessageHandle].sender == sender &&
-    that.asInstanceOf[MessageHandle].message == message &&
-    that.asInstanceOf[MessageHandle].future.isDefined == future.isDefined &&
-    that.asInstanceOf[MessageHandle].future.get == future.get &&
-    that.asInstanceOf[MessageHandle].tx.isDefined == tx.isDefined &&
-    that.asInstanceOf[MessageHandle].tx.get.id == tx.get.id
+    that.isInstanceOf[MessageInvocation] &&
+    that.asInstanceOf[MessageInvocation].sender == sender &&
+    that.asInstanceOf[MessageInvocation].message == message &&
+    that.asInstanceOf[MessageInvocation].future.isDefined == future.isDefined &&
+    that.asInstanceOf[MessageInvocation].future.get == future.get &&
+    that.asInstanceOf[MessageInvocation].tx.isDefined == tx.isDefined &&
+    that.asInstanceOf[MessageInvocation].tx.get.id == tx.get.id
 
-  override def toString(): String = "MessageHandle[message = " + message + ", sender = " + sender + ", future = " + future + ", tx = " + tx + "]"
-}
-
-class MessageQueue {
-  private[kernel] val queue: Queue[MessageHandle] = new LinkedList[MessageHandle]
-  @volatile private var interrupted = false
-
-  def append(handle: MessageHandle) = queue.synchronized {
-    queue.offer(handle)
-    queue.notifyAll
-  }
-
-  def prepend(handle: MessageHandle) = queue.synchronized {
-    queue.add(handle)
-    queue.notifyAll
-  }
-  
-  def read(destination: Queue[MessageHandle]) = queue.synchronized {
-    while (queue.isEmpty && !interrupted) queue.wait
-    if (!interrupted) while (!queue.isEmpty) destination.offer(queue.remove)
-    else interrupted = false
-  }
-
-  def interrupt = queue.synchronized {
-    interrupted = true
-    queue.notifyAll
-  }
+  override def toString(): String = "MessageInvocation[message = " + message + ", sender = " + sender + ", future = " + future + ", tx = " + tx + "]"
 }
diff --git a/kernel/src/main/scala/reactor/ThreadBasedDispatcher.scala b/kernel/src/main/scala/reactor/ThreadBasedDispatcher.scala
new file mode 100644
index 0000000000..b01f373dc9
--- /dev/null
+++ b/kernel/src/main/scala/reactor/ThreadBasedDispatcher.scala
@@ -0,0 +1,55 @@
+/**
+ * Copyright (C) 2009 Scalable Solutions.
+ */
+
+package se.scalablesolutions.akka.kernel.reactor
+
+import java.util.concurrent.LinkedBlockingQueue
+import java.util.Queue
+import kernel.actor.{Actor, ActorMessageInvoker}
+
+/**
+ * Dedicates a unique thread for each actor passed in as reference. Served through its messageQueue.
+ * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
+ */
+class ThreadBasedDispatcher private[kernel] (val messageHandler: MessageInvoker) extends MessageDispatcher {
+  def this(actor: Actor) = this(new ActorMessageInvoker(actor))
+
+  private val queue = new BlockingMessageQueue
+  private var selectorThread: Thread = _
+  @volatile private var active: Boolean = false
+
+  def messageQueue = queue
+  
+  def start = if (!active) {
+    active = true
+    selectorThread = new Thread {
+      override def run = {
+        while (active) {
+          try {
+            messageHandler.invoke(queue.take)
+          } catch { case e: InterruptedException => active = false }
+        }
+      }
+    }
+    selectorThread.start
+  }
+                       
+  def shutdown = if (active) {
+    active = false
+    selectorThread.interrupt
+  }
+  
+  def registerHandler(key: AnyRef, handler: MessageInvoker) = throw new UnsupportedOperationException
+  def unregisterHandler(key: AnyRef) = throw new UnsupportedOperationException
+}
+
+class BlockingMessageQueue extends MessageQueue {
+  // FIXME: configure the LBQ
+  private val queue = new LinkedBlockingQueue[MessageInvocation]
+  def append(handle: MessageInvocation) = queue.put(handle)
+  def prepend(handle: MessageInvocation) = queue.add(handle) // FIXME is add prepend???
+  def take: MessageInvocation = queue.take
+  def read(destination: Queue[MessageInvocation]) = throw new UnsupportedOperationException
+  def interrupt = throw new UnsupportedOperationException
+}
\ No newline at end of file
diff --git a/kernel/src/main/scala/state/CassandraStorage.scala b/kernel/src/main/scala/state/CassandraStorage.scala
index b40f37a4b8..496e491686 100644
--- a/kernel/src/main/scala/state/CassandraStorage.scala
+++ b/kernel/src/main/scala/state/CassandraStorage.scala
@@ -53,10 +53,10 @@ final object CassandraStorage extends Logging {
     if (!isRunning) {
       try {
         server.start
-        log.info("Persistent storage has started up successfully");
+        log.info("Cassandra persistent storage has started up successfully");
       } catch {
         case e =>
-          log.error("Could not start up persistent storage")
+          log.error("Could not start up Cassandra persistent storage")
           throw e
       }
       if (RUN_THRIFT_SERVICE) {
@@ -214,7 +214,7 @@ class CassandraThriftServer(server: CassandraServer) extends Logging {
       options)
   } catch {
     case e =>
-      log.error("Could not start up persistent storage node.")
+      log.error("Could not start up Cassandra thrift service")
       throw e
   }
 
@@ -222,9 +222,9 @@ class CassandraThriftServer(server: CassandraServer) extends Logging {
   private[this] val serverDaemon = actor {
     receive {
      case Start =>
-        log.info("Cassandra thrift service is starting up...")
         serverEngine.serve
-      case Stop =>
+        log.info("Cassandra thrift service has starting up successfully")
+     case Stop =>
         log.info("Cassandra thrift service is shutting down...")
         serverEngine.stop
     }
diff --git a/kernel/src/main/scala/state/DataFlowVariable.scala b/kernel/src/main/scala/state/DataFlowVariable.scala
index 93d5865e8f..5e8c8ac77c 100644
--- a/kernel/src/main/scala/state/DataFlowVariable.scala
+++ b/kernel/src/main/scala/state/DataFlowVariable.scala
@@ -39,8 +39,8 @@ object DataFlow {
   private class ReactiveEventBasedThread[MessageType, ReturnType](body: MessageType => ReturnType) extends Actor {
     def act = loop { 
       react {
-        case message: MessageType => sender ! body(message)
-        case 'exit => exit()
+        case 'exit   => exit()
+        case message => sender ! body(message.asInstanceOf[MessageType])
       }
     }
   }
diff --git a/kernel/src/main/scala/stm/Transaction.scala b/kernel/src/main/scala/stm/Transaction.scala
index 501c0f84a6..b72eb7c2b2 100644
--- a/kernel/src/main/scala/stm/Transaction.scala
+++ b/kernel/src/main/scala/stm/Transaction.scala
@@ -8,8 +8,6 @@ import java.util.concurrent.atomic.{AtomicInteger, AtomicLong}
 import kernel.state.Transactional
 import kernel.util.Logging
 
-class TransactionRollbackException(msg: String) extends RuntimeException(msg)
-
 @serializable sealed abstract class TransactionStatus
 object TransactionStatus {
   case object New extends TransactionStatus
@@ -39,22 +37,22 @@ object TransactionIdFactory {
 
   log.debug("Creating a new transaction with id [%s]", id)
 
-  private[this] val transactionals = new ChangeSet
+  @volatile private[this] var status: TransactionStatus = TransactionStatus.New
+
+  private[this] val transactionalItems = new ChangeSet
 
   private[this] var participants: List[String] = Nil
   private[this] var precommitted: List[String] = Nil
-  
+
   private[this] val depth = new AtomicInteger(0)
   
-  @volatile private[this] var status: TransactionStatus = TransactionStatus.New
-
   def increment = synchronized { depth.incrementAndGet }
   def decrement = synchronized { depth.decrementAndGet }
-  def topLevel_? = synchronized { depth.get == 0 }
+  def isTopLevel = synchronized { depth.get == 0 }
   
   def register(transactional: Transactional) = synchronized {
     ensureIsActiveOrNew
-    transactionals + transactional
+    transactionalItems + transactional
   }
 
   def begin(participant: String) = synchronized {
@@ -83,7 +81,7 @@ object TransactionIdFactory {
           }}.exists(_ == true)
         } else false
       if (haveAllPreCommitted) {
-        transactionals.items.foreach(_.commit)
+        transactionalItems.items.foreach(_.commit)
         status = TransactionStatus.Completed
         reset
         true
@@ -97,7 +95,7 @@ object TransactionIdFactory {
   def rollback(participant: String) = synchronized {
     ensureIsActiveOrAborted
     log.debug("TX ROLLBACK - Server with UUID [%s] has initiated transaction rollback for [%s]", participant, toString)
-    transactionals.items.foreach(_.rollback)
+    transactionalItems.items.foreach(_.rollback)
     status = TransactionStatus.Aborted
     reset
   }
@@ -105,7 +103,7 @@ object TransactionIdFactory {
   def rollbackForRescheduling(participant: String) = synchronized {
     ensureIsActiveOrAborted
     log.debug("TX ROLLBACK for recheduling - Server with UUID [%s] has initiated transaction rollback for [%s]", participant, toString)
-    transactionals.items.foreach(_.rollback)
+    transactionalItems.items.foreach(_.rollback)
     reset
   }
 
@@ -121,7 +119,7 @@ object TransactionIdFactory {
   def isAborted = status == TransactionStatus.Aborted
 
   private def reset = {
-    transactionals.clear
+    transactionalItems.clear
     participants = Nil
     precommitted = Nil    
   }
@@ -136,7 +134,7 @@ object TransactionIdFactory {
     throw new IllegalStateException("Expected ACTIVE or NEW transaction - current status [" + status + "]: " + toString)
 
   // For reinitialize transaction after sending it over the wire 
-  private[kernel] def reinit = {
+  private[kernel] def reinit = synchronized {
     import net.lag.logging.{Logger, Level}
     if (log == null) {
       log = Logger.get(this.getClass.getName)
diff --git a/kernel/src/main/scala/stm/TransactionManagement.scala b/kernel/src/main/scala/stm/TransactionManagement.scala
index a2300de4a5..ae06fed357 100644
--- a/kernel/src/main/scala/stm/TransactionManagement.scala
+++ b/kernel/src/main/scala/stm/TransactionManagement.scala
@@ -6,8 +6,11 @@ package se.scalablesolutions.akka.kernel.stm
 
 import java.util.concurrent.atomic.AtomicBoolean
 
+import kernel.reactor.MessageInvocation
 import kernel.util.Logging
-import org.codehaus.aspectwerkz.proxy.Uuid
+import org.codehaus.aspectwerkz.proxy.Uuid // FIXME is java.util.UUID better?
+
+class TransactionRollbackException(msg: String) extends RuntimeException(msg)
 
 class TransactionAwareWrapperException(val cause: Throwable, val tx: Option[Transaction]) extends RuntimeException(cause) {
   override def toString(): String = "TransactionAwareWrapperException[" + cause + ", " + tx + "]"
@@ -17,7 +20,8 @@ object TransactionManagement {
   val TIME_WAITING_FOR_COMPLETION = kernel.Kernel.config.getInt("akka.stm.wait-for-completion", 100)
   val NR_OF_TIMES_WAITING_FOR_COMPLETION = kernel.Kernel.config.getInt("akka.stm.wait-nr-of-times", 3)
   val TRANSACTION_ENABLED = new AtomicBoolean(kernel.Kernel.config.getBool("akka.stm.service", true))
-  val RESTART_TRANSACTION_ON_COLLISION = kernel.Kernel.config.getBool("akka.stm.restart-transaction", true)
+  // FIXME reenable 'akka.stm.restart-on-collision' when new STM is in place 
+  val RESTART_TRANSACTION_ON_COLLISION = false //kernel.Kernel.config.getBool("akka.stm.restart-on-collision", true)
 
   def isTransactionalityEnabled = TRANSACTION_ENABLED.get
   def disableTransactions = TRANSACTION_ENABLED.set(false)
@@ -27,9 +31,11 @@ object TransactionManagement {
   }
 }
 
-// FIXME: STM that allows concurrent updates, detects collision, rolls back and restarts
 trait TransactionManagement extends Logging {
   val uuid = Uuid.newUuid.toString
+  
+  protected[this] var latestMessage: Option[MessageInvocation] = None
+  protected[this] var messageToReschedule: Option[MessageInvocation] = None
 
   import TransactionManagement.threadBoundTx
   private[kernel] var activeTx: Option[Transaction] = None
@@ -74,6 +80,25 @@ trait TransactionManagement extends Logging {
       tx.rollbackForRescheduling(uuid)
   }
 
+  protected def handleCollision = {
+    var nrRetries = 0
+    var failed = true
+    do {
+      Thread.sleep(TransactionManagement.TIME_WAITING_FOR_COMPLETION)
+      nrRetries += 1
+      log.debug("Pending transaction [%s] not completed, waiting %s milliseconds. Attempt %s", activeTx.get, TransactionManagement.TIME_WAITING_FOR_COMPLETION, nrRetries)
+      failed = !tryToCommitTransaction
+    } while(nrRetries < TransactionManagement.NR_OF_TIMES_WAITING_FOR_COMPLETION && failed)
+    if (failed) {
+      log.debug("Pending transaction [%s] still not completed, aborting and rescheduling message [%s]", activeTx.get, latestMessage)
+      rollback(activeTx)
+      if (TransactionManagement.RESTART_TRANSACTION_ON_COLLISION) messageToReschedule = Some(latestMessage.get)
+      else throw new TransactionRollbackException("Conflicting transactions, rolling back transaction for message [" + latestMessage + "]")
+    }
+  }
+
+  protected def isTransactionTopLevel = activeTx.isDefined && activeTx.get.isTopLevel
+  
   protected def isInExistingTransaction = TransactionManagement.threadBoundTx.get.isDefined
 
   protected def isTransactionAborted = activeTx.isDefined && activeTx.get.isAborted
@@ -82,11 +107,10 @@ trait TransactionManagement extends Logging {
 
   protected def decrementTransaction =  if (activeTx.isDefined) activeTx.get.decrement
 
-  protected def removeTransactionIfTopLevel =
-    if (activeTx.isDefined && activeTx.get.topLevel_?) {
-      activeTx = None
-      threadBoundTx.set(None)
-    }
+  protected def removeTransactionIfTopLevel = if (isTransactionTopLevel) {
+    activeTx = None
+    threadBoundTx.set(None)
+  }
 
   protected def reenteringExistingTransaction= if (activeTx.isDefined) {
     val cflowTx = threadBoundTx.get
diff --git a/kernel/src/test/scala/AllTest.scala b/kernel/src/test/scala/AllTest.scala
new file mode 100644
index 0000000000..b0ef909aae
--- /dev/null
+++ b/kernel/src/test/scala/AllTest.scala
@@ -0,0 +1,26 @@
+package se.scalablesolutions.akka.kernel
+
+import junit.framework.Test
+import junit.framework.TestCase
+import junit.framework.TestSuite
+
+import kernel.actor.{ActorSpec, RemoteActorSpec, PersistentActorSpec, InMemoryActorSpec}
+import kernel.reactor.{EventBasedSingleThreadDispatcherTest, EventBasedThreadPoolDispatcherTest}
+
+object AllTest extends TestCase {
+  def suite(): Test = {
+    val suite = new TestSuite("All Scala tests")
+    suite.addTestSuite(classOf[SupervisorSpec])
+    suite.addTestSuite(classOf[RemoteSupervisorSpec])
+    suite.addTestSuite(classOf[EventBasedSingleThreadDispatcherTest])
+    suite.addTestSuite(classOf[EventBasedThreadPoolDispatcherTest])
+    suite.addTestSuite(classOf[ActorSpec])
+    suite.addTestSuite(classOf[RemoteActorSpec])
+    suite.addTestSuite(classOf[PersistentActorSpec])
+    suite.addTestSuite(classOf[InMemoryActorSpec])
+    //suite.addTestSuite(classOf[TransactionClasherSpec])
+    suite
+  }
+
+  def main(args: Array[String]) = junit.textui.TestRunner.run(suite)
+}
\ No newline at end of file
diff --git a/kernel/src/test/scala/AllTests.scala b/kernel/src/test/scala/AllTests.scala
deleted file mode 100644
index 464b2e3922..0000000000
--- a/kernel/src/test/scala/AllTests.scala
+++ /dev/null
@@ -1,22 +0,0 @@
-package se.scalablesolutions.akka.kernel
-
-import junit.framework.Test
-import junit.framework.TestCase
-import junit.framework.TestSuite
-
-object AllTests extends TestCase {
-  def suite(): Test = {
-    val suite = new TestSuite("All tests")
-    suite.addTestSuite(classOf[se.scalablesolutions.akka.kernel.SupervisorSpec])
-    suite.addTestSuite(classOf[se.scalablesolutions.akka.kernel.RemoteSupervisorSpec])
-    suite.addTestSuite(classOf[se.scalablesolutions.akka.kernel.reactor.EventBasedDispatcherTest])
-    suite.addTestSuite(classOf[se.scalablesolutions.akka.kernel.reactor.ThreadBasedDispatcherTest])
-    suite.addTestSuite(classOf[se.scalablesolutions.akka.kernel.actor.ActorSpec])
-    suite.addTestSuite(classOf[se.scalablesolutions.akka.kernel.actor.RemoteActorSpec])
-    suite.addTestSuite(classOf[se.scalablesolutions.akka.kernel.actor.PersistentActorSpec])
-    suite.addTestSuite(classOf[se.scalablesolutions.akka.kernel.actor.InMemoryActorSpec])
-    suite
-  }
-
-  def main(args: Array[String]) = junit.textui.TestRunner.run(suite)
-}
\ No newline at end of file
diff --git a/kernel/src/test/scala/EventBasedDispatcherTest.scala b/kernel/src/test/scala/EventBasedSingleThreadDispatcherTest.scala
similarity index 81%
rename from kernel/src/test/scala/EventBasedDispatcherTest.scala
rename to kernel/src/test/scala/EventBasedSingleThreadDispatcherTest.scala
index 8f346f69d9..dc272893f5 100644
--- a/kernel/src/test/scala/EventBasedDispatcherTest.scala
+++ b/kernel/src/test/scala/EventBasedSingleThreadDispatcherTest.scala
@@ -9,13 +9,13 @@ import org.junit.{Test, Before}
 import org.junit.Assert._
 import junit.framework.TestCase
 
-class EventBasedDispatcherTest extends TestCase {
+class EventBasedSingleThreadDispatcherTest extends TestCase {
   private var threadingIssueDetected: AtomicBoolean = null
 
-  class TestMessageHandle(handleLatch: CountDownLatch) extends MessageHandler {
+  class TestMessageHandle(handleLatch: CountDownLatch) extends MessageInvoker {
     val guardLock: Lock = new ReentrantLock
 
-    def handle(message: MessageHandle) {
+    def invoke(message: MessageInvocation) {
       try {
         if (threadingIssueDetected.get) return
         if (guardLock.tryLock) {
@@ -59,7 +59,7 @@ class EventBasedDispatcherTest extends TestCase {
     dispatcher.registerHandler(key, new TestMessageHandle(handleLatch))
     dispatcher.start
     for (i <- 0 until 100) {
-      dispatcher.messageQueue.append(new MessageHandle(key, new Object, None, None))
+      dispatcher.messageQueue.append(new MessageInvocation(key, new Object, None, None))
     }
     assertTrue(handleLatch.await(5, TimeUnit.SECONDS))
     assertFalse(threadingIssueDetected.get)
@@ -73,8 +73,8 @@ class EventBasedDispatcherTest extends TestCase {
     dispatcher.registerHandler(key1, new TestMessageHandle(handleLatch))
     dispatcher.registerHandler(key2, new TestMessageHandle(handleLatch))
     dispatcher.start
-    dispatcher.messageQueue.append(new MessageHandle(key1, new Object, None, None))
-    dispatcher.messageQueue.append(new MessageHandle(key2, new Object, None, None))
+    dispatcher.messageQueue.append(new MessageInvocation(key1, new Object, None, None))
+    dispatcher.messageQueue.append(new MessageInvocation(key2, new Object, None, None))
     assertTrue(handleLatch.await(5, TimeUnit.SECONDS))
     assertFalse(threadingIssueDetected.get)
   }
@@ -84,9 +84,9 @@ class EventBasedDispatcherTest extends TestCase {
     val key1 = "key1"
     val key2 = "key2"
     val dispatcher = new EventBasedSingleThreadDispatcher
-    dispatcher.registerHandler(key1, new MessageHandler {
+    dispatcher.registerHandler(key1, new MessageInvoker {
       var currentValue = -1;
-      def handle(message: MessageHandle) {
+      def invoke(message: MessageInvocation) {
         if (threadingIssueDetected.get) return
         val messageValue = message.message.asInstanceOf[Int]
         if (messageValue.intValue == currentValue + 1) {
@@ -95,9 +95,9 @@ class EventBasedDispatcherTest extends TestCase {
         } else threadingIssueDetected.set(true)
       }
     })
-    dispatcher.registerHandler(key2, new MessageHandler {
+    dispatcher.registerHandler(key2, new MessageInvoker {
       var currentValue = -1;
-      def handle(message: MessageHandle) {
+      def invoke(message: MessageInvocation) {
         if (threadingIssueDetected.get) return
         val messageValue = message.message.asInstanceOf[Int]
         if (messageValue.intValue == currentValue + 1) {
@@ -108,8 +108,8 @@ class EventBasedDispatcherTest extends TestCase {
     })
     dispatcher.start
     for (i <- 0 until 100) {
-      dispatcher.messageQueue.append(new MessageHandle(key1, new Integer(i), None, None))
-      dispatcher.messageQueue.append(new MessageHandle(key2, new Integer(i), None, None))
+      dispatcher.messageQueue.append(new MessageInvocation(key1, new Integer(i), None, None))
+      dispatcher.messageQueue.append(new MessageInvocation(key2, new Integer(i), None, None))
     }
     assertTrue(handleLatch.await(5, TimeUnit.SECONDS))
     assertFalse(threadingIssueDetected.get)
diff --git a/kernel/src/test/scala/EventBasedThreadPoolDispatcherTest.scala b/kernel/src/test/scala/EventBasedThreadPoolDispatcherTest.scala
new file mode 100644
index 0000000000..ea3b83729e
--- /dev/null
+++ b/kernel/src/test/scala/EventBasedThreadPoolDispatcherTest.scala
@@ -0,0 +1,143 @@
+package se.scalablesolutions.akka.kernel.reactor
+
+import java.util.concurrent.ThreadPoolExecutor.CallerRunsPolicy
+import java.util.concurrent.atomic.AtomicBoolean
+import java.util.concurrent.locks.Lock
+import java.util.concurrent.locks.ReentrantLock
+import java.util.concurrent.{Executors, CountDownLatch, CyclicBarrier, TimeUnit}
+import org.junit.Before
+import org.junit.Test
+import org.junit.Assert._
+import junit.framework.TestCase
+
+class EventBasedThreadPoolDispatcherTest extends TestCase {
+  private var threadingIssueDetected: AtomicBoolean = null
+
+  @Before
+  override def setUp = {
+    threadingIssueDetected = new AtomicBoolean(false)
+  }
+
+  @Test
+  def testMessagesDispatchedToTheSameHandlerAreExecutedSequentially = {
+    internalTestMessagesDispatchedToTheSameHandlerAreExecutedSequentially
+  }
+
+  @Test
+  def testMessagesDispatchedToDifferentHandlersAreExecutedConcurrently = {
+    internalTestMessagesDispatchedToDifferentHandlersAreExecutedConcurrently
+  }
+
+  @Test
+  def testMessagesDispatchedToHandlersAreExecutedInFIFOOrder = {
+    internalTestMessagesDispatchedToHandlersAreExecutedInFIFOOrder
+  }
+
+  private def internalTestMessagesDispatchedToTheSameHandlerAreExecutedSequentially: Unit = {
+    val guardLock = new ReentrantLock
+    val handleLatch = new CountDownLatch(10)
+    val key = "key"
+    val dispatcher = new EventBasedThreadPoolDispatcher
+    dispatcher.withNewThreadPoolWithBoundedBlockingQueue(100)
+      .setCorePoolSize(2)
+      .setMaxPoolSize(4)
+      .setKeepAliveTimeInMillis(60000)
+      .setRejectionPolicy(new CallerRunsPolicy)
+      .buildThreadPool
+    dispatcher.registerHandler(key, new MessageInvoker {
+      def invoke(message: MessageInvocation) {
+        try {
+          if (threadingIssueDetected.get) return
+          if (guardLock.tryLock) {
+            Thread.sleep(100)
+            handleLatch.countDown
+          } else {
+            threadingIssueDetected.set(true)
+          }
+        } catch {
+          case e: Exception => threadingIssueDetected.set(true); e.printStackTrace
+        } finally {
+          guardLock.unlock
+        }
+      }
+    })
+    dispatcher.start
+    for (i <- 0 until 10) {
+      dispatcher.messageQueue.append(new MessageInvocation(key, new Object, None, None))
+    }
+    assertTrue(handleLatch.await(5, TimeUnit.SECONDS))
+    assertFalse(threadingIssueDetected.get)
+  }
+
+  private def internalTestMessagesDispatchedToDifferentHandlersAreExecutedConcurrently: Unit = {
+    val handlersBarrier = new CyclicBarrier(3)
+    val key1 = "key1"
+    val key2 = "key2"
+    val dispatcher = new EventBasedThreadPoolDispatcher
+    dispatcher.withNewThreadPoolWithBoundedBlockingQueue(100)
+      .setCorePoolSize(2)
+      .setMaxPoolSize(4)
+      .setKeepAliveTimeInMillis(60000)
+      .setRejectionPolicy(new CallerRunsPolicy)
+      .buildThreadPool
+    dispatcher.registerHandler(key1, new MessageInvoker {
+      def invoke(message: MessageInvocation) = synchronized {
+        try {handlersBarrier.await(1, TimeUnit.SECONDS)}
+        catch {case e: Exception => threadingIssueDetected.set(true)}
+      }
+    })
+    dispatcher.registerHandler(key2, new MessageInvoker {
+      def invoke(message: MessageInvocation) = synchronized {
+        try {handlersBarrier.await(1, TimeUnit.SECONDS)}
+        catch {case e: Exception => threadingIssueDetected.set(true)}
+      }
+    })
+    dispatcher.start
+    dispatcher.messageQueue.append(new MessageInvocation(key1, "Sending Message 1", None, None))
+    dispatcher.messageQueue.append(new MessageInvocation(key2, "Sending Message 2", None, None))
+    handlersBarrier.await(5, TimeUnit.SECONDS)
+    assertFalse(threadingIssueDetected.get)
+  }
+
+  private def internalTestMessagesDispatchedToHandlersAreExecutedInFIFOOrder: Unit = {
+    val handleLatch = new CountDownLatch(200)
+    val key1 = "key1"
+    val key2 = "key2"
+    val dispatcher = new EventBasedThreadPoolDispatcher
+    dispatcher.withNewThreadPoolWithBoundedBlockingQueue(100)
+      .setCorePoolSize(2)
+      .setMaxPoolSize(4)
+      .setKeepAliveTimeInMillis(60000)
+      .setRejectionPolicy(new CallerRunsPolicy)
+      .buildThreadPool
+    dispatcher.registerHandler(key1, new MessageInvoker {
+      var currentValue = -1;
+      def invoke(message: MessageInvocation) {
+        if (threadingIssueDetected.get) return
+        val messageValue = message.message.asInstanceOf[Int]
+        if (messageValue.intValue == currentValue + 1) {
+          currentValue = messageValue.intValue
+          handleLatch.countDown
+        } else threadingIssueDetected.set(true)
+      }
+    })
+    dispatcher.registerHandler(key2, new MessageInvoker {
+      var currentValue = -1;
+      def invoke(message: MessageInvocation) {
+        if (threadingIssueDetected.get) return
+        val messageValue = message.message.asInstanceOf[Int]
+        if (messageValue.intValue == currentValue + 1) {
+          currentValue = messageValue.intValue
+          handleLatch.countDown
+        } else threadingIssueDetected.set(true)
+      }
+    })
+    dispatcher.start
+    for (i <- 0 until 100) {
+      dispatcher.messageQueue.append(new MessageInvocation(key1, new Integer(i), None, None))
+      dispatcher.messageQueue.append(new MessageInvocation(key2, new Integer(i), None, None))
+    }
+    assertTrue(handleLatch.await(5, TimeUnit.SECONDS))
+    assertFalse(threadingIssueDetected.get)
+  }
+}
diff --git a/kernel/src/test/scala/InMemoryActorSpec.scala b/kernel/src/test/scala/InMemoryActorSpec.scala
index 7e541d5267..9f5e2eb797 100644
--- a/kernel/src/test/scala/InMemoryActorSpec.scala
+++ b/kernel/src/test/scala/InMemoryActorSpec.scala
@@ -140,7 +140,7 @@ class InMemoryActorSpec extends TestCase {
     Thread.sleep(100)
     stateful ! SuccessOneWay("testShouldNotRollbackStateForStatefulServerInCaseOfSuccess", "new state") // transactionrequired
     Thread.sleep(100)
-    assertEquals("new state", (stateful !! GetVectorSize).get)
+    assertEquals(2, (stateful !! GetVectorSize).get)
   }
 
   @Test
@@ -225,4 +225,5 @@ class InMemoryActorSpec extends TestCase {
     } catch {case e: RuntimeException => {}}
     assertEquals("init", (stateful !! GetRefState).get) // check that state is == init state
   }
+  
 }
\ No newline at end of file
diff --git a/kernel/src/test/scala/RemoteSupervisorSpec.scala b/kernel/src/test/scala/RemoteSupervisorSpec.scala
index e1c199234a..86805f2d84 100644
--- a/kernel/src/test/scala/RemoteSupervisorSpec.scala
+++ b/kernel/src/test/scala/RemoteSupervisorSpec.scala
@@ -474,7 +474,7 @@ class RemoteSupervisorSpec extends junit.framework.TestCase with Suite  {
       override def getSupervisorConfig: SupervisorConfig = {
         SupervisorConfig(
           RestartStrategy(AllForOne, 3, 100),
-          Worker(
+          Supervise(
             pingpong1,
             LifeCycle(Permanent, 100))
           :: Nil)
@@ -491,7 +491,7 @@ class RemoteSupervisorSpec extends junit.framework.TestCase with Suite  {
       override def getSupervisorConfig: SupervisorConfig = {
         SupervisorConfig(
           RestartStrategy(OneForOne, 3, 100),
-          Worker(
+          Supervise(
             pingpong1,
             LifeCycle(Permanent, 100))
           :: Nil)
@@ -512,15 +512,15 @@ class RemoteSupervisorSpec extends junit.framework.TestCase with Suite  {
       override def getSupervisorConfig: SupervisorConfig = {
         SupervisorConfig(
           RestartStrategy(AllForOne, 3, 100),
-          Worker(
+          Supervise(
             pingpong1,
             LifeCycle(Permanent, 100))
           ::
-          Worker(
+          Supervise(
             pingpong2,
             LifeCycle(Permanent, 100))
           ::
-          Worker(
+          Supervise(
             pingpong3,
             LifeCycle(Permanent, 100))
           :: Nil)
@@ -541,15 +541,15 @@ class RemoteSupervisorSpec extends junit.framework.TestCase with Suite  {
       override def getSupervisorConfig: SupervisorConfig = {
         SupervisorConfig(
           RestartStrategy(OneForOne, 3, 100),
-          Worker(
+          Supervise(
             pingpong1,
             LifeCycle(Permanent, 100))
           ::
-          Worker(
+          Supervise(
             pingpong2,
             LifeCycle(Permanent, 100))
           ::
-          Worker(
+          Supervise(
             pingpong3,
             LifeCycle(Permanent, 100))
           :: Nil)
@@ -570,17 +570,17 @@ class RemoteSupervisorSpec extends junit.framework.TestCase with Suite  {
       override def getSupervisorConfig: SupervisorConfig = {
         SupervisorConfig(
           RestartStrategy(AllForOne, 3, 100),
-          Worker(
+          Supervise(
             pingpong1,
             LifeCycle(Permanent, 100))
           ::
           SupervisorConfig(
             RestartStrategy(AllForOne, 3, 100),
-            Worker(
+            Supervise(
               pingpong2,
               LifeCycle(Permanent, 100))
             ::
-            Worker(
+            Supervise(
               pingpong3,
               LifeCycle(Permanent, 100))
             :: Nil)
diff --git a/kernel/src/test/scala/SupervisorSpec.scala b/kernel/src/test/scala/SupervisorSpec.scala
index 6517d6530a..9c49da7d54 100644
--- a/kernel/src/test/scala/SupervisorSpec.scala
+++ b/kernel/src/test/scala/SupervisorSpec.scala
@@ -460,7 +460,7 @@ class SupervisorSpec extends junit.framework.TestCase with Suite {
       override def getSupervisorConfig: SupervisorConfig = {
         SupervisorConfig(
           RestartStrategy(AllForOne, 3, 100),
-          Worker(
+          Supervise(
             pingpong1,
             LifeCycle(Permanent, 100))
           :: Nil)
@@ -476,7 +476,7 @@ class SupervisorSpec extends junit.framework.TestCase with Suite {
       override def getSupervisorConfig: SupervisorConfig = {
         SupervisorConfig(
           RestartStrategy(OneForOne, 3, 100),
-          Worker(
+          Supervise(
             pingpong1,
             LifeCycle(Permanent, 100))
           :: Nil)
@@ -494,15 +494,15 @@ class SupervisorSpec extends junit.framework.TestCase with Suite {
       override def getSupervisorConfig: SupervisorConfig = {
         SupervisorConfig(
           RestartStrategy(AllForOne, 3, 100),
-          Worker(
+          Supervise(
             pingpong1,
             LifeCycle(Permanent, 100))
           ::
-          Worker(
+          Supervise(
             pingpong2,
             LifeCycle(Permanent, 100))
           ::
-          Worker(
+          Supervise(
             pingpong3,
             LifeCycle(Permanent, 100))
           :: Nil)
@@ -520,15 +520,15 @@ class SupervisorSpec extends junit.framework.TestCase with Suite {
       override def getSupervisorConfig: SupervisorConfig = {
         SupervisorConfig(
           RestartStrategy(OneForOne, 3, 100),
-          Worker(
+          Supervise(
             pingpong1,
             LifeCycle(Permanent, 100))
           ::
-          Worker(
+          Supervise(
             pingpong2,
             LifeCycle(Permanent, 100))
           ::
-          Worker(
+          Supervise(
             pingpong3,
             LifeCycle(Permanent, 100))
           :: Nil)
@@ -546,17 +546,17 @@ class SupervisorSpec extends junit.framework.TestCase with Suite {
       override def getSupervisorConfig: SupervisorConfig = {
         SupervisorConfig(
           RestartStrategy(AllForOne, 3, 100),
-          Worker(
+          Supervise(
             pingpong1,
             LifeCycle(Permanent, 100))
           ::
           SupervisorConfig(
             RestartStrategy(AllForOne, 3, 100),
-            Worker(
+            Supervise(
               pingpong2,
               LifeCycle(Permanent, 100))
             ::
-            Worker(
+            Supervise(
               pingpong3,
               LifeCycle(Permanent, 100))
             :: Nil)
diff --git a/kernel/src/test/scala/ThreadBasedDispatcherTest.scala b/kernel/src/test/scala/ThreadBasedDispatcherTest.scala
index dde09f75ec..621e3dccfd 100644
--- a/kernel/src/test/scala/ThreadBasedDispatcherTest.scala
+++ b/kernel/src/test/scala/ThreadBasedDispatcherTest.scala
@@ -1,18 +1,36 @@
 package se.scalablesolutions.akka.kernel.reactor
 
-import java.util.concurrent.ThreadPoolExecutor.CallerRunsPolicy
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicBoolean
 import java.util.concurrent.locks.Lock
 import java.util.concurrent.locks.ReentrantLock
-import java.util.concurrent.{Executors, CountDownLatch, CyclicBarrier, TimeUnit}
-import org.junit.Before
-import org.junit.Test
+import org.junit.{Test, Before}
 import org.junit.Assert._
 import junit.framework.TestCase
 
 class ThreadBasedDispatcherTest extends TestCase {
   private var threadingIssueDetected: AtomicBoolean = null
 
+  class TestMessageHandle(handleLatch: CountDownLatch) extends MessageInvoker {
+    val guardLock: Lock = new ReentrantLock
+
+    def invoke(message: MessageInvocation) {
+      try {
+        if (threadingIssueDetected.get) return
+        if (guardLock.tryLock) {
+          handleLatch.countDown
+        } else {
+          threadingIssueDetected.set(true)
+        }
+      } catch {
+        case e: Exception => threadingIssueDetected.set(true)
+      } finally {
+        guardLock.unlock
+      }
+    }
+  }
+
   @Before
   override def setUp = {
     threadingIssueDetected = new AtomicBoolean(false)
@@ -23,11 +41,6 @@ class ThreadBasedDispatcherTest extends TestCase {
     internalTestMessagesDispatchedToTheSameHandlerAreExecutedSequentially
   }
 
-  @Test
-  def testMessagesDispatchedToDifferentHandlersAreExecutedConcurrently = {
-    internalTestMessagesDispatchedToDifferentHandlersAreExecutedConcurrently
-  }
-
   @Test
   def testMessagesDispatchedToHandlersAreExecutedInFIFOOrder = {
     internalTestMessagesDispatchedToHandlersAreExecutedInFIFOOrder
@@ -35,95 +48,21 @@ class ThreadBasedDispatcherTest extends TestCase {
 
   private def internalTestMessagesDispatchedToTheSameHandlerAreExecutedSequentially: Unit = {
     val guardLock = new ReentrantLock
-    val handleLatch = new CountDownLatch(10)
-    val key = "key"
-    val dispatcher = new EventBasedThreadPoolDispatcher
-    dispatcher.withNewThreadPoolWithBoundedBlockingQueue(100)
-      .setCorePoolSize(2)
-      .setMaxPoolSize(4)
-      .setKeepAliveTimeInMillis(60000)
-      .setRejectionPolicy(new CallerRunsPolicy)
-      .buildThreadPool
-    dispatcher.registerHandler(key, new MessageHandler {
-      def handle(message: MessageHandle) {
-        try {
-          if (threadingIssueDetected.get) return
-          if (guardLock.tryLock) {
-            Thread.sleep(100)
-            handleLatch.countDown
-          } else {
-            threadingIssueDetected.set(true)
-          }
-        } catch {
-          case e: Exception => threadingIssueDetected.set(true); e.printStackTrace
-        } finally {
-          guardLock.unlock
-        }
-      }
-    })
+    val handleLatch = new CountDownLatch(100)
+    val dispatcher = new ThreadBasedDispatcher(new TestMessageHandle(handleLatch))
     dispatcher.start
-    for (i <- 0 until 10) {
-      dispatcher.messageQueue.append(new MessageHandle(key, new Object, None, None))
+    for (i <- 0 until 100) {
+      dispatcher.messageQueue.append(new MessageInvocation("id", new Object, None, None))
     }
     assertTrue(handleLatch.await(5, TimeUnit.SECONDS))
     assertFalse(threadingIssueDetected.get)
   }
 
-  private def internalTestMessagesDispatchedToDifferentHandlersAreExecutedConcurrently: Unit = {
-    val handlersBarrier = new CyclicBarrier(3)
-    val key1 = "key1"
-    val key2 = "key2"
-    val dispatcher = new EventBasedThreadPoolDispatcher
-    dispatcher.withNewThreadPoolWithBoundedBlockingQueue(100)
-      .setCorePoolSize(2)
-      .setMaxPoolSize(4)
-      .setKeepAliveTimeInMillis(60000)
-      .setRejectionPolicy(new CallerRunsPolicy)
-      .buildThreadPool
-    dispatcher.registerHandler(key1, new MessageHandler {
-      def handle(message: MessageHandle) = synchronized {
-        try {handlersBarrier.await(1, TimeUnit.SECONDS)}
-        catch {case e: Exception => threadingIssueDetected.set(true)}
-      }
-    })
-    dispatcher.registerHandler(key2, new MessageHandler {
-      def handle(message: MessageHandle) = synchronized {
-        try {handlersBarrier.await(1, TimeUnit.SECONDS)}
-        catch {case e: Exception => threadingIssueDetected.set(true)}
-      }
-    })
-    dispatcher.start
-    dispatcher.messageQueue.append(new MessageHandle(key1, "Sending Message 1", None, None))
-    dispatcher.messageQueue.append(new MessageHandle(key2, "Sending Message 2", None, None))
-    handlersBarrier.await(5, TimeUnit.SECONDS)
-    assertFalse(threadingIssueDetected.get)
-  }
-
   private def internalTestMessagesDispatchedToHandlersAreExecutedInFIFOOrder: Unit = {
-    val handleLatch = new CountDownLatch(200)
-    val key1 = "key1"
-    val key2 = "key2"
-    val dispatcher = new EventBasedThreadPoolDispatcher
-    dispatcher.withNewThreadPoolWithBoundedBlockingQueue(100)
-      .setCorePoolSize(2)
-      .setMaxPoolSize(4)
-      .setKeepAliveTimeInMillis(60000)
-      .setRejectionPolicy(new CallerRunsPolicy)
-      .buildThreadPool
-    dispatcher.registerHandler(key1, new MessageHandler {
+    val handleLatch = new CountDownLatch(100)
+    val dispatcher = new ThreadBasedDispatcher(new MessageInvoker {
       var currentValue = -1;
-      def handle(message: MessageHandle) {
-        if (threadingIssueDetected.get) return
-        val messageValue = message.message.asInstanceOf[Int]
-        if (messageValue.intValue == currentValue + 1) {
-          currentValue = messageValue.intValue
-          handleLatch.countDown
-        } else threadingIssueDetected.set(true)
-      }
-    })
-    dispatcher.registerHandler(key2, new MessageHandler {
-      var currentValue = -1;
-      def handle(message: MessageHandle) {
+      def invoke(message: MessageInvocation) {
         if (threadingIssueDetected.get) return
         val messageValue = message.message.asInstanceOf[Int]
         if (messageValue.intValue == currentValue + 1) {
@@ -134,10 +73,10 @@ class ThreadBasedDispatcherTest extends TestCase {
     })
     dispatcher.start
     for (i <- 0 until 100) {
-      dispatcher.messageQueue.append(new MessageHandle(key1, new Integer(i), None, None))
-      dispatcher.messageQueue.append(new MessageHandle(key2, new Integer(i), None, None))
+      dispatcher.messageQueue.append(new MessageInvocation("id", new Integer(i), None, None))
     }
     assertTrue(handleLatch.await(5, TimeUnit.SECONDS))
     assertFalse(threadingIssueDetected.get)
+    dispatcher.shutdown
   }
 }
diff --git a/kernel/src/test/scala/TransactionClasherSpec.scala b/kernel/src/test/scala/TransactionClasherSpec.scala
index 3000b34931..4177036c90 100644
--- a/kernel/src/test/scala/TransactionClasherSpec.scala
+++ b/kernel/src/test/scala/TransactionClasherSpec.scala
@@ -48,9 +48,42 @@ class TxClasherActor extends Actor {
   }
 }
 
+class TxActorOneWay(clasher: Actor) extends Actor {
+  timeout = 1000000
+  makeTransactional
+
+  def receive: PartialFunction[Any, Unit] = {
+    case msg: AnyRef =>
+      clasher ! msg
+  }
+}
+
+class TxClasherActorOneWay extends Actor {
+  val vector = TransactionalState.newInMemoryVector[String]
+  timeout = 1000000
+  makeTransactional
+  var count = 0
+  def receive: PartialFunction[Any, Unit] = {
+    case "First" =>
+      if (count == 0) Thread.sleep(5000)
+      count += 1
+      println("FIRST")
+      vector.add("First")
+      println("--- VECTOR: " + vector)
+    case "Second" =>
+      println("SECOND")
+      vector.add("Second")
+      println("--- VECTOR: " + vector)
+    case "Index0" =>
+      reply(vector(0))
+    case "Index1" =>
+      reply(vector(1))
+  }
+}
+
 class TransactionClasherSpec extends TestCase {
   @Test
-  def testX = {
+  def testBangBangClash = {
     val clasher = new TxClasherActor
     clasher.start
     val txActor1 = new TxActor(clasher)
@@ -70,6 +103,27 @@ class TransactionClasherSpec extends TestCase {
     } catch { case e: TransactionRollbackException => {} }
   }
 
+  @Test
+  def testBangClash = {
+    val clasher = new TxClasherActorOneWay
+    clasher.start
+    val txActor1 = new TxActorOneWay(clasher)
+    txActor1.start
+    val txActor2 = new TxActorOneWay(clasher)
+    txActor2.start
+
+    val t1 = new Thread(new Runnable() {
+      def run = {
+        txActor1 ! "First"
+      }
+    }).start
+    Thread.sleep(1000)
+    try {
+      txActor2 ! "Second"
+      fail("Expected TransactionRollbackException")
+    } catch { case e: TransactionRollbackException => {} }
+  }
+ 
   /*
   @Test
   def testX = {
diff --git a/util-java/src/main/java/se/scalablesolutions/akka/annotation/configuration.java b/util-java/src/main/java/se/scalablesolutions/akka/annotation/configuration.java
new file mode 100644
index 0000000000..4c662945b6
--- /dev/null
+++ b/util-java/src/main/java/se/scalablesolutions/akka/annotation/configuration.java
@@ -0,0 +1,11 @@
+/**
+ * Copyright (C) 2009 Scalable Solutions.
+ */
+
+package se.scalablesolutions.akka.annotation;
+
+import java.lang.annotation.*;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface configuration {}