Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Update version for release 2.1-M2

  • Loading branch information...
commit 2097adea8d345b13ec73ad6bc70c59f0c286024f 1 parent fafffb5
@rkuhn rkuhn authored
Showing with 63 additions and 63 deletions.
  1. +2 −2 akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala
  2. +1 −1  akka-actor/src/main/resources/reference.conf
  3. +1 −1  akka-actor/src/main/scala/akka/actor/ActorSystem.scala
  4. +2 −2 akka-docs/conf.py
  5. +3 −3 akka-docs/dev/developer-guidelines.rst
  6. +1 −1  akka-docs/dev/multi-jvm-testing.rst
  7. +13 −13 akka-docs/intro/getting-started.rst
  8. +8 −8 akka-docs/java/camel.rst
  9. +1 −1  akka-docs/java/event-bus.rst
  10. +2 −2 akka-docs/java/remoting.rst
  11. +1 −1  akka-docs/java/routing.rst
  12. +1 −1  akka-docs/modules/camel.rst
  13. +3 −3 akka-docs/modules/durable-mailbox.rst
  14. +1 −1  akka-docs/project/licenses.rst
  15. +2 −2 akka-docs/scala/actors.rst
  16. +8 −8 akka-docs/scala/camel.rst
  17. +1 −1  akka-docs/scala/event-bus.rst
  18. +2 −2 akka-docs/scala/fsm.rst
  19. +2 −2 akka-docs/scala/remoting.rst
  20. +2 −2 akka-docs/scala/routing.rst
  21. +1 −1  akka-kernel/src/main/dist/README
  22. +1 −1  akka-kernel/src/main/dist/config/application.conf
  23. +2 −2 akka-sbt-plugin/sample/project/Build.scala
  24. +1 −1  akka-sbt-plugin/sample/project/plugins.sbt
  25. +1 −1  project/AkkaBuild.scala
