Permalink
Browse files

Update version for release 2.0

  • Loading branch information...
1 parent e8180e1 commit 6b0f0b080dd844479be239c686a57c451d884e6e @pvlugter pvlugter committed Mar 6, 2012
Showing with 100 additions and 100 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. +1 −1 akka-docs/dev/multi-jvm-testing.rst
  6. +26 −26 akka-docs/intro/getting-started-first-java.rst
  7. +27 −27 akka-docs/intro/getting-started-first-scala.rst
  8. +9 −9 akka-docs/intro/getting-started.rst
  9. +1 −1 akka-docs/java/remoting.rst
  10. +1 −1 akka-docs/modules/camel.rst
  11. +1 −1 akka-docs/modules/spring.rst
  12. +1 −1 akka-docs/project/migration-guide-1.3.x-2.0.x.rst
  13. +1 −1 akka-docs/scala/remoting.rst
  14. +1 −1 akka-kernel/src/main/dist/README
  15. +1 −1 akka-kernel/src/main/dist/config/application.conf
  16. +2 −2 akka-sbt-plugin/sample/project/Build.scala
  17. +1 −1 akka-sbt-plugin/sample/project/plugins.sbt
  18. +1 −1 akka-spring/src/main/resources/META-INF/spring.schemas
  19. 0 akka-spring/src/main/resources/akka/spring/{akka-2.0-SNAPSHOT.xsd → akka-2.0.xsd}
  20. +1 −1 akka-spring/src/test/resources/akka-test.conf
  21. +1 −1 akka-spring/src/test/resources/appContext.xml
  22. +1 −1 akka-spring/src/test/resources/appContextCamelServiceCustom.xml
  23. +1 −1 akka-spring/src/test/resources/appContextCamelServiceDefault.xml
  24. +1 −1 akka-spring/src/test/resources/dispatcher-config.xml
  25. +1 −1 akka-spring/src/test/resources/failing-appContext.xml
  26. +1 −1 akka-spring/src/test/resources/property-config.xml
  27. +1 −1 akka-spring/src/test/resources/server-managed-config.xml
  28. +1 −1 akka-spring/src/test/resources/supervisor-config.xml
  29. +1 −1 akka-spring/src/test/resources/typed-actor-config.xml
  30. +1 −1 akka-spring/src/test/resources/untyped-actor-config.xml
  31. +2 −2 akka-tutorials/akka-tutorial-first/pom.xml
  32. +4 −4 akka-tutorials/akka-tutorial-first/project/TutorialBuild.scala
  33. +1 −1 project/AkkaBuild.scala
  34. +2 −2 src/main/ls/2.0.json
