Permalink
Browse files

Update version for release 2.0.4

  • Loading branch information...
1 parent 9388389 commit 0ceae29f90a4a15547628ade356ac5f9b90134ee @rkuhn rkuhn committed Nov 14, 2012
Showing with 53 additions and 53 deletions.
  1. +2 −2 akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala
  2. +1 −1 akka-actor/src/main/resources/reference.conf
  3. +1 −1 akka-actor/src/main/scala/akka/actor/ActorSystem.scala
  4. +2 −2 akka-docs/conf.py
  5. +2 −2 akka-docs/dev/developer-guidelines.rst
  6. +1 −1 akka-docs/dev/multi-jvm-testing.rst
  7. +9 −9 akka-docs/intro/getting-started.rst
  8. +1 −1 akka-docs/java/event-bus.rst
  9. +2 −2 akka-docs/java/remoting.rst
  10. +1 −1 akka-docs/java/routing.rst
  11. +1 −1 akka-docs/modules/camel.rst
  12. +1 −1 akka-docs/modules/spring.rst
  13. +1 −1 akka-docs/project/licenses.rst
  14. +1 −1 akka-docs/project/migration-guide-1.3.x-2.0.x.rst
  15. +2 −2 akka-docs/scala/actors.rst
  16. +1 −1 akka-docs/scala/event-bus.rst
  17. +2 −2 akka-docs/scala/fsm.rst
  18. +2 −2 akka-docs/scala/remoting.rst
  19. +2 −2 akka-docs/scala/routing.rst
  20. +1 −1 akka-kernel/src/main/dist/README
  21. +1 −1 akka-kernel/src/main/dist/config/application.conf
  22. +2 −2 akka-sbt-plugin/sample/project/Build.scala
  23. +1 −1 akka-sbt-plugin/sample/project/plugins.sbt
  24. +1 −1 akka-spring/src/main/resources/META-INF/spring.schemas
  25. +1 −1 akka-spring/src/test/resources/akka-test.conf
  26. +1 −1 akka-spring/src/test/resources/appContext.xml
  27. +1 −1 akka-spring/src/test/resources/appContextCamelServiceCustom.xml
  28. +1 −1 akka-spring/src/test/resources/appContextCamelServiceDefault.xml
  29. +1 −1 akka-spring/src/test/resources/dispatcher-config.xml
  30. +1 −1 akka-spring/src/test/resources/failing-appContext.xml
  31. +1 −1 akka-spring/src/test/resources/property-config.xml
  32. +1 −1 akka-spring/src/test/resources/server-managed-config.xml
  33. +1 −1 akka-spring/src/test/resources/supervisor-config.xml
  34. +1 −1 akka-spring/src/test/resources/typed-actor-config.xml
  35. +1 −1 akka-spring/src/test/resources/untyped-actor-config.xml
  36. +1 −1 project/AkkaBuild.scala
