mid multiverse bug tracing

akka.iml

@@ -5,7 +5,7 @@
       <configuration />
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <exclude-output />

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

@@ -12,21 +12,18 @@
     <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-SNAPSHOT" level="project" />
-    <orderEntry type="library" exported="" name="Maven: javax.annotation:jsr250-api:1.0" level="project" />
     <orderEntry type="library" exported="" name="Maven: com.google.protobuf:protobuf-java:2.1.0" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.multiverse:multiverse:0.3" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.scala-lang:scala-library:2.7.5" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.codehaus.aspectwerkz:aspectwerkz-nodeps-jdk5:2.1" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.codehaus.aspectwerkz:aspectwerkz-jdk5:2.1" level="project" />
+    <orderEntry type="library" exported="" name="Maven: com.twitter:scala-stats:1.0" level="project" />
     <orderEntry type="library" exported="" name="Maven: net.lag:configgy:1.3" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.scala-lang:scala-compiler:2.7.4" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.scala-tools:vscaladoc:1.1-md-3" level="project" />
     <orderEntry type="library" exported="" name="Maven: markdownj:markdownj:1.0.2b4-0.3.0" level="project" />
     <orderEntry type="library" name="Maven: junit:junit:4.5" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.scala-tools.testing:specs:1.4.4" level="project" />
-    <orderEntry type="library" exported="" name="Maven: org.guiceyfruit:guiceyfruit-core:2.0" level="project" />
-    <orderEntry type="library" exported="" name="Maven: org.guiceyfruit:guice-all:2.0" level="project" />
-    <orderEntry type="library" exported="" name="Maven: javax.annotation:com.springsource.javax.annotation:1.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Maven: org.aopalliance:com.springsource.org.aopalliance:1.0.0" level="project" />
     <orderEntry type="library" exported="" name="Maven: com.google.code.google-collections:google-collect:snapshot-20080530" level="project" />
     <orderEntry type="library" exported="" name="Maven: cglib:cglib:2.2" level="project" />
     <orderEntry type="library" exported="" name="Maven: asm:asm:3.1" level="project" />
@@ -39,13 +36,10 @@
     <orderEntry type="library" exported="" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.1.0" level="project" />
     <orderEntry type="library" exported="" name="Maven: sbinary:sbinary:0.3" level="project" />
     <orderEntry type="library" exported="" name="Maven: com.twitter:scala-json:1.0" level="project" />
-    <orderEntry type="library" exported="" name="Maven: org.apache.cassandra:cassandra:0.4.0-dev" level="project" />
+    <orderEntry type="library" exported="" name="Maven: com.mongodb:mongo:0.6" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.apache.cassandra:cassandra:0.4.0-trunk" level="project" />
     <orderEntry type="library" exported="" name="Maven: com.facebook:thrift:1.0" level="project" />
     <orderEntry type="library" exported="" name="Maven: com.facebook:fb303:1.0" level="project" />
-    <orderEntry type="library" exported="" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Maven: high-scale-lib:high-scale-lib:1.0" level="project" />
-    <orderEntry type="library" exported="" name="Maven: commons-lang:commons-lang:2.4" level="project" />
-    <orderEntry type="library" exported="" name="Maven: se.foldleft:cassidy:0.1" level="project" />
     <orderEntry type="library" exported="" name="Maven: commons-pool:commons-pool:1.5.1" level="project" />
     <orderEntry type="library" exported="" name="Maven: com.sun.grizzly:grizzly-comet-webserver:1.8.6.3" level="project" />
     <orderEntry type="library" name="Maven: com.sun.grizzly:grizzly-servlet-webserver:1.9.9" level="project" />
@@ -75,8 +69,8 @@
     <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: commons-logging:commons-logging:1.0.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.grizzly:grizzly-utils:1.9.9" 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" />

kernel/akka-kernel.iml

@@ -5,12 +5,12 @@
       <configuration />
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/scala" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/scala" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
@@ -28,21 +28,18 @@
     <orderEntry type="library" name="Scala 2.7.5" level="application" />
     <orderEntry type="module" module-name="akka-util-java" exported="" />
     <orderEntry type="library" exported="" name="Maven: org.guiceyfruit:guice-core:2.0-beta-4" level="project" />
-    <orderEntry type="library" exported="" name="Maven: org.guiceyfruit:guice-jsr250:2.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" exported="" name="Maven: javax.annotation:jsr250-api:1.0" level="project" />
     <orderEntry type="library" exported="" name="Maven: com.google.protobuf:protobuf-java:2.1.0" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.multiverse:multiverse:0.3" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.scala-lang:scala-library:2.7.5" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.codehaus.aspectwerkz:aspectwerkz-nodeps-jdk5:2.1" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.codehaus.aspectwerkz:aspectwerkz-jdk5:2.1" level="project" />
