diff --git a/akka-docs/rst/common/cluster.rst b/akka-docs/rst/common/cluster.rst index 0cf5df704f..854cd551cd 100644 --- a/akka-docs/rst/common/cluster.rst +++ b/akka-docs/rst/common/cluster.rst @@ -5,7 +5,7 @@ Cluster Specification ###################### -.. note:: This module is :ref:`experimental `. This document describes the design concepts of the new clustering coming in Akka Coltrane. Not everything described here is implemented yet. +.. note:: This document describes the design concepts of the clustering. Not everything described here is implemented yet. Intro ===== diff --git a/akka-docs/rst/general/configuration.rst b/akka-docs/rst/general/configuration.rst index d5feabe4d2..29cdb5c087 100644 --- a/akka-docs/rst/general/configuration.rst +++ b/akka-docs/rst/general/configuration.rst @@ -367,6 +367,18 @@ akka-testkit .. literalinclude:: ../../../akka-testkit/src/main/resources/reference.conf :language: none +akka-camel +~~~~~~~~~~ + +.. literalinclude:: ../../../akka-camel/src/main/resources/reference.conf + :language: none + +akka-cluster +~~~~~~~~~~~~ + +.. literalinclude:: ../../../akka-cluster/src/main/resources/reference.conf + :language: none + akka-transactor ~~~~~~~~~~~~~~~ diff --git a/akka-docs/rst/intro/getting-started.rst b/akka-docs/rst/intro/getting-started.rst index 97d47da2ec..c877b9ff1b 100644 --- a/akka-docs/rst/intro/getting-started.rst +++ b/akka-docs/rst/intro/getting-started.rst @@ -37,6 +37,8 @@ Akka is very modular and consists of several JARs containing different features. - ``akka-camel`` – Apache Camel integration +- ``akka-cluster`` – Cluster membership management, elastic routers. + - ``akka-dataflow`` – add-on to SIP-14 futures supporting implicit continuation-passing style @@ -75,9 +77,6 @@ mailing list. - ``akka-channels-experimental`` – Typed Channels on top of untyped Actors, using Scala 2.10 macros -- ``akka-cluster-experimental`` – Cluster membership management, leader - election, elastic routers. - - ``akka-contrib`` – an assortment of contributions which may or may not be moved into core modules, see :ref:`akka-contrib` for more details. diff --git a/akka-docs/rst/java/cluster-usage.rst b/akka-docs/rst/java/cluster-usage.rst index ab89a54755..7db19e37a6 100644 --- a/akka-docs/rst/java/cluster-usage.rst +++ b/akka-docs/rst/java/cluster-usage.rst @@ -5,8 +5,6 @@ Cluster Usage ###################### -.. note:: This module is :ref:`experimental `. This document describes how to use the features implemented so far. More features are coming in Akka Coltrane. Track progress of the Coltrane milestone in `Assembla `_ and the `Roadmap `_. - For introduction to the Akka Cluster concepts please see :ref:`cluster`. Preparing Your Project for Clustering @@ -16,15 +14,10 @@ The Akka cluster is a separate jar file. Make sure that you have the following d com.typesafe.akka - akka-cluster-experimental_@binVersion@ + akka-cluster_@binVersion@ @version@ -If you are using the latest nightly build you should pick a timestamped Akka -version from -``_. -We recommend against using ``SNAPSHOT`` in order to obtain stable builds. - .. _cluster_simple_example_java: A Simple Cluster Example diff --git a/akka-docs/rst/scala/cluster-usage.rst b/akka-docs/rst/scala/cluster-usage.rst index ac3e19a0a4..1e003bee5b 100644 --- a/akka-docs/rst/scala/cluster-usage.rst +++ b/akka-docs/rst/scala/cluster-usage.rst @@ -5,8 +5,6 @@ Cluster Usage ####################### -.. note:: This module is :ref:`experimental `. This document describes how to use the features implemented so far. More features are coming in Akka Coltrane. Track progress of the Coltrane milestone in `Assembla `_ and the `Roadmap `_. - For introduction to the Akka Cluster concepts please see :ref:`cluster`. Preparing Your Project for Clustering @@ -14,12 +12,7 @@ Preparing Your Project for Clustering The Akka cluster is a separate jar file. Make sure that you have the following dependency in your project:: - "com.typesafe.akka" %% "akka-cluster-experimental" % "@version@" @crossString@ - -If you are using the latest nightly build you should pick a timestamped Akka -version from -``_. -We recommend against using ``SNAPSHOT`` in order to obtain stable builds. + "com.typesafe.akka" %% "akka-cluster" % "@version@" @crossString@ A Simple Cluster Example ^^^^^^^^^^^^^^^^^^^^^^^^ @@ -242,7 +235,7 @@ frontend nodes and 3 backend nodes:: sbt - project akka-sample-cluster-experimental + project akka-sample-cluster run-main sample.cluster.transformation.TransformationFrontend 2551 @@ -463,7 +456,7 @@ service nodes and 1 client:: sbt - project akka-sample-cluster-experimental + project akka-sample-cluster run-main sample.cluster.stats.StatsSample 2551 @@ -577,7 +570,7 @@ and you can try by starting nodes in different terminal windows. For example, st sbt - project akka-sample-cluster-experimental + project akka-sample-cluster run-main sample.cluster.factorial.FactorialBackend 2551 diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala index 4cd0215dc1..6f92e9b5c4 100644 --- a/project/AkkaBuild.scala +++ b/project/AkkaBuild.scala @@ -179,7 +179,7 @@ object AkkaBuild extends Build { ) configs (MultiJvm) lazy val cluster = Project( - id = "akka-cluster-experimental", + id = "akka-cluster", base = file("akka-cluster"), dependencies = Seq(remote, remoteTests % "test->test" , testkit % "test->test"), settings = defaultSettings ++ scaladocSettings ++ javadocSettings ++ multiJvmSettings ++ OSGi.cluster ++ experimentalSettings ++ @@ -192,7 +192,7 @@ object AkkaBuild extends Build { (name: String) => (src ** (name + ".conf")).get.headOption.map("-Dakka.config=" + _.absolutePath).toSeq }, scalatestOptions in MultiJvm := defaultMultiJvmScalatestOptions, - previousArtifact := akkaPreviousArtifact("akka-cluster-experimental") + previousArtifact := akkaPreviousArtifact("akka-cluster") ) ) configs (MultiJvm, ScalaBuff) @@ -388,7 +388,7 @@ object AkkaBuild extends Build { ) lazy val clusterSample = Project( - id = "akka-sample-cluster-experimental", + id = "akka-sample-cluster", base = file("akka-samples/akka-sample-cluster"), dependencies = Seq(cluster, contrib, remoteTests % "test", testkit % "test"), settings = sampleSettings ++ multiJvmSettings ++ experimentalSettings ++ Seq(