@@ -23,8 +23,8 @@ class ConfigSpec extends AkkaSpec(ConfigFactory.defaultReference(ActorSystem.fin
{
import config._
- getString("akka.version") must equal("2.0-SNAPSHOT")
- settings.ConfigVersion must equal("2.0-SNAPSHOT")
+ getString("akka.version") must equal("2.0")
+ settings.ConfigVersion must equal("2.0")
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-SNAPSHOT"
+ version = "2.0"
# 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-SNAPSHOT"
+ val Version = "2.0"
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'
+release = '2.0'
pygments_style = 'simple'
highlight_language = 'scala'
@@ -46,7 +46,7 @@ multi-JVM testing::
lazy val buildSettings = Defaults.defaultSettings ++ Seq(
organization := "com.typesafe.akka",
- version := "2.0-SNAPSHOT",
+ version := "2.0",
scalaVersion := "2.9.1",
crossPaths := false
)
@@ -85,7 +85,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.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
@@ -98,17 +98,17 @@ I'm opening up a shell, navigating down to the distribution, and setting the
On Linux/Unix/Mac systems::
- $ cd /Users/jboner/tools/akka-2.0-SNAPSHOT
+ $ cd /Users/jboner/tools/akka-2.0
$ export AKKA_HOME=`pwd`
$ echo $AKKA_HOME
- /Users/jboner/tools/akka-2.0-SNAPSHOT
+ /Users/jboner/tools/akka-2.0
On Windows systems::
- C:\Users\jboner\src\akka> cd akka-2.0-SNAPSHOT
- C:\Users\jboner\src\akka\akka-2.0-SNAPSHOT> set AKKA_HOME=%cd%
- C:\Users\jboner\src\akka\akka-2.0-SNAPSHOT> echo %AKKA_HOME%
- C:\Users\jboner\src\akka\akka-2.0-SNAPSHOT
+ C:\Users\jboner\src\akka> cd akka-2.0
+ C:\Users\jboner\src\akka\akka-2.0> set AKKA_HOME=%cd%
+ C:\Users\jboner\src\akka\akka-2.0> echo %AKKA_HOME%
+ C:\Users\jboner\src\akka\akka-2.0
The distribution looks like this.
@@ -124,7 +124,7 @@ On Linux/Unix/Mac systems::
On Windows systems::
- C:\Users\jboner\src\akka\akka-2.0-SNAPSHOT> dir
+ C:\Users\jboner\src\akka\akka-2.0> dir
bin
config
deploy
@@ -140,7 +140,7 @@ On Windows systems::
- 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.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.
@@ -160,10 +160,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.jar`` -- STM (Software Transactional Memory), transactors and transactional datastructures
+.. - ``akka-camel-2.0.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.jar`` -- Apache Camel Typed Actors integration
+.. - ``akka-spring-2.0.jar`` -- Spring framework integration
@@ -191,7 +191,7 @@ On Linux/Unix/Mac systems::
On Windows systems::
- C:\Users\jboner\src\akka\akka-2.0-SNAPSHOT> mvn archetype:generate \
+ C:\Users\jboner\src\akka\akka-2.0> mvn archetype:generate \
-DgroupId=akka.tutorial.first.java \
-DartifactId=akka-tutorial-first-java \
-DarchetypeArtifactId=maven-archetype-quickstart \
@@ -205,7 +205,7 @@ On Linux/Unix/Mac systems::
On Windows systems::
- C:\Users\jboner\src\akka\akka-2.0-SNAPSHOT> cd akka-tutorial-first-java
+ C:\Users\jboner\src\akka\akka-2.0> cd akka-tutorial-first-java
Here is the layout that Maven created::
@@ -248,7 +248,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</version>
</dependency>
</dependencies>
@@ -416,38 +416,38 @@ 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.jar`` and the
``scala-library.jar`` JAR files, so let's add them to the compiler classpath
when we compile the source.
On Linux/Unix/Mac systems::
- $ 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.jar tutorial/akka/tutorial/first/java/Pi.java
On Windows systems::
- C:\Users\jboner\src\akka\akka-2.0-SNAPSHOT> javac -cp \
- lib/scala-library.jar;lib/akka/akka-actor-2.0-SNAPSHOT.jar \
+ C:\Users\jboner\src\akka\akka-2.0> javac -cp \
+ lib/scala-library.jar;lib/akka/akka-actor-2.0.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.jar``
and the ``scala-library.jar`` JAR files to the classpath as well as the classes
we compiled ourselves.
On Linux/Unix/Mac systems::
$ 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.jar:. \
akka.tutorial.first.scala.Pi
Pi approximation: 3.1415926435897883
Calculation time: 359 millis
On Windows systems::
- C:\Users\jboner\src\akka\akka-2.0-SNAPSHOT> java \
- -cp lib/scala-library.jar;lib\akka\akka-actor-2.0-SNAPSHOT.jar;. \
+ C:\Users\jboner\src\akka\akka-2.0> java \
+ -cp lib/scala-library.jar;lib\akka\akka-actor-2.0.jar;. \
akka.tutorial.first.scala.Pi
Pi approximation: 3.1415926435897883
@@ -466,7 +466,7 @@ On Linux/Unix/Mac systems::
On Windows systems::
- C:\Users\jboner\src\akka\akka-2.0-SNAPSHOT> mvn compile
+ C:\Users\jboner\src\akka\akka-2.0> mvn compile
When this in done we can run our application directly inside Maven.
@@ -479,7 +479,7 @@ On Linux/Unix/Mac systems::
On Windows systems::
- C:\Users\jboner\src\akka\akka-2.0-SNAPSHOT> mvn exec:java \
+ C:\Users\jboner\src\akka\akka-2.0> mvn exec:java \
-Dexec.mainClass="akka.tutorial.first.java.Pi"
...
Pi approximation: 3.1415926435897883
@@ -106,7 +106,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.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
@@ -119,17 +119,17 @@ I'm opening up a shell, navigating down to the distribution, and setting the
On Linux/Unix/Mac systems::
- $ cd /Users/jboner/tools/akka-2.0-SNAPSHOT
+ $ cd /Users/jboner/tools/akka-2.0
$ export AKKA_HOME=`pwd`
$ echo $AKKA_HOME
- /Users/jboner/tools/akka-2.0-SNAPSHOT
+ /Users/jboner/tools/akka-2.0
On Windows systems::
- C:\Users\jboner\src\akka> cd akka-2.0-SNAPSHOT
- C:\Users\jboner\src\akka\akka-2.0-SNAPSHOT> set AKKA_HOME=%cd%
- C:\Users\jboner\src\akka\akka-2.0-SNAPSHOT> echo %AKKA_HOME%
- C:\Users\jboner\src\akka\akka-2.0-SNAPSHOT
+ C:\Users\jboner\src\akka> cd akka-2.0
+ C:\Users\jboner\src\akka\akka-2.0> set AKKA_HOME=%cd%
+ C:\Users\jboner\src\akka\akka-2.0> echo %AKKA_HOME%
+ C:\Users\jboner\src\akka\akka-2.0
The distribution looks like this.
@@ -145,7 +145,7 @@ On Linux/Unix/Mac systems::
On Windows systems::
- C:\Users\jboner\src\akka\akka-2.0-SNAPSHOT> dir
+ C:\Users\jboner\src\akka\akka-2.0> dir
bin
config
deploy
@@ -161,7 +161,7 @@ On Windows systems::
- 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.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.
@@ -182,10 +182,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.jar`` -- STM (Software Transactional Memory), transactors and transactional datastructures
+.. - ``akka-camel-2.0.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.jar`` -- Apache Camel Typed Actors integration
+.. - ``akka-spring-2.0.jar`` -- Spring framework integration
Downloading and installing Scala
@@ -209,7 +209,7 @@ On Linux/Unix/Mac systems::
On Windows systems::
- C:\Users\jboner\src\akka\akka-2.0-SNAPSHOT> set PATH=%PATH%;scala-2.9.1\bin
+ C:\Users\jboner\src\akka\akka-2.0> set PATH=%PATH%;scala-2.9.1\bin
You can test your installation by invoking scala.
@@ -220,7 +220,7 @@ On Linux/Unix/Mac systems::
On Windows systems::
- C:\Users\jboner\src\akka\akka-2.0-SNAPSHOT> scala -version
+ C:\Users\jboner\src\akka\akka-2.0> scala -version
Scala code runner version 2.9.1.final -- Copyright 2002-2011, LAMP/EPFL
Looks like we are all good. Finally let's create a source file ``Pi.scala`` for
@@ -267,7 +267,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"
Create a directory ``src/main/scala`` in which you will store the Scala source
files.
@@ -277,14 +277,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"
- libraryDependencies += "com.typesafe.akka" % "akka-remote" % "2.0-SNAPSHOT"
+ libraryDependencies += "com.typesafe.akka" % "akka-remote" % "2.0"
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.jar``. SBT will download that as well.
Start writing the code
@@ -454,36 +454,36 @@ 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.jar`` JAR
file, so let's add that to the compiler classpath when we compile the source.
On Linux/Unix/Mac systems::
- $ scalac -cp lib/akka/akka-actor-2.0-SNAPSHOT.jar Pi.scala
+ $ scalac -cp lib/akka/akka-actor-2.0.jar Pi.scala
On Windows systems::
- C:\Users\jboner\src\akka\akka-2.0-SNAPSHOT> scalac -cp lib\akka\akka-actor-2.0-SNAPSHOT.jar Pi.scala
+ C:\Users\jboner\src\akka\akka-2.0> scalac -cp lib\akka\akka-actor-2.0.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.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.
On Linux/Unix/Mac systems::
$ 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.jar:. \
akka.tutorial.first.scala.Pi
Pi approximation: 3.1415926435897883
Calculation time: 359 millis
On Windows systems::
- C:\Users\jboner\src\akka\akka-2.0-SNAPSHOT> java \
- -cp lib/scala-library.jar;lib\akka\akka-actor-2.0-SNAPSHOT.jar;. \
+ C:\Users\jboner\src\akka\akka-2.0> java \
+ -cp lib/scala-library.jar;lib\akka\akka-actor-2.0.jar;. \
akka.tutorial.first.scala.Pi
Pi approximation: 3.1415926435897883
@@ -505,7 +505,7 @@ On Linux/Unix/Mac systems::
On Windows systems::
- C:\Users\jboner\src\akka\akka-2.0-SNAPSHOT> sbt
+ C:\Users\jboner\src\akka\akka-2.0> sbt
> compile
...
Oops, something went wrong.

0 comments on commit 6b0f0b0

Please sign in to comment.