From 9235b0e221f00ebde5bbbadb491b720477105e27 Mon Sep 17 00:00:00 2001
From: Jonas Boner <jonas@jonasboner.com>
Date: Mon, 25 May 2009 15:52:45 +0200
Subject: [PATCH] renamed api-java to fun-test-java + upgrade guiceyfruit to
 2.0

---
 akka.iml                                      |   3 -
 akka.ipr                                      | 170 ++---
 akka.iws                                      | 585 ++++--------------
 api-java/akka-funtest-java.iml                |  87 +++
 {api-java => fun-test-java}/.classpath        |   0
 {api-java => fun-test-java}/.project          |   0
 .../.settings/org.eclipse.jdt.core.prefs      |   0
 .../akka-funtest-java.iml                     |  45 +-
 {api-java => fun-test-java}/api-java.iml      |   0
 {api-java => fun-test-java}/build.xml         |   0
 .../api/ActiveObjectGuiceConfigurator.java    |   0
 .../nbproject/build-impl.xml                  |   0
 .../nbproject/genfiles.properties             |   0
 .../nbproject/private/config.properties       |   0
 .../nbproject/private/private.properties      |   0
 .../nbproject/private/private.xml             |   0
 .../nbproject/project.properties              |   0
 .../nbproject/project.xml                     |   0
 {api-java => fun-test-java}/pom.xml           |   4 +-
 .../ActiveObjectGuiceConfiguratorTest.java    |   0
 .../se/scalablesolutions/akka/api/Bar.java    |   0
 .../scalablesolutions/akka/api/BarImpl.java   |   0
 .../se/scalablesolutions/akka/api/Ext.java    |   0
 .../scalablesolutions/akka/api/ExtImpl.java   |   0
 .../se/scalablesolutions/akka/api/Foo.java    |   0
 .../akka/api/InMemFailer.java                 |   0
 .../akka/api/InMemStateful.java               |   0
 .../akka/api/InMemoryStateTest.java           |   4 +-
 .../scalablesolutions/akka/api/JerseyFoo.java |   0
 .../akka/api/PersistentClasher.java           |   2 +-
 .../akka/api/PersistentFailer.java            |   0
 .../akka/api/PersistentStateTest.java         |   0
 .../akka/api/PersistentStateful.java          |   0
 .../scalablesolutions/akka/api/RestTest.java  |   0
 {api-java => fun-test-java}/testng.xml        |   0
 kernel/akka-kernel.iml                        |  53 +-
 kernel/pom.xml                                |   4 +-
 kernel/src/main/scala/ActiveObject.scala      |  18 +-
 .../{ErrRef.scala => ResultOrFailure.scala}   |  16 +-
 pom.xml                                       |   2 +-
 40 files changed, 363 insertions(+), 630 deletions(-)
 create mode 100644 api-java/akka-funtest-java.iml
 rename {api-java => fun-test-java}/.classpath (100%)
 rename {api-java => fun-test-java}/.project (100%)
 rename {api-java => fun-test-java}/.settings/org.eclipse.jdt.core.prefs (100%)
 rename api-java/akka-api-java.iml => fun-test-java/akka-funtest-java.iml (68%)
 rename {api-java => fun-test-java}/api-java.iml (100%)
 rename {api-java => fun-test-java}/build.xml (100%)
 rename {api-java => fun-test-java}/java/se/scalablesolutions/akka/api/ActiveObjectGuiceConfigurator.java (100%)
 rename {api-java => fun-test-java}/nbproject/build-impl.xml (100%)
 rename {api-java => fun-test-java}/nbproject/genfiles.properties (100%)
 rename {api-java => fun-test-java}/nbproject/private/config.properties (100%)
 rename {api-java => fun-test-java}/nbproject/private/private.properties (100%)
 rename {api-java => fun-test-java}/nbproject/private/private.xml (100%)
 rename {api-java => fun-test-java}/nbproject/project.properties (100%)
 rename {api-java => fun-test-java}/nbproject/project.xml (100%)
 rename {api-java => fun-test-java}/pom.xml (97%)
 rename {api-java => fun-test-java}/src/test/java/se/scalablesolutions/akka/api/ActiveObjectGuiceConfiguratorTest.java (100%)
 rename {api-java => fun-test-java}/src/test/java/se/scalablesolutions/akka/api/Bar.java (100%)
 rename {api-java => fun-test-java}/src/test/java/se/scalablesolutions/akka/api/BarImpl.java (100%)
 rename {api-java => fun-test-java}/src/test/java/se/scalablesolutions/akka/api/Ext.java (100%)
 rename {api-java => fun-test-java}/src/test/java/se/scalablesolutions/akka/api/ExtImpl.java (100%)
 rename {api-java => fun-test-java}/src/test/java/se/scalablesolutions/akka/api/Foo.java (100%)
 rename {api-java => fun-test-java}/src/test/java/se/scalablesolutions/akka/api/InMemFailer.java (100%)
 rename {api-java => fun-test-java}/src/test/java/se/scalablesolutions/akka/api/InMemStateful.java (100%)
 rename {api-java => fun-test-java}/src/test/java/se/scalablesolutions/akka/api/InMemoryStateTest.java (98%)
 rename {api-java => fun-test-java}/src/test/java/se/scalablesolutions/akka/api/JerseyFoo.java (100%)
 rename {api-java => fun-test-java}/src/test/java/se/scalablesolutions/akka/api/PersistentClasher.java (90%)
 rename {api-java => fun-test-java}/src/test/java/se/scalablesolutions/akka/api/PersistentFailer.java (100%)
 rename {api-java => fun-test-java}/src/test/java/se/scalablesolutions/akka/api/PersistentStateTest.java (100%)
 rename {api-java => fun-test-java}/src/test/java/se/scalablesolutions/akka/api/PersistentStateful.java (100%)
 rename {api-java => fun-test-java}/src/test/java/se/scalablesolutions/akka/api/RestTest.java (100%)
 rename {api-java => fun-test-java}/testng.xml (100%)
 rename kernel/src/main/scala/{ErrRef.scala => ResultOrFailure.scala} (68%)

diff --git a/akka.iml b/akka.iml
index 3f19ff34e0..3e135f5603 100644
--- a/akka.iml
+++ b/akka.iml
@@ -9,9 +9,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="akka-api-java" />
-    <orderEntry type="module" module-name="akka-kernel" />
-    <orderEntry type="module" module-name="akka-util-java" />
   </component>
 </module>
 
diff --git a/akka.ipr b/akka.ipr
index 1abbcb328b..d4cf40a6d0 100644
--- a/akka.ipr
+++ b/akka.ipr
@@ -140,8 +140,8 @@
     <option name="MAXIMUM_HEAP_SIZE" value="128" />
   </component>
   <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
-    <file url="file://$PROJECT_DIR$/api-java/src/test/java/se/scalablesolutions/akka/api/InMemoryStateTest.java" charset="windows-1252" />
-    <file url="file://$PROJECT_DIR$/api-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateTest.java" charset="windows-1252" />
+    <file url="file://$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemoryStateTest.java" charset="windows-1252" />
+    <file url="file://$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateTest.java" charset="windows-1252" />
     <file url="file://$PROJECT_DIR$/kernel/src/main/scala/Kernel.scala" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/kernel/src/main/scala/collection/HashTrie.scala" charset="windows-1252" />
     <file url="file://$PROJECT_DIR$/kernel/src/main/scala/collection/Vector.scala" charset="windows-1252" />
