Skip to content

Commit

Permalink
Update version for release 1.3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
viktorklang committed Feb 7, 2012
1 parent f85b902 commit 8dca68c
Show file tree
Hide file tree
Showing 23 changed files with 147 additions and 147 deletions.
Expand Up @@ -18,7 +18,7 @@ class ConfigSpec extends WordSpec with MustMatchers {

getList("akka.boot") must equal(Nil)
getString("akka.time-unit") must equal(Some("seconds"))
getString("akka.version") must equal(Some("1.3-SNAPSHOT"))
getString("akka.version") must equal(Some("1.3.1"))

getString("akka.actor.default-dispatcher.type") must equal(Some("GlobalExecutorBasedEventDriven"))
getInt("akka.actor.default-dispatcher.keep-alive-time") must equal(Some(60))
Expand Down
2 changes: 1 addition & 1 deletion akka-actor/src/main/scala/akka/config/Config.scala
Expand Up @@ -19,7 +19,7 @@ class ModuleNotAvailableException(message: String, cause: Throwable = null) exte
* @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
*/
object Config {
val VERSION = "1.3-SNAPSHOT"
val VERSION = "1.3.1"

val HOME = {
val envHome = System.getenv("AKKA_HOME") match {
Expand Down
16 changes: 8 additions & 8 deletions akka-docs/additional/add-on-modules.rst
Expand Up @@ -5,12 +5,12 @@ Add-on Modules

Akka Modules consist of add-on modules outside the core of Akka:

- ``akka-kernel-1.3-SNAPSHOT.jar`` -- Akka microkernel for running a bare-bones mini application server (embeds Jetty etc.)
- ``akka-amqp-1.3-SNAPSHOT.jar`` -- AMQP integration
- ``akka-camel-1.3-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-1.3-SNAPSHOT.jar`` -- Apache Camel Typed Actors integration
- ``akka-scalaz-1.3-SNAPSHOT.jar`` -- Support for the Scalaz library
- ``akka-spring-1.3-SNAPSHOT.jar`` -- Spring framework integration
- ``akka-osgi-dependencies-bundle-1.3-SNAPSHOT.jar`` -- OSGi support
- ``akka-kernel-1.3.1.jar`` -- Akka microkernel for running a bare-bones mini application server (embeds Jetty etc.)
- ``akka-amqp-1.3.1.jar`` -- AMQP integration
- ``akka-camel-1.3.1.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-1.3.1.jar`` -- Apache Camel Typed Actors integration
- ``akka-scalaz-1.3.1.jar`` -- Support for the Scalaz library
- ``akka-spring-1.3.1.jar`` -- Spring framework integration
- ``akka-osgi-dependencies-bundle-1.3.1.jar`` -- OSGi support

Documentation for Akka Modules is located `here <http://akka.io/docs/akka-modules/1.3-SNAPSHOT/>`_.
Documentation for Akka Modules is located `here <http://akka.io/docs/akka-modules/1.3.1/>`_.
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 = '1.3-SNAPSHOT'
release = '1.3-SNAPSHOT'
version = '1.3.1'
release = '1.3.1'

pygments_style = 'simple'
highlight_language = 'scala'
Expand Down
2 changes: 1 addition & 1 deletion akka-docs/dev/building-akka.rst
Expand Up @@ -124,7 +124,7 @@ convenient.
For example, building Akka as above is more commonly done like this::

% sbt
[info] Building project akka 1.3-SNAPSHOT against Scala 2.9.1
[info] Building project akka 1.3.1 against Scala 2.9.1
[info] using AkkaParentProject with sbt 0.7.6 and Scala 2.7.7
> update
[info]
Expand Down
48 changes: 24 additions & 24 deletions akka-docs/disabled/getting-started-first.rst
Expand Up @@ -41,14 +41,14 @@ Downloading and installing Akka

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-1.3-SNAPSHOT`` distribution of Akka core (not Akka Modules) from `http://akka.io/downloads <http://akka.io/downloads/>`_. 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 ``/Users/jboner/tools/``, simply by unzipping it to this directory.
Let's get the ``akka-1.3.1`` distribution of Akka core (not Akka Modules) from `http://akka.io/downloads <http://akka.io/downloads/>`_. 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 ``/Users/jboner/tools/``, simply by unzipping it to this directory.

You need to do one more thing in order to install Akka properly: set the ``AKKA_HOME`` environment variable to the root of the distribution. In my case I'm opening up a shell, navigating down to the distribution, and setting the ``AKKA_HOME`` variable::

$ cd /Users/jboner/tools/akka-1.3-SNAPSHOT
$ cd /Users/jboner/tools/akka-1.3.1
$ export AKKA_HOME=`pwd`
$ echo $AKKA_HOME
/Users/jboner/tools/akka-1.3-SNAPSHOT
/Users/jboner/tools/akka-1.3.1

The distribution looks like this::

Expand All @@ -68,27 +68,27 @@ The distribution looks like this::
- In the ``scripts`` directory we have scripts for running Akka.
- Finally ``scala-library.jar`` is the JAR for the latest Scala distribution that Akka depends on.

The only JAR we will need for this tutorial (apart from the ``scala-library.jar`` JAR) is the ``akka-actor-1.3-SNAPSHOT.jar`` JAR in the ``dist`` directory. This is a self-contained JAR with zero dependencies and contains everything we need to write a system using Actors.
The only JAR we will need for this tutorial (apart from the ``scala-library.jar`` JAR) is the ``akka-actor-1.3.1.jar`` JAR in the ``dist`` directory. This is a self-contained JAR with zero dependencies and contains everything we need to write a system using Actors.

Akka is very modular and has many JARs for containing different features. The core distribution has seven modules:

- ``akka-actor-1.3-SNAPSHOT.jar`` -- Standard Actors
- ``akka-typed-actor-1.3-SNAPSHOT.jar`` -- Typed Actors
- ``akka-remote-1.3-SNAPSHOT.jar`` -- Remote Actors
- ``akka-stm-1.3-SNAPSHOT.jar`` -- STM (Software Transactional Memory), transactors and transactional datastructures
- ``akka-http-1.3-SNAPSHOT.jar`` -- Akka Mist for continuation-based asynchronous HTTP and also Jersey integration
- ``akka-slf4j-1.3-SNAPSHOT.jar`` -- SLF4J Event Handler Listener
- ``akka-testkit-1.3-SNAPSHOT.jar`` -- Toolkit for testing Actors
- ``akka-actor-1.3.1.jar`` -- Standard Actors
- ``akka-typed-actor-1.3.1.jar`` -- Typed Actors
- ``akka-remote-1.3.1.jar`` -- Remote Actors
- ``akka-stm-1.3.1.jar`` -- STM (Software Transactional Memory), transactors and transactional datastructures
- ``akka-http-1.3.1.jar`` -- Akka Mist for continuation-based asynchronous HTTP and also Jersey integration
- ``akka-slf4j-1.3.1.jar`` -- SLF4J Event Handler Listener
- ``akka-testkit-1.3.1.jar`` -- Toolkit for testing Actors

We also have Akka Modules containing add-on modules outside the core of Akka. You can download the Akka Modules distribution from `<http://akka.io/downloads/>`_. It contains Akka core as well. We will not be needing any modules there today, but for your information the module JARs are these:

- ``akka-kernel-1.3-SNAPSHOT.jar`` -- Akka microkernel for running a bare-bones mini application server (embeds Jetty etc.)
- ``akka-amqp-1.3-SNAPSHOT.jar`` -- AMQP integration
- ``akka-camel-1.3-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-1.3-SNAPSHOT.jar`` -- Apache Camel Typed Actors integration
- ``akka-scalaz-1.3-SNAPSHOT.jar`` -- Support for the Scalaz library
- ``akka-spring-1.3-SNAPSHOT.jar`` -- Spring framework integration
- ``akka-osgi-dependencies-bundle-1.3-SNAPSHOT.jar`` -- OSGi support
- ``akka-kernel-1.3.1.jar`` -- Akka microkernel for running a bare-bones mini application server (embeds Jetty etc.)
- ``akka-amqp-1.3.1.jar`` -- AMQP integration
- ``akka-camel-1.3.1.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-1.3.1.jar`` -- Apache Camel Typed Actors integration
- ``akka-scalaz-1.3.1.jar`` -- Support for the Scalaz library
- ``akka-spring-1.3.1.jar`` -- Spring framework integration
- ``akka-osgi-dependencies-bundle-1.3.1.jar`` -- OSGi support

Downloading and installing Scala
--------------------------------
Expand Down Expand Up @@ -144,7 +144,7 @@ To use the plugin, first add a plugin definition to your SBT project by creating

class Plugins(info: ProjectInfo) extends PluginDefinition(info) {
val akkaRepo = "Akka Repo" at "http://akka.io/repository"
val akkaPlugin = "se.scalablesolutions.akka" % "akka-sbt-plugin" % "1.3-SNAPSHOT"
val akkaPlugin = "se.scalablesolutions.akka" % "akka-sbt-plugin" % "1.3.1"
}

Now we need to create a project definition using our Akka SBT plugin. We do that by creating a ``project/build/Project.scala`` file containing::
Expand All @@ -168,7 +168,7 @@ So, now we are all set. Just one final thing to do; make SBT download the depend

> update

SBT itself needs a whole bunch of dependencies but our project will only need one; ``akka-actor-1.3-SNAPSHOT.jar``. SBT downloads that as well.
SBT itself needs a whole bunch of dependencies but our project will only need one; ``akka-actor-1.3.1.jar``. SBT downloads that as well.

Start writing the code
----------------------
Expand Down Expand Up @@ -274,13 +274,13 @@ Run it as a command line application

If you have not typed in (or copied) the code for the tutorial as ``$AKKA_HOME/tutorial/Pi.scala`` then now is the 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 Scala's compiler ``scalac``. Our application depends on the ``akka-actor-1.3-SNAPSHOT.jar`` JAR file, so let's add that to the compiler classpath when we compile the source::
First we need to compile the source file. That is done with Scala's compiler ``scalac``. Our application depends on the ``akka-actor-1.3.1.jar`` JAR file, so let's add that to the compiler classpath when we compile the source::

$ scalac -cp dist/akka-actor-1.3-SNAPSHOT.jar tutorial/Pi.scala
$ scalac -cp dist/akka-actor-1.3.1.jar tutorial/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-1.3-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 compiled ourselves::
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-1.3.1.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 dist/akka-actor-1.3-SNAPSHOT.jar:scala-library.jar:tutorial akka.tutorial.scala.first.Pi
$ java -cp dist/akka-actor-1.3.1.jar:scala-library.jar:tutorial akka.tutorial.scala.first.Pi
AKKA_HOME is defined as [/Users/jboner/src/akka-stuff/akka-core], loading config from \
[/Users/jboner/src/akka-stuff/akka-core/config/akka.conf].

Expand Down
2 changes: 1 addition & 1 deletion akka-docs/intro/deployment-scenarios.rst
Expand Up @@ -56,7 +56,7 @@ To use the plugin, first add a plugin definition to your SBT project by creating

class Plugins(info: ProjectInfo) extends PluginDefinition(info) {
val akkaRepo = "Akka Repo" at "http://akka.io/repository"
val akkaPlugin = "se.scalablesolutions.akka" % "akka-sbt-plugin" % "1.3-SNAPSHOT"
val akkaPlugin = "se.scalablesolutions.akka" % "akka-sbt-plugin" % "1.3.1"
}

Then mix the ``AkkaKernelProject`` trait into your project definition. For
Expand Down
50 changes: 25 additions & 25 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-actors-1.3-SNAPSHOT.zip`` distribution of Akka from
Let's get the ``akka-actors-1.3.1.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-actors-1.3-SNAPSHOT
$ cd /Users/jboner/tools/akka-actors-1.3.1
$ export AKKA_HOME=`pwd`
$ echo $AKKA_HOME
/Users/jboner/tools/akka-actors-1.3-SNAPSHOT
/Users/jboner/tools/akka-actors-1.3.1

The distribution looks like this::

Expand All @@ -98,32 +98,32 @@ The distribution looks like this::


The only JAR we will need for this tutorial (apart from the
``scala-library.jar`` JAR) is the ``akka-actor-1.3-SNAPSHOT.jar`` JAR in the ``lib/akka``
``scala-library.jar`` JAR) is the ``akka-actor-1.3.1.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.

Akka is very modular and has many JARs for containing different features. The core distribution has seven modules:

- ``akka-actor-1.3-SNAPSHOT.jar`` -- Standard Actors
- ``akka-typed-actor-1.3-SNAPSHOT.jar`` -- Typed Actors
- ``akka-remote-1.3-SNAPSHOT.jar`` -- Remote Actors
- ``akka-stm-1.3-SNAPSHOT.jar`` -- STM (Software Transactional Memory), transactors and transactional datastructures
- ``akka-http-1.3-SNAPSHOT.jar`` -- Akka Mist for continuation-based asynchronous HTTP and also Jersey integration
- ``akka-slf4j-1.3-SNAPSHOT.jar`` -- SLF4J Event Handler Listener for logging with SLF4J
- ``akka-testkit-1.3-SNAPSHOT.jar`` -- Toolkit for testing Actors
- ``akka-actor-1.3.1.jar`` -- Standard Actors
- ``akka-typed-actor-1.3.1.jar`` -- Typed Actors
- ``akka-remote-1.3.1.jar`` -- Remote Actors
- ``akka-stm-1.3.1.jar`` -- STM (Software Transactional Memory), transactors and transactional datastructures
- ``akka-http-1.3.1.jar`` -- Akka Mist for continuation-based asynchronous HTTP and also Jersey integration
- ``akka-slf4j-1.3.1.jar`` -- SLF4J Event Handler Listener for logging with SLF4J
- ``akka-testkit-1.3.1.jar`` -- Toolkit for testing Actors

We also have Akka Modules containing add-on modules outside the core of
Akka. You can download the Akka Modules distribution from `<http://akka.io/downloads/>`_. It contains Akka
core as well. We will not be needing any modules there today, but for your
information the module JARs are these:

- ``akka-kernel-1.3-SNAPSHOT.jar`` -- Akka microkernel for running a bare-bones mini application server (embeds Jetty etc.)
- ``akka-amqp-1.3-SNAPSHOT.jar`` -- AMQP integration
- ``akka-camel-1.3-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-1.3-SNAPSHOT.jar`` -- Apache Camel Typed Actors integration
- ``akka-scalaz-1.3-SNAPSHOT.jar`` -- Support for the Scalaz library
- ``akka-spring-1.3-SNAPSHOT.jar`` -- Spring framework integration
- ``akka-osgi-dependencies-bundle-1.3-SNAPSHOT.jar`` -- OSGi support
- ``akka-kernel-1.3.1.jar`` -- Akka microkernel for running a bare-bones mini application server (embeds Jetty etc.)
- ``akka-amqp-1.3.1.jar`` -- AMQP integration
- ``akka-camel-1.3.1.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-1.3.1.jar`` -- Apache Camel Typed Actors integration
- ``akka-scalaz-1.3.1.jar`` -- Support for the Scalaz library
- ``akka-spring-1.3.1.jar`` -- Spring framework integration
- ``akka-osgi-dependencies-bundle-1.3.1.jar`` -- OSGi support


Downloading and installing Maven
Expand Down Expand Up @@ -188,7 +188,7 @@ It should now look something like this:
<dependency>
<groupId>se.scalablesolutions.akka</groupId>
<artifactId>akka-actor</artifactId>
<version>1.3-SNAPSHOT</version>
<version>1.3.1</version>
</dependency>
</dependencies>
Expand Down Expand Up @@ -723,22 +723,22 @@ 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-1.3-SNAPSHOT.jar`` and the
``javac``. Our application depends on the ``akka-actor-1.3.1.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-1.3-SNAPSHOT.jar tutorial/akka/tutorial/first/java/Pi.java
$ javac -cp lib/scala-library.jar:lib/akka/akka-actor-1.3.1.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-1.3-SNAPSHOT.jar``
is done with ``java`` but yet again we need to add the ``akka-actor-1.3.1.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-1.3-SNAPSHOT.jar:tutorial \
-cp lib/scala-library.jar:lib/akka/akka-actor-1.3.1.jar:tutorial \
akka.tutorial.java.first.Pi
AKKA_HOME is defined as [/Users/jboner/tools/akka-actors-1.3-SNAPSHOT]
loading config from [/Users/jboner/tools/akka-actors-1.3-SNAPSHOT/config/akka.conf].
AKKA_HOME is defined as [/Users/jboner/tools/akka-actors-1.3.1]
loading config from [/Users/jboner/tools/akka-actors-1.3.1/config/akka.conf].

Pi estimate: 3.1435501812459323
Calculation time: 822 millis
Expand Down

0 comments on commit 8dca68c

Please sign in to comment.