Skip to content
This repository
Browse code

Update version for release 2.0-M1

  • Loading branch information...
commit 72ab7d1b5d2b0410885d6eede5ff78ad13b30c24 1 parent e66d466
Peter Vlugter authored December 16, 2011

Showing 34 changed files with 83 additions and 83 deletions. Show diff stats Hide diff stats

  1. 4  akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala
  2. 2  akka-actor/src/main/resources/reference.conf
  3. 2  akka-actor/src/main/scala/akka/actor/ActorSystem.scala
  4. 4  akka-docs/conf.py
  5. 4  akka-docs/disabled/camel.rst
  6. 26  akka-docs/intro/getting-started-first-java.rst
  7. 16  akka-docs/intro/getting-started-first-scala-eclipse.rst
  8. 32  akka-docs/intro/getting-started-first-scala.rst
  9. 18  akka-docs/intro/getting-started.rst
  10. 2  akka-docs/java/transactors.rst
  11. 2  akka-docs/modules/camel.rst
  12. 2  akka-docs/modules/spring.rst
  13. 2  akka-docs/scala/agents.rst
  14. 2  akka-docs/scala/remoting.rst
  15. 2  akka-docs/scala/transactors.rst
  16. 2  akka-spring/src/main/resources/META-INF/spring.schemas
  17. 0  akka-spring/src/main/resources/akka/spring/{akka-2.0-SNAPSHOT.xsd → akka-2.0-M1.xsd}
  18. 2  akka-spring/src/test/resources/akka-test.conf
  19. 2  akka-spring/src/test/resources/appContext.xml
  20. 2  akka-spring/src/test/resources/appContextCamelServiceCustom.xml
  21. 2  akka-spring/src/test/resources/appContextCamelServiceDefault.xml
  22. 2  akka-spring/src/test/resources/dispatcher-config.xml
  23. 2  akka-spring/src/test/resources/failing-appContext.xml
  24. 2  akka-spring/src/test/resources/property-config.xml
  25. 2  akka-spring/src/test/resources/server-managed-config.xml
  26. 2  akka-spring/src/test/resources/supervisor-config.xml
  27. 2  akka-spring/src/test/resources/typed-actor-config.xml
  28. 2  akka-spring/src/test/resources/untyped-actor-config.xml
  29. 4  akka-tutorials/akka-tutorial-first/pom.xml
  30. 8  akka-tutorials/akka-tutorial-first/project/TutorialBuild.scala
  31. 2  project/AkkaBuild.scala
  32. 2  project/sbt7/build.properties
  33. 2  scripts/run_akka.sh
  34. 4  src/main/ls/2.0.json