@@ -421,7 +421,6 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/akka.iml" filepath="$PROJECT_DIR$/akka.iml" />
-      <module fileurl="file://$PROJECT_DIR$/api-java/akka-api-java.iml" filepath="$PROJECT_DIR$/api-java/akka-api-java.iml" />
       <module fileurl="file://$PROJECT_DIR$/kernel/akka-kernel.iml" filepath="$PROJECT_DIR$/kernel/akka-kernel.iml" />
       <module fileurl="file://$PROJECT_DIR$/util-java/akka-util-java.iml" filepath="$PROJECT_DIR$/util-java/akka-util-java.iml" />
     </modules>
@@ -463,17 +462,6 @@
         <root url="jar://$MAVEN_REPOSITORY$/org/scala-lang/scala-library/2.7.3/scala-library-2.7.3-sources.jar!/" />
       </SOURCES>
     </library>
-    <library name="Maven: net.lag:configgy:1.2">
-      <CLASSES>
-        <root url="jar://$MAVEN_REPOSITORY$/net/lag/configgy/1.2/configgy-1.2.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://$MAVEN_REPOSITORY$/net/lag/configgy/1.2/configgy-1.2-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://$MAVEN_REPOSITORY$/net/lag/configgy/1.2/configgy-1.2-sources.jar!/" />
-      </SOURCES>
-    </library>
     <library name="Maven: org.guiceyfruit:guice-core:2.0-SNAPSHOT">
       <CLASSES>
         <root url="jar://$MAVEN_REPOSITORY$/org/guiceyfruit/guice-core/2.0-SNAPSHOT/guice-core-2.0-SNAPSHOT.jar!/" />
@@ -930,50 +918,6 @@
         <root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-client/1.1.0-ea/jersey-client-1.1.0-ea-sources.jar!/" />
       </SOURCES>
     </library>
-    <library name="Maven: org.jmock:jmock:2.4.0">
-      <CLASSES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/jmock/jmock/2.4.0/jmock-2.4.0.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://$MAVEN_REPOSITORY$/org/jmock/jmock/2.4.0/jmock-2.4.0-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/jmock/jmock/2.4.0/jmock-2.4.0-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.hamcrest:hamcrest-core:1.1">
-      <CLASSES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.hamcrest:hamcrest-library:1.1">
-      <CLASSES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: com.sun.xml.bind:jaxb-impl:2.1.10">
-      <CLASSES>
-        <root url="jar://$MAVEN_REPOSITORY$/com/sun/xml/bind/jaxb-impl/2.1.10/jaxb-impl-2.1.10.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://$MAVEN_REPOSITORY$/com/sun/xml/bind/jaxb-impl/2.1.10/jaxb-impl-2.1.10-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://$MAVEN_REPOSITORY$/com/sun/xml/bind/jaxb-impl/2.1.10/jaxb-impl-2.1.10-sources.jar!/" />
-      </SOURCES>
-    </library>
     <library name="Maven: com.sun.jersey.contribs:jersey-multipart:1.0.3">
       <CLASSES>
         <root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/contribs/jersey-multipart/1.0.3/jersey-multipart-1.0.3.jar!/" />
@@ -1029,28 +973,6 @@
         <root url="jar://$MAVEN_REPOSITORY$/org/guiceyfruit/guice-servlet/2.0-beta-6/guice-servlet-2.0-beta-6-sources.jar!/" />
       </SOURCES>
     </library>
-    <library name="Maven: org.guiceyfruit:guiceyfruit-core:2.0-beta-7">
-      <CLASSES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/guiceyfruit/guiceyfruit-core/2.0-beta-7/guiceyfruit-core-2.0-beta-7.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://$MAVEN_REPOSITORY$/org/guiceyfruit/guiceyfruit-core/2.0-beta-7/guiceyfruit-core-2.0-beta-7-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/guiceyfruit/guiceyfruit-core/2.0-beta-7/guiceyfruit-core-2.0-beta-7-sources.jar!/" />
-      </SOURCES>
-    </library>
-    <library name="Maven: org.guiceyfruit:guice-all:2.0-beta-7">
-      <CLASSES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/guiceyfruit/guice-all/2.0-beta-7/guice-all-2.0-beta-7.jar!/" />
-      </CLASSES>
-      <JAVADOC>
-        <root url="jar://$MAVEN_REPOSITORY$/org/guiceyfruit/guice-all/2.0-beta-7/guice-all-2.0-beta-7-javadoc.jar!/" />
-      </JAVADOC>
-      <SOURCES>
-        <root url="jar://$MAVEN_REPOSITORY$/org/guiceyfruit/guice-all/2.0-beta-7/guice-all-2.0-beta-7-sources.jar!/" />
-      </SOURCES>
-    </library>
     <library name="Maven: javax.annotation:com.springsource.javax.annotation:1.0.0">
       <CLASSES>
         <root url="jar://$MAVEN_REPOSITORY$/javax/annotation/com.springsource.javax.annotation/1.0.0/com.springsource.javax.annotation-1.0.0.jar!/" />
@@ -1194,6 +1116,94 @@
         <root url="jar://$MAVEN_REPOSITORY$/com/sun/grizzly/grizzly-http-servlet/1.9.9/grizzly-http-servlet-1.9.9-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!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$MAVEN_REPOSITORY$/net/lag/configgy/1.3/configgy-1.3-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$MAVEN_REPOSITORY$/net/lag/configgy/1.3/configgy-1.3-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Maven: org.scala-lang:scala-compiler:2.7.4">
+      <CLASSES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/scala-lang/scala-compiler/2.7.4/scala-compiler-2.7.4.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$MAVEN_REPOSITORY$/org/scala-lang/scala-compiler/2.7.4/scala-compiler-2.7.4-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/scala-lang/scala-compiler/2.7.4/scala-compiler-2.7.4-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Maven: org.scala-tools:vscaladoc:1.1-md-3">
+      <CLASSES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/scala-tools/vscaladoc/1.1-md-3/vscaladoc-1.1-md-3.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$MAVEN_REPOSITORY$/org/scala-tools/vscaladoc/1.1-md-3/vscaladoc-1.1-md-3-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/scala-tools/vscaladoc/1.1-md-3/vscaladoc-1.1-md-3-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Maven: markdownj:markdownj:1.0.2b4-0.3.0">
+      <CLASSES>
+        <root url="jar://$MAVEN_REPOSITORY$/markdownj/markdownj/1.0.2b4-0.3.0/markdownj-1.0.2b4-0.3.0.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$MAVEN_REPOSITORY$/markdownj/markdownj/1.0.2b4-0.3.0/markdownj-1.0.2b4-0.3.0-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$MAVEN_REPOSITORY$/markdownj/markdownj/1.0.2b4-0.3.0/markdownj-1.0.2b4-0.3.0-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Maven: org.scala-tools.testing:specs:1.4.4">
+      <CLASSES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/scala-tools/testing/specs/1.4.4/specs-1.4.4.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$MAVEN_REPOSITORY$/org/scala-tools/testing/specs/1.4.4/specs-1.4.4-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/scala-tools/testing/specs/1.4.4/specs-1.4.4-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Maven: org.guiceyfruit:guiceyfruit-core:2.0">
+      <CLASSES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/guiceyfruit/guiceyfruit-core/2.0/guiceyfruit-core-2.0.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$MAVEN_REPOSITORY$/org/guiceyfruit/guiceyfruit-core/2.0/guiceyfruit-core-2.0-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/guiceyfruit/guiceyfruit-core/2.0/guiceyfruit-core-2.0-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Maven: org.guiceyfruit:guice-all:2.0">
+      <CLASSES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/guiceyfruit/guice-all/2.0/guice-all-2.0.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$MAVEN_REPOSITORY$/org/guiceyfruit/guice-all/2.0/guice-all-2.0-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/guiceyfruit/guice-all/2.0/guice-all-2.0-sources.jar!/" />
+      </SOURCES>
+    </library>
   </component>
   <UsedPathMacros>
     <macro name="MAVEN_REPOSITORY" description="Maven Local Repostiry" />
