From 4a61a14d8b02a98ff263cb2bd5e0f2321432fddf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Bone=CC=81r?= Date: Mon, 21 May 2012 14:40:18 +0200 Subject: [PATCH 1/4] Added Akka Mist port and pointers to other community HTTP/REST projects to the HTTP docs --- akka-docs/modules/http.rst | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/akka-docs/modules/http.rst b/akka-docs/modules/http.rst index c2c01d3ebc..b0f54948d3 100644 --- a/akka-docs/modules/http.rst +++ b/akka-docs/modules/http.rst @@ -1,18 +1,30 @@ .. _http-module: HTTP -==== +#### -Play2-mini ----------- +Play2 Mini +========== -The Akka team recommends the `Play2-mini `_ framework when building RESTful +The Akka team recommends the `Play2 Mini `_ framework when building RESTful service applications that integrates with Akka. It provides a REST API on top of `Play2 `_. 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" % "" + +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 `_. + +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 `_. From ae84ee0a5765a88c9b0a37ae7d15aacac7cf1773 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Bone=CC=81r?= Date: Mon, 21 May 2012 16:45:15 +0200 Subject: [PATCH 2/4] Updated copyright to 2012 --- akka-actor/src/main/scala/akka/actor/Scheduler.scala | 2 +- .../src/test/scala/akka/cluster/NodeStartupSpec.scala | 2 +- akka-docs/project/licenses.rst | 2 +- akka-docs/scala/code/akka/docs/io/HTTPServer.scala | 2 +- akka-remote/src/main/scala/akka/remote/RemoteDaemon.scala | 2 +- akka-remote/src/main/scala/akka/remote/netty/Client.scala | 2 +- .../src/main/scala/akka/remote/netty/NettyRemoteSupport.scala | 2 +- akka-remote/src/main/scala/akka/remote/netty/Server.scala | 2 +- akka-remote/src/main/scala/akka/remote/netty/Settings.scala | 4 ++-- .../test/scala/akka/zeromq/ConcurrentSocketActorSpec.scala | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/akka-actor/src/main/scala/akka/actor/Scheduler.scala b/akka-actor/src/main/scala/akka/actor/Scheduler.scala index 827e511308..8b02734cc8 100644 --- a/akka-actor/src/main/scala/akka/actor/Scheduler.scala +++ b/akka-actor/src/main/scala/akka/actor/Scheduler.scala @@ -1,5 +1,5 @@ /** - * Copyright (C) 2009-2011 Typesafe Inc. + * Copyright (C) 2009-2012 Typesafe Inc. */ package akka.actor diff --git a/akka-cluster/src/test/scala/akka/cluster/NodeStartupSpec.scala b/akka-cluster/src/test/scala/akka/cluster/NodeStartupSpec.scala index 33f069e3bb..711a0552b4 100644 --- a/akka-cluster/src/test/scala/akka/cluster/NodeStartupSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/NodeStartupSpec.scala @@ -1,5 +1,5 @@ /** - * Copyright (C) 2009-2011 Typesafe Inc. + * Copyright (C) 2009-2012 Typesafe Inc. */ package akka.cluster diff --git a/akka-docs/project/licenses.rst b/akka-docs/project/licenses.rst index d7d9865b31..b83b6a5f46 100644 --- a/akka-docs/project/licenses.rst +++ b/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. + Copyright 2009-2012 Typesafe Inc. 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 diff --git a/akka-docs/scala/code/akka/docs/io/HTTPServer.scala b/akka-docs/scala/code/akka/docs/io/HTTPServer.scala index 837dbf4264..01bb53023b 100644 --- a/akka-docs/scala/code/akka/docs/io/HTTPServer.scala +++ b/akka-docs/scala/code/akka/docs/io/HTTPServer.scala @@ -1,5 +1,5 @@ /** - * Copyright (C) 2009-2011 Typesafe Inc. + * Copyright (C) 2009-2012 Typesafe Inc. */ package akka.docs.io diff --git a/akka-remote/src/main/scala/akka/remote/RemoteDaemon.scala b/akka-remote/src/main/scala/akka/remote/RemoteDaemon.scala index 295227081a..7e4beecc7d 100644 --- a/akka-remote/src/main/scala/akka/remote/RemoteDaemon.scala +++ b/akka-remote/src/main/scala/akka/remote/RemoteDaemon.scala @@ -1,5 +1,5 @@ /** - * Copyright (C) 2009-2011 Typesafe Inc. + * Copyright (C) 2009-2012 Typesafe Inc. */ package akka.remote diff --git a/akka-remote/src/main/scala/akka/remote/netty/Client.scala b/akka-remote/src/main/scala/akka/remote/netty/Client.scala index 7baf3011ee..0d689ef30d 100644 --- a/akka-remote/src/main/scala/akka/remote/netty/Client.scala +++ b/akka-remote/src/main/scala/akka/remote/netty/Client.scala @@ -1,5 +1,5 @@ /** - * Copyright (C) 2009-2011 Typesafe Inc. + * Copyright (C) 2009-2012 Typesafe Inc. */ package akka.remote.netty diff --git a/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala b/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala index c45fa986f2..4fd70b822f 100644 --- a/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala +++ b/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala @@ -1,5 +1,5 @@ /** - * Copyright (C) 2009-2011 Typesafe Inc. + * Copyright (C) 2009-2012 Typesafe Inc. */ package akka.remote.netty diff --git a/akka-remote/src/main/scala/akka/remote/netty/Server.scala b/akka-remote/src/main/scala/akka/remote/netty/Server.scala index 7e4d1eaaa9..674023dd52 100644 --- a/akka-remote/src/main/scala/akka/remote/netty/Server.scala +++ b/akka-remote/src/main/scala/akka/remote/netty/Server.scala @@ -1,5 +1,5 @@ /** - * Copyright (C) 2009-2011 Typesafe Inc. + * Copyright (C) 2009-2012 Typesafe Inc. */ package akka.remote.netty diff --git a/akka-remote/src/main/scala/akka/remote/netty/Settings.scala b/akka-remote/src/main/scala/akka/remote/netty/Settings.scala index e2f69d77b5..f73ba52ef6 100644 --- a/akka-remote/src/main/scala/akka/remote/netty/Settings.scala +++ b/akka-remote/src/main/scala/akka/remote/netty/Settings.scala @@ -1,5 +1,5 @@ /** - * Copyright (C) 2009-2011 Typesafe Inc. + * Copyright (C) 2009-2012 Typesafe Inc. */ package akka.remote.netty @@ -73,4 +73,4 @@ class NettySettings(config: Config, val systemName: String) { case sz ⇒ sz } -} \ No newline at end of file +} diff --git a/akka-zeromq/src/test/scala/akka/zeromq/ConcurrentSocketActorSpec.scala b/akka-zeromq/src/test/scala/akka/zeromq/ConcurrentSocketActorSpec.scala index dcc456b544..ea4da04f5a 100644 --- a/akka-zeromq/src/test/scala/akka/zeromq/ConcurrentSocketActorSpec.scala +++ b/akka-zeromq/src/test/scala/akka/zeromq/ConcurrentSocketActorSpec.scala @@ -1,5 +1,5 @@ /** - * Copyright (C) 2009-2011 Typesafe Inc. + * Copyright (C) 2009-2012 Typesafe Inc. */ package akka.zeromq From 803db7b5ac749083efc6f521ce23ab1be67fe396 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Bone=CC=81r?= Date: Mon, 21 May 2012 17:01:21 +0200 Subject: [PATCH 3/4] Added Typesafe to the 'sponsors' doc page --- akka-docs/project/sponsors.rst | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/akka-docs/project/sponsors.rst b/akka-docs/project/sponsors.rst index 085d35cc0d..630493f8c5 100644 --- a/akka-docs/project/sponsors.rst +++ b/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 `_. 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 `_ and `YourKit .NET 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 `_ +and `YourKit .NET Profiler `_ From 22692eb95de6c3706c23d164190d7a5c4c2b3caf Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Mon, 21 May 2012 19:33:50 +0200 Subject: [PATCH 4/4] Switching to logging InvocationException's getCause --- akka-actor/src/main/scala/akka/actor/ActorCell.scala | 2 +- akka-actor/src/main/scala/akka/util/LockUtil.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/akka-actor/src/main/scala/akka/actor/ActorCell.scala b/akka-actor/src/main/scala/akka/actor/ActorCell.scala index 8c68ba3315..68c9097d83 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorCell.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorCell.scala @@ -514,7 +514,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) } diff --git a/akka-actor/src/main/scala/akka/util/LockUtil.scala b/akka-actor/src/main/scala/akka/util/LockUtil.scala index c3295d4b52..739232c3c9 100644 --- a/akka-actor/src/main/scala/akka/util/LockUtil.scala +++ b/akka-actor/src/main/scala/akka/util/LockUtil.scala @@ -25,7 +25,7 @@ final class ReentrantGuard { * 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)) {