Permalink
Browse files

Update version for release 2.0-M2

  • Loading branch information...
1 parent 7108a54 commit 9bf5c3bbf84386db4863fb930b4c5d649a0a7b4c @viktorklang viktorklang committed Dec 30, 2011
Showing with 81 additions and 81 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/disabled/camel.rst
  6. +13 −13 akka-docs/intro/getting-started-first-java.rst
  7. +8 −8 akka-docs/intro/getting-started-first-scala-eclipse.rst
  8. +16 −16 akka-docs/intro/getting-started-first-scala.rst
  9. +9 −9 akka-docs/intro/getting-started.rst
  10. +1 −1 akka-docs/modules/camel.rst
  11. +1 −1 akka-docs/modules/spring.rst
  12. +1 −1 akka-docs/scala/remoting.rst
  13. +1 −1 akka-kernel/src/main/dist/README
  14. +1 −1 akka-samples/akka-sample-remote/src/main/resources/common.conf
  15. +1 −1 akka-spring/src/main/resources/META-INF/spring.schemas
  16. 0 akka-spring/src/main/resources/akka/spring/{akka-2.0-SNAPSHOT.xsd → akka-2.0-M2.xsd}
  17. +1 −1 akka-spring/src/test/resources/akka-test.conf
  18. +1 −1 akka-spring/src/test/resources/appContext.xml
  19. +1 −1 akka-spring/src/test/resources/appContextCamelServiceCustom.xml
  20. +1 −1 akka-spring/src/test/resources/appContextCamelServiceDefault.xml
  21. +1 −1 akka-spring/src/test/resources/dispatcher-config.xml
  22. +1 −1 akka-spring/src/test/resources/failing-appContext.xml
  23. +1 −1 akka-spring/src/test/resources/property-config.xml
  24. +1 −1 akka-spring/src/test/resources/server-managed-config.xml
  25. +1 −1 akka-spring/src/test/resources/supervisor-config.xml
  26. +1 −1 akka-spring/src/test/resources/typed-actor-config.xml
  27. +1 −1 akka-spring/src/test/resources/untyped-actor-config.xml
  28. +2 −2 akka-tutorials/akka-tutorial-first/pom.xml
  29. +4 −4 akka-tutorials/akka-tutorial-first/project/TutorialBuild.scala
  30. +1 −1 project/AkkaBuild.scala
  31. +1 −1 scripts/run_akka.sh
  32. +2 −2 src/main/ls/2.0.json