@@ -23,8 +23,8 @@ class ConfigSpec extends AkkaSpec(ConfigFactory.defaultReference(ActorSystem.fin
{
import config._
- getString("akka.version") must equal("2.0.4-SNAPSHOT")
- settings.ConfigVersion must equal("2.0.4-SNAPSHOT")
+ getString("akka.version") must equal("2.0.4")
+ settings.ConfigVersion must equal("2.0.4")
getBoolean("akka.daemonic") must equal(false)
getBoolean("akka.actor.serialize-messages") must equal(false)
@@ -7,7 +7,7 @@
akka {
# Akka version, checked against the runtime version of Akka.
- version = "2.0.4-SNAPSHOT"
+ version = "2.0.4"
# Home directory of Akka, modules in the deploy directory will be loaded
home = ""
@@ -23,7 +23,7 @@ import collection.immutable.Stack
object ActorSystem {
- val Version = "2.0.4-SNAPSHOT"
+ val Version = "2.0.4"
val EnvHome = System.getenv("AKKA_HOME") match {
case null | "" | "." None
View
@@ -17,8 +17,8 @@
project = u'Akka'
copyright = u'2011, Typesafe Inc'
-version = '2.0.4-SNAPSHOT'
-release = '2.0.4-SNAPSHOT'
+version = '2.0.4'
+release = '2.0.4'
pygments_style = 'simple'
highlight_language = 'scala'
@@ -46,12 +46,12 @@ All code that is checked in **should** have tests. All testing is done with ``Sc
* Name tests as **Test.scala** if they do not depend on any external stuff. That keeps surefire happy.
* Name tests as **Spec.scala** if they have external dependencies.
-There is a testing standard that should be followed: `Ticket001Spec <https://github.com/akka/akka/blob/master/akka-actor-tests/src/test/scala/akka/ticket/Ticket001Spec.scala>`_
+There is a testing standard that should be followed: `Ticket001Spec <http://github.com/akka/akka/tree/v2.0.4/akka-actor-tests/src/test/scala/akka/ticket/Ticket001Spec.scala>`_
Actor TestKit
^^^^^^^^^^^^^
-There is a useful test kit for testing actors: `akka.util.TestKit <https://github.com/akka/akka/tree/master/akka-testkit/src/main/scala/akka/testkit/TestKit.scala>`_. It enables assertions concerning replies received and their timing, there is more documentation in the :ref:`akka-testkit` module.
+There is a useful test kit for testing actors: `akka.util.TestKit <http://github.com/akka/akka/tree/v2.0.4/akka-testkit/src/main/scala/akka/testkit/TestKit.scala>`_. It enables assertions concerning replies received and their timing, there is more documentation in the :ref:`akka-testkit` module.
Multi-JVM Testing
^^^^^^^^^^^^^^^^^
@@ -46,7 +46,7 @@ multi-JVM testing::
lazy val buildSettings = Defaults.defaultSettings ++ Seq(
organization := "com.typesafe.akka",
- version := "2.0.4-SNAPSHOT",
+ version := "2.0.4",
scalaVersion := "2.9.1",
crossPaths := false
)
@@ -31,12 +31,12 @@ Modules
Akka is very modular and has many JARs for containing different features.
-- ``akka-actor-2.0.4-SNAPSHOT.jar`` -- Standard Actors, Typed Actors and much more
-- ``akka-remote-2.0.4-SNAPSHOT.jar`` -- Remote Actors
-- ``akka-slf4j-2.0.4-SNAPSHOT.jar`` -- SLF4J Event Handler Listener
-- ``akka-testkit-2.0.4-SNAPSHOT.jar`` -- Toolkit for testing Actors
-- ``akka-kernel-2.0.4-SNAPSHOT.jar`` -- Akka microkernel for running a bare-bones mini application server
-- ``akka-<storage-system>-mailbox-2.0.4-SNAPSHOT.jar`` -- Akka durable mailboxes
+- ``akka-actor-2.0.4.jar`` -- Standard Actors, Typed Actors and much more
+- ``akka-remote-2.0.4.jar`` -- Remote Actors
+- ``akka-slf4j-2.0.4.jar`` -- SLF4J Event Handler Listener
+- ``akka-testkit-2.0.4.jar`` -- Toolkit for testing Actors
+- ``akka-kernel-2.0.4.jar`` -- Akka microkernel for running a bare-bones mini application server
+- ``akka-<storage-system>-mailbox-2.0.4.jar`` -- Akka durable mailboxes
How to see the JARs dependencies of each Akka module is described in the
:ref:`dependencies` section. Worth noting is that ``akka-actor`` has zero
@@ -93,14 +93,14 @@ Summary of the essential parts for using Akka with Maven:
<url>http://repo.typesafe.com/typesafe/releases/</url>
</repository>
-2) Add the Akka dependencies. For example, here is the dependency for Akka Actor 2.0.4-SNAPSHOT:
+2) Add the Akka dependencies. For example, here is the dependency for Akka Actor 2.0.4:
.. code-block:: xml
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-actor</artifactId>
- <version>2.0.4-SNAPSHOT</version>
+ <version>2.0.4</version>
</dependency>
**Note**: for snapshot versions both ``SNAPSHOT`` and timestamped versions are published.
@@ -127,7 +127,7 @@ SBT installation instructions on `https://github.com/harrah/xsbt/wiki/Setup <htt
resolvers += "Typesafe Repository" at "http://repo.typesafe.com/typesafe/releases/"
- libraryDependencies += "com.typesafe.akka" % "akka-actor" % "2.0.4-SNAPSHOT"
+ libraryDependencies += "com.typesafe.akka" % "akka-actor" % "2.0.4"
Using Akka with Eclipse
@@ -44,7 +44,7 @@ The classifiers presented here are part of the Akka distribution, but rolling
your own in case you do not find a perfect match is not difficult, check the
implementation of the existing ones on `github`_.
-.. _github: https://github.com/akka/akka/blob/master/akka-actor/src/main/scala/akka/event/EventBus.scala
+.. _github: http://github.com/akka/akka/tree/v2.0.4/akka-actor/src/main/scala/akka/event/EventBus.scala
Lookup Classification
---------------------
@@ -14,7 +14,7 @@ The Akka remoting is a separate jar file. Make sure that you have the following
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-remote</artifactId>
- <version>2.0.4-SNAPSHOT</version>
+ <version>2.0.4</version>
</dependency>
To enable remote capabilities in your Akka project you should, at a minimum, add the following changes
@@ -154,7 +154,7 @@ Description of the Remoting Sample
There is a more extensive remote example that comes with the Akka distribution.
Please have a look here for more information: `Remote Sample
-<https://github.com/akka/akka/tree/master/akka-samples/akka-sample-remote>`_
+<http://github.com/akka/akka/tree/v2.0.4/akka-samples/akka-sample-remote>`_
This sample demonstrates both, remote deployment and look-up of remote actors.
First, let us have a look at the common setup for both scenarios (this is
``common.conf``):
@@ -323,7 +323,7 @@ from incoming sender/message to a ``List`` of ``Destination(sender, routee)``.
The sender is what "parent" the routee should see - changing this could be useful if you for example want
another actor than the original sender to intermediate the result of the routee (if there is a result).
For more information about how to alter the original sender we refer to the source code of
-`ScatterGatherFirstCompletedRouter <https://github.com/akka/akka/blob/master/akka-actor/src/main/scala/akka/routing/Routing.scala#L375>`_
+`ScatterGatherFirstCompletedRouter <http://github.com/akka/akka/tree/v2.0.4/akka-actor/src/main/scala/akka/routing/Routing.scala#L375>`_
All in all the custom router looks like this:
@@ -6,7 +6,7 @@
#######
.. note::
- The Akka Camel module has not been migrated to Akka 2.0.4-SNAPSHOT yet.
+ The Akka Camel module has not been migrated to Akka 2.0.4 yet.
It might not make it into Akka 2.0 final but will then hopefully be
re-introduce in an upcoming release. It might also be backported to
@@ -6,7 +6,7 @@
####################
.. note::
- The Akka Spring module has not been migrated to Akka 2.0.4-SNAPSHOT yet.
+ The Akka Spring module has not been migrated to Akka 2.0.4 yet.
It might not make it into Akka 2.0 final but will then hopefully be
re-introduce in an upcoming release. It might also be backported to
@@ -196,4 +196,4 @@ Licenses for Dependency Libraries
---------------------------------
Each dependency and its license can be seen in the project build file (the comment on the side of each dependency):
-`<https://github.com/akka/akka/blob/master/project/build/AkkaProject.scala#L127>`_
+`<http://github.com/akka/akka/tree/v2.0.4/project/build/AkkaProject.scala#L127>`_
@@ -27,7 +27,7 @@ be removed in Akka 2.1.
The migration kit is provided in separate jar files. Add the following dependency::
- "com.typesafe.akka" % "akka-actor-migration" % "2.0.4-SNAPSHOT"
+ "com.typesafe.akka" % "akka-actor-migration" % "2.0.4"
The first step of the migration is to do some trivial replacements.
Search and replace the following (be careful with the non qualified names):
@@ -595,7 +595,7 @@ The ``become`` method is useful for many different things, but a particular nice
example of it is in example where it is used to implement a Finite State Machine
(FSM): `Dining Hakkers`_.
-.. _Dining Hakkers: http://github.com/akka/akka/blob/master/akka-samples/akka-sample-fsm/src/main/scala/DiningHakkersOnBecome.scala
+.. _Dining Hakkers: http://github.com/akka/akka/tree/v2.0.4/akka-samples/akka-sample-fsm/src/main/scala/DiningHakkersOnBecome.scala
Here is another little cute example of ``become`` and ``unbecome`` in action:
@@ -604,7 +604,7 @@ Here is another little cute example of ``become`` and ``unbecome`` in action:
Encoding Scala Actors nested receives without accidentally leaking memory
-------------------------------------------------------------------------
-See this `Unnested receive example <https://github.com/akka/akka/blob/master/akka-docs/scala/code/akka/docs/actor/UnnestedReceives.scala>`_.
+See this `Unnested receive example <http://github.com/akka/akka/tree/v2.0.4/akka-docs/scala/code/akka/docs/actor/UnnestedReceives.scala>`_.
Downgrade
@@ -46,7 +46,7 @@ The classifiers presented here are part of the Akka distribution, but rolling
your own in case you do not find a perfect match is not difficult, check the
implementation of the existing ones on `github`_.
-.. _github: https://github.com/akka/akka/blob/master/akka-actor/src/main/scala/akka/event/EventBus.scala
+.. _github: http://github.com/akka/akka/tree/v2.0.4/akka-actor/src/main/scala/akka/event/EventBus.scala
Lookup Classification
---------------------
@@ -490,5 +490,5 @@ Examples
A bigger FSM example contrasted with Actor's :meth:`become`/:meth:`unbecome` can be found in the sources:
- * `Dining Hakkers using FSM <https://github.com/akka/akka/blob/master/akka-samples/akka-sample-fsm/src/main/scala/DiningHakkersOnFsm.scala#L1>`_
- * `Dining Hakkers using become <https://github.com/akka/akka/blob/master/akka-samples/akka-sample-fsm/src/main/scala/DiningHakkersOnBecome.scala#L1>`_
+ * `Dining Hakkers using FSM <http://github.com/akka/akka/tree/v2.0.4/akka-samples/akka-sample-fsm/src/main/scala/DiningHakkersOnFsm.scala#L1>`_
+ * `Dining Hakkers using become <http://github.com/akka/akka/tree/v2.0.4/akka-samples/akka-sample-fsm/src/main/scala/DiningHakkersOnBecome.scala#L1>`_
@@ -12,7 +12,7 @@ Preparing your ActorSystem for Remoting
The Akka remoting is a separate jar file. Make sure that you have the following dependency in your project::
- "com.typesafe.akka" % "akka-remote" % "2.0.4-SNAPSHOT"
+ "com.typesafe.akka" % "akka-remote" % "2.0.4"
To enable remote capabilities in your Akka project you should, at a minimum, add the following changes
to your ``application.conf`` file::
@@ -167,7 +167,7 @@ Description of the Remoting Sample
There is a more extensive remote example that comes with the Akka distribution.
Please have a look here for more information: `Remote Sample
-<https://github.com/akka/akka/tree/master/akka-samples/akka-sample-remote>`_
+<http://github.com/akka/akka/tree/v2.0.4/akka-samples/akka-sample-remote>`_
This sample demonstrates both, remote deployment and look-up of remote actors.
First, let us have a look at the common setup for both scenarios (this is
``common.conf``):
@@ -324,14 +324,14 @@ As you can see above what's returned in the partial function is a ``List`` of ``
The sender is what "parent" the routee should see - changing this could be useful if you for example want
another actor than the original sender to intermediate the result of the routee (if there is a result).
For more information about how to alter the original sender we refer to the source code of
-`ScatterGatherFirstCompletedRouter <https://github.com/akka/akka/blob/master/akka-actor/src/main/scala/akka/routing/Routing.scala#L375>`_
+`ScatterGatherFirstCompletedRouter <http://github.com/akka/akka/tree/v2.0.4/akka-actor/src/main/scala/akka/routing/Routing.scala#L375>`_
All in all the custom router looks like this:
.. includecode:: ../../akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala#CustomRouter
If you are interested in how to use the VoteCountRouter you can have a look at the test class
-`RoutingSpec <https://github.com/akka/akka/blob/master/akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala>`_
+`RoutingSpec <http://github.com/akka/akka/tree/v2.0.4/akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala>`_
Configured Custom Router
************************
@@ -2,7 +2,7 @@
Akka
====
-This is the Akka 2.0.4-SNAPSHOT download.
+This is the Akka 2.0.4 download.
Included are all libraries, documentation, and sources for Akka.
@@ -1,3 +1,3 @@
# In this file you can override any option defined in the 'reference.conf' files.
# Copy in all or parts of the 'reference.conf' files and modify as you please.
-# For more info about config, please visit the Akka Documentation: http://akka.io/docs/akka/2.0.4-SNAPSHOT/
+# For more info about config, please visit the Akka Documentation: http://akka.io/docs/akka/2.0.4/
@@ -6,7 +6,7 @@ import akka.sbt.AkkaKernelPlugin.{ Dist, outputDirectory, distJvmOptions}
object HelloKernelBuild extends Build {
val Organization = "akka.sample"
- val Version = "2.0.4-SNAPSHOT"
+ val Version = "2.0.4"
val ScalaVersion = "2.9.1"
lazy val HelloKernel = Project(
@@ -49,7 +49,7 @@ object Dependencies {
object Dependency {
// Versions
object V {
- val Akka = "2.0.4-SNAPSHOT"
+ val Akka = "2.0.4"
}
val akkaKernel = "com.typesafe.akka" % "akka-kernel" % V.Akka
@@ -1,3 +1,3 @@
resolvers += "Typesafe Repo" at "http://repo.typesafe.com/typesafe/releases/"
-addSbtPlugin("com.typesafe.akka" % "akka-sbt-plugin" % "2.0.4-SNAPSHOT")
+addSbtPlugin("com.typesafe.akka" % "akka-sbt-plugin" % "2.0.4")
@@ -1 +1 @@
-http\://akka.io/akka-2.0.4-SNAPSHOT.xsd=akka/spring/akka-2.0.4-SNAPSHOT.xsd
+http\://akka.io/akka-2.0.4.xsd=akka/spring/akka-2.0.4.xsd
@@ -6,7 +6,7 @@
# Modify as needed.
akka {
- version = "2.0.4-SNAPSHOT" # Akka version, checked against the runtime version of Akka.
+ version = "2.0.4" # Akka version, checked against the runtime version of Akka.
enabled-modules = ["remote"] # Comma separated list of the enabled modules. Options: ["remote", "camel", "http"]
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://akka.io/schema/akka
- http://akka.io/akka-2.0.4-SNAPSHOT.xsd">
+ http://akka.io/akka-2.0.4.xsd">
<akka:typed-actor id="sample"
interface="akka.spring.SampleBeanIntf"
@@ -6,7 +6,7 @@
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://akka.io/schema/akka
-http://akka.io/akka-2.0.4-SNAPSHOT.xsd
+http://akka.io/akka-2.0.4.xsd
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd">
@@ -6,7 +6,7 @@
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://akka.io/schema/akka
-http://akka.io/akka-2.0.4-SNAPSHOT.xsd
+http://akka.io/akka-2.0.4.xsd
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd">
@@ -7,7 +7,7 @@
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://akka.io/schema/akka
-http://akka.io/akka-2.0.4-SNAPSHOT.xsd">
+http://akka.io/akka-2.0.4.xsd">
<akka:typed-actor id="typed-actor-with-dispatcher"
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://akka.io/schema/akka
- http://akka.io/akka-2.0.4-SNAPSHOT.xsd">
+ http://akka.io/akka-2.0.4.xsd">
<akka:typed-actor id="bean"
implementation="org.springframework.core.io.ResourceEditor"
@@ -7,7 +7,7 @@
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://akka.io/schema/akka
-http://akka.io/akka-2.0.4-SNAPSHOT.xsd">
+http://akka.io/akka-2.0.4.xsd">
<akka:property-placeholder location="akka-test.conf"/>
@@ -7,7 +7,7 @@
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://akka.io/schema/akka
-http://akka.io/akka-2.0.4-SNAPSHOT.xsd">
+http://akka.io/akka-2.0.4.xsd">
<akka:untyped-actor id="client-managed-remote-untyped-actor"
@@ -7,7 +7,7 @@
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://akka.io/schema/akka
-http://akka.io/akka-2.0.4-SNAPSHOT.xsd">
+http://akka.io/akka-2.0.4.xsd">
<akka:supervision id="supervision1">
<akka:restart-strategy failover="AllForOne" retries="3" timerange="1000">
@@ -7,7 +7,7 @@
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://akka.io/schema/akka
-http://akka.io/akka-2.0.4-SNAPSHOT.xsd">
+http://akka.io/akka-2.0.4.xsd">
<akka:typed-actor id="simple-typed-actor"
interface="akka.spring.foo.IMyPojo"
@@ -7,7 +7,7 @@
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://akka.io/schema/akka
-http://akka.io/akka-2.0.4-SNAPSHOT.xsd">
+http://akka.io/akka-2.0.4.xsd">
<akka:untyped-actor id="simple-untyped-actor"
implementation="akka.spring.foo.PingActor"/>
@@ -20,7 +20,7 @@ object AkkaBuild extends Build {
lazy val buildSettings = Seq(
organization := "com.typesafe.akka",
- version := "2.0.4-SNAPSHOT",
+ version := "2.0.4",
scalaVersion := "2.9.2"
)

0 comments on commit 0ceae29

Please sign in to comment.