View
4 akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala
@@ -25,8 +25,8 @@ class ConfigSpec extends AkkaSpec(ConfigFactory.defaultReference(ActorSystem.fin
{
import config._
- getString("akka.version") must equal("2.1-SNAPSHOT")
- settings.ConfigVersion must equal("2.1-SNAPSHOT")
+ getString("akka.version") must equal("2.1-M2")
+ settings.ConfigVersion must equal("2.1-M2")
getBoolean("akka.daemonic") must equal(false)
getBoolean("akka.actor.serialize-messages") must equal(false)
View
2  akka-actor/src/main/resources/reference.conf
@@ -7,7 +7,7 @@
akka {
# Akka version, checked against the runtime version of Akka.
- version = "2.1-SNAPSHOT"
+ version = "2.1-M2"
# Home directory of Akka, modules in the deploy directory will be loaded
home = ""
View
2  akka-actor/src/main/scala/akka/actor/ActorSystem.scala
@@ -22,7 +22,7 @@ import scala.concurrent.util.FiniteDuration
object ActorSystem {
- val Version: String = "2.1-SNAPSHOT"
+ val Version: String = "2.1-M2"
val EnvHome: Option[String] = System.getenv("AKKA_HOME") match {
case null | "" | "." None
View
4 akka-docs/conf.py
@@ -17,8 +17,8 @@
project = u'Akka'
copyright = u'2011, Typesafe Inc'
-version = '2.1-SNAPSHOT'
-release = '2.1-SNAPSHOT'
+version = '2.1-M2'
+release = '2.1-M2'
pygments_style = 'simple'
highlight_language = 'scala'
View
6 akka-docs/dev/developer-guidelines.rst
@@ -46,12 +46,12 @@ All code that is checked in **should** have tests. All testing is done with ``Sc
* Name tests as **Test.scala** if they do not depend on any external stuff. That keeps surefire happy.
* Name tests as **Spec.scala** if they have external dependencies.
-There is a testing standard that should be followed: `Ticket001Spec <https://github.com/akka/akka/blob/master/akka-actor-tests/src/test/scala/akka/ticket/Ticket001Spec.scala>`_
+There is a testing standard that should be followed: `Ticket001Spec <http://github.com/akka/akka/tree/v2.1-M2/akka-actor-tests/src/test/scala/akka/ticket/Ticket001Spec.scala>`_
Actor TestKit
^^^^^^^^^^^^^
-There is a useful test kit for testing actors: `akka.util.TestKit <https://github.com/akka/akka/tree/master/akka-testkit/src/main/scala/akka/testkit/TestKit.scala>`_. It enables assertions concerning replies received and their timing, there is more documentation in the :ref:`akka-testkit` module.
+There is a useful test kit for testing actors: `akka.util.TestKit <http://github.com/akka/akka/tree/v2.1-M2/akka-testkit/src/main/scala/akka/testkit/TestKit.scala>`_. It enables assertions concerning replies received and their timing, there is more documentation in the :ref:`akka-testkit` module.
Multi-JVM Testing
^^^^^^^^^^^^^^^^^
@@ -63,4 +63,4 @@ with main methods) and running ScalaTest tests.
NetworkFailureTest
^^^^^^^^^^^^^^^^^^
-You can use the 'NetworkFailureTest' trait to test network failure.
+You can use the 'NetworkFailureTest' trait to test network failure.
View
2  akka-docs/dev/multi-jvm-testing.rst
@@ -51,7 +51,7 @@ multi-JVM testing (Simplified for clarity):
lazy val buildSettings = Defaults.defaultSettings ++ Seq(
organization := "com.typesafe.akka",
- version := "2.1-SNAPSHOT",
+ version := "2.1-M2",
scalaVersion := "|scalaVersion|",
crossPaths := false
)
View
26 akka-docs/intro/getting-started.rst
@@ -31,16 +31,16 @@ Modules
Akka is very modular and has many JARs for containing different features.
-- ``akka-actor-2.1-SNAPSHOT.jar`` -- Classic Actors, Typed Actors, IO Actor etc.
-- ``akka-remote-2.1-SNAPSHOT.jar`` -- Remote Actors
-- ``akka-testkit-2.1-SNAPSHOT.jar`` -- Toolkit for testing Actor systems
-- ``akka-kernel-2.1-SNAPSHOT.jar`` -- Akka microkernel for running a bare-bones mini application server
-- ``akka-transactor-2.1-SNAPSHOT.jar`` -- Transactors - transactional actors, integrated with Scala STM
-- ``akka-agent-2.1-SNAPSHOT.jar`` -- Agents, integrated with Scala STM
-- ``akka-camel-2.1-SNAPSHOT.jar`` -- Apache Camel integration
-- ``akka-zeromq-2.1-SNAPSHOT.jar`` -- ZeroMQ integration
-- ``akka-slf4j-2.1-SNAPSHOT.jar`` -- SLF4J Event Handler Listener
-- ``akka-<storage-system>-mailbox-2.1-SNAPSHOT.jar`` -- Akka durable mailboxes
+- ``akka-actor-2.1-M2.jar`` -- Classic Actors, Typed Actors, IO Actor etc.
+- ``akka-remote-2.1-M2.jar`` -- Remote Actors
+- ``akka-testkit-2.1-M2.jar`` -- Toolkit for testing Actor systems
+- ``akka-kernel-2.1-M2.jar`` -- Akka microkernel for running a bare-bones mini application server
+- ``akka-transactor-2.1-M2.jar`` -- Transactors - transactional actors, integrated with Scala STM
+- ``akka-agent-2.1-M2.jar`` -- Agents, integrated with Scala STM
+- ``akka-camel-2.1-M2.jar`` -- Apache Camel integration
+- ``akka-zeromq-2.1-M2.jar`` -- ZeroMQ integration
+- ``akka-slf4j-2.1-M2.jar`` -- SLF4J Event Handler Listener
+- ``akka-<storage-system>-mailbox-2.1-M2.jar`` -- Akka durable mailboxes
How to see the JARs dependencies of each Akka module is described in the
:ref:`dependencies` section.
@@ -96,14 +96,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.1-SNAPSHOT:
+2) Add the Akka dependencies. For example, here is the dependency for Akka Actor 2.1-M2:
.. code-block:: xml
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-actor</artifactId>
- <version>2.1-SNAPSHOT</version>
+ <version>2.1-M2</version>
</dependency>
**Note**: for snapshot versions both ``SNAPSHOT`` and timestamped versions are published.
@@ -132,7 +132,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.1-SNAPSHOT"
+ libraryDependencies += "com.typesafe.akka" % "akka-actor" % "2.1-M2"
Using Akka with Eclipse
View
16 akka-docs/java/camel.rst
@@ -132,7 +132,7 @@ An ``ActivationTimeoutException`` is thrown if the endpoint could not be activat
Deactivation of a Consumer or a Producer actor happens when the actor is terminated. For a Consumer, the route to the actor is stopped. For a Producer, the `SendProcessor`_ is stopped.
A ``DeActivationTimeoutException`` is thrown if the associated camel objects could not be deactivated within the specified timeout.
-.. _Camel: http://github.com/akka/akka/blob/master/akka-camel/src/main/scala/akka/camel/Camel.scala
+.. _Camel: http://github.com/akka/akka/tree/v2.1-M2/akka-camel/src/main/scala/akka/camel/Camel.scala
.. _CamelContext: https://svn.apache.org/repos/asf/camel/tags/camel-2.8.0/camel-core/src/main/java/org/apache/camel/CamelContext.java
.. _ProducerTemplate: https://svn.apache.org/repos/asf/camel/tags/camel-2.8.0/camel-core/src/main/java/org/apache/camel/ProducerTemplate.java
.. _SendProcessor: https://svn.apache.org/repos/asf/camel/tags/camel-2.8.0/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java
@@ -146,7 +146,7 @@ class. For example, the following actor class (Consumer1) implements the
`getEndpointUri` method, which is declared in the `UntypedConsumerActor`_ class, in order to receive
messages from the ``file:data/input/actor`` Camel endpoint.
-.. _UntypedConsumerActor: http://github.com/akka/akka/blob/master/akka-camel/src/main/scala/akka/camel/javaapi/UntypedConsumer.scala
+.. _UntypedConsumerActor: http://github.com/akka/akka/tree/v2.1-M2/akka-camel/src/main/scala/akka/camel/javaapi/UntypedConsumer.scala
.. includecode:: code/docs/camel/Consumer1.java#Consumer1
@@ -156,7 +156,7 @@ actor. Messages consumed by actors from Camel endpoints are of type
`CamelMessage`_. These are immutable representations of Camel messages.
.. _file component: http://camel.apache.org/file2.html
-.. _Message: http://github.com/akka/akka/blob/master/akka-camel/src/main/scala/akka/camel/CamelMessage.scala
+.. _Message: http://github.com/akka/akka/tree/v2.1-M2/akka-camel/src/main/scala/akka/camel/CamelMessage.scala
Here's another example that sets the endpointUri to
@@ -176,7 +176,7 @@ client the response type should be `CamelMessage`_. For any other response type,
new CamelMessage object is created by akka-camel with the actor response as message
body.
-.. _Message: http://github.com/akka/akka/blob/master/akka-camel/src/main/scala/akka/camel/CamelMessage.scala
+.. _Message: http://github.com/akka/akka/tree/v2.1-M2/akka-camel/src/main/scala/akka/camel/CamelMessage.scala
.. _camel-acknowledgements-java:
@@ -221,7 +221,7 @@ The timeout on the consumer actor can be overridden with the ``replyTimeout``, a
.. includecode:: code/docs/camel/Consumer4.java#Consumer4
.. _Exchange: https://svn.apache.org/repos/asf/camel/tags/camel-2.8.0/camel-core/src/main/java/org/apache/camel/Exchange.java
-.. _ask: http://github.com/akka/akka/blob/master/akka-actor/src/main/scala/akka/pattern/Patterns.scala
+.. _ask: http://github.com/akka/akka/tree/v2.1-M2/akka-actor/src/main/scala/akka/pattern/Patterns.scala
Producer Actors
===============
@@ -296,7 +296,7 @@ For initiating a a two-way message exchange, one of the
.. includecode:: code/docs/camel/RequestBodyActor.java#RequestProducerTemplate
-.. _UntypedProducerActor: http://github.com/akka/akka/blob/master/akka-camel/src/main/scala/akka/camel/javaapi/UntypedProducerActor.scala
+.. _UntypedProducerActor: http://github.com/akka/akka/tree/v2.1-M2/akka-camel/src/main/scala/akka/camel/javaapi/UntypedProducerActor.scala
.. _ProducerTemplate: https://svn.apache.org/repos/asf/camel/tags/camel-2.8.0/camel-core/src/main/java/org/apache/camel/ProducerTemplate.java
.. _camel-asynchronous-routing-java:
@@ -361,7 +361,7 @@ Akka Camel components
Akka actors can be accessed from Camel routes using the `actor`_ Camel component. This component can be used to
access any Akka actor (not only consumer actors) from Camel routes, as described in the following sections.
-.. _actor: http://github.com/akka/akka/blob/master/akka-camel/src/main/scala/akka/camel/internal/component/ActorComponent.scala
+.. _actor: http://github.com/akka/akka/tree/v2.1-M2/akka-camel/src/main/scala/akka/camel/internal/component/ActorComponent.scala
.. _access-to-actors-java:
@@ -372,7 +372,7 @@ To access actors from custom Camel routes, the `actor`_ Camel
component should be used. It fully supports Camel's `asynchronous routing
engine`_.
-.. _actor: http://github.com/akka/akka/blob/master/akka-camel/src/main/scala/akka/camel/internal/component/ActorComponent.scala
+.. _actor: http://github.com/akka/akka/tree/v2.1-M2/akka-camel/src/main/scala/akka/camel/internal/component/ActorComponent.scala
.. _asynchronous routing engine: http://camel.apache.org/asynchronous-routing-engine.html
This component accepts the following endpoint URI format:
View
2  akka-docs/java/event-bus.rst
@@ -44,7 +44,7 @@ The classifiers presented here are part of the Akka distribution, but rolling
your own in case you do not find a perfect match is not difficult, check the
implementation of the existing ones on `github`_.
-.. _github: https://github.com/akka/akka/blob/master/akka-actor/src/main/scala/akka/event/EventBus.scala
+.. _github: http://github.com/akka/akka/tree/v2.1-M2/akka-actor/src/main/scala/akka/event/EventBus.scala
Lookup Classification
---------------------
View
4 akka-docs/java/remoting.rst
@@ -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.1-SNAPSHOT</version>
+ <version>2.1-M2</version>
</dependency>
To enable remote capabilities in your Akka project you should, at a minimum, add the following changes
@@ -173,7 +173,7 @@ Description of the Remoting Sample
There is a more extensive remote example that comes with the Akka distribution.
Please have a look here for more information: `Remote Sample
-<https://github.com/akka/akka/tree/master/akka-samples/akka-sample-remote>`_
+<http://github.com/akka/akka/tree/v2.1-M2/akka-samples/akka-sample-remote>`_
This sample demonstrates both, remote deployment and look-up of remote actors.
First, let us have a look at the common setup for both scenarios (this is
``common.conf``):
View
2  akka-docs/java/routing.rst
@@ -337,7 +337,7 @@ from incoming sender/message to a ``List`` of ``Destination(sender, routee)``.
The sender is what "parent" the routee should see - changing this could be useful if you for example want
another actor than the original sender to intermediate the result of the routee (if there is a result).
For more information about how to alter the original sender we refer to the source code of
-`ScatterGatherFirstCompletedRouter <https://github.com/akka/akka/blob/master/akka-actor/src/main/scala/akka/routing/Routing.scala#L375>`_
+`ScatterGatherFirstCompletedRouter <http://github.com/akka/akka/tree/v2.1-M2/akka-actor/src/main/scala/akka/routing/Routing.scala#L375>`_
All in all the custom router looks like this:
View
2  akka-docs/modules/camel.rst
@@ -6,7 +6,7 @@
#######
.. note::
- The Akka Camel module has not been migrated to Akka 2.1-SNAPSHOT yet.
+ The Akka Camel module has not been migrated to Akka 2.1-M2 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
View
6 akka-docs/modules/durable-mailbox.rst
@@ -94,11 +94,11 @@ added in concrete subclass like this:
.. includecode:: code/docs/actor/mailbox/DurableMailboxDocSpec.scala
:include: custom-mailbox-test
-You find DurableMailboxDocSpec in ``akka-mailboxes-common-test-2.1-SNAPSHOT.jar``.
+You find DurableMailboxDocSpec in ``akka-mailboxes-common-test-2.1-M2.jar``.
Add this dependency::
- "com.typesafe.akka" % "akka-mailboxes-common-test" % "2.1-SNAPSHOT"
+ "com.typesafe.akka" % "akka-mailboxes-common-test" % "2.1-M2"
For more inspiration you can look at the old implementations based on Redis, MongoDB, Beanstalk,
and ZooKeeper, which can be found in Akka git repository tag
-`v2.0.1 <https://github.com/akka/akka/tree/v2.0.1/akka-durable-mailboxes>`_.
+`v2.0.1 <https://github.com/akka/akka/tree/v2.0.1/akka-durable-mailboxes>`_.
View
2  akka-docs/project/licenses.rst
@@ -36,4 +36,4 @@ Licenses for Dependency Libraries
---------------------------------
Each dependency and its license can be seen in the project build file (the comment on the side of each dependency):
-`<https://github.com/akka/akka/blob/master/project/AkkaBuild.scala#L497>`_
+`<http://github.com/akka/akka/tree/v2.1-M2/project/AkkaBuild.scala#L497>`_
View
4 akka-docs/scala/actors.rst
@@ -593,7 +593,7 @@ The ``become`` method is useful for many different things, but a particular nice
example of it is in example where it is used to implement a Finite State Machine
(FSM): `Dining Hakkers`_.
-.. _Dining Hakkers: http://github.com/akka/akka/blob/master/akka-samples/akka-sample-fsm/src/main/scala/DiningHakkersOnBecome.scala
+.. _Dining Hakkers: http://github.com/akka/akka/tree/v2.1-M2/akka-samples/akka-sample-fsm/src/main/scala/DiningHakkersOnBecome.scala
Here is another little cute example of ``become`` and ``unbecome`` in action:
@@ -602,7 +602,7 @@ Here is another little cute example of ``become`` and ``unbecome`` in action:
Encoding Scala Actors nested receives without accidentally leaking memory
-------------------------------------------------------------------------
-See this `Unnested receive example <https://github.com/akka/akka/blob/master/akka-docs/scala/code/docs/actor/UnnestedReceives.scala>`_.
+See this `Unnested receive example <http://github.com/akka/akka/tree/v2.1-M2/akka-docs/scala/code/docs/actor/UnnestedReceives.scala>`_.
Downgrade
View
16 akka-docs/scala/camel.rst
@@ -129,7 +129,7 @@ An ``ActivationTimeoutException`` is thrown if the endpoint could not be activat
Deactivation of a Consumer or a Producer actor happens when the actor is terminated. For a Consumer, the route to the actor is stopped. For a Producer, the `SendProcessor`_ is stopped.
A ``DeActivationTimeoutException`` is thrown if the associated camel objects could not be deactivated within the specified timeout.
-.. _Camel: http://github.com/akka/akka/blob/master/akka-camel/src/main/scala/akka/camel/Camel.scala
+.. _Camel: http://github.com/akka/akka/tree/v2.1-M2/akka-camel/src/main/scala/akka/camel/Camel.scala
.. _CamelContext: https://svn.apache.org/repos/asf/camel/tags/camel-2.8.0/camel-core/src/main/java/org/apache/camel/CamelContext.java
.. _ProducerTemplate: https://svn.apache.org/repos/asf/camel/tags/camel-2.8.0/camel-core/src/main/java/org/apache/camel/ProducerTemplate.java
.. _SendProcessor: https://svn.apache.org/repos/asf/camel/tags/camel-2.8.0/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java
@@ -143,7 +143,7 @@ trait. For example, the following actor class (Consumer1) implements the
endpointUri method, which is declared in the Consumer trait, in order to receive
messages from the ``file:data/input/actor`` Camel endpoint.
-.. _Consumer: http://github.com/akka/akka/blob/master/akka-camel/src/main/scala/akka/camel/Consumer.scala
+.. _Consumer: http://github.com/akka/akka/tree/v2.1-M2/akka-camel/src/main/scala/akka/camel/Consumer.scala
.. includecode:: code/docs/camel/Consumers.scala#Consumer1
@@ -153,7 +153,7 @@ actor. Messages consumed by actors from Camel endpoints are of type
`CamelMessage`_. These are immutable representations of Camel messages.
.. _file component: http://camel.apache.org/file2.html
-.. _Message: http://github.com/akka/akka/blob/master/akka-camel/src/main/scala/akka/camel/CamelMessage.scala
+.. _Message: http://github.com/akka/akka/tree/v2.1-M2/akka-camel/src/main/scala/akka/camel/CamelMessage.scala
Here's another example that sets the endpointUri to
@@ -173,7 +173,7 @@ client the response type should be `CamelMessage`_. For any other response type,
new CamelMessage object is created by akka-camel with the actor response as message
body.
-.. _CamelMessage: http://github.com/akka/akka/blob/master/akka-camel/src/main/scala/akka/camel/CamelMessage.scala
+.. _CamelMessage: http://github.com/akka/akka/tree/v2.1-M2/akka-camel/src/main/scala/akka/camel/CamelMessage.scala
.. _camel-acknowledgements:
@@ -218,7 +218,7 @@ The timeout on the consumer actor can be overridden with the ``replyTimeout``, a
.. includecode:: code/docs/camel/Consumers.scala#Consumer4
.. _Exchange: https://svn.apache.org/repos/asf/camel/tags/camel-2.8.0/camel-core/src/main/java/org/apache/camel/Exchange.java
-.. _ask: http://github.com/akka/akka/blob/master/akka-actor/src/main/scala/akka/pattern/AskSupport.scala
+.. _ask: http://github.com/akka/akka/tree/v2.1-M2/akka-actor/src/main/scala/akka/pattern/AskSupport.scala
Producer Actors
===============
@@ -292,7 +292,7 @@ For initiating a a two-way message exchange, one of the
.. includecode:: code/docs/camel/Producers.scala#RequestProducerTemplate
-.. _Producer: http://github.com/akka/akka/blob/master/akka-camel/src/main/scala/akka/camel/Producer.scala
+.. _Producer: http://github.com/akka/akka/tree/v2.1-M2/akka-camel/src/main/scala/akka/camel/Producer.scala
.. _ProducerTemplate: https://svn.apache.org/repos/asf/camel/tags/camel-2.8.0/camel-core/src/main/java/org/apache/camel/ProducerTemplate.java
.. _camel-asynchronous-routing:
@@ -357,7 +357,7 @@ Akka Camel components
Akka actors can be accessed from Camel routes using the `actor`_ Camel component. This component can be used to
access any Akka actor (not only consumer actors) from Camel routes, as described in the following sections.
-.. _actor: http://github.com/akka/akka/blob/master/akka-camel/src/main/scala/akka/camel/internal/component/ActorComponent.scala
+.. _actor: http://github.com/akka/akka/tree/v2.1-M2/akka-camel/src/main/scala/akka/camel/internal/component/ActorComponent.scala
.. _access-to-actors:
@@ -368,7 +368,7 @@ To access actors from custom Camel routes, the `actor`_ Camel
component should be used. It fully supports Camel's `asynchronous routing
engine`_.
-.. _actor: http://github.com/akka/akka/blob/master/akka-camel/src/main/scala/akka/camel/internal/component/ActorComponent.scala
+.. _actor: http://github.com/akka/akka/tree/v2.1-M2/akka-camel/src/main/scala/akka/camel/internal/component/ActorComponent.scala
.. _asynchronous routing engine: http://camel.apache.org/asynchronous-routing-engine.html
This component accepts the following endpoint URI format:
View
2  akka-docs/scala/event-bus.rst
@@ -46,7 +46,7 @@ The classifiers presented here are part of the Akka distribution, but rolling
your own in case you do not find a perfect match is not difficult, check the
implementation of the existing ones on `github`_.
-.. _github: https://github.com/akka/akka/blob/master/akka-actor/src/main/scala/akka/event/EventBus.scala
+.. _github: http://github.com/akka/akka/tree/v2.1-M2/akka-actor/src/main/scala/akka/event/EventBus.scala
Lookup Classification
---------------------
View
4 akka-docs/scala/fsm.rst
@@ -455,5 +455,5 @@ Examples
A bigger FSM example contrasted with Actor's :meth:`become`/:meth:`unbecome` can be found in the sources:
- * `Dining Hakkers using FSM <https://github.com/akka/akka/blob/master/akka-samples/akka-sample-fsm/src/main/scala/DiningHakkersOnFsm.scala#L1>`_
- * `Dining Hakkers using become <https://github.com/akka/akka/blob/master/akka-samples/akka-sample-fsm/src/main/scala/DiningHakkersOnBecome.scala#L1>`_
+ * `Dining Hakkers using FSM <http://github.com/akka/akka/tree/v2.1-M2/akka-samples/akka-sample-fsm/src/main/scala/DiningHakkersOnFsm.scala#L1>`_
+ * `Dining Hakkers using become <http://github.com/akka/akka/tree/v2.1-M2/akka-samples/akka-sample-fsm/src/main/scala/DiningHakkersOnBecome.scala#L1>`_
View
4 akka-docs/scala/remoting.rst
@@ -12,7 +12,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.1-SNAPSHOT"
+ "com.typesafe.akka" % "akka-remote" % "2.1-M2"
To enable remote capabilities in your Akka project you should, at a minimum, add the following changes
to your ``application.conf`` file::
@@ -182,7 +182,7 @@ Description of the Remoting Sample
There is a more extensive remote example that comes with the Akka distribution.
Please have a look here for more information: `Remote Sample
-<https://github.com/akka/akka/tree/master/akka-samples/akka-sample-remote>`_
+<http://github.com/akka/akka/tree/v2.1-M2/akka-samples/akka-sample-remote>`_
This sample demonstrates both, remote deployment and look-up of remote actors.
First, let us have a look at the common setup for both scenarios (this is
``common.conf``):
View
4 akka-docs/scala/routing.rst
@@ -338,14 +338,14 @@ As you can see above what's returned in the partial function is a ``List`` of ``
The sender is what "parent" the routee should see - changing this could be useful if you for example want
another actor than the original sender to intermediate the result of the routee (if there is a result).
For more information about how to alter the original sender we refer to the source code of
-`ScatterGatherFirstCompletedRouter <https://github.com/akka/akka/blob/master/akka-actor/src/main/scala/akka/routing/Routing.scala#L375>`_
+`ScatterGatherFirstCompletedRouter <http://github.com/akka/akka/tree/v2.1-M2/akka-actor/src/main/scala/akka/routing/Routing.scala#L375>`_
All in all the custom router looks like this:
.. includecode:: ../../akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala#CustomRouter
If you are interested in how to use the VoteCountRouter you can have a look at the test class
-`RoutingSpec <https://github.com/akka/akka/blob/master/akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala>`_
+`RoutingSpec <http://github.com/akka/akka/tree/v2.1-M2/akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala>`_
.. caution::
View
2  akka-kernel/src/main/dist/README
@@ -2,7 +2,7 @@
Akka
====
-This is the Akka 2.1-SNAPSHOT download.
+This is the Akka 2.1-M2 download.
Included are all libraries, documentation, and sources for Akka.
View
2  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.1-SNAPSHOT/
+# For more info about config, please visit the Akka Documentation: http://akka.io/docs/akka/2.1-M2/
View
4 akka-sbt-plugin/sample/project/Build.scala
@@ -6,7 +6,7 @@ import akka.sbt.AkkaKernelPlugin.{ Dist, outputDirectory, distJvmOptions}
object HelloKernelBuild extends Build {
val Organization = "akka.sample"
- val Version = "2.1-SNAPSHOT"
+ val Version = "2.1-M2"
val ScalaVersion = "2.10.0-M6"
lazy val HelloKernel = Project(
@@ -49,7 +49,7 @@ object Dependencies {
object Dependency {
// Versions
object V {
- val Akka = "2.1-SNAPSHOT"
+ val Akka = "2.1-M2"
}
val akkaKernel = "com.typesafe.akka" % "akka-kernel" % V.Akka
View
2  akka-sbt-plugin/sample/project/plugins.sbt
@@ -1,3 +1,3 @@
resolvers += "Typesafe Repo" at "http://repo.typesafe.com/typesafe/releases/"
-addSbtPlugin("com.typesafe.akka" % "akka-sbt-plugin" % "2.1-SNAPSHOT")
+addSbtPlugin("com.typesafe.akka" % "akka-sbt-plugin" % "2.1-M2")
View
2  project/AkkaBuild.scala
@@ -23,7 +23,7 @@ object AkkaBuild extends Build {
lazy val buildSettings = Seq(
organization := "com.typesafe.akka",
- version := "2.1-SNAPSHOT",
+ version := "2.1-M2",
scalaVersion := "2.10.0-M7"
)
Please sign in to comment.
Something went wrong with that request. Please try again.