Skip to content

Commit

Permalink
Update version for release 2.1.0-RC1
Browse files Browse the repository at this point in the history
  • Loading branch information
viktorklang committed Oct 16, 2012
1 parent 4887fdf commit b37bc01
Show file tree
Hide file tree
Showing 23 changed files with 47 additions and 47 deletions.
4 changes: 2 additions & 2 deletions akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala
Expand Up @@ -24,8 +24,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.0-RC1")
settings.ConfigVersion must equal("2.1.0-RC1")

getBoolean("akka.daemonic") must equal(false)
getBoolean("akka.actor.serialize-messages") must equal(false)
Expand Down
2 changes: 1 addition & 1 deletion akka-actor/src/main/resources/reference.conf
Expand Up @@ -7,7 +7,7 @@

akka {
# Akka version, checked against the runtime version of Akka.
version = "2.1-SNAPSHOT"
version = "2.1.0-RC1"

# Home directory of Akka, modules in the deploy directory will be loaded
home = ""
Expand Down
2 changes: 1 addition & 1 deletion akka-actor/src/main/scala/akka/actor/ActorSystem.scala
Expand Up @@ -23,7 +23,7 @@ import util.{ Failure, Success }

object ActorSystem {

val Version: String = "2.1-SNAPSHOT"
val Version: String = "2.1.0-RC1"

val EnvHome: Option[String] = System.getenv("AKKA_HOME") match {
case null | "" | "." None
Expand Down
6 changes: 3 additions & 3 deletions akka-docs/rst/cluster/cluster-usage-java.rst
Expand Up @@ -216,7 +216,7 @@ network failures and JVM crashes, in addition to graceful termination of watched
actor.

This example is included in ``akka-samples/akka-sample-cluster`` and you can try it by copying the
`source <https://github.com/akka/akka/tree/master/akka-samples/akka-sample-cluster>`_ to your
`source <http://github.com/akka/akka/tree/v2.1.0-RC1/akka-samples/akka-sample-cluster>`_ to your
maven project, defined as in :ref:`cluster_simple_example_java`.
Run it by starting nodes in different terminal windows. For example, starting 2
frontend nodes and 3 backend nodes::
Expand Down Expand Up @@ -379,7 +379,7 @@ This means that user requests can be sent to ``StatsService`` on any node and it
fan out to local children if more parallelism is needed.

This example is included in ``akka-samples/akka-sample-cluster`` and you can try it by copying the
`source <https://github.com/akka/akka/tree/master/akka-samples/akka-sample-cluster>`_ to your
`source <http://github.com/akka/akka/tree/v2.1.0-RC1/akka-samples/akka-sample-cluster>`_ to your
maven project, defined as in :ref:`cluster_simple_example_java`.
Run it by starting nodes in different terminal windows. For example, starting 3
service nodes and 1 client::
Expand Down Expand Up @@ -416,7 +416,7 @@ All nodes start ``StatsFacade`` and the router is now configured like this:
.. includecode:: ../../../akka-samples/akka-sample-cluster/src/main/java/sample/cluster/stats/japi/StatsSampleOneMasterMain.java#start-router-deploy

This example is included in ``akka-samples/akka-sample-cluster`` and you can try it by copying the
`source <https://github.com/akka/akka/tree/master/akka-samples/akka-sample-cluster>`_ to your
`source <http://github.com/akka/akka/tree/v2.1.0-RC1/akka-samples/akka-sample-cluster>`_ to your
maven project, defined as in :ref:`cluster_simple_example_java`.
Run it by starting nodes in different terminal windows. For example, starting 3
service nodes and 1 client::
Expand Down
6 changes: 3 additions & 3 deletions akka-docs/rst/dev/developer-guidelines.rst
Expand Up @@ -5,7 +5,7 @@ Developer Guidelines

.. note::

First read `The Akka Contributor Guidelines <https://github.com/akka/akka/blob/master/CONTRIBUTING.md>`_ .
First read `The Akka Contributor Guidelines <http://github.com/akka/akka/tree/v2.1.0-RC1/CONTRIBUTING.md>`_ .

Code Style
----------
Expand Down Expand Up @@ -50,12 +50,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.0-RC1/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.0-RC1/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
^^^^^^^^^^^^^^^^^
Expand Down
16 changes: 8 additions & 8 deletions akka-docs/rst/java/camel.rst
Expand Up @@ -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.0-RC1/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
Expand All @@ -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.0-RC1/akka-camel/src/main/scala/akka/camel/javaapi/UntypedConsumer.scala

.. includecode:: code/docs/camel/Consumer1.java#Consumer1

Expand All @@ -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.0-RC1/akka-camel/src/main/scala/akka/camel/CamelMessage.scala


Here's another example that sets the endpointUri to
Expand All @@ -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.0-RC1/akka-camel/src/main/scala/akka/camel/CamelMessage.scala

.. _camel-acknowledgements-java:

Expand Down Expand Up @@ -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.0-RC1/akka-actor/src/main/scala/akka/pattern/Patterns.scala

Producer Actors
===============
Expand Down Expand Up @@ -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.0-RC1/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:
Expand Down Expand Up @@ -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.0-RC1/akka-camel/src/main/scala/akka/camel/internal/component/ActorComponent.scala

.. _access-to-actors-java:

Expand All @@ -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.0-RC1/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:
Expand Down
2 changes: 1 addition & 1 deletion akka-docs/rst/java/event-bus.rst
Expand Up @@ -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.0-RC1/akka-actor/src/main/scala/akka/event/EventBus.scala

Lookup Classification
---------------------
Expand Down
2 changes: 1 addition & 1 deletion akka-docs/rst/java/remoting.rst
Expand Up @@ -193,7 +193,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.0-RC1/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``):
Expand Down
2 changes: 1 addition & 1 deletion akka-docs/rst/java/routing.rst
Expand Up @@ -406,7 +406,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.0-RC1/akka-actor/src/main/scala/akka/routing/Routing.scala#L375>`_

All in all the custom router looks like this:

Expand Down
2 changes: 1 addition & 1 deletion akka-docs/rst/modules/camel.rst
Expand Up @@ -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.0-RC1 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
Expand Down
2 changes: 1 addition & 1 deletion akka-docs/rst/project/licenses.rst
Expand Up @@ -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.0-RC1/project/AkkaBuild.scala#L497>`_
4 changes: 2 additions & 2 deletions akka-docs/rst/scala/actors.rst
Expand Up @@ -671,7 +671,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.0-RC1/akka-samples/akka-sample-fsm/src/main/scala/DiningHakkersOnBecome.scala

Here is another little cute example of ``become`` and ``unbecome`` in action:

Expand All @@ -680,7 +680,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.0-RC1/akka-docs/scala/code/docs/actor/UnnestedReceives.scala>`_.


Downgrade
Expand Down
16 changes: 8 additions & 8 deletions akka-docs/rst/scala/camel.rst
Expand Up @@ -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.0-RC1/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
Expand All @@ -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.0-RC1/akka-camel/src/main/scala/akka/camel/Consumer.scala

.. includecode:: code/docs/camel/Consumers.scala#Consumer1

Expand All @@ -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.0-RC1/akka-camel/src/main/scala/akka/camel/CamelMessage.scala


Here's another example that sets the endpointUri to
Expand All @@ -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.0-RC1/akka-camel/src/main/scala/akka/camel/CamelMessage.scala

.. _camel-acknowledgements:

Expand Down Expand Up @@ -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.0-RC1/akka-actor/src/main/scala/akka/pattern/AskSupport.scala

Producer Actors
===============
Expand Down Expand Up @@ -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.0-RC1/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:
Expand Down Expand Up @@ -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.0-RC1/akka-camel/src/main/scala/akka/camel/internal/component/ActorComponent.scala

.. _access-to-actors:

Expand All @@ -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.0-RC1/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:
Expand Down
2 changes: 1 addition & 1 deletion akka-docs/rst/scala/event-bus.rst
Expand Up @@ -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.0-RC1/akka-actor/src/main/scala/akka/event/EventBus.scala

Lookup Classification
---------------------
Expand Down
4 changes: 2 additions & 2 deletions akka-docs/rst/scala/fsm.rst
Expand Up @@ -458,5 +458,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.0-RC1/akka-samples/akka-sample-fsm/src/main/scala/DiningHakkersOnFsm.scala#L1>`_
* `Dining Hakkers using become <http://github.com/akka/akka/tree/v2.1.0-RC1/akka-samples/akka-sample-fsm/src/main/scala/DiningHakkersOnBecome.scala#L1>`_
2 changes: 1 addition & 1 deletion akka-docs/rst/scala/remoting.rst
Expand Up @@ -200,7 +200,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.0-RC1/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``):
Expand Down

0 comments on commit b37bc01

Please sign in to comment.