Merged with current master

LICENSE

@@ -1,6 +1,6 @@
 This software is licensed under the Apache 2 license, quoted below.
 
-Copyright 2009-2010 Scalable Solutions AB [http://scalablesolutions.se]
+Copyright 2009-2011 Scalable Solutions AB [http://scalablesolutions.se]
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not
 use this file except in compliance with the License. You may obtain a copy of

akka-actor/src/main/scala/akka/AkkaException.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka

akka-actor/src/main/scala/akka/Implicits.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka

akka-actor/src/main/scala/akka/actor/Actor.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.actor

akka-actor/src/main/scala/akka/actor/ActorRef.scala

@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ *  Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.actor

akka-actor/src/main/scala/akka/actor/ActorRegistry.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.actor

akka-actor/src/main/scala/akka/actor/BootableActorLoaderService.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.actor

akka-actor/src/main/scala/akka/actor/FSM.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.actor

akka-actor/src/main/scala/akka/actor/Supervisor.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.actor

akka-actor/src/main/scala/akka/actor/UntypedActor.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.actor

akka-actor/src/main/scala/akka/config/Config.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.config
@@ -20,7 +20,7 @@ class ModuleNotAvailableException(message: String) extends AkkaException(message
  * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
  */
 object Config extends Logging {
-  val VERSION = "1.0-RC2-SNAPSHOT"
+  val VERSION = "1.1-SNAPSHOT"
 
   val HOME = {
     val envHome = System.getenv("AKKA_HOME") match {
@@ -64,9 +64,19 @@ object Config extends Logging {
           "\n\tdue to: " + e.toString)
       }
       Configgy.config
+    } else if (getClass.getClassLoader.getResource(confName) ne null) {
+      try {
+        Configgy.configureFromResource(confName, getClass.getClassLoader)
+        log.slf4j.info("Config [{}] loaded from the application classpath.",confName)
+      } catch {
+        case e: ParseException => throw new ConfigurationException(
+          "Can't load '" + confName + "' config file from application classpath," +
+          "\n\tdue to: " + e.toString)
+      }
+      Configgy.config
     } else if (HOME.isDefined) {
       try {
-        val configFile = HOME.getOrElse(throwNoAkkaHomeException) + "/config/" + confName
+        val configFile = HOME.get + "/config/" + confName
         Configgy.configure(configFile)
         log.slf4j.info(
           "AKKA_HOME is defined as [{}], config loaded from [{}].",
@@ -79,16 +89,6 @@ object Config extends Logging {
           "\n\tdue to: " + e.toString)
       }
       Configgy.config
-    } else if (getClass.getClassLoader.getResource(confName) ne null) {
-      try {
-        Configgy.configureFromResource(confName, getClass.getClassLoader)
-        log.slf4j.info("Config [{}] loaded from the application classpath.",confName)
-      } catch {
-        case e: ParseException => throw new ConfigurationException(
-          "Can't load '" + confName + "' config file from application classpath," +
-          "\n\tdue to: " + e.toString)
-      }
-      Configgy.config
     } else {
       log.slf4j.warn(
         "\nCan't load '" + confName + "'." +
@@ -101,6 +101,7 @@ object Config extends Logging {
       CConfig.fromString("<akka></akka>") // default empty config
     }
   }
+  if (config.getBool("akka.enable-jmx", true)) config.registerWithJmx("akka")
 
   val CONFIG_VERSION = config.getString("akka.version", VERSION)
   if (VERSION != CONFIG_VERSION) throw new ConfigurationException(

akka-actor/src/main/scala/akka/config/Configuration.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.config

akka-actor/src/main/scala/akka/config/Configurator.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.config

akka-actor/src/main/scala/akka/config/SupervisionConfig.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.config

akka-actor/src/main/scala/akka/dataflow/DataFlow.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.dataflow

akka-actor/src/main/scala/akka/dispatch/Dispatchers.scala

@@ -1,5 +1,5 @@
 /**
- *   Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ *   Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.dispatch

akka-actor/src/main/scala/akka/dispatch/ExecutorBasedEventDrivenDispatcher.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.dispatch

akka-actor/src/main/scala/akka/dispatch/ExecutorBasedEventDrivenWorkStealingDispatcher.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.dispatch

akka-actor/src/main/scala/akka/dispatch/Future.scala

@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ *  Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.dispatch

akka-actor/src/main/scala/akka/dispatch/HawtDispatcher.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.dispatch

akka-actor/src/main/scala/akka/dispatch/MailboxHandling.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.dispatch

akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.dispatch

akka-actor/src/main/scala/akka/dispatch/ThreadBasedDispatcher.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.dispatch

akka-actor/src/main/scala/akka/dispatch/ThreadPoolBuilder.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.dispatch

akka-actor/src/main/scala/akka/routing/Iterators.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.routing

akka-actor/src/main/scala/akka/routing/Listeners.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.routing

akka-actor/src/main/scala/akka/routing/Routers.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.routing

akka-actor/src/main/scala/akka/routing/Routing.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.routing

akka-actor/src/main/scala/akka/util/Address.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 package akka.util
 

akka-actor/src/main/scala/akka/util/Bootable.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.util

akka-actor/src/main/scala/akka/util/Crypt.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.util

akka-actor/src/main/scala/akka/util/Duration.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.util

akka-actor/src/main/scala/akka/util/HashCode.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.util

akka-actor/src/main/scala/akka/util/Helpers.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.util

akka-actor/src/main/scala/akka/util/ListenerManagement.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.util

akka-actor/src/main/scala/akka/util/LockUtil.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.util

akka-actor/src/main/scala/akka/util/Logging.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.util

akka-actor/src/main/scala/akka/util/ReflectiveAccess.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.util
@@ -87,6 +87,49 @@ object ReflectiveAccess extends Logging {
     }
   }
 
+  object AkkaCloudModule {
+
+    type Mailbox = {
+      def enqueue(message: MessageInvocation)
+      def dequeue: MessageInvocation
+    }
+
+    type Serializer = {
+      def toBinary(obj: AnyRef): Array[Byte]
+      def fromBinary(bytes: Array[Byte], clazz: Option[Class[_]]): AnyRef
+    }
+
+    lazy val isEnabled = clusterObjectInstance.isDefined
+
+    val clusterObjectInstance: Option[AnyRef] =
+      getObjectFor("akka.cloud.cluster.Cluster$")
+
+    val serializerClass: Option[Class[_]] =
+      getClassFor("akka.serialization.Serializer")
+
+    def ensureEnabled = if (!isEnabled) throw new ModuleNotAvailableException(
+      "Feature is only available in Akka Cloud")
+
+    def createFileBasedMailbox(actorRef: ActorRef): Mailbox = createMailbox("akka.cloud.cluster.FileBasedMailbox", actorRef)
+
+    def createZooKeeperBasedMailbox(actorRef: ActorRef): Mailbox = createMailbox("akka.cloud.cluster.ZooKeeperBasedMailbox", actorRef)
+
+    def createBeanstalkBasedMailbox(actorRef: ActorRef): Mailbox = createMailbox("akka.cloud.cluster.BeanstalkBasedMailbox", actorRef)
+
+    def createRedisBasedMailbox(actorRef: ActorRef): Mailbox = createMailbox("akka.cloud.cluster.RedisBasedMailbox", actorRef)
+
+    private def createMailbox(mailboxClassname: String, actorRef: ActorRef): Mailbox = {
+      ensureEnabled
+      createInstance(
+        mailboxClassname,
+        Array(classOf[ActorRef]),
+        Array(actorRef).asInstanceOf[Array[AnyRef]],
+        loader)
+        .getOrElse(throw new IllegalActorStateException("Could not create durable mailbox [" + mailboxClassname + "] for actor [" + actorRef + "]"))
+        .asInstanceOf[Mailbox]
+    }
+  }
+
   val noParams = Array[Class[_]]()
   val noArgs   = Array[AnyRef]()
 
@@ -130,9 +173,15 @@ object ReflectiveAccess extends Logging {
     instance.setAccessible(true)
     Option(instance.get(null).asInstanceOf[T])
   } catch {
-    case e: ClassNotFoundException =>
+    case e: ClassNotFoundException => {
       log.slf4j.debug("Could not get object [{}] due to [{}]", fqn, e)
       None
+    }
+    case ei: ExceptionInInitializerError => {
+      log.error("Exception in initializer for object [%s]".format(fqn))
+      log.error(ei.getCause, "Cause was:")
+      throw ei
+    }
   }
 
   def getClassFor[T](fqn: String, classloader: ClassLoader = loader): Option[Class[T]] = try {

akka-actor/src/test/scala/akka/Messages.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka

akka-actor/src/test/scala/akka/actor/actor/ActorRefSpec.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.actor

akka-actor/src/test/scala/akka/actor/actor/FSMActorSpec.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.actor

akka-actor/src/test/scala/akka/actor/supervisor/RestartStrategySpec.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.actor

akka-actor/src/test/scala/akka/actor/supervisor/SupervisorHierarchySpec.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.actor

akka-actor/src/test/scala/akka/actor/supervisor/SupervisorMiscSpec.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 package akka.actor
 

akka-actor/src/test/scala/akka/actor/supervisor/SupervisorSpec.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.actor

akka-actor/src/test/scala/akka/dataflow/DataFlowSpec.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.dataflow

akka-actor/src/test/scala/akka/dispatch/ActorModelSpec.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 package akka.actor.dispatch
 

akka-actor/src/test/scala/akka/dispatch/DispatchersSpec.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 package akka.actor.dispatch
 

akka-actor/src/test/scala/akka/dispatch/HawtDispatcherEchoServer.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.actor.dispatch

akka-http/src/main/scala/akka/http/AkkaRestServlet.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 package akka.http
 
@@ -14,7 +14,7 @@ class AkkaRestServlet extends ServletContainer {
 
   val initParams = new java.util.HashMap[String,String]
 
-  addInitParameter("com.sun.jersey.config.property.packages",     c.getList("akka.http.resource_packages").mkString(";"))
+  addInitParameter("com.sun.jersey.config.property.packages",     c.getList("akka.http.resource-packages").mkString(";"))
   addInitParameter("com.sun.jersey.spi.container.ResourceFilters",c.getList("akka.http.filters").mkString(","))
 
 /**
@@ -35,4 +35,4 @@ class AkkaRestServlet extends ServletContainer {
   * Provide possibility to add config params
   */
   def addInitParameter(param: String, value: String): Unit = initParams.put(param,value)
-}
+}

akka-http/src/main/scala/akka/http/DefaultAkkaLoader.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.http

akka-http/src/main/scala/akka/http/EmbeddedAppServer.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.http

akka-http/src/main/scala/akka/http/ListWriter.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 package akka.http
 

akka-http/src/main/scala/akka/http/Mist.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.http

akka-http/src/main/scala/akka/http/Servlet30Context.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.http

akka-http/src/main/scala/akka/servlet/AkkaLoader.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.servlet

akka-http/src/main/scala/akka/servlet/Initializer.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.servlet

akka-http/src/test/scala/SecuritySpec.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.security

akka-remote/src/main/protocol/RemoteProtocol.proto

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 option java_package = "akka.remote.protocol";

akka-remote/src/main/scala/akka/remote/BootableRemoteActorService.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.remote

akka-remote/src/main/scala/akka/remote/MessageSerializer.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.remote

akka-remote/src/main/scala/akka/remote/NettyRemoteSupport.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.remote
@@ -404,7 +404,7 @@ class RemoteClientHandler(
     } catch {
       case e: Exception =>
         client.notifyListeners(RemoteClientError(e, client))
-        log.slf4j.error("Unexpected exception in remote client handler: {}", e)
+        log.slf4j.error("Unexpected exception in remote client handler", e)
         throw e
     }
   }

akka-remote/src/main/scala/akka/serialization/Binary.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.serialization

akka-remote/src/main/scala/akka/serialization/Compression.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.serialization

akka-remote/src/main/scala/akka/serialization/Serializable.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.serialization

akka-remote/src/main/scala/akka/serialization/SerializationProtocol.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.serialization

akka-remote/src/main/scala/akka/serialization/Serializer.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.serialization

akka-remote/src/test/protocol/ProtobufProtocol.proto

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.actor;

akka-remote/src/test/scala/Messages.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka

akka-remote/src/test/scala/remote/RemoteSupervisorSpec.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.actor.remote

akka-remote/src/test/scala/remote/RemoteTypedActorSpec.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.actor.remote

akka-remote/src/test/scala/remote/ServerInitiatedRemoteActorSample.scala

@@ -5,6 +5,26 @@ import akka.util.Logging
 
 import Actor._
 
+/*************************************
+Instructions how to run the sample:
+
+* Download Akka distribution.
+* Unzip and step into the Akka root dir
+* Set AKKA_HOME. For exampe 'export AKKA_HOME=`pwd`
+
+* Then open up two shells and in each run:
+* sbt
+* > project akka-remote
+* > console
+
+* Then paste in the code below into both shells.
+
+Then run:
+* ServerInitiatedRemoteActorServer.run in one shell
+* ServerInitiatedRemoteActorClient.run in one shell
+Have fun.
+*************************************/
+
 class HelloWorldActor extends Actor {
   self.start
 

akka-remote/src/test/scala/remote/ServerInitiatedRemoteSessionActorSpec.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.actor.remote

akka-remote/src/test/scala/remote/ServerInitiatedRemoteTypedActorSpec.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.actor.remote

akka-remote/src/test/scala/remote/ServerInitiatedRemoteTypedSessionActorSpec.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.actor.remote

akka-remote/src/test/scala/serialization/TypedActorSerializationSpec.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 
@@ -146,4 +146,4 @@ class MyStatelessTypedActorImpl extends TypedActor with MyTypedActor {
   override def requestReply(message: String) : String = {
     if (message == "hello") "world" else ("hello " + message)
   }
-}
+}

akka-remote/src/test/scala/ticket/Ticket434Spec.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 package akka.actor.ticket
 

akka-remote/src/test/scala/ticket/Ticket519Spec.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 package akka.actor.ticket
 

akka-samples/akka-sample-ants/src/main/scala/Ants.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package sample.ants

akka-samples/akka-sample-remote/src/main/scala/ClientManagedRemoteActorSample.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package sample.remote

akka-samples/akka-sample-remote/src/main/scala/ServerManagedRemoteActorSample.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package sample.remote

akka-sbt-plugin/project/build.properties

@@ -2,6 +2,6 @@ project.name=Akka SBT Plugin
 # need full domain name for publishing to scala-tools
 project.organization=se.scalablesolutions.akka
 # mirrors akka version
-project.version=1.0-RC2-SNAPSHOT
+project.version=1.1-SNAPSHOT
 sbt.version=0.7.4
 build.scala.versions=2.7.7

akka-sbt-plugin/src/main/scala/AkkaProject.scala

@@ -56,7 +56,7 @@ trait AkkaBaseProject extends BasicScalaProject {
 }
 
 trait AkkaProject extends AkkaBaseProject {
-  val akkaVersion = "1.0-RC2-SNAPSHOT"
+  val akkaVersion = "1.1-SNAPSHOT"
 
   // convenience method
   def akkaModule(module: String) = "se.scalablesolutions.akka" % ("akka-" + module) % akkaVersion

akka-stm/src/main/scala/akka/agent/Agent.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.agent

akka-stm/src/main/scala/akka/stm/Atomic.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.stm

akka-stm/src/main/scala/akka/stm/Ref.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.stm

akka-stm/src/main/scala/akka/stm/Stm.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.stm

akka-stm/src/main/scala/akka/stm/Transaction.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.stm
@@ -75,7 +75,8 @@ object Transaction {
     TransactionManagement.transaction.set(Some(tx))
     mtx.registerLifecycleListener(new TransactionLifecycleListener() {
       def notify(mtx: MultiverseTransaction, event: TransactionLifecycleEvent) = event match {
-        case TransactionLifecycleEvent.PostCommit => tx.commit
+        case TransactionLifecycleEvent.PostCommit => tx.commitJta
+        case TransactionLifecycleEvent.PreCommit => tx.commitPersistentState
         case TransactionLifecycleEvent.PostAbort => tx.abort
         case _ => {}
       }
@@ -89,6 +90,7 @@ object Transaction {
  */
 @serializable class Transaction extends Logging {
   val JTA_AWARE = config.getBool("akka.stm.jta-aware", false)
+  val STATE_RETRIES = config.getInt("akka.storage.max-retries",10)
 
   val id = Transaction.idFactory.incrementAndGet
   @volatile private[this] var status: TransactionStatus = TransactionStatus.New
@@ -109,10 +111,16 @@ object Transaction {
     jta.foreach { _.beginWithStmSynchronization(this) }
   }
 
-  def commit = synchronized {
+  def commitPersistentState = synchronized {
-    log.slf4j.trace("Committing transaction " + toString)
+    log.trace("Committing transaction " + toString)
-    persistentStateMap.valuesIterator.foreach(_.commit)
+    retry(STATE_RETRIES){
+      persistentStateMap.valuesIterator.foreach(_.commit)
+      persistentStateMap.clear
+    }
     status = TransactionStatus.Completed
+  }
+
+  def commitJta = synchronized {
     jta.foreach(_.commit)
   }
 
@@ -123,6 +131,21 @@ object Transaction {
     persistentStateMap.clear
   }
 
+  def retry(tries:Int)(block: => Unit):Unit={
+    log.debug("Trying commit of persistent data structures")
+    if(tries==0){
+      throw new TransactionRetryException("Exhausted Retries while committing persistent state")
+    }
+    try{
+      block
+    } catch{
+      case e:Exception=>{
+        log.warn(e,"Exception while committing persistent state, retrying")
+        retry(tries-1){block}
+      }
+    }
+  }
+
   def isNew = synchronized { status == TransactionStatus.New }
 
   def isActive = synchronized { status == TransactionStatus.Active }
@@ -144,7 +167,13 @@ object Transaction {
   private[akka] def isTopLevel = depth.get == 0
   //when calling this method, make sure to prefix the uuid with the type so you
   //have no possibility of kicking a diffferent type with the same uuid out of a transction
-  private[akka] def register(uuid: String, storage: Committable with Abortable) = persistentStateMap.put(uuid, storage)
+  private[akka] def register(uuid: String, storage: Committable with Abortable) = {
+    if(persistentStateMap.getOrElseUpdate(uuid, {storage}) ne storage){
+      log.error("existing:"+System.identityHashCode(persistentStateMap.get(uuid).get))
+      log.error("new:"+System.identityHashCode(storage))
+      throw new IllegalStateException("attempted to register an instance of persistent data structure for id [%s] when there is already a different instance registered".format(uuid))
+    }
+  }
 
   private def ensureIsActive = if (status != TransactionStatus.Active)
     throw new StmConfigurationException(

akka-stm/src/main/scala/akka/stm/TransactionFactory.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.stm

akka-stm/src/main/scala/akka/stm/TransactionFactoryBuilder.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.stm

akka-stm/src/main/scala/akka/stm/TransactionalMap.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.stm

akka-stm/src/main/scala/akka/stm/TransactionalVector.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.stm

akka-stm/src/main/scala/akka/stm/package.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka

akka-stm/src/main/scala/akka/transactor/Atomically.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.transactor

akka-stm/src/main/scala/akka/transactor/Coordinated.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.transactor

akka-stm/src/main/scala/akka/transactor/Transactor.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.transactor

akka-stm/src/main/scala/akka/transactor/UntypedTransactor.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ * Copyright (C) 2009-2011 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
 package akka.transactor