diff --git a/akka.iws b/akka.iws
index e886fe4ba9..59230ef6b6 100644
--- a/akka.iws
+++ b/akka.iws
@@ -2,18 +2,44 @@
 <project relativePaths="false" version="4">
   <component name="ChangeListManager">
     <list default="true" name="Default" comment="&#10;# Brief commit desciption here&#10;&#10;# Full commit description here (comment lines starting with '#' will not be included)&#10;&#10;">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/.classpath" afterPath="$PROJECT_DIR$/kernel/.classpath" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/main/scala/GenericServer.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/GenericServer.scala" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/api-java/.settings/org.eclipse.jdt.core.prefs" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/api-java/nbproject/private/private.properties" afterPath="" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/akka.iml" afterPath="$PROJECT_DIR$/akka.iml" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/api-java/src/test/java/se/scalablesolutions/akka/api/InMemFailer.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/api-java/src/test/java/se/scalablesolutions/akka/api/InMemStateful.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/api-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateTest.java" afterPath="" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/main/scala/ActiveObject.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/ActiveObject.scala" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/akka.ipr" afterPath="$PROJECT_DIR$/akka.ipr" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/api-java/build.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/api-java/.project" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/api-java/src/test/java/se/scalablesolutions/akka/api/RestTest.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/api-java/src/test/java/se/scalablesolutions/akka/api/ExtImpl.java" afterPath="" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/api-java/akka-api-java.iml" afterPath="$PROJECT_DIR$/api-java/akka-funtest-java.iml" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/api-java/src/test/java/se/scalablesolutions/akka/api/JerseyFoo.java" afterPath="" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/pom.xml" afterPath="$PROJECT_DIR$/kernel/pom.xml" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/api-java/.classpath" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/api-java/src/test/java/se/scalablesolutions/akka/api/PersistentFailer.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/api-java/nbproject/genfiles.properties" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/api-java/pom.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/api-java/nbproject/project.properties" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/api-java/src/test/java/se/scalablesolutions/akka/api/Ext.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/api-java/nbproject/private/config.properties" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/api-java/src/test/java/se/scalablesolutions/akka/api/PersistentClasher.java" afterPath="" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/akka-kernel.iml" afterPath="$PROJECT_DIR$/kernel/akka-kernel.iml" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/api-java/api-java.iml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/api-java/nbproject/build-impl.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/api-java/src/test/java/se/scalablesolutions/akka/api/ActiveObjectGuiceConfiguratorTest.java" afterPath="" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/akka.iws" afterPath="$PROJECT_DIR$/akka.iws" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/main/scala/reactor/ThreadBasedDispatcher.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/reactor/ThreadBasedDispatcher.scala" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/util-java/.project" afterPath="$PROJECT_DIR$/util-java/.project" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/test/scala/GenericServerContainerSuite.scala" afterPath="$PROJECT_DIR$/kernel/src/test/scala/GenericServerContainerSuite.scala" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api-java/.classpath" afterPath="$PROJECT_DIR$/api-java/.classpath" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/main/scala/reactor/Future.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/reactor/Future.scala" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api-java/.project" afterPath="$PROJECT_DIR$/api-java/.project" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/main/scala/reactor/EventDrivenDispatcher.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/reactor/EventDrivenDispatcher.scala" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/main/scala/reactor/Reactor.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/reactor/Reactor.scala" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/api-java/nbproject/project.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/api-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateful.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/api-java/src/test/java/se/scalablesolutions/akka/api/InMemoryStateTest.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/api-java/testng.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/api-java/java/se/scalablesolutions/akka/api/ActiveObjectGuiceConfigurator.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/api-java/src/test/java/se/scalablesolutions/akka/api/BarImpl.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/api-java/src/test/java/se/scalablesolutions/akka/api/Foo.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/api-java/nbproject/private/private.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/api-java/src/test/java/se/scalablesolutions/akka/api/Bar.java" afterPath="" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/kernel/src/main/scala/ErrRef.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/ResultOrFailure.scala" />
     </list>
     <ignored path="akka.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -89,73 +115,28 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="Reactor.scala" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/reactor/Reactor.scala">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="17" column="15" selection-start="521" selection-end="521" vertical-scroll-proportion="0.23514539">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="ThreadBasedDispatcher.scala" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/reactor/ThreadBasedDispatcher.scala">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="68" column="16" selection-start="2395" selection-end="2395" vertical-scroll-proportion="0.0">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="ActiveObject.scala" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/ActiveObject.scala">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="165" column="13" selection-start="5437" selection-end="5437" vertical-scroll-proportion="0.0">
+            <state line="226" column="10" selection-start="8132" selection-end="8132" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="GenericServer.scala" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/GenericServer.scala">
+      <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/kernel/pom.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="63" column="31" selection-start="1769" selection-end="1769" vertical-scroll-proportion="0.0">
+            <state line="38" column="60" selection-start="1203" selection-end="1203" vertical-scroll-proportion="-10.0">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="GenericServerContainerSuite.scala" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/kernel/src/test/scala/GenericServerContainerSuite.scala">
+      <file leaf-file-name="pom.xml" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/fun-test-java/pom.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="95" column="123" selection-start="1873" selection-end="1873" vertical-scroll-proportion="0.0">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="EventDrivenDispatcher.scala" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/reactor/EventDrivenDispatcher.scala">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="10" column="0" selection-start="345" selection-end="345" vertical-scroll-proportion="0.0">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="DataFlowVariable.scala" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/DataFlowVariable.scala">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="95" column="1" selection-start="2947" selection-end="2947" vertical-scroll-proportion="0.0">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Future.scala" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/reactor/Future.scala">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="26" column="85" selection-start="719" selection-end="719" vertical-scroll-proportion="0.0">
+            <state line="6" column="27" selection-start="314" selection-end="314" vertical-scroll-proportion="0.11851852">
               <folding />
             </state>
           </provider>
@@ -332,378 +313,6 @@
           <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.3" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="scala-library.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="Scala 2.7.3" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="scala-library.jar" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="actors" />
