Update version to 2.1-SNAPSHOT

This commit is contained in:
Peter Vlugter 2012-03-05 10:50:54 +13:00
parent fa1cd02eb1
commit 1fd28e429e
36 changed files with 100 additions and 85 deletions

View file

@ -23,8 +23,8 @@ class ConfigSpec extends AkkaSpec(ConfigFactory.defaultReference(ActorSystem.fin
{ {
import config._ import config._
getString("akka.version") must equal("2.0-SNAPSHOT") getString("akka.version") must equal("2.1-SNAPSHOT")
settings.ConfigVersion must equal("2.0-SNAPSHOT") settings.ConfigVersion must equal("2.1-SNAPSHOT")
getBoolean("akka.daemonic") must equal(false) getBoolean("akka.daemonic") must equal(false)
getBoolean("akka.actor.serialize-messages") must equal(false) getBoolean("akka.actor.serialize-messages") must equal(false)

View file

@ -7,7 +7,7 @@
akka { akka {
# Akka version, checked against the runtime version of Akka. # Akka version, checked against the runtime version of Akka.
version = "2.0-SNAPSHOT" version = "2.1-SNAPSHOT"
# Home directory of Akka, modules in the deploy directory will be loaded # Home directory of Akka, modules in the deploy directory will be loaded
home = "" home = ""

View file

@ -23,7 +23,7 @@ import collection.immutable.Stack
object ActorSystem { object ActorSystem {
val Version = "2.0-SNAPSHOT" val Version = "2.1-SNAPSHOT"
val EnvHome = System.getenv("AKKA_HOME") match { val EnvHome = System.getenv("AKKA_HOME") match {
case null | "" | "." None case null | "" | "." None

View file

@ -17,8 +17,8 @@ exclude_patterns = ['_build', 'pending', 'disabled']
project = u'Akka' project = u'Akka'
copyright = u'2011, Typesafe Inc' copyright = u'2011, Typesafe Inc'
version = '2.0-SNAPSHOT' version = '2.1-SNAPSHOT'
release = '2.0-SNAPSHOT' release = '2.1-SNAPSHOT'
pygments_style = 'simple' pygments_style = 'simple'
highlight_language = 'scala' highlight_language = 'scala'

View file

@ -48,7 +48,7 @@ multi-JVM testing::
lazy val buildSettings = Defaults.defaultSettings ++ Seq( lazy val buildSettings = Defaults.defaultSettings ++ Seq(
organization := "com.typesafe.akka", organization := "com.typesafe.akka",
version := "2.0-SNAPSHOT", version := "2.1-SNAPSHOT",
scalaVersion := "2.9.1", scalaVersion := "2.9.1",
crossPaths := false crossPaths := false
) )
@ -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 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 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.

View file

@ -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 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. 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.1-SNAPSHOT.zip`` distribution of Akka from
http://akka.io/downloads/ which includes everything we need for this http://akka.io/downloads/ which includes everything we need for this
tutorial. Once you have downloaded the distribution unzip it in the folder you 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 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 I'm opening up a shell, navigating down to the distribution, and setting the
``AKKA_HOME`` variable:: ``AKKA_HOME`` variable::
$ cd /Users/jboner/tools/akka-2.0-SNAPSHOT $ cd /Users/jboner/tools/akka-2.1-SNAPSHOT
$ export AKKA_HOME=`pwd` $ export AKKA_HOME=`pwd`
$ echo $AKKA_HOME $ echo $AKKA_HOME
/Users/jboner/tools/akka-2.0-SNAPSHOT /Users/jboner/tools/akka-2.1-SNAPSHOT
The distribution looks like this:: 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. - In the ``src`` directory we have the source JARs for Akka.
The only JAR we will need for this tutorial (apart from the 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.1-SNAPSHOT.jar`` JAR in the ``lib/akka``
directory. This is a self-contained JAR with zero dependencies and contains directory. This is a self-contained JAR with zero dependencies and contains
everything we need to write a system using Actors. 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-durable-mailboxes`` -- Durable mailboxes: file-based, MongoDB, Redis, Beanstalk and Zookeeper
.. - ``akka-amqp`` -- AMQP integration .. - ``akka-amqp`` -- AMQP integration
.. - ``akka-stm-2.0-SNAPSHOT.jar`` -- STM (Software Transactional Memory), transactors and transactional datastructures .. - ``akka-stm-2.1-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-2.1-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-camel-typed-2.1-SNAPSHOT.jar`` -- Apache Camel Typed Actors integration
.. - ``akka-spring-2.0-SNAPSHOT.jar`` -- Spring framework integration .. - ``akka-spring-2.1-SNAPSHOT.jar`` -- Spring framework integration
@ -192,7 +192,7 @@ repositories, including akka.io. It should now look something like this:
<dependency> <dependency>
<groupId>com.typesafe.akka</groupId> <groupId>com.typesafe.akka</groupId>
<artifactId>akka-actor</artifactId> <artifactId>akka-actor</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.1-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
@ -360,19 +360,19 @@ time. When that's done open up a shell and step in to the Akka distribution
(``cd $AKKA_HOME``). (``cd $AKKA_HOME``).
First we need to compile the source file. That is done with Java's compiler 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.1-SNAPSHOT.jar`` and the
``scala-library.jar`` JAR files, so let's add them to the compiler classpath ``scala-library.jar`` JAR files, so let's add them to the compiler classpath
when we compile the source:: 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.1-SNAPSHOT.jar tutorial/akka/tutorial/first/java/Pi.java
When we have compiled the source file we are ready to run the application. This 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.1-SNAPSHOT.jar``
and the ``scala-library.jar`` JAR files to the classpath as well as the classes and the ``scala-library.jar`` JAR files to the classpath as well as the classes
we compiled ourselves:: we compiled ourselves::
$ java \ $ java \
-cp lib/scala-library.jar:lib/akka/akka-actor-2.0-SNAPSHOT.jar:. \ -cp lib/scala-library.jar:lib/akka/akka-actor-2.1-SNAPSHOT.jar:. \
akka.tutorial.java.first.Pi akka.tutorial.java.first.Pi
Pi approximation: 3.1435501812459323 Pi approximation: 3.1435501812459323

View file

@ -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 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. 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.1-SNAPSHOT.zip`` distribution of Akka from
http://akka.io/downloads/ which includes everything we need for this http://akka.io/downloads/ which includes everything we need for this
tutorial. Once you have downloaded the distribution unzip it in the folder you 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 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 I'm opening up a shell, navigating down to the distribution, and setting the
``AKKA_HOME`` variable:: ``AKKA_HOME`` variable::
$ cd /Users/jboner/tools/akka-2.0-SNAPSHOT $ cd /Users/jboner/tools/akka-2.1-SNAPSHOT
$ export AKKA_HOME=`pwd` $ export AKKA_HOME=`pwd`
$ echo $AKKA_HOME $ echo $AKKA_HOME
/Users/jboner/tools/akka-2.0-SNAPSHOT /Users/jboner/tools/akka-2.1-SNAPSHOT
The distribution looks like this:: 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. - In the ``src`` directory we have the source JARs for Akka.
The only JAR we will need for this tutorial (apart from the 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.1-SNAPSHOT.jar`` JAR in the ``lib/akka``
directory. This is a self-contained JAR with zero dependencies and contains directory. This is a self-contained JAR with zero dependencies and contains
everything we need to write a system using Actors. 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-durable-mailboxes`` -- Durable mailboxes: file-based, MongoDB, Redis, Zookeeper
.. - ``akka-amqp`` -- AMQP integration .. - ``akka-amqp`` -- AMQP integration
.. - ``akka-stm-2.0-SNAPSHOT.jar`` -- STM (Software Transactional Memory), transactors and transactional datastructures .. - ``akka-stm-2.1-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-2.1-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-camel-typed-2.1-SNAPSHOT.jar`` -- Apache Camel Typed Actors integration
.. - ``akka-spring-2.0-SNAPSHOT.jar`` -- Spring framework integration .. - ``akka-spring-2.1-SNAPSHOT.jar`` -- Spring framework integration
Downloading and installing the Scala IDE for Eclipse Downloading and installing the Scala IDE for Eclipse

View file

@ -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 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. 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.1-SNAPSHOT.zip`` distribution of Akka from
http://akka.io/downloads/ which includes everything we need for this http://akka.io/downloads/ which includes everything we need for this
tutorial. Once you have downloaded the distribution unzip it in the folder you 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 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 I'm opening up a shell, navigating down to the distribution, and setting the
``AKKA_HOME`` variable:: ``AKKA_HOME`` variable::
$ cd /Users/jboner/tools/akka-2.0-SNAPSHOT $ cd /Users/jboner/tools/akka-2.1-SNAPSHOT
$ export AKKA_HOME=`pwd` $ export AKKA_HOME=`pwd`
$ echo $AKKA_HOME $ echo $AKKA_HOME
/Users/jboner/tools/akka-2.0-SNAPSHOT /Users/jboner/tools/akka-2.1-SNAPSHOT
The distribution looks like this:: 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. - In the ``src`` directory we have the source JARs for Akka.
The only JAR we will need for this tutorial (apart from the 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.1-SNAPSHOT.jar`` JAR in the ``lib/akka``
directory. This is a self-contained JAR with zero dependencies and contains directory. This is a self-contained JAR with zero dependencies and contains
everything we need to write a system using Actors. everything we need to write a system using Actors.
@ -144,10 +144,10 @@ modules are:
- ``akka-amqp`` -- AMQP integration - ``akka-amqp`` -- AMQP integration
.. - ``akka-stm-2.0-SNAPSHOT.jar`` -- STM (Software Transactional Memory), transactors and transactional datastructures .. - ``akka-stm-2.1-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-2.1-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-camel-typed-2.1-SNAPSHOT.jar`` -- Apache Camel Typed Actors integration
.. - ``akka-spring-2.0-SNAPSHOT.jar`` -- Spring framework integration .. - ``akka-spring-2.1-SNAPSHOT.jar`` -- Spring framework integration
Downloading and installing Scala 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/" 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.1-SNAPSHOT"
Create a directory ``src/main/scala`` in which you will store the Scala source Create a directory ``src/main/scala`` in which you will store the Scala source
files. 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 ``build.sbt``. Note that there must be a blank line between each. Here is an
example adding ``akka-remote``:: example adding ``akka-remote``::
libraryDependencies += "com.typesafe.akka" % "akka-actor" % "2.0-SNAPSHOT" libraryDependencies += "com.typesafe.akka" % "akka-actor" % "2.1-SNAPSHOT"
libraryDependencies += "com.typesafe.akka" % "akka-remote" % "2.0-SNAPSHOT" libraryDependencies += "com.typesafe.akka" % "akka-remote" % "2.1-SNAPSHOT"
So, now we are all set. So, now we are all set.
SBT itself needs a whole bunch of dependencies but our project will only need 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.1-SNAPSHOT.jar``. SBT will download that as well.
Start writing the code Start writing the code
@ -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``). 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 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.1-SNAPSHOT.jar`` JAR
file, so let's add that to the compiler classpath when we compile the source:: 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.1-SNAPSHOT.jar Pi.scala
When we have compiled the source file we are ready to run the application. This 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 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.1-SNAPSHOT.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 need to add the Scala runtime library ``scala-library.jar`` and the classes we
compiled ourselves:: compiled ourselves::
$ java \ $ java \
-cp lib/scala-library.jar:lib/akka/akka-actor-2.0-SNAPSHOT.jar:. \ -cp lib/scala-library.jar:lib/akka/akka-actor-2.1-SNAPSHOT.jar:. \
akka.tutorial.first.scala.Pi akka.tutorial.first.scala.Pi
Pi approximation: 3.1435501812459323 Pi approximation: 3.1435501812459323

View file

@ -44,12 +44,12 @@ Modules
Akka is very modular and has many JARs for containing different features. 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-actor-2.1-SNAPSHOT.jar`` -- Standard Actors, Typed Actors and much more
- ``akka-remote-2.0-SNAPSHOT.jar`` -- Remote Actors - ``akka-remote-2.1-SNAPSHOT.jar`` -- Remote Actors
- ``akka-slf4j-2.0-SNAPSHOT.jar`` -- SLF4J Event Handler Listener - ``akka-slf4j-2.1-SNAPSHOT.jar`` -- SLF4J Event Handler Listener
- ``akka-testkit-2.0-SNAPSHOT.jar`` -- Toolkit for testing Actors - ``akka-testkit-2.1-SNAPSHOT.jar`` -- Toolkit for testing Actors
- ``akka-kernel-2.0-SNAPSHOT.jar`` -- Akka microkernel for running a bare-bones mini application server - ``akka-kernel-2.1-SNAPSHOT.jar`` -- Akka microkernel for running a bare-bones mini application server
- ``akka-<storage-system>-mailbox-2.0-SNAPSHOT.jar`` -- Akka durable mailboxes - ``akka-<storage-system>-mailbox-2.1-SNAPSHOT.jar`` -- Akka durable mailboxes
How to see the JARs dependencies of each Akka module is described in the 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 :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> <url>http://repo.typesafe.com/typesafe/releases/</url>
</repository> </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.1-SNAPSHOT:
.. code-block:: xml .. code-block:: xml
<dependency> <dependency>
<groupId>com.typesafe.akka</groupId> <groupId>com.typesafe.akka</groupId>
<artifactId>akka-actor</artifactId> <artifactId>akka-actor</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.1-SNAPSHOT</version>
</dependency> </dependency>
**Note**: for snapshot versions both ``SNAPSHOT`` and timestamped versions are published. **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/" 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.1-SNAPSHOT"
Using Akka with Eclipse Using Akka with Eclipse

View file

@ -14,7 +14,7 @@ The Akka remoting is a separate jar file. Make sure that you have the following
<dependency> <dependency>
<groupId>com.typesafe.akka</groupId> <groupId>com.typesafe.akka</groupId>
<artifactId>akka-remote</artifactId> <artifactId>akka-remote</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.1-SNAPSHOT</version>
</dependency> </dependency>
To enable remote capabilities in your Akka project you should, at a minimum, add the following changes To enable remote capabilities in your Akka project you should, at a minimum, add the following changes

View file

@ -6,7 +6,7 @@
####### #######
.. note:: .. 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.1-SNAPSHOT yet.
It might not make it into Akka 2.0 final but will then hopefully be 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 re-introduce in an upcoming release. It might also be backported to

View file

@ -6,7 +6,7 @@
#################### ####################
.. note:: .. 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.1-SNAPSHOT yet.
It might not make it into Akka 2.0 final but will then hopefully be 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 re-introduce in an upcoming release. It might also be backported to

View file

@ -33,7 +33,7 @@ be removed in Akka 2.1.
The migration kit is provided in separate jar files. Add the following dependency:: 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"
The first step of the migration is to do some trivial replacements. The first step of the migration is to do some trivial replacements.
Search and replace the following (be careful with the non qualified names): Search and replace the following (be careful with the non qualified names):

View file

@ -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:: 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.1-SNAPSHOT"
To enable remote capabilities in your Akka project you should, at a minimum, add the following changes To enable remote capabilities in your Akka project you should, at a minimum, add the following changes
to your ``application.conf`` file:: to your ``application.conf`` file::

View file

@ -2,7 +2,7 @@
Akka Akka
==== ====
This is the Akka 2.0-SNAPSHOT download. This is the Akka 2.1-SNAPSHOT download.
Included are all libraries, documentation, and sources for Akka. Included are all libraries, documentation, and sources for Akka.

View file

@ -1,3 +1,3 @@
# In this file you can override any option defined in the 'reference.conf' files. # 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. # 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.1-SNAPSHOT/

View file

@ -6,7 +6,7 @@ import akka.sbt.AkkaKernelPlugin.{ Dist, outputDirectory, distJvmOptions}
object HelloKernelBuild extends Build { object HelloKernelBuild extends Build {
val Organization = "akka.sample" val Organization = "akka.sample"
val Version = "2.0-SNAPSHOT" val Version = "2.1-SNAPSHOT"
val ScalaVersion = "2.9.1" val ScalaVersion = "2.9.1"
lazy val HelloKernel = Project( lazy val HelloKernel = Project(
@ -49,7 +49,7 @@ object Dependencies {
object Dependency { object Dependency {
// Versions // Versions
object V { object V {
val Akka = "2.0-SNAPSHOT" val Akka = "2.1-SNAPSHOT"
} }
val akkaKernel = "com.typesafe.akka" % "akka-kernel" % V.Akka val akkaKernel = "com.typesafe.akka" % "akka-kernel" % V.Akka

View file

@ -1,3 +1,3 @@
resolvers += "Typesafe Repo" at "http://repo.typesafe.com/typesafe/releases/" resolvers += "Typesafe Repo" at "http://repo.typesafe.com/typesafe/releases/"
addSbtPlugin("com.typesafe.akka" % "akka-sbt-plugin" % "2.0-SNAPSHOT") addSbtPlugin("com.typesafe.akka" % "akka-sbt-plugin" % "2.1-SNAPSHOT")

View file

@ -1 +1 @@
http\://akka.io/akka-2.0-SNAPSHOT.xsd=akka/spring/akka-2.0-SNAPSHOT.xsd http\://akka.io/akka-2.1-SNAPSHOT.xsd=akka/spring/akka-2.1-SNAPSHOT.xsd

View file

@ -6,7 +6,7 @@
# Modify as needed. # Modify as needed.
akka { akka {
version = "2.0-SNAPSHOT" # Akka version, checked against the runtime version of Akka. version = "2.1-SNAPSHOT" # Akka version, checked against the runtime version of Akka.
enabled-modules = ["remote"] # Comma separated list of the enabled modules. Options: ["remote", "camel", "http"] enabled-modules = ["remote"] # Comma separated list of the enabled modules. Options: ["remote", "camel", "http"]

View file

@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://akka.io/schema/akka http://akka.io/schema/akka
http://akka.io/akka-2.0-SNAPSHOT.xsd"> http://akka.io/akka-2.1-SNAPSHOT.xsd">
<akka:typed-actor id="sample" <akka:typed-actor id="sample"
interface="akka.spring.SampleBeanIntf" interface="akka.spring.SampleBeanIntf"

View file

@ -6,7 +6,7 @@
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://akka.io/schema/akka http://akka.io/schema/akka
http://akka.io/akka-2.0-SNAPSHOT.xsd http://akka.io/akka-2.1-SNAPSHOT.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd"> http://camel.apache.org/schema/spring/camel-spring.xsd">

View file

@ -6,7 +6,7 @@
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://akka.io/schema/akka http://akka.io/schema/akka
http://akka.io/akka-2.0-SNAPSHOT.xsd http://akka.io/akka-2.1-SNAPSHOT.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd"> http://camel.apache.org/schema/spring/camel-spring.xsd">

View file

@ -7,7 +7,7 @@
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://akka.io/schema/akka http://akka.io/schema/akka
http://akka.io/akka-2.0-SNAPSHOT.xsd"> http://akka.io/akka-2.1-SNAPSHOT.xsd">
<akka:typed-actor id="typed-actor-with-dispatcher" <akka:typed-actor id="typed-actor-with-dispatcher"

View file

@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://akka.io/schema/akka http://akka.io/schema/akka
http://akka.io/akka-2.0-SNAPSHOT.xsd"> http://akka.io/akka-2.1-SNAPSHOT.xsd">
<akka:typed-actor id="bean" <akka:typed-actor id="bean"
implementation="org.springframework.core.io.ResourceEditor" implementation="org.springframework.core.io.ResourceEditor"

View file

@ -7,7 +7,7 @@
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://akka.io/schema/akka http://akka.io/schema/akka
http://akka.io/akka-2.0-SNAPSHOT.xsd"> http://akka.io/akka-2.1-SNAPSHOT.xsd">
<akka:property-placeholder location="akka-test.conf"/> <akka:property-placeholder location="akka-test.conf"/>

View file

@ -7,7 +7,7 @@
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://akka.io/schema/akka http://akka.io/schema/akka
http://akka.io/akka-2.0-SNAPSHOT.xsd"> http://akka.io/akka-2.1-SNAPSHOT.xsd">
<akka:untyped-actor id="client-managed-remote-untyped-actor" <akka:untyped-actor id="client-managed-remote-untyped-actor"

View file

@ -7,7 +7,7 @@
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://akka.io/schema/akka http://akka.io/schema/akka
http://akka.io/akka-2.0-SNAPSHOT.xsd"> http://akka.io/akka-2.1-SNAPSHOT.xsd">
<akka:supervision id="supervision1"> <akka:supervision id="supervision1">
<akka:restart-strategy failover="AllForOne" retries="3" timerange="1000"> <akka:restart-strategy failover="AllForOne" retries="3" timerange="1000">

View file

@ -7,7 +7,7 @@
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://akka.io/schema/akka http://akka.io/schema/akka
http://akka.io/akka-2.0-SNAPSHOT.xsd"> http://akka.io/akka-2.1-SNAPSHOT.xsd">
<akka:typed-actor id="simple-typed-actor" <akka:typed-actor id="simple-typed-actor"
interface="akka.spring.foo.IMyPojo" interface="akka.spring.foo.IMyPojo"

View file

@ -7,7 +7,7 @@
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://akka.io/schema/akka http://akka.io/schema/akka
http://akka.io/akka-2.0-SNAPSHOT.xsd"> http://akka.io/akka-2.1-SNAPSHOT.xsd">
<akka:untyped-actor id="simple-untyped-actor" <akka:untyped-actor id="simple-untyped-actor"
implementation="akka.spring.foo.PingActor"/> implementation="akka.spring.foo.PingActor"/>

View file

@ -8,14 +8,14 @@
<groupId>akka.tutorial.first.java</groupId> <groupId>akka.tutorial.first.java</groupId>
<artifactId>akka-tutorial-first-java</artifactId> <artifactId>akka-tutorial-first-java</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>2.0-SNAPSHOT</version> <version>2.1-SNAPSHOT</version>
<url>http://akka.io</url> <url>http://akka.io</url>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.typesafe.akka</groupId> <groupId>com.typesafe.akka</groupId>
<artifactId>akka-actor</artifactId> <artifactId>akka-actor</artifactId>
<version>2.0-SNAPSHOT</version> <version>2.1-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>

View file

@ -4,7 +4,7 @@ import Keys._
object TutorialBuild extends Build { object TutorialBuild extends Build {
lazy val buildSettings = Seq( lazy val buildSettings = Seq(
organization := "com.typesafe.akka", organization := "com.typesafe.akka",
version := "2.0-SNAPSHOT", version := "2.1-SNAPSHOT",
scalaVersion := "2.9.1" scalaVersion := "2.9.1"
) )
@ -13,10 +13,10 @@ object TutorialBuild extends Build {
base = file("."), base = file("."),
settings = Defaults.defaultSettings ++ Seq( settings = Defaults.defaultSettings ++ Seq(
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"com.typesafe.akka" % "akka-actor" % "2.0-SNAPSHOT", "com.typesafe.akka" % "akka-actor" % "2.1-SNAPSHOT",
"junit" % "junit" % "4.5" % "test", "junit" % "junit" % "4.5" % "test",
"org.scalatest" % "scalatest_2.9.0" % "1.6.1" % "test", "org.scalatest" % "scalatest_2.9.0" % "1.6.1" % "test",
"com.typesafe.akka" % "akka-testkit" % "2.0-SNAPSHOT" % "test") "com.typesafe.akka" % "akka-testkit" % "2.1-SNAPSHOT" % "test")
) )
) )
} }

View file

@ -18,7 +18,7 @@ object AkkaBuild extends Build {
lazy val buildSettings = Seq( lazy val buildSettings = Seq(
organization := "com.typesafe.akka", organization := "com.typesafe.akka",
version := "2.0-SNAPSHOT", version := "2.1-SNAPSHOT",
scalaVersion := "2.9.1-1" scalaVersion := "2.9.1-1"
) )

View file

@ -2,7 +2,7 @@
{ {
"organization":"com.typesafe.akka", "organization":"com.typesafe.akka",
"name":"akka", "name":"akka",
"version":"2.0-SNAPSHOT", "version":"2.0",
"description":"Akka is the platform for the next generation of event-driven, scalable and fault-tolerant architectures on the JVM.", "description":"Akka is the platform for the next generation of event-driven, scalable and fault-tolerant architectures on the JVM.",
"site":"", "site":"",
"tags":["actors","stm","concurrency","distributed","fault-tolerance","scala","java","futures","dataflow","remoting"], "tags":["actors","stm","concurrency","distributed","fault-tolerance","scala","java","futures","dataflow","remoting"],
@ -12,4 +12,4 @@
"dependencies": [], "dependencies": [],
"scalas": ["2.9.1"], "scalas": ["2.9.1"],
"sbt": false "sbt": false
} }

15
src/main/ls/2.1.json Normal file
View file

@ -0,0 +1,15 @@
{
"organization":"com.typesafe.akka",
"name":"akka",
"version":"2.1-SNAPSHOT",
"description":"Akka is the platform for the next generation of event-driven, scalable and fault-tolerant architectures on the JVM.",
"site":"",
"tags":["actors","stm","concurrency","distributed","fault-tolerance","scala","java","futures","dataflow","remoting"],
"docs":"",
"licenses": [],
"resolvers": ["http://akka.io/repository/"],
"dependencies": [],
"scalas": ["2.9.1"],
"sbt": false
}