From 52e1881ece53b6df8420f7fcebbcea9a49d6f7dc Mon Sep 17 00:00:00 2001 From: Roland Date: Wed, 4 Jul 2012 11:30:02 +0200 Subject: [PATCH] move 'repl' script into AkkaBuild as initialCommands, thanks Pete! --- project/AkkaBuild.scala | 15 +++++++++++++++ repl | 22 ---------------------- 2 files changed, 15 insertions(+), 22 deletions(-) delete mode 100644 repl diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala index d62ed11b29..244073b013 100644 --- a/project/AkkaBuild.scala +++ b/project/AkkaBuild.scala @@ -36,6 +36,20 @@ object AkkaBuild extends Build { Publish.defaultPublishTo in ThisBuild <<= crossTarget / "repository", Unidoc.unidocExclude := Seq(samples.id, tutorials.id), Dist.distExclude := Seq(actorTests.id, akkaSbtPlugin.id, docs.id), + initialCommands in ThisBuild := + """|import akka.actor._ + |import akka.dispatch._ + |import com.typesafe.config.ConfigFactory + |import akka.util.duration._ + |import akka.util.Timeout + |val config = ConfigFactory.parseString("akka.daemonic=on") + |val remoteConfig = ConfigFactory.parseString("akka.remote.netty{port=0,use-dispatcher-for-io=akka.actor.default-dispatcher,execution-pool-size=0},akka.actor.provider=RemoteActorRefProvider").withFallback(config) + |var system: ActorSystem = null + |def startSystem(remoting: Boolean = false) { system = ActorSystem("repl", if(remoting) remoteConfig else config) } + |implicit def ec = system.dispatcher + |implicit val timeout = Timeout(5 seconds) + |""".stripMargin, + initialCommands in Test in ThisBuild += "import akka.testkit._", // online version of docs sphinxDocs <<= baseDirectory / "akka-docs", sphinxTags in sphinxHtml += "online", @@ -68,6 +82,7 @@ object AkkaBuild extends Build { dependencies = Seq(actor), settings = defaultSettings ++ Seq( libraryDependencies ++= Dependencies.testkit, + initialCommands += "import akka.testkit._", previousArtifact := akkaPreviousArtifact("akka-testkit") ) ) diff --git a/repl b/repl deleted file mode 100644 index cbdfeb2662..0000000000 --- a/repl +++ /dev/null @@ -1,22 +0,0 @@ -import akka.actor._ -import akka.dispatch.{ Future, Promise } -import com.typesafe.config.ConfigFactory -import akka.testkit._ -val remoteConfig = try { - Class.forName("akka.remote.RemoteActorRefProvider") - "\nakka.actor.provider=akka.remote.RemoteActorRefProvider" - } catch { - case _: ClassNotFoundException => "" - } -val config=ConfigFactory.parseString(""" - akka.daemonic=on - akka.remote.netty { - use-dispatcher-for-io = akka.actor.default-dispatcher - execution-pool-size = 0 - } -""" + remoteConfig) -val sys=ActorSystem("repl", config.withFallback(ConfigFactory.load())).asInstanceOf[ExtendedActorSystem] -implicit val ec=sys.dispatcher -import akka.util.duration._ -import akka.util.Timeout -implicit val timeout=Timeout(5 seconds)