-          <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="Scala 2.7.3" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="scala-library.jar" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="actors" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="FJTaskRunner" />
-          <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="Scala 2.7.3" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="scala-library.jar" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="actors" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="FJTask" />
-          <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="Scala 2.7.3" />
-          <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-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>
-      <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="aspectwerkz 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="aspectwerkz 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="aspectwerkz 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="ProxySubclassingStrategy" />
-          <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="aspectwerkz 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="intercept" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="AdvisableImpl" />
-          <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="aspectwerkz 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="intercept" />
-          <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="aspectwerkz 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="management" />
-          <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="aspectwerkz 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="trove" />
-          <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="aspectwerkz 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="trove" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="TIntObjectHashMap" />
-          <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="aspectwerkz 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="trove" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-        </PATH_ELEMENT>
-        <PATH_ELEMENT>
-          <option name="myItemId" value="TIntHash" />
-          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ClassTreeNode" />
-        </PATH_ELEMENT>
       </PATH>
       <PATH>
         <PATH_ELEMENT>
@@ -896,6 +505,24 @@
           <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>
+      <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>
     </subPane>
   </component>
@@ -1091,7 +718,7 @@
       </method>
     </configuration>
     <configuration default="false" name="InMemoryStateTest" type="JUnit" factoryName="JUnit" enabled="false" merge="false" sample_coverage="true" runner="emma">
-      <module name="akka-api-java" />
+      <module name="" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" value="" />
       <option name="PACKAGE_NAME" value="se.scalablesolutions.akka.api" />
@@ -1121,7 +748,7 @@
       </method>
     </configuration>
     <configuration default="false" name="PersistentStateTest" type="JUnit" factoryName="JUnit" enabled="false" merge="false" sample_coverage="true" runner="emma">
-      <module name="akka-api-java" />
+      <module name="" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" value="" />
       <option name="PACKAGE_NAME" value="se.scalablesolutions.akka.api" />
@@ -1151,7 +778,7 @@
       </method>
     </configuration>
     <configuration default="false" name="ActiveObjectGuiceConfiguratorTest" type="JUnit" factoryName="JUnit" enabled="false" merge="false" sample_coverage="true" runner="emma">
-      <module name="akka-api-java" />
+      <module name="" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" value="" />
       <option name="PACKAGE_NAME" value="se.scalablesolutions.akka.api" />
@@ -1205,7 +832,7 @@
       </method>
     </configuration>
     <configuration default="false" name="REST" type="JUnit" factoryName="JUnit" enabled="false" merge="false" sample_coverage="true" runner="emma">
-      <module name="akka-api-java" />
+      <module name="" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" value="" />
       <option name="PACKAGE_NAME" value="se.scalablesolutions.akka.api" />
@@ -1288,8 +915,8 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="4" y="22" width="1916" height="1178" extended-state="6" />
-    <editor active="true" />
+    <frame x="1" y="22" width="1916" height="1178" extended-state="0" />
+    <editor active="false" />
     <layout>
       <window_info id="Web Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32908162" sideWeight="0.5" order="14" 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="15" side_tool="false" />
@@ -1297,8 +924,8 @@
       <window_info id="Data Sources" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3294881" sideWeight="0.6875" order="3" side_tool="false" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3294881" sideWeight="0.59183675" order="4" side_tool="false" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32780612" 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.3299411" sideWeight="0.7730627" order="1" side_tool="false" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3265306" sideWeight="0.5" order="1" side_tool="false" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3299411" sideWeight="0.7730627" order="1" side_tool="false" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32564574" sideWeight="0.5" order="1" side_tool="false" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24873829" sideWeight="0.74165636" order="0" side_tool="false" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" />
       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.22047971" sideWeight="0.5" order="12" side_tool="false" />
@@ -1359,27 +986,6 @@
     </buildFile>
   </component>
   <component name="editorHistoryManager">
-    <entry file="jar://$PROJECT_DIR$/../../../bin/scala-2.7.3.final/src/scala-library-src.jar!/scala/actors/FJTask.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="393" column="16" selection-start="15159" selection-end="15159" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$PROJECT_DIR$/../../../bin/scala-2.7.3.final/src/scala-library-src.jar!/scala/actors/FJTaskRunner.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="842" column="23" selection-start="26825" selection-end="26825" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/api-java/src/test/java/se/scalablesolutions/akka/api/InMemFailer.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/Transaction.scala">
       <provider selected="true" editor-type-id="text-editor">
         <state line="79" column="0" selection-start="2646" selection-end="2646" vertical-scroll-proportion="0.0">
@@ -1387,7 +993,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/api-java/src/test/java/se/scalablesolutions/akka/api/InMemStateful.java">
+    <entry file="file://$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemStateful.java">
       <provider selected="true" editor-type-id="text-editor">
         <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
           <folding />
@@ -1401,13 +1007,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/api-java/src/test/java/se/scalablesolutions/akka/api/InMemoryStateTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="39" column="14" selection-start="1734" selection-end="1734" vertical-scroll-proportion="0.33200794">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/Logging.scala">
       <provider selected="true" editor-type-id="text-editor">
         <state line="5" column="42" selection-start="0" selection-end="92" vertical-scroll-proportion="0.0">
@@ -1443,13 +1042,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/ActiveObject.scala">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="165" column="13" selection-start="5437" selection-end="5437" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/GenericServer.scala">
       <provider selected="true" editor-type-id="text-editor">
         <state line="63" column="31" selection-start="1769" selection-end="1769" vertical-scroll-proportion="0.0">
@@ -1466,7 +1058,42 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/reactor/Reactor.scala">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="17" column="15" selection-start="521" selection-end="521" vertical-scroll-proportion="0.23514539">
+        <state line="17" column="15" selection-start="521" selection-end="521" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <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="7" column="66" selection-start="207" selection-end="207" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/ActiveObject.scala">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="226" column="10" selection-start="8132" selection-end="8132" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/ResultOrFailure.scala">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="32" column="47" selection-start="663" selection-end="663" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/kernel/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="38" column="60" selection-start="1203" selection-end="1203" vertical-scroll-proportion="-10.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/fun-test-java/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="6" column="27" selection-start="314" selection-end="314" vertical-scroll-proportion="0.11851852">
           <folding />
         </state>
       </provider>
