Merge branch 'master' into wip-2006-binary-compat-√

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

@@ -531,7 +531,7 @@ private[akka] class ActorCell(
             """exception during creation, this problem is likely to occur because the class of the Actor you tried to create is either,
                a non-static inner class (in which case make it a static inner class or use Props(new ...) or Props( new UntypedActorFactory ... )
                or is missing an appropriate, reachable no-args constructor.
-            """, i)
+            """, i.getCause)
         case NonFatal(e) ⇒
           throw ActorInitializationException(self, "exception during creation", e)
       }

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

@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2009-2011 Typesafe Inc. <http://www.typesafe.com>
+ *  Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
 
 package akka.actor

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

@@ -20,7 +20,7 @@ final class ReentrantGuard extends ReentrantLock {
  * An atomic switch that can be either on or off
  */
 class Switch(startAsOn: Boolean = false) {
-  private val switch = new AtomicBoolean(startAsOn)
+  private val switch = new AtomicBoolean(startAsOn) // FIXME switch to AQS
 
   protected def transcend(from: Boolean, action: ⇒ Unit): Boolean = synchronized {
     if (switch.compareAndSet(from, !from)) {

akka-cluster/src/test/scala/akka/cluster/NodeStartupSpec.scala

@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2009-2011 Typesafe Inc. <http://www.typesafe.com>
+ *  Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
 package akka.cluster
 

akka-docs/modules/http.rst

@@ -1,18 +1,30 @@
 .. _http-module:
 
 HTTP
-====
+####
 
-Play2-mini
-----------
+Play2 Mini
+==========
 
-The Akka team recommends the `Play2-mini <https://github.com/typesafehub/play2-mini>`_ framework when building RESTful
+The Akka team recommends the `Play2 Mini <https://github.com/typesafehub/play2-mini>`_ framework when building RESTful
 service applications that integrates with Akka. It provides a REST API on top of `Play2 <https://github.com/playframework/Play20/>`_.
 
 Getting started
 ---------------
 
 First you must make your application aware of play-mini.
-In SBT you just have to add the following to your _libraryDependencies_::
+In SBT you just have to add the following to your ``libraryDependencies``::
 
   libraryDependencies += "com.typesafe" %% "play-mini" % "<version-number>"
+
+Akka Mist
+=========
+
+If you are using Akka Mist (Akka's old HTTP/REST module) with Akka 1.x and wish to upgrade to 2.x
+there is now a port of Akka Mist to Akka 2.x. You can find it `here <https://github.com/thenewmotion/akka-http>`_.
+
+Other Alternatives
+==================
+
+There are a bunch of other alternatives for using Akka with HTTP/REST. You can find some of them
+among the `Community Projects <http://akka.io/community>`_.

akka-docs/project/licenses.rst

@@ -12,7 +12,7 @@ Akka License
 
   This software is licensed under the Apache 2 license, quoted below.
 
-  Copyright 2009-2011 Typesafe Inc. <http://www.typesafe.com>
+  Copyright 2009-2012 Typesafe Inc. <http://www.typesafe.com>
 
   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-docs/project/sponsors.rst

@@ -1,11 +1,23 @@
 .. _sponsors:
 
 Sponsors
-============
+========
+
+Typesafe
+--------
+
+Typesafe is the company behind the Akka Project, Scala Programming Language,
+Play Web Framework, Scala IDE, Simple Build Tool and many other open source
+projects. It also provides the Typesafe Stack, a full-featured development
+stack consisting of AKka, Play and Scala. Learn more at
+`typesafe.com <http://typesafe.com>`_.
 
 YourKit
 -------
 
 YourKit is kindly supporting open source projects with its full-featured Java Profiler.
-YourKit, LLC is the creator of innovative and intelligent tools for profiling Java and .NET applications.
-Take a look at YourKit’s leading software products: `YourKit Java Profiler <http://www.yourkit.com/java/profiler/index.jsp>`_ and `YourKit .NET Profiler <http://www.yourkit.com/.net/profiler/index.jsp>`_
+
+YourKit, LLC is the creator of innovative and intelligent tools for profiling Java
+and .NET applications. Take a look at YourKit’s leading software products:
+`YourKit Java Profiler <http://www.yourkit.com/java/profiler/index.jsp>`_
+and `YourKit .NET Profiler <http://www.yourkit.com/.net/profiler/index.jsp>`_

akka-docs/scala/code/akka/docs/io/HTTPServer.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2011 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
 package akka.docs.io
 

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

@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2009-2011 Typesafe Inc. <http://www.typesafe.com>
+ *  Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
 
 package akka.remote

akka-remote/src/main/scala/akka/remote/netty/Client.scala

@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2009-2011 Typesafe Inc. <http://www.typesafe.com>
+ *  Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
 package akka.remote.netty
 

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2011 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
 
 package akka.remote.netty

akka-remote/src/main/scala/akka/remote/netty/Server.scala

@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2009-2011 Typesafe Inc. <http://www.typesafe.com>
+ *  Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
 package akka.remote.netty
 

akka-remote/src/main/scala/akka/remote/netty/Settings.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2011 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
 package akka.remote.netty
 
@@ -73,4 +73,4 @@ class NettySettings(config: Config, val systemName: String) {
     case sz           ⇒ sz
   }
 
-}
+}

akka-zeromq/src/test/scala/akka/zeromq/ConcurrentSocketActorSpec.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2011 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
 package akka.zeromq