+    <orderEntry type="library" exported="" name="Maven: com.twitter:scala-stats:1.0" level="project" />
     <orderEntry type="library" exported="" name="Maven: net.lag:configgy:1.3" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.scala-lang:scala-compiler:2.7.4" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.scala-tools:vscaladoc:1.1-md-3" level="project" />
     <orderEntry type="library" exported="" name="Maven: markdownj:markdownj:1.0.2b4-0.3.0" level="project" />
     <orderEntry type="library" name="Maven: junit:junit:4.5" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.scala-tools.testing:specs:1.4.4" level="project" />
-    <orderEntry type="library" exported="" name="Maven: org.guiceyfruit:guiceyfruit-core:2.0" level="project" />
-    <orderEntry type="library" exported="" name="Maven: org.guiceyfruit:guice-all:2.0" level="project" />
-    <orderEntry type="library" exported="" name="Maven: javax.annotation:com.springsource.javax.annotation:1.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Maven: org.aopalliance:com.springsource.org.aopalliance:1.0.0" level="project" />
     <orderEntry type="library" exported="" name="Maven: com.google.code.google-collections:google-collect:snapshot-20080530" level="project" />
     <orderEntry type="library" exported="" name="Maven: cglib:cglib:2.2" level="project" />
     <orderEntry type="library" exported="" name="Maven: asm:asm:3.1" level="project" />
@@ -55,13 +52,10 @@
     <orderEntry type="library" exported="" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.1.0" level="project" />
     <orderEntry type="library" exported="" name="Maven: sbinary:sbinary:0.3" level="project" />
     <orderEntry type="library" exported="" name="Maven: com.twitter:scala-json:1.0" level="project" />
-    <orderEntry type="library" exported="" name="Maven: org.apache.cassandra:cassandra:0.4.0-dev" level="project" />
+    <orderEntry type="library" exported="" name="Maven: com.mongodb:mongo:0.6" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.apache.cassandra:cassandra:0.4.0-trunk" level="project" />
     <orderEntry type="library" exported="" name="Maven: com.facebook:thrift:1.0" level="project" />
     <orderEntry type="library" exported="" name="Maven: com.facebook:fb303:1.0" level="project" />
-    <orderEntry type="library" exported="" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Maven: high-scale-lib:high-scale-lib:1.0" level="project" />
-    <orderEntry type="library" exported="" name="Maven: commons-lang:commons-lang:2.4" level="project" />
-    <orderEntry type="library" exported="" name="Maven: se.foldleft:cassidy:0.1" level="project" />
     <orderEntry type="library" exported="" name="Maven: commons-pool:commons-pool:1.5.1" level="project" />
     <orderEntry type="library" exported="" name="Maven: com.sun.grizzly:grizzly-comet-webserver:1.8.6.3" level="project" />
     <orderEntry type="library" exported="" name="Maven: com.sun.grizzly:grizzly-servlet-webserver:1.8.6.3" level="project" />
@@ -93,7 +87,6 @@
     <orderEntry type="library" exported="" name="Maven: log4j:log4j:1.2.13" level="project" />
     <orderEntry type="library" exported="" name="Maven: commons-logging:commons-logging:1.0.4" level="project" />
     <orderEntry type="library" name="Maven: org.scala-tools.testing:scalatest:0.9.5" level="project" />
-    <orderEntry type="library" exported="" name="Maven: com.sun.jersey:jersey-client:1.1.0-ea" level="project" />
   </component>
 </module>
 

kernel/src/test/scala/InMemoryActorSpec.scala