diff --git a/api-java/akka-funtest-java.iml b/api-java/akka-funtest-java.iml
new file mode 100644
index 0000000000..62e899a6d4
--- /dev/null
+++ b/api-java/akka-funtest-java.iml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module relativePaths="true" MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$/../fun-test-java">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../fun-test-java/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/../fun-test-java/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/../config" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module" module-name="akka-kernel" exported="" />
+    <orderEntry type="module" module-name="akka-util-java" exported="" />
+    <orderEntry type="library" exported="" name="Maven: org.guiceyfruit:guice-core:2.0-beta-4" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.guiceyfruit:guice-jsr250:2.0-beta-4" level="project" />
+    <orderEntry type="library" exported="" name="Maven: javax.annotation:jsr250-api:1.0" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.scala-lang:scala-library:2.7.3" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.codehaus.aspectwerkz:aspectwerkz-nodeps-jdk5:2.1" level="project" />
+    <orderEntry type="library" exported="" name="Maven: net.lag:configgy:1.3" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.scala-lang:scala-compiler:2.7.4" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.scala-tools:vscaladoc:1.1-md-3" level="project" />
+    <orderEntry type="library" exported="" name="Maven: markdownj:markdownj:1.0.2b4-0.3.0" level="project" />
+    <orderEntry type="library" name="Maven: junit:junit:4.5" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.scala-tools.testing:specs:1.4.4" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.guiceyfruit:guiceyfruit-core:2.0-beta-7" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.guiceyfruit:guice-all:2.0-beta-7" level="project" />
+    <orderEntry type="library" exported="" name="Maven: javax.annotation:com.springsource.javax.annotation:1.0.0" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.aopalliance:com.springsource.org.aopalliance:1.0.0" level="project" />
+    <orderEntry type="library" exported="" name="Maven: com.google.code.google-collections:google-collect:snapshot-20080530" level="project" />
+    <orderEntry type="library" exported="" name="Maven: cglib:cglib:2.2" level="project" />
+    <orderEntry type="library" exported="" name="Maven: asm:asm:3.1" level="project" />
+    <orderEntry type="library" exported="" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.apache.camel:camel-core:2.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" exported="" name="Maven: commons-logging:commons-logging-api:1.1" level="project" />
+    <orderEntry type="library" exported="" name="Maven: javax.xml.bind:jaxb-api:2.1" level="project" />
+    <orderEntry type="library" exported="" name="Maven: javax.xml.stream:stax-api:1.0-2" level="project" />
+    <orderEntry type="library" exported="" name="Maven: javax.activation:activation:1.1" level="project" />
+    <orderEntry type="library" exported="" name="Maven: com.sun.xml.bind:jaxb-impl:2.1.10" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.jboss.netty:netty:3.1.0.BETA2" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.grizzly:grizzly-servlet-webserver:1.9.9" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.grizzly:grizzly-http:1.9.9" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.grizzly:grizzly-framework:1.9.9" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.grizzly:grizzly-utils:1.9.9" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.grizzly:grizzly-rcm:1.9.9" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.grizzly:grizzly-portunif:1.9.9" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.grizzly:grizzly-http-servlet:1.9.9" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-server:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-core:1.0.3" level="project" />
+    <orderEntry type="library" exported="" name="Maven: javax.ws.rs:jsr311-api:1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-json:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.jettison:jettison:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-asl:0.9.4" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-client:1.1.0-ea" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-atom:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: rome:rome:0.9" level="project" />
+    <orderEntry type="library" name="Maven: jdom:jdom:1.0" level="project" />
+    <orderEntry type="library" exported="" name="Maven: com.sun.jersey.contribs:jersey-multipart:1.0.3" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.jvnet:mimepull:1.3" level="project" />
+    <orderEntry type="library" exported="" name="Maven: com.sun.jersey.contribs:jersey-guice:1.0.3" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.guiceyfruit:guice-servlet:2.0-beta-6" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.apache.cassandra:cassandra:0.3.0-dev" level="project" />
+    <orderEntry type="library" exported="" name="Maven: com.facebook:thrift:1.0" level="project" />
+    <orderEntry type="library" exported="" name="Maven: com.facebook:fb303:1.0" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.apache.commons:commons-collections:3.2.1" level="project" />
+    <orderEntry type="library" exported="" name="Maven: high-scale-lib:high-scale-lib:1.0" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.apache.commons:commons-lang:2.4" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.slf4j:slf4j-log4j12:1.4.3" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.slf4j:slf4j-api:1.4.3" level="project" />
+    <orderEntry type="library" exported="" name="Maven: log4j:log4j:1.2.13" level="project" />
+    <orderEntry type="library" name="Maven: org.jmock:jmock:2.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-library:1.1" level="project" />
+  </component>
+</module>
+
diff --git a/api-java/.classpath b/fun-test-java/.classpath
similarity index 100%
rename from api-java/.classpath
rename to fun-test-java/.classpath
diff --git a/api-java/.project b/fun-test-java/.project
similarity index 100%
rename from api-java/.project
rename to fun-test-java/.project
diff --git a/api-java/.settings/org.eclipse.jdt.core.prefs b/fun-test-java/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from api-java/.settings/org.eclipse.jdt.core.prefs
rename to fun-test-java/.settings/org.eclipse.jdt.core.prefs
diff --git a/api-java/akka-api-java.iml b/fun-test-java/akka-funtest-java.iml
similarity index 68%
rename from api-java/akka-api-java.iml
rename to fun-test-java/akka-funtest-java.iml
index aa56adb8d7..9dbc6d4b81 100644
--- a/api-java/akka-api-java.iml
+++ b/fun-test-java/akka-funtest-java.iml
@@ -25,7 +25,13 @@
     <orderEntry type="library" exported="" name="Maven: org.guiceyfruit:guice-jsr250:2.0-beta-4" level="project" />
     <orderEntry type="library" exported="" name="Maven: javax.annotation:jsr250-api:1.0" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.scala-lang:scala-library:2.7.3" level="project" />
-    <orderEntry type="library" exported="" name="Maven: net.lag:configgy:1.2" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.codehaus.aspectwerkz:aspectwerkz-nodeps-jdk5:2.1" level="project" />
+    <orderEntry type="library" exported="" name="Maven: net.lag:configgy:1.3" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.scala-lang:scala-compiler:2.7.4" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.scala-tools:vscaladoc:1.1-md-3" level="project" />
+    <orderEntry type="library" exported="" name="Maven: markdownj:markdownj:1.0.2b4-0.3.0" level="project" />
+    <orderEntry type="library" name="Maven: junit:junit:4.5" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.scala-tools.testing:specs:1.4.4" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.guiceyfruit:guiceyfruit-core:2.0-beta-7" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.guiceyfruit:guice-all:2.0-beta-7" level="project" />
     <orderEntry type="library" exported="" name="Maven: javax.annotation:com.springsource.javax.annotation:1.0.0" level="project" />
@@ -41,25 +47,25 @@
     <orderEntry type="library" exported="" name="Maven: javax.activation:activation:1.1" level="project" />
     <orderEntry type="library" exported="" name="Maven: com.sun.xml.bind:jaxb-impl:2.1.10" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.jboss.netty:netty:3.1.0.BETA2" level="project" />