4  akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala
@@ -20,8 +20,8 @@ class ConfigSpec extends AkkaSpec(ConfigFactory.defaultReference) {
20 20
       val config = settings.config
21 21
       import config._
22 22
 
23  
-      getString("akka.version") must equal("2.0-SNAPSHOT")
24  
-      settings.ConfigVersion must equal("2.0-SNAPSHOT")
  23
+      getString("akka.version") must equal("2.0-M1")
  24
+      settings.ConfigVersion must equal("2.0-M1")
25 25
 
26 26
       getString("akka.actor.default-dispatcher.type") must equal("Dispatcher")
27 27
       getMilliseconds("akka.actor.default-dispatcher.keep-alive-time") must equal(60 * 1000)
2  akka-actor/src/main/resources/reference.conf
@@ -7,7 +7,7 @@
7 7
 
8 8
 akka {
9 9
   # Akka version, checked against the runtime version of Akka.
10  
-  version = "2.0-SNAPSHOT"
  10
+  version = "2.0-M1"
11 11
 
12 12
   # Home directory of Akka, modules in the deploy directory will be loaded
13 13
   home = ""
2  akka-actor/src/main/scala/akka/actor/ActorSystem.scala
@@ -29,7 +29,7 @@ import java.io.Closeable
29 29
 
30 30
 object ActorSystem {
31 31
 
32  
-  val Version = "2.0-SNAPSHOT"
  32
+  val Version = "2.0-M1"
33 33
 
34 34
   val EnvHome = System.getenv("AKKA_HOME") match {
35 35
     case null | "" | "." ⇒ None
4  akka-docs/conf.py
@@ -17,8 +17,8 @@
17 17
 
18 18
 project = u'Akka'
19 19
 copyright = u'2011, Typesafe Inc'
20  
-version = '2.0-SNAPSHOT'
21  
-release = '2.0-SNAPSHOT'
  20
+version = '2.0-M1'
  21
+release = '2.0-M1'
22 22
 
23 23
 pygments_style = 'simple'
24 24
 highlight_language = 'scala'
4  akka-docs/disabled/camel.rst
Source Rendered
@@ -2459,10 +2459,10 @@ main method) that can be started from `sbt`_.
2459 2459
 .. code-block:: none
2460 2460
 
2461 2461
    $ sbt
2462  
-   [info] Building project akka 2.0-SNAPSHOT against Scala 2.9.0
  2462
+   [info] Building project akka 2.0-M1 against Scala 2.9.0
2463 2463
    [info]    using AkkaModulesParentProject with sbt 0.7.7 and Scala 2.7.7
2464 2464
    > project akka-sample-camel
2465  
-   Set current project to akka-sample-camel 2.0-SNAPSHOT
  2465
+   Set current project to akka-sample-camel 2.0-M1
2466 2466
    > run
2467 2467
    ...
2468 2468
    Multiple main classes detected, select one to run:
26  akka-docs/intro/getting-started-first-java.rst
Source Rendered
@@ -66,7 +66,7 @@ To build and run the tutorial sample from the command line, you have to download
66 66
 Akka. If you prefer to use SBT to build and run the sample then you can skip this
67 67
 section and jump to the next one.
68 68
 
69  
-Let's get the ``akka-2.0-SNAPSHOT.zip`` distribution of Akka from
  69
+Let's get the ``akka-2.0-M1.zip`` distribution of Akka from
70 70
 http://akka.io/downloads/ which includes everything we need for this
71 71
 tutorial. Once you have downloaded the distribution unzip it in the folder you
72 72
 would like to have Akka installed in. In my case I choose to install it in
@@ -77,10 +77,10 @@ You need to do one more thing in order to install Akka properly: set the
77 77
 I'm opening up a shell, navigating down to the distribution, and setting the
78 78
 ``AKKA_HOME`` variable::
79 79
 
80  
-    $ cd /Users/jboner/tools/akka-2.0-SNAPSHOT
  80
+    $ cd /Users/jboner/tools/akka-2.0-M1
81 81
     $ export AKKA_HOME=`pwd`
82 82
     $ echo $AKKA_HOME
83  
-    /Users/jboner/tools/akka-2.0-SNAPSHOT
  83
+    /Users/jboner/tools/akka-2.0-M1
84 84
 
85 85
 The distribution looks like this::
86 86
 
@@ -100,7 +100,7 @@ The distribution looks like this::
100 100
 - In the ``src`` directory we have the source JARs for Akka.
101 101
 
102 102
 The only JAR we will need for this tutorial (apart from the
103  
-``scala-library.jar`` JAR) is the ``akka-actor-2.0-SNAPSHOT.jar`` JAR in the ``lib/akka``
  103
+``scala-library.jar`` JAR) is the ``akka-actor-2.0-M1.jar`` JAR in the ``lib/akka``
104 104
 directory. This is a self-contained JAR with zero dependencies and contains
105 105
 everything we need to write a system using Actors.
106 106
 
@@ -120,10 +120,10 @@ modules are:
120 120
 - ``akka-durable-mailboxes`` -- Durable mailboxes: file-based, MongoDB, Redis, Beanstalk and Zookeeper
121 121
 
122 122
 .. - ``akka-amqp`` -- AMQP integration
123  
-.. - ``akka-stm-2.0-SNAPSHOT.jar`` -- STM (Software Transactional Memory), transactors and transactional datastructures
124  
-.. - ``akka-camel-2.0-SNAPSHOT.jar`` -- Apache Camel Actors integration (it's the best way to have your Akka application communicate with the rest of the world)
125  
-.. - ``akka-camel-typed-2.0-SNAPSHOT.jar`` -- Apache Camel Typed Actors integration
126  
-.. - ``akka-spring-2.0-SNAPSHOT.jar`` -- Spring framework integration
  123
+.. - ``akka-stm-2.0-M1.jar`` -- STM (Software Transactional Memory), transactors and transactional datastructures
  124
+.. - ``akka-camel-2.0-M1.jar`` -- Apache Camel Actors integration (it's the best way to have your Akka application communicate with the rest of the world)
  125
+.. - ``akka-camel-typed-2.0-M1.jar`` -- Apache Camel Typed Actors integration
  126
+.. - ``akka-spring-2.0-M1.jar`` -- Spring framework integration
127 127
 
128 128
 
129 129
 
@@ -192,7 +192,7 @@ repositories, including akka.io.  It should now look something like this:
192 192
             <dependency>
193 193
                 <groupId>com.typesafe.akka</groupId>
194 194
                 <artifactId>akka-actor</artifactId>
195  
-                <version>2.0-SNAPSHOT</version>
  195
+                <version>2.0-M1</version>
196 196
             </dependency>
197 197
         </dependencies>
198 198
 
@@ -350,19 +350,19 @@ time. When that's done open up a shell and step in to the Akka distribution
350 350
 (``cd $AKKA_HOME``).
351 351
 
352 352
 First we need to compile the source file. That is done with Java's compiler
353  
-``javac``. Our application depends on the ``akka-actor-2.0-SNAPSHOT.jar`` and the
  353
+``javac``. Our application depends on the ``akka-actor-2.0-M1.jar`` and the
354 354
 ``scala-library.jar`` JAR files, so let's add them to the compiler classpath
355 355
 when we compile the source::
356 356
 
357  
-    $ javac -cp lib/scala-library.jar:lib/akka/akka-actor-2.0-SNAPSHOT.jar tutorial/akka/tutorial/first/java/Pi.java
  357
+    $ javac -cp lib/scala-library.jar:lib/akka/akka-actor-2.0-M1.jar tutorial/akka/tutorial/first/java/Pi.java
358 358
 
359 359
 When we have compiled the source file we are ready to run the application. This
360  
-is done with ``java`` but yet again we need to add the ``akka-actor-2.0-SNAPSHOT.jar``
  360
+is done with ``java`` but yet again we need to add the ``akka-actor-2.0-M1.jar``
361 361
 and the ``scala-library.jar`` JAR files to the classpath as well as the classes
362 362
 we compiled ourselves::
363 363
 
364 364
     $ java \
365  
-        -cp lib/scala-library.jar:lib/akka/akka-actor-2.0-SNAPSHOT.jar:. \
  365
+        -cp lib/scala-library.jar:lib/akka/akka-actor-2.0-M1.jar:. \
366 366
         akka.tutorial.java.first.Pi
367 367
 
368 368
     Pi estimate:        3.1435501812459323
16  akka-docs/intro/getting-started-first-scala-eclipse.rst
Source Rendered
@@ -88,7 +88,7 @@ To build and run the tutorial sample from the command line, you have to download
88 88
 Akka. If you prefer to use SBT to build and run the sample then you can skip this
89 89
 section and jump to the next one.
90 90
 
91  
-Let's get the ``akka-2.0-SNAPSHOT.zip`` distribution of Akka from
  91
+Let's get the ``akka-2.0-M1.zip`` distribution of Akka from
92 92
 http://akka.io/downloads/ which includes everything we need for this
93 93
 tutorial. Once you have downloaded the distribution unzip it in the folder you
94 94
 would like to have Akka installed in. In my case I choose to install it in
@@ -99,10 +99,10 @@ You need to do one more thing in order to install Akka properly: set the
99 99
 I'm opening up a shell, navigating down to the distribution, and setting the
100 100
 ``AKKA_HOME`` variable::
101 101
 
102  
-    $ cd /Users/jboner/tools/akka-2.0-SNAPSHOT
  102
+    $ cd /Users/jboner/tools/akka-2.0-M1
103 103
     $ export AKKA_HOME=`pwd`
104 104
     $ echo $AKKA_HOME
105  
-    /Users/jboner/tools/akka-2.0-SNAPSHOT
  105
+    /Users/jboner/tools/akka-2.0-M1
106 106
 
107 107
 The distribution looks like this::
108 108
 
@@ -122,7 +122,7 @@ The distribution looks like this::
122 122
 - In the ``src`` directory we have the source JARs for Akka.
123 123
 
124 124
 The only JAR we will need for this tutorial (apart from the
125  
-``scala-library.jar`` JAR) is the ``akka-actor-2.0-SNAPSHOT.jar`` JAR in the ``lib/akka``
  125
+``scala-library.jar`` JAR) is the ``akka-actor-2.0-M1.jar`` JAR in the ``lib/akka``
126 126
 directory. This is a self-contained JAR with zero dependencies and contains
127 127
 everything we need to write a system using Actors.
128 128
 
@@ -142,10 +142,10 @@ modules are:
142 142
 - ``akka-durable-mailboxes`` -- Durable mailboxes: file-based, MongoDB, Redis, Zookeeper
143 143
 
144 144
 .. - ``akka-amqp`` -- AMQP integration
145  
-.. - ``akka-stm-2.0-SNAPSHOT.jar`` -- STM (Software Transactional Memory), transactors and transactional datastructures
146  
-.. - ``akka-camel-2.0-SNAPSHOT.jar`` -- Apache Camel Actors integration (it's the best way to have your Akka application communicate with the rest of the world)
147  
-.. - ``akka-camel-typed-2.0-SNAPSHOT.jar`` -- Apache Camel Typed Actors integration
148  
-.. - ``akka-spring-2.0-SNAPSHOT.jar`` -- Spring framework integration
  145
+.. - ``akka-stm-2.0-M1.jar`` -- STM (Software Transactional Memory), transactors and transactional datastructures
  146
+.. - ``akka-camel-2.0-M1.jar`` -- Apache Camel Actors integration (it's the best way to have your Akka application communicate with the rest of the world)
  147
+.. - ``akka-camel-typed-2.0-M1.jar`` -- Apache Camel Typed Actors integration
  148
+.. - ``akka-spring-2.0-M1.jar`` -- Spring framework integration
149 149
 
150 150
 
151 151
 Downloading and installing the Scala IDE for Eclipse
32  akka-docs/intro/getting-started-first-scala.rst
Source Rendered
@@ -89,7 +89,7 @@ To build and run the tutorial sample from the command line, you have to download
89 89
 Akka. If you prefer to use SBT to build and run the sample then you can skip this
90 90
 section and jump to the next one.
91 91
 
92  
-Let's get the ``akka-2.0-SNAPSHOT.zip`` distribution of Akka from
  92
+Let's get the ``akka-2.0-M1.zip`` distribution of Akka from
93 93
 http://akka.io/downloads/ which includes everything we need for this
94 94
 tutorial. Once you have downloaded the distribution unzip it in the folder you
95 95
 would like to have Akka installed in. In my case I choose to install it in
@@ -100,10 +100,10 @@ You need to do one more thing in order to install Akka properly: set the
100 100
 I'm opening up a shell, navigating down to the distribution, and setting the
101 101
 ``AKKA_HOME`` variable::
102 102
 
103  
-    $ cd /Users/jboner/tools/akka-2.0-SNAPSHOT
  103
+    $ cd /Users/jboner/tools/akka-2.0-M1
104 104
     $ export AKKA_HOME=`pwd`
105 105
     $ echo $AKKA_HOME
106  
-    /Users/jboner/tools/akka-2.0-SNAPSHOT
  106
+    /Users/jboner/tools/akka-2.0-M1
107 107
 
108 108
 The distribution looks like this::
109 109
 
@@ -123,7 +123,7 @@ The distribution looks like this::
123 123
 - In the ``src`` directory we have the source JARs for Akka.
124 124
 
125 125
 The only JAR we will need for this tutorial (apart from the
126  
-``scala-library.jar`` JAR) is the ``akka-actor-2.0-SNAPSHOT.jar`` JAR in the ``lib/akka``
  126
+``scala-library.jar`` JAR) is the ``akka-actor-2.0-M1.jar`` JAR in the ``lib/akka``
127 127
 directory. This is a self-contained JAR with zero dependencies and contains
128 128
 everything we need to write a system using Actors.
129 129
 
@@ -144,10 +144,10 @@ modules are:
144 144
 
145 145
 - ``akka-amqp`` -- AMQP integration
146 146
 
147  
-.. - ``akka-stm-2.0-SNAPSHOT.jar`` -- STM (Software Transactional Memory), transactors and transactional datastructures
148  
-.. - ``akka-camel-2.0-SNAPSHOT.jar`` -- Apache Camel Actors integration (it's the best way to have your Akka application communicate with the rest of the world)
149  
-.. - ``akka-camel-typed-2.0-SNAPSHOT.jar`` -- Apache Camel Typed Actors integration
150  
-.. - ``akka-spring-2.0-SNAPSHOT.jar`` -- Spring framework integration
  147
+.. - ``akka-stm-2.0-M1.jar`` -- STM (Software Transactional Memory), transactors and transactional datastructures
  148
+.. - ``akka-camel-2.0-M1.jar`` -- Apache Camel Actors integration (it's the best way to have your Akka application communicate with the rest of the world)
  149
+.. - ``akka-camel-typed-2.0-M1.jar`` -- Apache Camel Typed Actors integration
  150
+.. - ``akka-spring-2.0-M1.jar`` -- Spring framework integration
151 151
 
152 152
 
153 153
 Downloading and installing Scala
@@ -216,7 +216,7 @@ in the directory you want to create your project in::
216 216
 
217 217
     resolvers += "Typesafe Repository" at "http://repo.typesafe.com/typesafe/releases/"
218 218
 
219  
-    libraryDependencies += "com.typesafe.akka" % "akka-actor" % "2.0-SNAPSHOT"
  219
+    libraryDependencies += "com.typesafe.akka" % "akka-actor" % "2.0-M1"
220 220
 
221 221
 Create a directory ``src/main/scala`` in which you will store the Scala source
222 222
 files.
@@ -226,14 +226,14 @@ modules beyond ``akka-actor``, you can add these as ``libraryDependencies`` in
226 226
 ``build.sbt``. Note that there must be a blank line between each. Here is an
227 227
 example adding ``akka-remote``::
228 228
 
229  
-    libraryDependencies += "com.typesafe.akka" % "akka-actor" % "2.0-SNAPSHOT"
  229
+    libraryDependencies += "com.typesafe.akka" % "akka-actor" % "2.0-M1"
230 230
 
231  
-    libraryDependencies += "com.typesafe.akka" % "akka-remote" % "2.0-SNAPSHOT"
  231
+    libraryDependencies += "com.typesafe.akka" % "akka-remote" % "2.0-M1"
232 232
 
233 233
 So, now we are all set.
234 234
 
235 235
 SBT itself needs a whole bunch of dependencies but our project will only need
236  
-one; ``akka-actor-2.0-SNAPSHOT.jar``. SBT will download that as well.
  236
+one; ``akka-actor-2.0-M1.jar``. SBT will download that as well.
237 237
 
238 238
 
239 239
 Start writing the code
@@ -402,19 +402,19 @@ If you have not typed in (or copied) the code for the tutorial as in
402 402
 When that's done open up a shell and step in to the Akka distribution (``cd $AKKA_HOME``).
403 403
 
404 404
 First we need to compile the source file. That is done with Scala's compiler
405  
-``scalac``. Our application depends on the ``akka-actor-2.0-SNAPSHOT.jar`` JAR
  405
+``scalac``. Our application depends on the ``akka-actor-2.0-M1.jar`` JAR
406 406
 file, so let's add that to the compiler classpath when we compile the source::
407 407
 
408  
-    $ scalac -cp lib/akka/akka-actor-2.0-SNAPSHOT.jar Pi.scala
  408
+    $ scalac -cp lib/akka/akka-actor-2.0-M1.jar Pi.scala
409 409
 
410 410
 When we have compiled the source file we are ready to run the application. This
411 411
 is done with ``java`` but yet again we need to add the
412  
-``akka-actor-2.0-SNAPSHOT.jar`` JAR file to the classpath, and this time we also
  412
+``akka-actor-2.0-M1.jar`` JAR file to the classpath, and this time we also
413 413
 need to add the Scala runtime library ``scala-library.jar`` and the classes we
414 414
 compiled ourselves::
415 415
 
416 416
     $ java \
417  
-        -cp lib/scala-library.jar:lib/akka/akka-actor-2.0-SNAPSHOT.jar:. \
  417
+        -cp lib/scala-library.jar:lib/akka/akka-actor-2.0-M1.jar:. \
418 418
         akka.tutorial.first.scala.Pi
419 419
 
420 420
     Pi estimate:        3.1435501812459323
18  akka-docs/intro/getting-started.rst
Source Rendered
@@ -44,12 +44,12 @@ Modules
44 44
 
45 45
 Akka is very modular and has many JARs for containing different features.
46 46
 
47  
-- ``akka-actor-2.0-SNAPSHOT.jar`` -- Standard Actors, Typed Actors and much more
48  
-- ``akka-remote-2.0-SNAPSHOT.jar`` -- Remote Actors
49  
-- ``akka-slf4j-2.0-SNAPSHOT.jar`` -- SLF4J Event Handler Listener
50  
-- ``akka-testkit-2.0-SNAPSHOT.jar`` -- Toolkit for testing Actors
51  
-- ``akka-kernel-2.0-SNAPSHOT.jar`` -- Akka microkernel for running a bare-bones mini application server
52  
-- ``akka-<storage-system>-mailbox-2.0-SNAPSHOT.jar`` -- Akka durable mailboxes
  47
+- ``akka-actor-2.0-M1.jar`` -- Standard Actors, Typed Actors and much more
  48
+- ``akka-remote-2.0-M1.jar`` -- Remote Actors
  49
+- ``akka-slf4j-2.0-M1.jar`` -- SLF4J Event Handler Listener
  50
+- ``akka-testkit-2.0-M1.jar`` -- Toolkit for testing Actors
  51
+- ``akka-kernel-2.0-M1.jar`` -- Akka microkernel for running a bare-bones mini application server
  52
+- ``akka-<storage-system>-mailbox-2.0-M1.jar`` -- Akka durable mailboxes
53 53
 
54 54
 How to see the JARs dependencies of each Akka module is described in the
55 55
 :ref:`dependencies` section. Worth noting is that ``akka-actor`` has zero
@@ -105,14 +105,14 @@ Summary of the essential parts for using Akka with Maven:
105 105
     <url>http://repo.typesafe.com/typesafe/releases/</url>
106 106
   </repository>
107 107
 
108  
-2) Add the Akka dependencies. For example, here is the dependency for Akka Actor 2.0-SNAPSHOT:
  108
+2) Add the Akka dependencies. For example, here is the dependency for Akka Actor 2.0-M1:
109 109
 
110 110
 .. code-block:: xml
111 111
 
112 112
   <dependency>
113 113
     <groupId>com.typesafe.akka</groupId>
114 114
     <artifactId>akka-actor</artifactId>
115  
-    <version>2.0-SNAPSHOT</version>
  115
+    <version>2.0-M1</version>
116 116
   </dependency>
117 117
 
118 118
 **Note**: for snapshot versions both ``SNAPSHOT`` and timestamped versions are published.
@@ -138,7 +138,7 @@ SBT installation instructions on `https://github.com/harrah/xsbt/wiki/Setup <htt
138 138
 
139 139
     resolvers += "Typesafe Repository" at "http://repo.typesafe.com/typesafe/releases/"
140 140
 
141  
-    libraryDependencies += "com.typesafe.akka" % "akka-actor" % "2.0-SNAPSHOT"
  141
+    libraryDependencies += "com.typesafe.akka" % "akka-actor" % "2.0-M1"
142 142
 
143 143
 
144 144
 Using Akka with Eclipse
2  akka-docs/java/transactors.rst
Source Rendered
@@ -3,4 +3,4 @@
3 3
 Transactors (Java)
4 4
 ==================
5 5
 
6  
-The Akka Transactors module has not been migrated to Akka 2.0-SNAPSHOT yet.
  6
+The Akka Transactors module has not been migrated to Akka 2.0-M1 yet.
2  akka-docs/modules/camel.rst
Source Rendered
@@ -6,7 +6,7 @@
6 6
 #######
7 7
 
8 8
 .. note::
9  
-    The Akka Camel module has not been migrated to Akka 2.0-SNAPSHOT yet.
  9
+    The Akka Camel module has not been migrated to Akka 2.0-M1 yet.
10 10
 
11 11
     It might not make it into Akka 2.0 final but will then hopefully be
12 12
     re-introduce in an upcoming release. It might also be backported to
2  akka-docs/modules/spring.rst
Source Rendered
@@ -6,7 +6,7 @@
6 6
 ####################
7 7
 
8 8
 .. note::
9  
-    The Akka Spring module has not been migrated to Akka 2.0-SNAPSHOT yet.
  9
+    The Akka Spring module has not been migrated to Akka 2.0-M1 yet.
10 10
 
11 11
     It might not make it into Akka 2.0 final but will then hopefully be
12 12
     re-introduce in an upcoming release. It might also be backported to
2  akka-docs/scala/agents.rst
Source Rendered
... ...
@@ -1,4 +1,4 @@
1 1
 Agents (Scala)
2 2
 ==============
3 3
 
4  
-The Akka Agents module has not been migrated to Akka 2.0-SNAPSHOT yet.
  4
+The Akka Agents module has not been migrated to Akka 2.0-M1 yet.
2  akka-docs/scala/remoting.rst
Source Rendered
@@ -16,7 +16,7 @@ The Akka remoting is a separate jar file. Make sure that you have a dependency f
16 16
 
17 17
 In you SBT project you should add the following as a dependency::
18 18
 
19  
-  "com.typesafe.akka" % "akka-remote" % "2.0-SNAPSHOT"
  19
+  "com.typesafe.akka" % "akka-remote" % "2.0-M1"
20 20
 
21 21
 First of all you have to change the actor provider from ``LocalActorRefProvider`` to ``RemoteActorRefProvider``::
22 22
 
2  akka-docs/scala/transactors.rst
Source Rendered
@@ -3,4 +3,4 @@
3 3
 Transactors (Scala)
4 4
 ===================
5 5
 
6  
-The Akka Transactors module has not been migrated to Akka 2.0-SNAPSHOT yet.
  6
+The Akka Transactors module has not been migrated to Akka 2.0-M1 yet.
2  akka-spring/src/main/resources/META-INF/spring.schemas
... ...
@@ -1 +1 @@
1  
-http\://akka.io/akka-2.0-SNAPSHOT.xsd=akka/spring/akka-2.0-SNAPSHOT.xsd
  1
+http\://akka.io/akka-2.0-M1.xsd=akka/spring/akka-2.0-M1.xsd
0  .../main/resources/akka/spring/akka-2.0-SNAPSHOT.xsd → ...ng/src/main/resources/akka/spring/akka-2.0-M1.xsd
File renamed without changes
2  akka-spring/src/test/resources/akka-test.conf
@@ -6,7 +6,7 @@
6 6
 # Modify as needed.
7 7
 
8 8
 akka {
9  
-  version = "2.0-SNAPSHOT"   # Akka version, checked against the runtime version of Akka.
  9
+  version = "2.0-M1"   # Akka version, checked against the runtime version of Akka.
10 10
 
11 11
   enabled-modules = ["remote"]       # Comma separated list of the enabled modules. Options: ["remote", "camel", "http"]
12 12
 
2  akka-spring/src/test/resources/appContext.xml
@@ -5,7 +5,7 @@
5 5
        xsi:schemaLocation="http://www.springframework.org/schema/beans
6 6
        http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
7 7
        http://akka.io/schema/akka
8  
-       http://akka.io/akka-2.0-SNAPSHOT.xsd">
  8
+       http://akka.io/akka-2.0-M1.xsd">
9 9
 
10 10
     <akka:typed-actor id="sample"
11 11
                         interface="akka.spring.SampleBeanIntf"
2  akka-spring/src/test/resources/appContextCamelServiceCustom.xml
@@ -6,7 +6,7 @@
6 6
 http://www.springframework.org/schema/beans
7 7
 http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
8 8
 http://akka.io/schema/akka
9  
-http://akka.io/akka-2.0-SNAPSHOT.xsd
  9
+http://akka.io/akka-2.0-M1.xsd
10 10
 http://camel.apache.org/schema/spring
11 11
 http://camel.apache.org/schema/spring/camel-spring.xsd">
12 12
 
2  akka-spring/src/test/resources/appContextCamelServiceDefault.xml
@@ -6,7 +6,7 @@
6 6
 http://www.springframework.org/schema/beans
7 7
 http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
8 8
 http://akka.io/schema/akka
9  
-http://akka.io/akka-2.0-SNAPSHOT.xsd
  9
+http://akka.io/akka-2.0-M1.xsd
10 10
 http://camel.apache.org/schema/spring
11 11
 http://camel.apache.org/schema/spring/camel-spring.xsd">
12 12
 
2  akka-spring/src/test/resources/dispatcher-config.xml
@@ -7,7 +7,7 @@
7 7
 http://www.springframework.org/schema/beans
8 8
 http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
9 9
 http://akka.io/schema/akka
10  
-http://akka.io/akka-2.0-SNAPSHOT.xsd">
  10
+http://akka.io/akka-2.0-M1.xsd">
11 11
 
12 12
 
13 13
   <akka:typed-actor id="typed-actor-with-dispatcher"
2  akka-spring/src/test/resources/failing-appContext.xml
@@ -5,7 +5,7 @@
5 5
        xsi:schemaLocation="http://www.springframework.org/schema/beans
6 6
        http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
7 7
        http://akka.io/schema/akka
8  
-       http://akka.io/akka-2.0-SNAPSHOT.xsd">
  8
+       http://akka.io/akka-2.0-M1.xsd">
9 9
 
10 10
     <akka:typed-actor id="bean"
11 11
                         implementation="org.springframework.core.io.ResourceEditor"
2  akka-spring/src/test/resources/property-config.xml
@@ -7,7 +7,7 @@
7 7
 http://www.springframework.org/schema/beans
8 8
 http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
9 9
 http://akka.io/schema/akka
10  
-http://akka.io/akka-2.0-SNAPSHOT.xsd">
  10
+http://akka.io/akka-2.0-M1.xsd">
11 11
 
12 12
 
13 13
   <akka:property-placeholder location="akka-test.conf"/>
2  akka-spring/src/test/resources/server-managed-config.xml
@@ -7,7 +7,7 @@
7 7
 http://www.springframework.org/schema/beans
8 8
 http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
9 9
 http://akka.io/schema/akka
10  
-http://akka.io/akka-2.0-SNAPSHOT.xsd">
  10
+http://akka.io/akka-2.0-M1.xsd">
11 11
 
12 12
 
13 13
   <akka:untyped-actor id="client-managed-remote-untyped-actor"
2  akka-spring/src/test/resources/supervisor-config.xml
@@ -7,7 +7,7 @@
7 7
 http://www.springframework.org/schema/beans
8 8
 http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
9 9
 http://akka.io/schema/akka
10  
-http://akka.io/akka-2.0-SNAPSHOT.xsd">
  10
+http://akka.io/akka-2.0-M1.xsd">
11 11
 
12 12
   <akka:supervision id="supervision1">
13 13
     <akka:restart-strategy failover="AllForOne" retries="3" timerange="1000">
2  akka-spring/src/test/resources/typed-actor-config.xml
@@ -7,7 +7,7 @@
7 7
 http://www.springframework.org/schema/beans
8 8
 http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
9 9
 http://akka.io/schema/akka
10  
-http://akka.io/akka-2.0-SNAPSHOT.xsd">
  10
+http://akka.io/akka-2.0-M1.xsd">
11 11
 
12 12
   <akka:typed-actor id="simple-typed-actor"
13 13
                       interface="akka.spring.foo.IMyPojo"
2  akka-spring/src/test/resources/untyped-actor-config.xml
@@ -7,7 +7,7 @@
7 7
 http://www.springframework.org/schema/beans
8 8
 http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
9 9
 http://akka.io/schema/akka
10  
-http://akka.io/akka-2.0-SNAPSHOT.xsd">
  10
+http://akka.io/akka-2.0-M1.xsd">
11 11
 
12 12
   <akka:untyped-actor id="simple-untyped-actor"
13 13
                       implementation="akka.spring.foo.PingActor"/>
4  akka-tutorials/akka-tutorial-first/pom.xml
@@ -8,14 +8,14 @@
8 8
     <groupId>akka.tutorial.first.java</groupId>
9 9
     <artifactId>akka-tutorial-first-java</artifactId>
10 10
     <packaging>jar</packaging>
11  
-    <version>2.0-SNAPSHOT</version>
  11
+    <version>2.0-M1</version>
12 12
     <url>http://akka.io</url>
13 13
 
14 14
     <dependencies>
15 15
         <dependency>
16 16
             <groupId>com.typesafe.akka</groupId>
17 17
             <artifactId>akka-actor</artifactId>
18  
-            <version>2.0-SNAPSHOT</version>
  18
+            <version>2.0-M1</version>
19 19
         </dependency>
20 20
     </dependencies>
21 21
 
8  akka-tutorials/akka-tutorial-first/project/TutorialBuild.scala
@@ -4,7 +4,7 @@ import Keys._
4 4
 object TutorialBuild extends Build {
5 5
   lazy val buildSettings = Seq(
6 6
     organization := "com.typesafe.akka",
7  
-    version := "2.0-SNAPSHOT",
  7
+    version := "2.0-M1",
8 8
     scalaVersion := "2.9.1"
9 9
   )
10 10
 
@@ -13,10 +13,10 @@ object TutorialBuild extends Build {
13 13
     base = file("."),
14 14
     settings = Defaults.defaultSettings ++ Seq(
15 15
       libraryDependencies ++= Seq(
16  
-        "com.typesafe.akka" % "akka-actor"      % "2.0-SNAPSHOT",
  16
+        "com.typesafe.akka" % "akka-actor"      % "2.0-M1",
17 17
         "junit"             % "junit"           % "4.5"           % "test",
18 18
         "org.scalatest"     % "scalatest_2.9.0" % "1.6.1"         % "test",
19  
-        "com.typesafe.akka" % "akka-testkit"    % "2.0-SNAPSHOT"  % "test")
  19
+        "com.typesafe.akka" % "akka-testkit"    % "2.0-M1"  % "test")
20 20
     )
21 21
   )
22  
-}
  22
+}
2  project/AkkaBuild.scala
@@ -17,7 +17,7 @@ object AkkaBuild extends Build {
17 17
 
18 18
   lazy val buildSettings = Seq(
19 19
     organization := "com.typesafe.akka",
20  
-    version      := "2.0-SNAPSHOT",
  20
+    version      := "2.0-M1",
21 21
     scalaVersion := "2.9.1"
22 22
   )
23 23
 
2  project/sbt7/build.properties
... ...
@@ -1,6 +1,6 @@
1 1
 project.organization=se.scalablesolutions.akka
2 2
 project.name=akka
3  
-project.version=2.0-SNAPSHOT
  3
+project.version=2.0-M1
4 4
 build.scala.versions=2.9.0
5 5
 sbt.version=0.7.7
6 6
 
2  scripts/run_akka.sh
... ...
@@ -1,6 +1,6 @@
1 1
 #!/bin/bash
2 2
 cd $AKKA_HOME
3  
-VERSION=2.0-SNAPSHOT
  3
+VERSION=2.0-M1
4 4
 TARGET_DIR=dist/$VERSION/$1
5 5
 shift 1
6 6
 VMARGS=$@
4  src/main/ls/2.0.json
@@ -2,7 +2,7 @@
2 2
 {
3 3
  "organization":"com.typesafe.akka",
4 4
  "name":"akka",
5  
- "version":"2.0-SNAPSHOT",
  5
+ "version":"2.0-M1",
6 6
  "description":"Akka is the platform for the next generation of event-driven, scalable and fault-tolerant architectures on the JVM.",
7 7
  "site":"",
8 8
  "tags":["actors","stm","concurrency","distributed","fault-tolerance","scala","java","futures","dataflow","remoting"],
@@ -12,4 +12,4 @@
12 12
  "dependencies": [],
13 13
  "scalas": ["2.9.1"],
14 14
  "sbt": false
15  
-}
  15
+}

0 notes on commit 72ab7d1

Please sign in to comment.
Something went wrong with that request. Please try again.