@@ -86,6 +86,7 @@ class InMemFailerActor extends Actor {
 }
                                                         
 class InMemoryActorSpec extends TestCase {
+/*
   @Test
   def testOneWayMapShouldNotRollbackStateForStatefulServerInCaseOfSuccess = {
     val stateful = new InMemStatefulActor
@@ -212,30 +213,18 @@ class InMemoryActorSpec extends TestCase {
     Thread.sleep(100)
     assertEquals("init", (stateful !! GetRefState).get) // check that state is == init state
   }
-
+       */
   @Test
   def testRefShouldRollbackStateForStatefulServerInCaseOfFailure = {
     val stateful = new InMemStatefulActor
     stateful.start
-    println("------------ 1")
-    try {
     stateful !! SetRefState("init") // set init state
-    } catch {
-      case e: RuntimeException => 
-        println("------------ 1.1")
-        stateful !! SetRefState("init") // set init state        
-        println("------------ 1.2")
-    }
-    println("------------ 2")
     val failer = new InMemFailerActor
     failer.start
     try {
-    println("------------ 3")
       stateful !! Failure("testShouldRollbackStateForStatefulServerInCaseOfFailure", "new state", failer) // call failing transactionrequired method
-    println("------------ 4")
       fail("should have thrown an exception")
     } catch {case e: RuntimeException => {
-      println("------------ 5")
     }}
     assertEquals("init", (stateful !! GetRefState).get) // check that state is == init state
   }

samples-java/akka-samples-java.iml

@@ -9,8 +9,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="akka-kernel" exported="" />
+    <orderEntry type="library" exported="" name="Maven: se.scalablesolutions.akka:akka-kernel:0.5" level="project" />
-    <orderEntry type="module" module-name="akka-util-java" exported="" />
+    <orderEntry type="library" exported="" name="Maven: se.scalablesolutions.akka:akka-util-java:0.5" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.guiceyfruit:guice-core:2.0-beta-4" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.guiceyfruit:guice-jsr250:2.0-SNAPSHOT" level="project" />
     <orderEntry type="library" exported="" name="Maven: javax.annotation:jsr250-api:1.0" level="project" />

samples-lift/akka-samples-lift.iml

@@ -16,14 +16,14 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="Maven: org.codehaus.aspectwerkz:aspectwerkz-nodeps-jdk5:2.1" level="project" />
+    <orderEntry type="library" exported="" name="Maven: se.scalablesolutions.akka:akka-kernel:0.5" level="project" />
-    <orderEntry type="module" module-name="akka-kernel" exported="" />
+    <orderEntry type="library" exported="" name="Maven: se.scalablesolutions.akka:akka-util-java:0.5" level="project" />
-    <orderEntry type="module" module-name="akka-util-java" exported="" />
     <orderEntry type="library" exported="" name="Maven: org.guiceyfruit:guice-core:2.0-beta-4" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.guiceyfruit:guice-jsr250:2.0-SNAPSHOT" level="project" />
     <orderEntry type="library" exported="" name="Maven: javax.annotation:jsr250-api:1.0" level="project" />
     <orderEntry type="library" exported="" name="Maven: com.google.protobuf:protobuf-java:2.1.0" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.scala-lang:scala-library:2.7.5" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.codehaus.aspectwerkz:aspectwerkz-nodeps-jdk5:2.1" level="project" />
     <orderEntry type="library" exported="" name="Maven: net.lag:configgy:1.3" level="project" />
     <orderEntry type="library" name="Maven: org.scala-lang:scala-compiler:2.7.5" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.scala-tools:vscaladoc:1.1-md-3" level="project" />

samples-scala/akka-samples-scala.iml

@@ -14,8 +14,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="akka-kernel" exported="" />
+    <orderEntry type="library" exported="" name="Maven: se.scalablesolutions.akka:akka-kernel:0.5" level="project" />
-    <orderEntry type="module" module-name="akka-util-java" exported="" />
+    <orderEntry type="library" exported="" name="Maven: se.scalablesolutions.akka:akka-util-java:0.5" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.guiceyfruit:guice-core:2.0-beta-4" level="project" />
     <orderEntry type="library" exported="" name="Maven: org.guiceyfruit:guice-jsr250:2.0-SNAPSHOT" level="project" />
     <orderEntry type="library" exported="" name="Maven: javax.annotation:jsr250-api:1.0" level="project" />

util-java/akka-util-java.iml

@@ -11,9 +11,8 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Protobuf" level="application" />
     <orderEntry type="library" exported="" name="Maven: org.guiceyfruit:guice-core:2.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" exported="" name="Maven: org.guiceyfruit:guice-jsr250:2.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" exported="" name="Maven: javax.annotation:jsr250-api:1.0" level="project" />
     <orderEntry type="library" exported="" name="Maven: com.google.protobuf:protobuf-java:2.1.0" level="project" />
+    <orderEntry type="library" exported="" name="Maven: org.multiverse:multiverse:0.3" level="project" />
   </component>
 </module>
 

util-java/src/main/java/se/scalablesolutions/akka/kernel/stm/Ref.java

@@ -85,9 +85,11 @@ public final class Ref<E> extends FastAtomicObjectMixin implements ManagedRef<E>
 
   @Override
     public E set(final E newRef) {
+    System.out.println("------------- REF SET 1: " + newRef);
     return new AtomicTemplate<E>() {
       @Override
         public E execute(Transaction t) throws Exception {
+          System.out.println("------------- REF SET 2: " + newRef);
         RefTranlocal<E> tranlocalRef = (RefTranlocal) ((Transaction) t).privatize(Ref.this);
         return tranlocalRef.set(newRef);
       }