-    <orderEntry type="library" exported="" name="Maven: com.sun.grizzly:grizzly-servlet-webserver:1.9.9" level="project" />
-    <orderEntry type="library" exported="" name="Maven: com.sun.grizzly:grizzly-http:1.9.9" level="project" />
-    <orderEntry type="library" exported="" name="Maven: com.sun.grizzly:grizzly-framework:1.9.9" level="project" />
-    <orderEntry type="library" exported="" name="Maven: com.sun.grizzly:grizzly-utils:1.9.9" level="project" />
-    <orderEntry type="library" exported="" name="Maven: com.sun.grizzly:grizzly-rcm:1.9.9" level="project" />
-    <orderEntry type="library" exported="" name="Maven: com.sun.grizzly:grizzly-portunif:1.9.9" level="project" />
-    <orderEntry type="library" exported="" name="Maven: com.sun.grizzly:grizzly-http-servlet:1.9.9" level="project" />
-    <orderEntry type="library" exported="" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
-    <orderEntry type="library" exported="" name="Maven: com.sun.jersey:jersey-server:1.0.3" level="project" />
-    <orderEntry type="library" exported="" name="Maven: com.sun.jersey:jersey-core:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.grizzly:grizzly-servlet-webserver:1.9.9" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.grizzly:grizzly-http:1.9.9" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.grizzly:grizzly-framework:1.9.9" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.grizzly:grizzly-utils:1.9.9" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.grizzly:grizzly-rcm:1.9.9" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.grizzly:grizzly-portunif:1.9.9" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.grizzly:grizzly-http-servlet:1.9.9" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-server:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-core:1.0.3" level="project" />
     <orderEntry type="library" exported="" name="Maven: javax.ws.rs:jsr311-api:1.0" level="project" />
-    <orderEntry type="library" exported="" name="Maven: com.sun.jersey:jersey-json:1.0.3" level="project" />
-    <orderEntry type="library" exported="" name="Maven: org.codehaus.jettison:jettison:1.0.1" level="project" />
-    <orderEntry type="library" exported="" name="Maven: stax:stax-api:1.0.1" level="project" />
-    <orderEntry type="library" exported="" name="Maven: org.codehaus.jackson:jackson-asl:0.9.4" level="project" />
-    <orderEntry type="library" exported="" name="Maven: com.sun.jersey:jersey-client:1.1.0-ea" level="project" />
-    <orderEntry type="library" exported="" name="Maven: com.sun.jersey:jersey-atom:1.0.3" level="project" />
-    <orderEntry type="library" exported="" name="Maven: rome:rome:0.9" level="project" />
-    <orderEntry type="library" exported="" name="Maven: jdom:jdom:1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-json:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.jettison:jettison:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-asl:0.9.4" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-client:1.1.0-ea" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-atom:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: rome:rome:0.9" level="project" />
+    <orderEntry type="library" name="Maven: jdom:jdom:1.0" level="project" />
     <orderEntry type="library" exported="" name="Maven: com.sun.jersey.contribs:jersey-multipart:1.0.3" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.jvnet:mimepull:1.3" level="project" />
     <orderEntry type="library" exported="" name="Maven: com.sun.jersey.contribs:jersey-guice:1.0.3" level="project" />
@@ -73,7 +79,6 @@
     <orderEntry type="library" exported="" name="Maven: org.slf4j:slf4j-log4j12:1.4.3" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.slf4j:slf4j-api:1.4.3" level="project" />
     <orderEntry type="library" exported="" name="Maven: log4j:log4j:1.2.13" level="project" />
-    <orderEntry type="library" exported="" name="Maven: junit:junit:4.5" level="project" />
     <orderEntry type="library" name="Maven: org.jmock:jmock:2.4.0" level="project" />
     <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
     <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-library:1.1" level="project" />
diff --git a/api-java/api-java.iml b/fun-test-java/api-java.iml
similarity index 100%
rename from api-java/api-java.iml
rename to fun-test-java/api-java.iml
diff --git a/api-java/build.xml b/fun-test-java/build.xml
similarity index 100%
rename from api-java/build.xml
rename to fun-test-java/build.xml
diff --git a/api-java/java/se/scalablesolutions/akka/api/ActiveObjectGuiceConfigurator.java b/fun-test-java/java/se/scalablesolutions/akka/api/ActiveObjectGuiceConfigurator.java
similarity index 100%
rename from api-java/java/se/scalablesolutions/akka/api/ActiveObjectGuiceConfigurator.java
rename to fun-test-java/java/se/scalablesolutions/akka/api/ActiveObjectGuiceConfigurator.java
diff --git a/api-java/nbproject/build-impl.xml b/fun-test-java/nbproject/build-impl.xml
similarity index 100%
rename from api-java/nbproject/build-impl.xml
rename to fun-test-java/nbproject/build-impl.xml
diff --git a/api-java/nbproject/genfiles.properties b/fun-test-java/nbproject/genfiles.properties
similarity index 100%
rename from api-java/nbproject/genfiles.properties
rename to fun-test-java/nbproject/genfiles.properties
diff --git a/api-java/nbproject/private/config.properties b/fun-test-java/nbproject/private/config.properties
similarity index 100%
rename from api-java/nbproject/private/config.properties
rename to fun-test-java/nbproject/private/config.properties
diff --git a/api-java/nbproject/private/private.properties b/fun-test-java/nbproject/private/private.properties
similarity index 100%
rename from api-java/nbproject/private/private.properties
rename to fun-test-java/nbproject/private/private.properties
diff --git a/api-java/nbproject/private/private.xml b/fun-test-java/nbproject/private/private.xml
similarity index 100%
rename from api-java/nbproject/private/private.xml
rename to fun-test-java/nbproject/private/private.xml
diff --git a/api-java/nbproject/project.properties b/fun-test-java/nbproject/project.properties
similarity index 100%
rename from api-java/nbproject/project.properties
rename to fun-test-java/nbproject/project.properties
diff --git a/api-java/nbproject/project.xml b/fun-test-java/nbproject/project.xml
similarity index 100%
rename from api-java/nbproject/project.xml
rename to fun-test-java/nbproject/project.xml
diff --git a/api-java/pom.xml b/fun-test-java/pom.xml
similarity index 97%
rename from api-java/pom.xml
rename to fun-test-java/pom.xml
index 514030f5ec..d371df6e52 100755
--- a/api-java/pom.xml
+++ b/fun-test-java/pom.xml
@@ -3,8 +3,8 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <name>Akka Java API</name>
-  <artifactId>akka-api-java</artifactId>
+  <name>Akka Functional Tests in Java</name>
+  <artifactId>akka-fun-test-java</artifactId>
 
   <packaging>jar</packaging>
 
