From 74b1e3a53d03c319407fdfa22515f760c5131111 Mon Sep 17 00:00:00 2001
From: Roland <rk@rkuhn.info>
Date: Mon, 15 Oct 2012 20:26:13 +0200
Subject: [PATCH] review comments: Duration.parse and FIXMEs

- found two more mentions of Duration.parse, replaced by Duration.create
- add FIXME to build for zeroMQ and scalaVersion
---
 .../src/main/scala/akka/actor/UntypedActor.scala       |  2 +-
 akka-docs/rst/project/migration-guide-2.0.x-2.1.x.rst  |  2 +-
 project/AkkaBuild.scala                                | 10 +++-------
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/akka-actor/src/main/scala/akka/actor/UntypedActor.scala b/akka-actor/src/main/scala/akka/actor/UntypedActor.scala
index 015d8fb9e3..47ddf4fc43 100644
--- a/akka-actor/src/main/scala/akka/actor/UntypedActor.scala
+++ b/akka-actor/src/main/scala/akka/actor/UntypedActor.scala
@@ -36,7 +36,7 @@ import akka.japi.{ Creator }
  *      }
  *    }
  *
- *   private static SupervisorStrategy strategy = new OneForOneStrategy(10, Duration.parse("1 minute"),
+ *   private static SupervisorStrategy strategy = new OneForOneStrategy(10, Duration.create("1 minute"),
  *     new Function<Throwable, Directive>() {
  *       @Override
  *       public Directive apply(Throwable t) {
diff --git a/akka-docs/rst/project/migration-guide-2.0.x-2.1.x.rst b/akka-docs/rst/project/migration-guide-2.0.x-2.1.x.rst
index bf2a7baf73..b162f8e24f 100644
--- a/akka-docs/rst/project/migration-guide-2.0.x-2.1.x.rst
+++ b/akka-docs/rst/project/migration-guide-2.0.x-2.1.x.rst
@@ -66,7 +66,7 @@ Java:
 ::
   
   // Use this Actors' Dispatcher as ExecutionContext
-  getContext().system().scheduler().scheduleOnce(Duration.parse("10 seconds",
+  getContext().system().scheduler().scheduleOnce(Duration.create("10 seconds",
     getSelf(), new Reconnect(), getContext().getDispatcher());
 
   // Use ActorSystem's default Dispatcher as ExecutionContext
diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index 1bf83f218c..47ca2278d4 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -29,6 +29,7 @@ object AkkaBuild extends Build {
   lazy val buildSettings = Seq(
     organization := "com.typesafe.akka",
     version      := "2.1-SNAPSHOT",
+    // FIXME: use 2.10.0 for final
     scalaVersion := System.getProperty("akka.scalaVersion", "2.10.0-RC1")
   )
 
@@ -401,13 +402,7 @@ object AkkaBuild extends Build {
     super.settings ++
     buildSettings ++
     Seq(
-      shellPrompt := { s => Project.extract(s).currentProject.id + " > " },
-      resolvers <<= (resolvers, scalaVersion) apply {
-        case (res, "2.10.0-SNAPSHOT") =>
-          res :+ ("Sonatype Snapshot Repo" at "https://oss.sonatype.org/content/repositories/snapshots/")
-        case (res, _) =>
-          res
-      }
+      shellPrompt := { s => Project.extract(s).currentProject.id + " > " }
     )
 
   lazy val baseSettings = Defaults.defaultSettings ++ Publish.settings
@@ -659,6 +654,7 @@ object Dependencies {
     val scalaStm      = "org.scala-tools"             % "scala-stm"                    % "0.6" cross CrossVersion.full // Modified BSD (Scala)
 
     val slf4jApi      = "org.slf4j"                   % "slf4j-api"                    % "1.7.2"       // MIT
+    // FIXME: use 2.10.0-RC1 version once published
     val zeroMQClient  = "org.zeromq"                  % "zeromq-scala-binding_2.10.0-M7"         % "0.0.6" // ApacheV2
     val uncommonsMath = "org.uncommons.maths"         % "uncommons-maths"              % "1.2.2a"      // ApacheV2
     val ariesBlueprint = "org.apache.aries.blueprint" % "org.apache.aries.blueprint"   % "0.3.2"       // ApacheV2