{%- endif %}
{%- endblock %}
diff --git a/akka-docs/_sphinx/themes/akka/static/akka.css_t b/akka-docs/_sphinx/themes/akka/static/akka.css_t
index f05e86bb6a..146ba31623 100644
--- a/akka-docs/_sphinx/themes/akka/static/akka.css_t
+++ b/akka-docs/_sphinx/themes/akka/static/akka.css_t
@@ -112,13 +112,16 @@ div.header h2 {
font-size: 1.3em;
font-weight: normal;
letter-spacing: 1px;
- text-transform: uppercase;
- color: #aaa;
+ color: {{ theme_headingcolor }};
border: 0;
margin-top: -3px;
padding: 0;
}
+div.header img.leftlogo {
+ float: left;
+}
+
div.header img.rightlogo {
float: right;
}
diff --git a/akka-docs/additional/index.rst b/akka-docs/additional/index.rst
index f36b5ce7cd..7398db601b 100644
--- a/akka-docs/additional/index.rst
+++ b/akka-docs/additional/index.rst
@@ -7,7 +7,7 @@ Additional Information
add-on-modules
articles
benchmarks
- recipes
+ recipies
external-sample-projects
companies-using-akka
third-party-integrations
diff --git a/akka-docs/additional/recipes.rst b/akka-docs/additional/recipies.rst
similarity index 100%
rename from akka-docs/additional/recipes.rst
rename to akka-docs/additional/recipies.rst
diff --git a/akka-docs/conf.py b/akka-docs/conf.py
index 712a3d10c8..f6a0c67069 100644
--- a/akka-docs/conf.py
+++ b/akka-docs/conf.py
@@ -28,9 +28,6 @@ show_authors = True
# -- Options for HTML output ---------------------------------------------------
html_theme = 'akka'
-html_theme_options = {
- 'full_logo': 'true'
- }
html_theme_path = ['_sphinx/themes']
html_title = 'Akka Documentation'
diff --git a/akka-docs/intro/getting-started-first-java.rst b/akka-docs/intro/getting-started-first-java.rst
index b16ba62323..df7f352eab 100644
--- a/akka-docs/intro/getting-started-first-java.rst
+++ b/akka-docs/intro/getting-started-first-java.rst
@@ -37,7 +37,7 @@ To check out the code using Git invoke the following::
$ git clone git://github.com/jboner/akka.git
-Then you can navigate down to the tutorial::
+Then you can navigate down to the tutorial::
$ cd akka/akka-tutorials/akka-tutorial-first
@@ -58,39 +58,49 @@ You can test your installation by invoking ``java``::
Java(TM) SE Runtime Environment (build 1.6.0_24-b07-334-10M3326)
Java HotSpot(TM) 64-Bit Server VM (build 19.1-b02-334, mixed mode)
+
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.
+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.1`` distribution of Akka core (not Akka Modules) from `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-actors-1.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
+``/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::
+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.1
+ $ cd /Users/jboner/tools/akka-actors-1.1
$ export AKKA_HOME=`pwd`
$ echo $AKKA_HOME
- /Users/jboner/tools/akka-1.1
+ /Users/jboner/tools/akka-actors-1.1
The distribution looks like this::
- $ ls -l
- total 16944
- drwxr-xr-x 7 jboner staff 238 Apr 6 11:15 .
- drwxr-xr-x 28 jboner staff 952 Apr 6 11:16 ..
- drwxr-xr-x 17 jboner staff 578 Apr 6 11:16 deploy
- drwxr-xr-x 26 jboner staff 884 Apr 6 11:16 dist
- drwxr-xr-x 3 jboner staff 102 Apr 6 11:15 lib_managed
- -rwxr-xr-x 1 jboner staff 8674105 Apr 6 11:15 scala-library.jar
- drwxr-xr-x 4 jboner staff 136 Apr 6 11:16 scripts
+ $ ls -1
+ config
+ doc
+ lib
+ src
-- In the ``dist`` directory we have the Akka JARs, including sources and docs.
-- In the ``lib_managed/compile`` directory we have Akka's dependency JARs.
-- In the ``deploy`` directory we have the sample JARs.
-- 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.
+- In the ``config`` directory we have the Akka conf files.
+- In the ``doc`` directory we have the documentation, API, doc JARs, and also
+ the source files for the tutorials.
+- In the ``lib`` directory we have the Scala and Akka JARs.
+- 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-1.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.
+
+The only JAR we will need for this tutorial (apart from the
+``scala-library.jar`` JAR) is the ``akka-actor-1.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:
@@ -115,6 +125,7 @@ information the module JARs are these:
- ``akka-spring-1.1.jar`` -- Spring framework integration
- ``akka-osgi-dependencies-bundle-1.1.jar`` -- OSGi support
+
Downloading and installing Maven
--------------------------------
@@ -181,7 +192,7 @@ We also need to edit the ``pom.xml`` build file. Let's add the dependency we nee
AkkaAkka Maven2 Repository
- http://www.scalablesolutions.se/akka/repository/
+ http://akka.io/repository/
@@ -698,35 +709,42 @@ Before we package it up and run it, let's take a look at the full code now, with
}
}
+
Run it as a command line application
------------------------------------
-To build and run the tutorial from the command line, you need to have the Scala library JAR on the classpath.
+If you have not typed in (or copied) the code for the tutorial as
+``$AKKA_HOME/tutorial/akka/tutorial/first/java/Pi.java`` then now is the
+time. When that's done open up a shell and step in to the Akka distribution
+(``cd $AKKA_HOME``).
-Scala can be downloaded from `http://www.scala-lang.org/downloads `_. Browse there and download the Scala 2.9.0.RC1 release. If you pick the ``tgz`` or ``zip`` distribution then just unzip it where you want it installed. If you pick the IzPack Installer then double click on it and follow the instructions.
+First we need to compile the source file. That is done with Java's compiler
+``javac``. Our application depends on the ``akka-actor-1.1.jar`` and the
+``scala-library.jar`` JAR files, so let's add them to the compiler classpath
+when we compile the source::
-The ``scala-library.jar`` resides in the ``scala-2.9.0.RC1/lib`` directory. Copy that to your project directory.
+ $ javac -cp lib/scala-library.jar:lib/akka/akka-actor-1.1.jar tutorial/akka/tutorial/first/java/Pi.java
-If you have not typed in (or copied) the code for the tutorial as ``$AKKA_HOME/tutorial/akka/tutorial/first/java/Pi.java`` 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 Java's compiler ``javac``. Our application depends on the ``akka-actor-1.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 dist/akka-actor-1.1.jar:scala-library.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.1.jar`` and the ``scala-library.jar`` JAR files to the classpath as well as 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.1.jar``
+and the ``scala-library.jar`` JAR files to the classpath as well as the classes
+we compiled ourselves::
$ java \
- -cp dist/akka-actor-1.1.jar:scala-library.jar:tutorial \
+ -cp lib/scala-library.jar:lib/akka/akka-actor-1.1.jar:tutorial \
akka.tutorial.java.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].
+ AKKA_HOME is defined as [/Users/jboner/tools/akka-actors-1.1]
+ loading config from [/Users/jboner/tools/akka-actors-1.1/config/akka.conf].
Pi estimate: 3.1435501812459323
Calculation time: 822 millis
Yippee! It is working.
-If you have not defined the ``AKKA_HOME`` environment variable then Akka can't find the ``akka.conf`` configuration file and will print out a ``Can’t load akka.conf`` warning. This is ok since it will then just use the defaults.
+If you have not defined the ``AKKA_HOME`` environment variable then Akka can't
+find the ``akka.conf`` configuration file and will print out a ``Can’t load
+akka.conf`` warning. This is ok since it will then just use the defaults.
+
Run it inside Maven
-------------------
diff --git a/akka-docs/intro/getting-started-first-scala-eclipse.rst b/akka-docs/intro/getting-started-first-scala-eclipse.rst
index c30644fc01..aa996aaa1a 100644
--- a/akka-docs/intro/getting-started-first-scala-eclipse.rst
+++ b/akka-docs/intro/getting-started-first-scala-eclipse.rst
@@ -43,39 +43,49 @@ You can test your installation by invoking ``java``::
Java(TM) SE Runtime Environment (build 1.6.0_24-b07-334-10M3326)
Java HotSpot(TM) 64-Bit Server VM (build 19.1-b02-334, mixed mode)
+
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.
+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.1`` distribution of Akka core (not Akka Modules) from `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-actors-1.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
+``/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::
+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.1
+ $ cd /Users/jboner/tools/akka-actors-1.1
$ export AKKA_HOME=`pwd`
$ echo $AKKA_HOME
- /Users/jboner/tools/akka-1.1
+ /Users/jboner/tools/akka-actors-1.1
The distribution looks like this::
- $ ls -l
- total 16944
- drwxr-xr-x 7 jboner staff 238 Apr 6 11:15 .
- drwxr-xr-x 28 jboner staff 952 Apr 6 11:16 ..
- drwxr-xr-x 17 jboner staff 578 Apr 6 11:16 deploy
- drwxr-xr-x 26 jboner staff 884 Apr 6 11:16 dist
- drwxr-xr-x 3 jboner staff 102 Apr 6 11:15 lib_managed
- -rwxr-xr-x 1 jboner staff 8674105 Apr 6 11:15 scala-library.jar
- drwxr-xr-x 4 jboner staff 136 Apr 6 11:16 scripts
+ $ ls -1
+ config
+ doc
+ lib
+ src
-- In the ``dist`` directory we have the Akka JARs, including sources and docs.
-- In the ``lib_managed/compile`` directory we have Akka's dependency JARs.
-- In the ``deploy`` directory we have the sample JARs.
-- 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.
+- In the ``config`` directory we have the Akka conf files.
+- In the ``doc`` directory we have the documentation, API, doc JARs, and also
+ the source files for the tutorials.
+- In the ``lib`` directory we have the Scala and Akka JARs.
+- 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-1.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.
+
+The only JAR we will need for this tutorial (apart from the
+``scala-library.jar`` JAR) is the ``akka-actor-1.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:
@@ -84,7 +94,7 @@ Akka is very modular and has many JARs for containing different features. The co
- ``akka-remote-1.1.jar`` -- Remote Actors
- ``akka-stm-1.1.jar`` -- STM (Software Transactional Memory), transactors and transactional datastructures
- ``akka-http-1.1.jar`` -- Akka Mist for continuation-based asynchronous HTTP and also Jersey integration
-- ``akka-slf4j-1.1.jar`` -- SLF4J Event Handler Listener
+- ``akka-slf4j-1.1.jar`` -- SLF4J Event Handler Listener for logging with SLF4J
- ``akka-testkit-1.1.jar`` -- Toolkit for testing Actors
We also have Akka Modules containing add-on modules outside the core of
@@ -100,6 +110,7 @@ information the module JARs are these:
- ``akka-spring-1.1.jar`` -- Spring framework integration
- ``akka-osgi-dependencies-bundle-1.1.jar`` -- OSGi support
+
Downloading and installing the Scala IDE for Eclipse
----------------------------------------------------
diff --git a/akka-docs/intro/getting-started-first-scala.rst b/akka-docs/intro/getting-started-first-scala.rst
index 7fd47db7e0..c390548661 100644
--- a/akka-docs/intro/getting-started-first-scala.rst
+++ b/akka-docs/intro/getting-started-first-scala.rst
@@ -58,39 +58,49 @@ You can test your installation by invoking ``java``::
Java(TM) SE Runtime Environment (build 1.6.0_24-b07-334-10M3326)
Java HotSpot(TM) 64-Bit Server VM (build 19.1-b02-334, mixed mode)
+
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.
+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.1`` distribution of Akka core (not Akka Modules) from `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-actors-1.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
+``/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::
+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.1
+ $ cd /Users/jboner/tools/akka-actors-1.1
$ export AKKA_HOME=`pwd`
$ echo $AKKA_HOME
- /Users/jboner/tools/akka-1.1
+ /Users/jboner/tools/akka-actors-1.1
The distribution looks like this::
- $ ls -l
- total 16944
- drwxr-xr-x 7 jboner staff 238 Apr 6 11:15 .
- drwxr-xr-x 28 jboner staff 952 Apr 6 11:16 ..
- drwxr-xr-x 17 jboner staff 578 Apr 6 11:16 deploy
- drwxr-xr-x 26 jboner staff 884 Apr 6 11:16 dist
- drwxr-xr-x 3 jboner staff 102 Apr 6 11:15 lib_managed
- -rwxr-xr-x 1 jboner staff 8674105 Apr 6 11:15 scala-library.jar
- drwxr-xr-x 4 jboner staff 136 Apr 6 11:16 scripts
+ $ ls -1
+ config
+ doc
+ lib
+ src
-- In the ``dist`` directory we have the Akka JARs, including sources and docs.
-- In the ``lib_managed/compile`` directory we have Akka's dependency JARs.
-- In the ``deploy`` directory we have the sample JARs.
-- 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.
+- In the ``config`` directory we have the Akka conf files.
+- In the ``doc`` directory we have the documentation, API, doc JARs, and also
+ the source files for the tutorials.
+- In the ``lib`` directory we have the Scala and Akka JARs.
+- 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-1.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.
+
+The only JAR we will need for this tutorial (apart from the
+``scala-library.jar`` JAR) is the ``akka-actor-1.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:
@@ -99,7 +109,7 @@ Akka is very modular and has many JARs for containing different features. The co
- ``akka-remote-1.1.jar`` -- Remote Actors
- ``akka-stm-1.1.jar`` -- STM (Software Transactional Memory), transactors and transactional datastructures
- ``akka-http-1.1.jar`` -- Akka Mist for continuation-based asynchronous HTTP and also Jersey integration
-- ``akka-slf4j-1.1.jar`` -- SLF4J Event Handler Listener
+- ``akka-slf4j-1.1.jar`` -- SLF4J Event Handler Listener for logging with SLF4J
- ``akka-testkit-1.1.jar`` -- Toolkit for testing Actors
We also have Akka Modules containing add-on modules outside the core of
@@ -115,6 +125,7 @@ information the module JARs are these:
- ``akka-spring-1.1.jar`` -- Spring framework integration
- ``akka-osgi-dependencies-bundle-1.1.jar`` -- OSGi support
+
Downloading and installing Scala
--------------------------------
@@ -174,9 +185,7 @@ Now we need to create a project definition using our Akka SBT plugin. We do that
import sbt._
- class TutorialOneProject(info: ProjectInfo) extends DefaultProject(info) with AkkaProject {
- val akkaRepo = "Akka Repo" at "http://akka.io/repository"
- }
+ class TutorialOneProject(info: ProjectInfo) extends DefaultProject(info) with AkkaProject
The magic is in mixing in the ``AkkaProject`` trait.
@@ -510,15 +519,15 @@ If you have not typed in (or copied) the code for the tutorial as ``$AKKA_HOME/t
First we need to compile the source file. That is done with Scala's compiler ``scalac``. Our application depends on the ``akka-actor-1.1.jar`` JAR file, so let's add that to the compiler classpath when we compile the source::
- $ scalac -cp dist/akka-actor-1.1.jar tutorial/Pi.scala
+ $ scalac -cp lib/akka/akka-actor-1.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.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.1.jar:scala-library.jar:tutorial \
+ -cp lib/scala-library.jar:lib/akka/akka-actor-1.1.jar:. \
akka.tutorial.first.scala.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].
+ AKKA_HOME is defined as [/Users/jboner/tools/akka-actors-1.1]
+ loading config from [/Users/jboner/tools/akka-actors-1.1/config/akka.conf].
Pi estimate: 3.1435501812459323
Calculation time: 858 millis
diff --git a/akka-docs/java/guice-integration.rst b/akka-docs/java/guice-integration.rst
new file mode 100644
index 0000000000..de00b701cb
--- /dev/null
+++ b/akka-docs/java/guice-integration.rst
@@ -0,0 +1,52 @@
+Guice Integration
+=================
+
+Module stability: **STABLE**
+
+All Typed Actors support dependency injection using `Guice `_ annotations (such as ‘@Inject’ etc.).
+The ‘TypedActorManager’ class understands Guice and will do the wiring for you.
+
+External Guice modules
+----------------------
+
+You can also plug in external Guice modules and have not-actors wired up as part of the configuration.
+Here is an example:
+
+.. code-block:: java
+
+ import static akka.config.Supervision.*;
+ import static akka.config.SupervisorConfig.*;
+
+ TypedActorConfigurator manager = new TypedActorConfigurator();
+
+ manager.configure(
+ new AllForOneStrategy(new Class[]{Exception.class}, 3, 1000),
+ new SuperviseTypedActor[] {
+ new SuperviseTypedActor(
+ Foo.class,
+ FooImpl.class,
+ temporary(),
+ 1000),
+ new SuperviseTypedActor(
+ Bar.class,
+ BarImpl.class,
+ permanent(),
+ 1000)
+ })
+ .addExternalGuiceModule(new AbstractModule() {
+ protected void configure() {
+ bind(Ext.class).to(ExtImpl.class).in(Scopes.SINGLETON);
+ }})
+ .configure()
+ .inject()
+ .supervise();
+
+Retrieve the external Guice dependency
+--------------------------------------
+
+The external dependency can be retrieved like this:
+
+.. code-block:: java
+
+ Ext ext = manager.getExternalDependency(Ext.class);
+
diff --git a/akka-docs/java/index.rst b/akka-docs/java/index.rst
index 54b2adf201..1d09b3e437 100644
--- a/akka-docs/java/index.rst
+++ b/akka-docs/java/index.rst
@@ -17,3 +17,4 @@ Java API
fault-tolerance
dispatchers
routing
+ guice-integration
diff --git a/akka-tutorials/akka-tutorial-first/README b/akka-tutorials/akka-tutorial-first/README
new file mode 100644
index 0000000000..f4b42f631f
--- /dev/null
+++ b/akka-tutorials/akka-tutorial-first/README
@@ -0,0 +1,7 @@
+================
+ First Tutorial
+================
+
+This is the source code for the first tutorial.
+
+See the Akka Documentation for information about this tutorial.
diff --git a/akka-tutorials/akka-tutorial-first/pom.xml b/akka-tutorials/akka-tutorial-first/pom.xml
index e6b1758877..b3e9f7319c 100644
--- a/akka-tutorials/akka-tutorial-first/pom.xml
+++ b/akka-tutorials/akka-tutorial-first/pom.xml
@@ -8,7 +8,7 @@
akka.tutorial.first.javaakka-tutorial-first-javajar
- 1.0-SNAPSHOT
+ 1.2-SNAPSHOThttp://akka.io
@@ -23,7 +23,7 @@
AkkaAkka Maven2 Repository
- http://www.scalablesolutions.se/akka/repository/
+ http://akka.io/repository/
diff --git a/akka-tutorials/akka-tutorial-first/project/build.properties b/akka-tutorials/akka-tutorial-first/project/build.properties
new file mode 100644
index 0000000000..e4ff105728
--- /dev/null
+++ b/akka-tutorials/akka-tutorial-first/project/build.properties
@@ -0,0 +1,5 @@
+project.organization=se.scalablesolutions.akka
+project.name=akka-tutorial-first
+project.version=1.2-SNAPSHOT
+build.scala.versions=2.9.0.RC3
+sbt.version=0.7.6.RC0
diff --git a/akka-tutorials/akka-tutorial-first/project/build/Project.scala b/akka-tutorials/akka-tutorial-first/project/build/Project.scala
new file mode 100644
index 0000000000..975f2ce970
--- /dev/null
+++ b/akka-tutorials/akka-tutorial-first/project/build/Project.scala
@@ -0,0 +1,3 @@
+import sbt._
+
+class TutorialOneProject(info: ProjectInfo) extends DefaultProject(info) with AkkaProject
diff --git a/akka-tutorials/akka-tutorial-first/project/plugins/Plugins.scala b/akka-tutorials/akka-tutorial-first/project/plugins/Plugins.scala
new file mode 100644
index 0000000000..aa263a988e
--- /dev/null
+++ b/akka-tutorials/akka-tutorial-first/project/plugins/Plugins.scala
@@ -0,0 +1,6 @@
+import sbt._
+
+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.2-SNAPSHOT"
+}
diff --git a/akka-tutorials/akka-tutorial-first/src/main/java/akka/tutorial/first/java/Pi.java b/akka-tutorials/akka-tutorial-first/src/main/java/akka/tutorial/first/java/Pi.java
index 24264b52a7..bb081af751 100644
--- a/akka-tutorials/akka-tutorial-first/src/main/java/akka/tutorial/first/java/Pi.java
+++ b/akka-tutorials/akka-tutorial-first/src/main/java/akka/tutorial/first/java/Pi.java
@@ -18,31 +18,6 @@ import akka.routing.UntypedLoadBalancer;
import java.util.concurrent.CountDownLatch;
-/**
- * First part in Akka tutorial for Java.
- *
- * Calculates Pi.
- *
- * Run on command line:
- *