diff --git a/api-java/src/test/java/se/scalablesolutions/akka/api/ActiveObjectGuiceConfiguratorTest.java b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/ActiveObjectGuiceConfiguratorTest.java
similarity index 100%
rename from api-java/src/test/java/se/scalablesolutions/akka/api/ActiveObjectGuiceConfiguratorTest.java
rename to fun-test-java/src/test/java/se/scalablesolutions/akka/api/ActiveObjectGuiceConfiguratorTest.java
diff --git a/api-java/src/test/java/se/scalablesolutions/akka/api/Bar.java b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/Bar.java
similarity index 100%
rename from api-java/src/test/java/se/scalablesolutions/akka/api/Bar.java
rename to fun-test-java/src/test/java/se/scalablesolutions/akka/api/Bar.java
diff --git a/api-java/src/test/java/se/scalablesolutions/akka/api/BarImpl.java b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/BarImpl.java
similarity index 100%
rename from api-java/src/test/java/se/scalablesolutions/akka/api/BarImpl.java
rename to fun-test-java/src/test/java/se/scalablesolutions/akka/api/BarImpl.java
diff --git a/api-java/src/test/java/se/scalablesolutions/akka/api/Ext.java b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/Ext.java
similarity index 100%
rename from api-java/src/test/java/se/scalablesolutions/akka/api/Ext.java
rename to fun-test-java/src/test/java/se/scalablesolutions/akka/api/Ext.java
diff --git a/api-java/src/test/java/se/scalablesolutions/akka/api/ExtImpl.java b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/ExtImpl.java
similarity index 100%
rename from api-java/src/test/java/se/scalablesolutions/akka/api/ExtImpl.java
rename to fun-test-java/src/test/java/se/scalablesolutions/akka/api/ExtImpl.java
diff --git a/api-java/src/test/java/se/scalablesolutions/akka/api/Foo.java b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/Foo.java
similarity index 100%
rename from api-java/src/test/java/se/scalablesolutions/akka/api/Foo.java
rename to fun-test-java/src/test/java/se/scalablesolutions/akka/api/Foo.java
diff --git a/api-java/src/test/java/se/scalablesolutions/akka/api/InMemFailer.java b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemFailer.java
similarity index 100%
rename from api-java/src/test/java/se/scalablesolutions/akka/api/InMemFailer.java
rename to fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemFailer.java
diff --git a/api-java/src/test/java/se/scalablesolutions/akka/api/InMemStateful.java b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemStateful.java
similarity index 100%
rename from api-java/src/test/java/se/scalablesolutions/akka/api/InMemStateful.java
rename to fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemStateful.java
diff --git a/api-java/src/test/java/se/scalablesolutions/akka/api/InMemoryStateTest.java b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemoryStateTest.java
similarity index 98%
rename from api-java/src/test/java/se/scalablesolutions/akka/api/InMemoryStateTest.java
rename to fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemoryStateTest.java
index 97a7fda6d0..f388f6164a 100755
--- a/api-java/src/test/java/se/scalablesolutions/akka/api/InMemoryStateTest.java
+++ b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemoryStateTest.java
@@ -4,8 +4,8 @@
 
 package se.scalablesolutions.akka.api;
 
-import static se.scalablesolutions.akka.kernel.config.JavaConfig.*;
 import se.scalablesolutions.akka.kernel.config.*;
+import static se.scalablesolutions.akka.kernel.config.JavaConfig.*;
 
 import junit.framework.TestCase;
 
