Skip to content

Commit

Permalink
Update version for release 2.0-RC4
Browse files Browse the repository at this point in the history
  • Loading branch information
viktorklang committed Mar 1, 2012
1 parent 0c01b92 commit 91249e1
Show file tree
Hide file tree
Showing 35 changed files with 85 additions and 85 deletions.
4 changes: 2 additions & 2 deletions akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala
Expand Up @@ -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-RC4")
settings.ConfigVersion must equal("2.0-RC4")

getBoolean("akka.daemonic") must equal(false)
getBoolean("akka.actor.serialize-messages") must equal(false)
Expand Down
2 changes: 1 addition & 1 deletion akka-actor/src/main/resources/reference.conf
Expand Up @@ -7,7 +7,7 @@

akka {
# Akka version, checked against the runtime version of Akka.
version = "2.0-SNAPSHOT"
version = "2.0-RC4"

# Home directory of Akka, modules in the deploy directory will be loaded
home = ""
Expand Down
2 changes: 1 addition & 1 deletion akka-actor/src/main/scala/akka/actor/ActorSystem.scala
Expand Up @@ -23,7 +23,7 @@ import collection.immutable.Stack

object ActorSystem {

val Version = "2.0-SNAPSHOT"
val Version = "2.0-RC4"

val EnvHome = System.getenv("AKKA_HOME") match {
case null | "" | "." None
Expand Down
4 changes: 2 additions & 2 deletions akka-docs/conf.py
Expand Up @@ -17,8 +17,8 @@

project = u'Akka'
copyright = u'2011, Typesafe Inc'
version = '2.0-SNAPSHOT'
release = '2.0-SNAPSHOT'
version = '2.0-RC4'
release = '2.0-RC4'

pygments_style = 'simple'
highlight_language = 'scala'
Expand Down
4 changes: 2 additions & 2 deletions akka-docs/dev/multi-jvm-testing.rst
Expand Up @@ -48,7 +48,7 @@ multi-JVM testing::

lazy val buildSettings = Defaults.defaultSettings ++ Seq(
organization := "com.typesafe.akka",
version := "2.0-SNAPSHOT",
version := "2.0-RC4",
scalaVersion := "2.9.1",
crossPaths := false
)
Expand Down Expand Up @@ -381,4 +381,4 @@ same machine at the same time.

The machines that are used for testing (slaves) should have ssh access to the outside world and be able to talk
to each other with the internal addresses given. On the master machine ssh client is required. Obviosly git
and sbt should be installed on both master and slave machines.
and sbt should be installed on both master and slave machines.
26 changes: 13 additions & 13 deletions akka-docs/intro/getting-started-first-java.rst
Expand Up @@ -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-RC4.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
Expand All @@ -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-RC4
$ export AKKA_HOME=`pwd`
$ echo $AKKA_HOME
/Users/jboner/tools/akka-2.0-SNAPSHOT
/Users/jboner/tools/akka-2.0-RC4

The distribution looks like this::

Expand All @@ -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-RC4.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.

Expand All @@ -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-RC4.jar`` -- STM (Software Transactional Memory), transactors and transactional datastructures
.. - ``akka-camel-2.0-RC4.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-RC4.jar`` -- Apache Camel Typed Actors integration
.. - ``akka-spring-2.0-RC4.jar`` -- Spring framework integration
Expand Down Expand Up @@ -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-RC4</version>
</dependency>
</dependencies>
Expand Down Expand Up @@ -360,19 +360,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-RC4.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-RC4.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-RC4.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-RC4.jar:. \
akka.tutorial.java.first.Pi

Pi approximation: 3.1435501812459323
Expand Down
16 changes: 8 additions & 8 deletions akka-docs/intro/getting-started-first-scala-eclipse.rst
Expand Up @@ -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-RC4.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
Expand All @@ -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-RC4
$ export AKKA_HOME=`pwd`
$ echo $AKKA_HOME
/Users/jboner/tools/akka-2.0-SNAPSHOT
/Users/jboner/tools/akka-2.0-RC4

The distribution looks like this::

Expand All @@ -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-RC4.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.

Expand All @@ -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-RC4.jar`` -- STM (Software Transactional Memory), transactors and transactional datastructures
.. - ``akka-camel-2.0-RC4.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-RC4.jar`` -- Apache Camel Typed Actors integration
.. - ``akka-spring-2.0-RC4.jar`` -- Spring framework integration
Downloading and installing the Scala IDE for Eclipse
Expand Down
32 changes: 16 additions & 16 deletions akka-docs/intro/getting-started-first-scala.rst
Expand Up @@ -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-RC4.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
Expand All @@ -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-RC4
$ export AKKA_HOME=`pwd`
$ echo $AKKA_HOME
/Users/jboner/tools/akka-2.0-SNAPSHOT
/Users/jboner/tools/akka-2.0-RC4

The distribution looks like this::

Expand All @@ -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-RC4.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.

Expand All @@ -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-RC4.jar`` -- STM (Software Transactional Memory), transactors and transactional datastructures
.. - ``akka-camel-2.0-RC4.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-RC4.jar`` -- Apache Camel Typed Actors integration
.. - ``akka-spring-2.0-RC4.jar`` -- Spring framework integration
Downloading and installing Scala
Expand Down Expand Up @@ -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-RC4"

Create a directory ``src/main/scala`` in which you will store the Scala source
files.
Expand All @@ -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-RC4"

libraryDependencies += "com.typesafe.akka" % "akka-remote" % "2.0-SNAPSHOT"
libraryDependencies += "com.typesafe.akka" % "akka-remote" % "2.0-RC4"

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-RC4.jar``. SBT will download that as well.


Start writing the code
Expand Down Expand Up @@ -403,19 +403,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-RC4.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-RC4.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-RC4.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-RC4.jar:. \
akka.tutorial.first.scala.Pi

Pi approximation: 3.1435501812459323
Expand Down
18 changes: 9 additions & 9 deletions akka-docs/intro/getting-started.rst
Expand Up @@ -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-RC4.jar`` -- Standard Actors, Typed Actors and much more
- ``akka-remote-2.0-RC4.jar`` -- Remote Actors
- ``akka-slf4j-2.0-RC4.jar`` -- SLF4J Event Handler Listener
- ``akka-testkit-2.0-RC4.jar`` -- Toolkit for testing Actors
- ``akka-kernel-2.0-RC4.jar`` -- Akka microkernel for running a bare-bones mini application server
- ``akka-<storage-system>-mailbox-2.0-RC4.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
Expand Down Expand Up @@ -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-RC4:

.. code-block:: xml
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-actor</artifactId>
<version>2.0-SNAPSHOT</version>
<version>2.0-RC4</version>
</dependency>
**Note**: for snapshot versions both ``SNAPSHOT`` and timestamped versions are published.
Expand All @@ -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-RC4"


Using Akka with Eclipse
Expand Down
2 changes: 1 addition & 1 deletion akka-docs/java/remoting.rst
Expand Up @@ -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-SNAPSHOT</version>
<version>2.0-RC4</version>
</dependency>

To enable remote capabilities in your Akka project you should, at a minimum, add the following changes
Expand Down
2 changes: 1 addition & 1 deletion akka-docs/modules/camel.rst
Expand Up @@ -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-RC4 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
Expand Down
2 changes: 1 addition & 1 deletion akka-docs/modules/spring.rst
Expand Up @@ -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-RC4 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
Expand Down
2 changes: 1 addition & 1 deletion akka-docs/project/migration-guide-1.3.x-2.0.x.rst
Expand Up @@ -33,7 +33,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-SNAPSHOT"
"com.typesafe.akka" % "akka-actor-migration" % "2.0-RC4"

The first step of the migration is to do some trivial replacements.
Search and replace the following (be careful with the non qualified names):
Expand Down
2 changes: 1 addition & 1 deletion akka-docs/scala/remoting.rst
Expand Up @@ -16,7 +16,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-SNAPSHOT"
"com.typesafe.akka" % "akka-remote" % "2.0-RC4"

To enable remote capabilities in your Akka project you should, at a minimum, add the following changes
to your ``application.conf`` file::
Expand Down
2 changes: 1 addition & 1 deletion akka-kernel/src/main/dist/README
Expand Up @@ -2,7 +2,7 @@
Akka
====

This is the Akka 2.0-SNAPSHOT download.
This is the Akka 2.0-RC4 download.

Included are all libraries, documentation, and sources for Akka.

Expand Down
2 changes: 1 addition & 1 deletion akka-kernel/src/main/dist/config/application.conf
@@ -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-SNAPSHOT/
# For more info about config, please visit the Akka Documentation: http://akka.io/docs/akka/2.0-RC4/
4 changes: 2 additions & 2 deletions akka-sbt-plugin/sample/project/Build.scala
Expand Up @@ -6,7 +6,7 @@ import akka.sbt.AkkaKernelPlugin.{ Dist, outputDirectory, distJvmOptions}

object HelloKernelBuild extends Build {
val Organization = "akka.sample"
val Version = "2.0-SNAPSHOT"
val Version = "2.0-RC4"
val ScalaVersion = "2.9.1"

lazy val HelloKernel = Project(
Expand Down Expand Up @@ -49,7 +49,7 @@ object Dependencies {
object Dependency {
// Versions
object V {
val Akka = "2.0-SNAPSHOT"
val Akka = "2.0-RC4"
}

val akkaKernel = "com.typesafe.akka" % "akka-kernel" % V.Akka
Expand Down

0 comments on commit 91249e1

Please sign in to comment.