@@ -20,8 +20,8 @@ class ConfigSpec extends AkkaSpec(ConfigFactory.defaultReference) {
val config = settings.config
import config._
- getString("akka.version") must equal("2.0-SNAPSHOT")
- settings.ConfigVersion must equal("2.0-SNAPSHOT")
+ getString("akka.version") must equal("2.0-M2")
+ settings.ConfigVersion must equal("2.0-M2")
getString("akka.actor.default-dispatcher.type") must equal("Dispatcher")
getString("akka.actor.default-dispatcher.name") must equal("default-dispatcher")
@@ -7,7 +7,7 @@
akka {
# Akka version, checked against the runtime version of Akka.
- version = "2.0-SNAPSHOT"
+ version = "2.0-M2"
# Home directory of Akka, modules in the deploy directory will be loaded
home = ""
@@ -28,7 +28,7 @@ import java.io.Closeable
object ActorSystem {
- val Version = "2.0-SNAPSHOT"
+ val Version = "2.0-M2"
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-SNAPSHOT'
-release = '2.0-SNAPSHOT'
+version = '2.0-M2'
+release = '2.0-M2'
pygments_style = 'simple'
highlight_language = 'scala'
@@ -2459,10 +2459,10 @@ main method) that can be started from `sbt`_.
.. code-block:: none
$ sbt
- [info] Building project akka 2.0-SNAPSHOT against Scala 2.9.0
+ [info] Building project akka 2.0-M2 against Scala 2.9.0
[info] using AkkaModulesParentProject with sbt 0.7.7 and Scala 2.7.7
> project akka-sample-camel
- Set current project to akka-sample-camel 2.0-SNAPSHOT
+ Set current project to akka-sample-camel 2.0-M2
> run
...
Multiple main classes detected, select one to run:
@@ -66,7 +66,7 @@ To build and run the tutorial sample from the command line, you have to download
Akka. If you prefer to use SBT to build and run the sample then you can skip this
section and jump to the next one.
-Let's get the ``akka-2.0-SNAPSHOT.zip`` distribution of Akka from
+Let's get the ``akka-2.0-M2.zip`` distribution of Akka from
http://akka.io/downloads/ which includes everything we need for this
tutorial. Once you have downloaded the distribution unzip it in the folder you
would like to have Akka installed in. In my case I choose to install it in
@@ -77,10 +77,10 @@ You need to do one more thing in order to install Akka properly: set the
I'm opening up a shell, navigating down to the distribution, and setting the
``AKKA_HOME`` variable::
- $ cd /Users/jboner/tools/akka-2.0-SNAPSHOT
+ $ cd /Users/jboner/tools/akka-2.0-M2
$ export AKKA_HOME=`pwd`
$ echo $AKKA_HOME
- /Users/jboner/tools/akka-2.0-SNAPSHOT
+ /Users/jboner/tools/akka-2.0-M2
The distribution looks like this::
@@ -100,7 +100,7 @@ The distribution looks like this::
- In the ``src`` directory we have the source JARs for Akka.
The only JAR we will need for this tutorial (apart from the
-``scala-library.jar`` JAR) is the ``akka-actor-2.0-SNAPSHOT.jar`` JAR in the ``lib/akka``
+``scala-library.jar`` JAR) is the ``akka-actor-2.0-M2.jar`` JAR in the ``lib/akka``
directory. This is a self-contained JAR with zero dependencies and contains
everything we need to write a system using Actors.
@@ -120,10 +120,10 @@ modules are:
- ``akka-durable-mailboxes`` -- Durable mailboxes: file-based, MongoDB, Redis, Beanstalk and Zookeeper
.. - ``akka-amqp`` -- AMQP integration
-.. - ``akka-stm-2.0-SNAPSHOT.jar`` -- STM (Software Transactional Memory), transactors and transactional datastructures
-.. - ``akka-camel-2.0-SNAPSHOT.jar`` -- Apache Camel Actors integration (it's the best way to have your Akka application communicate with the rest of the world)
-.. - ``akka-camel-typed-2.0-SNAPSHOT.jar`` -- Apache Camel Typed Actors integration
-.. - ``akka-spring-2.0-SNAPSHOT.jar`` -- Spring framework integration
+.. - ``akka-stm-2.0-M2.jar`` -- STM (Software Transactional Memory), transactors and transactional datastructures
+.. - ``akka-camel-2.0-M2.jar`` -- Apache Camel Actors integration (it's the best way to have your Akka application communicate with the rest of the world)
+.. - ``akka-camel-typed-2.0-M2.jar`` -- Apache Camel Typed Actors integration
+.. - ``akka-spring-2.0-M2.jar`` -- Spring framework integration
@@ -192,7 +192,7 @@ repositories, including akka.io. It should now look something like this:
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-actor</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M2</version>
</dependency>
</dependencies>
@@ -350,19 +350,19 @@ time. When that's done open up a shell and step in to the Akka distribution
(``cd $AKKA_HOME``).
First we need to compile the source file. That is done with Java's compiler
-``javac``. Our application depends on the ``akka-actor-2.0-SNAPSHOT.jar`` and the
+``javac``. Our application depends on the ``akka-actor-2.0-M2.jar`` and the
``scala-library.jar`` JAR files, so let's add them to the compiler classpath
when we compile the source::
- $ javac -cp lib/scala-library.jar:lib/akka/akka-actor-2.0-SNAPSHOT.jar tutorial/akka/tutorial/first/java/Pi.java
+ $ javac -cp lib/scala-library.jar:lib/akka/akka-actor-2.0-M2.jar tutorial/akka/tutorial/first/java/Pi.java
When we have compiled the source file we are ready to run the application. This
-is done with ``java`` but yet again we need to add the ``akka-actor-2.0-SNAPSHOT.jar``
+is done with ``java`` but yet again we need to add the ``akka-actor-2.0-M2.jar``
and the ``scala-library.jar`` JAR files to the classpath as well as the classes
we compiled ourselves::
$ java \
- -cp lib/scala-library.jar:lib/akka/akka-actor-2.0-SNAPSHOT.jar:. \
+ -cp lib/scala-library.jar:lib/akka/akka-actor-2.0-M2.jar:. \
akka.tutorial.java.first.Pi
Pi estimate: 3.1435501812459323
@@ -88,7 +88,7 @@ To build and run the tutorial sample from the command line, you have to download
Akka. If you prefer to use SBT to build and run the sample then you can skip this
section and jump to the next one.
-Let's get the ``akka-2.0-SNAPSHOT.zip`` distribution of Akka from
+Let's get the ``akka-2.0-M2.zip`` distribution of Akka from
http://akka.io/downloads/ which includes everything we need for this
tutorial. Once you have downloaded the distribution unzip it in the folder you
would like to have Akka installed in. In my case I choose to install it in
@@ -99,10 +99,10 @@ You need to do one more thing in order to install Akka properly: set the
I'm opening up a shell, navigating down to the distribution, and setting the
``AKKA_HOME`` variable::
- $ cd /Users/jboner/tools/akka-2.0-SNAPSHOT
+ $ cd /Users/jboner/tools/akka-2.0-M2
$ export AKKA_HOME=`pwd`
$ echo $AKKA_HOME
- /Users/jboner/tools/akka-2.0-SNAPSHOT
+ /Users/jboner/tools/akka-2.0-M2
The distribution looks like this::
@@ -122,7 +122,7 @@ The distribution looks like this::
- In the ``src`` directory we have the source JARs for Akka.
The only JAR we will need for this tutorial (apart from the
-``scala-library.jar`` JAR) is the ``akka-actor-2.0-SNAPSHOT.jar`` JAR in the ``lib/akka``
+``scala-library.jar`` JAR) is the ``akka-actor-2.0-M2.jar`` JAR in the ``lib/akka``
directory. This is a self-contained JAR with zero dependencies and contains
everything we need to write a system using Actors.
@@ -142,10 +142,10 @@ modules are:
- ``akka-durable-mailboxes`` -- Durable mailboxes: file-based, MongoDB, Redis, Zookeeper
.. - ``akka-amqp`` -- AMQP integration
-.. - ``akka-stm-2.0-SNAPSHOT.jar`` -- STM (Software Transactional Memory), transactors and transactional datastructures
-.. - ``akka-camel-2.0-SNAPSHOT.jar`` -- Apache Camel Actors integration (it's the best way to have your Akka application communicate with the rest of the world)
-.. - ``akka-camel-typed-2.0-SNAPSHOT.jar`` -- Apache Camel Typed Actors integration
-.. - ``akka-spring-2.0-SNAPSHOT.jar`` -- Spring framework integration
+.. - ``akka-stm-2.0-M2.jar`` -- STM (Software Transactional Memory), transactors and transactional datastructures
+.. - ``akka-camel-2.0-M2.jar`` -- Apache Camel Actors integration (it's the best way to have your Akka application communicate with the rest of the world)
+.. - ``akka-camel-typed-2.0-M2.jar`` -- Apache Camel Typed Actors integration
+.. - ``akka-spring-2.0-M2.jar`` -- Spring framework integration
Downloading and installing the Scala IDE for Eclipse
@@ -89,7 +89,7 @@ To build and run the tutorial sample from the command line, you have to download
Akka. If you prefer to use SBT to build and run the sample then you can skip this
section and jump to the next one.
-Let's get the ``akka-2.0-SNAPSHOT.zip`` distribution of Akka from
+Let's get the ``akka-2.0-M2.zip`` distribution of Akka from
http://akka.io/downloads/ which includes everything we need for this
tutorial. Once you have downloaded the distribution unzip it in the folder you
would like to have Akka installed in. In my case I choose to install it in
@@ -100,10 +100,10 @@ You need to do one more thing in order to install Akka properly: set the
I'm opening up a shell, navigating down to the distribution, and setting the
``AKKA_HOME`` variable::
- $ cd /Users/jboner/tools/akka-2.0-SNAPSHOT
+ $ cd /Users/jboner/tools/akka-2.0-M2
$ export AKKA_HOME=`pwd`
$ echo $AKKA_HOME
- /Users/jboner/tools/akka-2.0-SNAPSHOT
+ /Users/jboner/tools/akka-2.0-M2
The distribution looks like this::
@@ -123,7 +123,7 @@ The distribution looks like this::
- In the ``src`` directory we have the source JARs for Akka.
The only JAR we will need for this tutorial (apart from the
-``scala-library.jar`` JAR) is the ``akka-actor-2.0-SNAPSHOT.jar`` JAR in the ``lib/akka``
+``scala-library.jar`` JAR) is the ``akka-actor-2.0-M2.jar`` JAR in the ``lib/akka``
directory. This is a self-contained JAR with zero dependencies and contains
everything we need to write a system using Actors.
@@ -144,10 +144,10 @@ modules are:
- ``akka-amqp`` -- AMQP integration
-.. - ``akka-stm-2.0-SNAPSHOT.jar`` -- STM (Software Transactional Memory), transactors and transactional datastructures
-.. - ``akka-camel-2.0-SNAPSHOT.jar`` -- Apache Camel Actors integration (it's the best way to have your Akka application communicate with the rest of the world)
-.. - ``akka-camel-typed-2.0-SNAPSHOT.jar`` -- Apache Camel Typed Actors integration
-.. - ``akka-spring-2.0-SNAPSHOT.jar`` -- Spring framework integration
+.. - ``akka-stm-2.0-M2.jar`` -- STM (Software Transactional Memory), transactors and transactional datastructures
+.. - ``akka-camel-2.0-M2.jar`` -- Apache Camel Actors integration (it's the best way to have your Akka application communicate with the rest of the world)
+.. - ``akka-camel-typed-2.0-M2.jar`` -- Apache Camel Typed Actors integration
+.. - ``akka-spring-2.0-M2.jar`` -- Spring framework integration
Downloading and installing Scala
@@ -216,7 +216,7 @@ in the directory you want to create your project in::
resolvers += "Typesafe Repository" at "http://repo.typesafe.com/typesafe/releases/"
- libraryDependencies += "com.typesafe.akka" % "akka-actor" % "2.0-SNAPSHOT"
+ libraryDependencies += "com.typesafe.akka" % "akka-actor" % "2.0-M2"
Create a directory ``src/main/scala`` in which you will store the Scala source
files.
@@ -226,14 +226,14 @@ modules beyond ``akka-actor``, you can add these as ``libraryDependencies`` in
``build.sbt``. Note that there must be a blank line between each. Here is an
example adding ``akka-remote``::
- libraryDependencies += "com.typesafe.akka" % "akka-actor" % "2.0-SNAPSHOT"
+ libraryDependencies += "com.typesafe.akka" % "akka-actor" % "2.0-M2"
- libraryDependencies += "com.typesafe.akka" % "akka-remote" % "2.0-SNAPSHOT"
+ libraryDependencies += "com.typesafe.akka" % "akka-remote" % "2.0-M2"
So, now we are all set.
SBT itself needs a whole bunch of dependencies but our project will only need
-one; ``akka-actor-2.0-SNAPSHOT.jar``. SBT will download that as well.
+one; ``akka-actor-2.0-M2.jar``. SBT will download that as well.
Start writing the code
@@ -402,19 +402,19 @@ If you have not typed in (or copied) the code for the tutorial as in
When that's done open up a shell and step in to the Akka distribution (``cd $AKKA_HOME``).
First we need to compile the source file. That is done with Scala's compiler
-``scalac``. Our application depends on the ``akka-actor-2.0-SNAPSHOT.jar`` JAR
+``scalac``. Our application depends on the ``akka-actor-2.0-M2.jar`` JAR
file, so let's add that to the compiler classpath when we compile the source::
- $ scalac -cp lib/akka/akka-actor-2.0-SNAPSHOT.jar Pi.scala
+ $ scalac -cp lib/akka/akka-actor-2.0-M2.jar Pi.scala
When we have compiled the source file we are ready to run the application. This
is done with ``java`` but yet again we need to add the
-``akka-actor-2.0-SNAPSHOT.jar`` JAR file to the classpath, and this time we also
+``akka-actor-2.0-M2.jar`` JAR file to the classpath, and this time we also
need to add the Scala runtime library ``scala-library.jar`` and the classes we
compiled ourselves::
$ java \
- -cp lib/scala-library.jar:lib/akka/akka-actor-2.0-SNAPSHOT.jar:. \
+ -cp lib/scala-library.jar:lib/akka/akka-actor-2.0-M2.jar:. \
akka.tutorial.first.scala.Pi
Pi estimate: 3.1435501812459323
@@ -44,12 +44,12 @@ Modules
Akka is very modular and has many JARs for containing different features.
-- ``akka-actor-2.0-SNAPSHOT.jar`` -- Standard Actors, Typed Actors and much more
-- ``akka-remote-2.0-SNAPSHOT.jar`` -- Remote Actors
-- ``akka-slf4j-2.0-SNAPSHOT.jar`` -- SLF4J Event Handler Listener
-- ``akka-testkit-2.0-SNAPSHOT.jar`` -- Toolkit for testing Actors
-- ``akka-kernel-2.0-SNAPSHOT.jar`` -- Akka microkernel for running a bare-bones mini application server
-- ``akka-<storage-system>-mailbox-2.0-SNAPSHOT.jar`` -- Akka durable mailboxes
+- ``akka-actor-2.0-M2.jar`` -- Standard Actors, Typed Actors and much more
+- ``akka-remote-2.0-M2.jar`` -- Remote Actors
+- ``akka-slf4j-2.0-M2.jar`` -- SLF4J Event Handler Listener
+- ``akka-testkit-2.0-M2.jar`` -- Toolkit for testing Actors
+- ``akka-kernel-2.0-M2.jar`` -- Akka microkernel for running a bare-bones mini application server
+- ``akka-<storage-system>-mailbox-2.0-M2.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
@@ -105,14 +105,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-SNAPSHOT:
+2) Add the Akka dependencies. For example, here is the dependency for Akka Actor 2.0-M2:
.. code-block:: xml
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-actor</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M2</version>
</dependency>
**Note**: for snapshot versions both ``SNAPSHOT`` and timestamped versions are published.
@@ -138,7 +138,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-SNAPSHOT"
+ libraryDependencies += "com.typesafe.akka" % "akka-actor" % "2.0-M2"
Using Akka with Eclipse
@@ -6,7 +6,7 @@
#######
.. note::
- The Akka Camel module has not been migrated to Akka 2.0-SNAPSHOT yet.
+ The Akka Camel module has not been migrated to Akka 2.0-M2 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-SNAPSHOT yet.
+ The Akka Spring module has not been migrated to Akka 2.0-M2 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
@@ -15,7 +15,7 @@ The Akka remoting is a separate jar file. Make sure that you have a dependency f
In you SBT project you should add the following as a dependency::
- "com.typesafe.akka" % "akka-remote" % "2.0-SNAPSHOT"
+ "com.typesafe.akka" % "akka-remote" % "2.0-M2"
To enable remote capabilities in your Akka project you should, at a minimum, add the following changes
to your ``application.conf`` file::
@@ -2,7 +2,7 @@
Akka
====
-This is the Akka 2.0-SNAPSHOT download.
+This is the Akka 2.0-M2 download.
Included are all libraries, documentation, and sources for Akka.
@@ -1,5 +1,5 @@
akka {
- version = "2.0-SNAPSHOT"
+ version = "2.0-M2"
actor {
provider = "akka.remote.RemoteActorRefProvider"
@@ -1 +1 @@
-http\://akka.io/akka-2.0-SNAPSHOT.xsd=akka/spring/akka-2.0-SNAPSHOT.xsd
+http\://akka.io/akka-2.0-M2.xsd=akka/spring/akka-2.0-M2.xsd
@@ -6,7 +6,7 @@
# Modify as needed.
akka {
- version = "2.0-SNAPSHOT" # Akka version, checked against the runtime version of Akka.
+ version = "2.0-M2" # 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-SNAPSHOT.xsd">
+ http://akka.io/akka-2.0-M2.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-SNAPSHOT.xsd
+http://akka.io/akka-2.0-M2.xsd
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd">
Oops, something went wrong.

0 comments on commit 9bf5c3b

Please sign in to comment.