@@ -145,7 +145,7 @@ class InMemClasherImpl implements InMemClasher {
 
     // FIXME: this statement gives me this error:
     // se.scalablesolutions.akka.kernel.ActiveObjectException:
-    // Unexpected message [!(scala.actors.Channel@c2b2f6,ErrRef[Right(null)])]
+    // Unexpected message [!(scala.actors.Channel@c2b2f6,ResultOrFailure[Right(null)])]
     // to
     // [GenericServer[se.scalablesolutions.akka.api.StatefulImpl]] from
     // [GenericServer[se.scalablesolutions.akka.api.ClasherImpl]]]
diff --git a/api-java/src/test/java/se/scalablesolutions/akka/api/JerseyFoo.java b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/JerseyFoo.java
similarity index 100%
rename from api-java/src/test/java/se/scalablesolutions/akka/api/JerseyFoo.java
rename to fun-test-java/src/test/java/se/scalablesolutions/akka/api/JerseyFoo.java
diff --git a/api-java/src/test/java/se/scalablesolutions/akka/api/PersistentClasher.java b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentClasher.java
similarity index 90%
rename from api-java/src/test/java/se/scalablesolutions/akka/api/PersistentClasher.java
rename to fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentClasher.java
index 14a39ea659..422e4f9339 100644
--- a/api-java/src/test/java/se/scalablesolutions/akka/api/PersistentClasher.java
+++ b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentClasher.java
@@ -20,7 +20,7 @@ public class PersistentClasher {
 
     // FIXME: this statement gives me this error:
     // se.scalablesolutions.akka.kernel.ActiveObjectException:
-    // Unexpected message [!(scala.actors.Channel@c2b2f6,ErrRef[Right(null)])]
+    // Unexpected message [!(scala.actors.Channel@c2b2f6,ResultOrFailure[Right(null)])]
     // to
     // [GenericServer[se.scalablesolutions.akka.api.StatefulImpl]] from
     // [GenericServer[se.scalablesolutions.akka.api.ClasherImpl]]]
diff --git a/api-java/src/test/java/se/scalablesolutions/akka/api/PersistentFailer.java b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentFailer.java
similarity index 100%
rename from api-java/src/test/java/se/scalablesolutions/akka/api/PersistentFailer.java
rename to fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentFailer.java
diff --git a/api-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateTest.java b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateTest.java
similarity index 100%
rename from api-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateTest.java
rename to fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateTest.java
diff --git a/api-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateful.java b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateful.java
similarity index 100%
rename from api-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateful.java
rename to fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateful.java
diff --git a/api-java/src/test/java/se/scalablesolutions/akka/api/RestTest.java b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/RestTest.java
similarity index 100%
rename from api-java/src/test/java/se/scalablesolutions/akka/api/RestTest.java
rename to fun-test-java/src/test/java/se/scalablesolutions/akka/api/RestTest.java
diff --git a/api-java/testng.xml b/fun-test-java/testng.xml
similarity index 100%
rename from api-java/testng.xml
rename to fun-test-java/testng.xml
diff --git a/kernel/akka-kernel.iml b/kernel/akka-kernel.iml
index e6c8ae4520..4dcea33987 100644
--- a/kernel/akka-kernel.iml
+++ b/kernel/akka-kernel.iml
@@ -70,14 +70,40 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$APPLICATION_HOME_DIR$/lib/javaee.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="aspectwerkz 2.1">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../lib/aspectwerkz-nodeps-jdk5-2.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="file://$MODULE_DIR$/../../../java/aspectwerkz4/src/main" />
+        </SOURCES>
+      </library>
+    </orderEntry>
     <orderEntry type="module" module-name="akka-util-java" exported="" />
     <orderEntry type="library" exported="" name="Maven: org.guiceyfruit:guice-core:2.0-beta-4" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.guiceyfruit:guice-jsr250:2.0-beta-4" level="project" />
     <orderEntry type="library" exported="" name="Maven: javax.annotation:jsr250-api:1.0" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.scala-lang:scala-library:2.7.3" level="project" />
-    <orderEntry type="library" exported="" name="Maven: net.lag:configgy:1.2" level="project" />
-    <orderEntry type="library" exported="" name="Maven: org.guiceyfruit:guiceyfruit-core:2.0-beta-7" level="project" />
-    <orderEntry type="library" exported="" name="Maven: org.guiceyfruit:guice-all:2.0-beta-7" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.codehaus.aspectwerkz:aspectwerkz-nodeps-jdk5:2.1" level="project" />
+    <orderEntry type="library" exported="" name="Maven: net.lag:configgy:1.3" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.scala-lang:scala-compiler:2.7.4" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.scala-tools:vscaladoc:1.1-md-3" level="project" />
+    <orderEntry type="library" exported="" name="Maven: markdownj:markdownj:1.0.2b4-0.3.0" level="project" />
+    <orderEntry type="library" name="Maven: junit:junit:4.5" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.scala-tools.testing:specs:1.4.4" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.guiceyfruit:guiceyfruit-core:2.0" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.guiceyfruit:guice-all:2.0" level="project" />
     <orderEntry type="library" exported="" name="Maven: javax.annotation:com.springsource.javax.annotation:1.0.0" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.aopalliance:com.springsource.org.aopalliance:1.0.0" level="project" />
     <orderEntry type="library" exported="" name="Maven: com.google.code.google-collections:google-collect:snapshot-20080530" level="project" />
@@ -125,27 +151,6 @@
     <orderEntry type="library" exported="" name="Maven: log4j:log4j:1.2.13" level="project" />
     <orderEntry type="library" name="Maven: org.scala-tools.testing:scalatest:0.9.5" level="project" />
     <orderEntry type="library" name="Maven: com.jteigen.scalatest:junit4runner:1.0" level="project" />
-    <orderEntry type="library" name="Maven: junit:junit:4.5" level="project" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$APPLICATION_HOME_DIR$/lib/javaee.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="aspectwerkz 2.1">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib/aspectwerkz-nodeps-jdk5-2.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$MODULE_DIR$/../../../java/aspectwerkz4/src/main" />
-        </SOURCES>
-      </library>
-    </orderEntry>
   </component>
 </module>
 
diff --git a/kernel/pom.xml b/kernel/pom.xml
index e9634f2d61..6dfd9e8ff7 100755
--- a/kernel/pom.xml
+++ b/kernel/pom.xml
@@ -33,12 +33,12 @@
     <dependency>
       <groupId>net.lag</groupId>
       <artifactId>configgy</artifactId>
-      <version>1.2</version>
+      <version>1.3</version>
     </dependency>
     <dependency>
       <groupId>org.guiceyfruit</groupId>
       <artifactId>guiceyfruit-core</artifactId>
-      <version>2.0-beta-7</version>
+      <version>2.0</version>
     </dependency>
     <dependency>
       <groupId>org.guiceyfruit</groupId>
diff --git a/kernel/src/main/scala/ActiveObject.scala b/kernel/src/main/scala/ActiveObject.scala
index 50beb2f1ff..73da2bcd0b 100755
--- a/kernel/src/main/scala/ActiveObject.scala
+++ b/kernel/src/main/scala/ActiveObject.scala
@@ -143,7 +143,7 @@ sealed class TransactionalAroundAdvice(target: Class[_],
     activeTx = None
   }
 
-  private def handleResult(result: ErrRef[AnyRef]): AnyRef = {
+  private def handleResult(result: ResultOrFailure[AnyRef]): AnyRef = {
     try {
       result()
     } catch {
@@ -162,11 +162,11 @@ sealed class TransactionalAroundAdvice(target: Class[_],
 
   private def sendOneWay(joinpoint: JoinPoint) = server ! Invocation(joinpoint, activeTx)
 
-  private def sendAndReceiveEventually(joinpoint: JoinPoint): ErrRef[AnyRef] = {
+  private def sendAndReceiveEventually(joinpoint: JoinPoint): ResultOrFailure[AnyRef] = {
     server !!! (Invocation(joinpoint, activeTx), {
-      var ref = ErrRef(activeTx)
-      ref() = throw new ActiveObjectInvocationTimeoutException("Invocation to active object [" + targetInstance.getClass.getName + "] timed out after " + server.timeout + " milliseconds")
-      ref
+      var resultOrFailure = ResultOrFailure(activeTx)
+      resultOrFailure() = throw new ActiveObjectInvocationTimeoutException("Invocation to active object [" + targetInstance.getClass.getName + "] timed out after " + server.timeout + " milliseconds")
+      resultOrFailure
     })
   }
 
@@ -216,13 +216,15 @@ sealed class TransactionalAroundAdvice(target: Class[_],
 private[kernel] class Dispatcher(val targetName: String) extends GenericServer {
   override def body: PartialFunction[Any, Unit] = {
 
-    case (tx: Option[Transaction], joinpoint: JoinPoint) =>
+    case Invocation(joinpoint: JoinPoint, tx: Option[Transaction]) =>
       ActiveObject.threadBoundTx.set(tx)
       try {
-        reply(ErrRef(joinpoint.proceed, tx))
+        reply(ResultOrFailure(joinpoint.proceed, tx))
       } catch {
         case e =>
-          val ref = ErrRef(tx); ref() = throw e; reply(ref)
+          val resultOrFailure = ResultOrFailure(tx)
+          resultOrFailure() = throw e
+          reply(resultOrFailure)
       }
 
     case 'exit =>
diff --git a/kernel/src/main/scala/ErrRef.scala b/kernel/src/main/scala/ResultOrFailure.scala
similarity index 68%
rename from kernel/src/main/scala/ErrRef.scala
rename to kernel/src/main/scala/ResultOrFailure.scala
index a810824421..f3fe516910 100644
--- a/kernel/src/main/scala/ErrRef.scala
+++ b/kernel/src/main/scala/ResultOrFailure.scala
@@ -9,8 +9,8 @@ package se.scalablesolutions.akka.kernel
  *
  * Usage:
  * <pre>
- * scala> ErrRef(1)
- * res0: ErrRef[Int] = ErrRef@a96606
+ * scala> ResultOrFailure(1)
+ * res0: ResultOrFailure[Int] = ResultOrFailure@a96606
  *  
  * scala> res0()
  * res1: Int = 1
@@ -30,7 +30,7 @@ package se.scalablesolutions.akka.kernel
  *
  * scala> res0()
  * java.lang.RuntimeException: Lets see what happens here...
- * 	at ErrRef.apply(RefExcept.scala:11)
+ * 	at ResultOrFailure.apply(RefExcept.scala:11)
  * 	at .<init>(<console>:6)
  * 	at .<clinit>(<console>)
  * 	at Re...
@@ -38,7 +38,7 @@ package se.scalablesolutions.akka.kernel
  *
  * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
  */
-class ErrRef[Payload](payload: Payload, val tx: Option[Transaction]) {
+class ResultOrFailure[Payload](payload: Payload, val tx: Option[Transaction]) {
   private[this] var contents: Either[Throwable, Payload] = Right(payload)
 
   def update(value: => Payload) = {
@@ -50,9 +50,9 @@ class ErrRef[Payload](payload: Payload, val tx: Option[Transaction]) {
     case Left(e) => throw e.fillInStackTrace
   }
 
-  override def toString(): String = "ErrRef[" + contents + "]"
+  override def toString(): String = "ResultOrFailure[" + contents + "]"
 }
-object ErrRef {
-  def apply[Payload](payload: Payload, tx: Option[Transaction]) = new ErrRef(payload, tx)
-  def apply[AnyRef](tx: Option[Transaction]) = new ErrRef(new Object, tx)
+object ResultOrFailure {
+  def apply[Payload](payload: Payload, tx: Option[Transaction]) = new ResultOrFailure(payload, tx)
+  def apply[AnyRef](tx: Option[Transaction]) = new ResultOrFailure(new Object, tx)
 }
diff --git a/pom.xml b/pom.xml
index db2ecf4095..5c181ab17a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
   <modules>
     <module>util-java</module>
     <module>kernel</module>
-    <module>api-java</module>
+    <module>fun-test-java</module>
   </modules>
 
   <repositories>