From edc1d8046f1df851177d301813f3b879b07eabd1 Mon Sep 17 00:00:00 2001
From: Eugene Vigdorchik <eugene.vigdorchik@gmail.com>
Date: Thu, 12 Jan 2012 12:47:11 +0400
Subject: [PATCH] Integrate schoir for distributed testing.

---
 .gitignore                                                 | 2 ++
 akka-remote/src/multi-jvm/scala/akka/remote/ZKClient.scala | 3 ---
 project/AkkaBuild.scala                                    | 3 ++-
 project/plugins.sbt                                        | 5 +++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8ec862d18c..b80964477d 100755
--- a/.gitignore
+++ b/.gitignore
@@ -61,3 +61,5 @@ akka.sublime-workspace
 .target
 .multi-jvm
 _mb
+schoir.props
+worker*.log
\ No newline at end of file
diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/ZKClient.scala b/akka-remote/src/multi-jvm/scala/akka/remote/ZKClient.scala
index 52f5dc3b33..96bccb13fa 100755
--- a/akka-remote/src/multi-jvm/scala/akka/remote/ZKClient.scala
+++ b/akka-remote/src/multi-jvm/scala/akka/remote/ZKClient.scala
@@ -28,7 +28,6 @@ object ZkClient extends Watcher {
         zk.exists("/", false); true
       } catch {
         case _: KeeperException.ConnectionLossException =>
-          println("Server is not ready, sleeping...")
           Thread.sleep(10000)
           false
       }
@@ -61,7 +60,6 @@ object ZkClient extends Watcher {
     }
 
     def enter() {
-      println("ZK creating " + root + "/" + name)
       zk.create(root + "/" + name, Array[Byte](), Ids.OPEN_ACL_UNSAFE,
                 CreateMode.EPHEMERAL)
 
@@ -69,7 +67,6 @@ object ZkClient extends Watcher {
     }
 
     final def leave() {
-      println("ZK leaving " + root + "/" + name)
       zk.create(root + "/" + name + ".leave", Array[Byte](), Ids.OPEN_ACL_UNSAFE,
                 CreateMode.EPHEMERAL)
 
diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index 8f6e656e46..ada3dbcbd2 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -8,6 +8,7 @@ import sbt._
 import sbt.Keys._
 import com.typesafe.sbtmultijvm.MultiJvmPlugin
 import com.typesafe.sbtmultijvm.MultiJvmPlugin.{ MultiJvm, extraOptions, jvmOptions, scalatestOptions }
+import com.typesafe.schoir.SchoirPlugin.schoirSettings
 import com.typesafe.sbtscalariform.ScalariformPlugin
 import com.typesafe.sbtscalariform.ScalariformPlugin.ScalariformKeys
 import java.lang.Boolean.getBoolean
@@ -70,7 +71,7 @@ object AkkaBuild extends Build {
     id = "akka-remote",
     base = file("akka-remote"),
     dependencies = Seq(actor, actorTests % "test->test", testkit % "test->test"),
-    settings = defaultSettings ++ multiJvmSettings ++ Seq(
+    settings = defaultSettings ++ multiJvmSettings ++ schoirSettings ++ Seq(
       libraryDependencies ++= Dependencies.cluster,
       // disable parallel tests
       parallelExecution in Test := false,
diff --git a/project/plugins.sbt b/project/plugins.sbt
index b9dfcde215..024f70877c 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,7 +1,9 @@
 
 resolvers += Classpaths.typesafeResolver
 
-addSbtPlugin("com.typesafe.sbtmultijvm" % "sbt-multi-jvm" % "0.1.7")
+addSbtPlugin("com.typesafe.sbtmultijvm" % "sbt-multi-jvm" % "0.1.9")
+
+addSbtPlugin("com.typesafe.schoir" % "schoir" % "0.1.1")
 
 addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse" % "1.5.0")
 
@@ -12,4 +14,3 @@ resolvers ++= Seq(
   "coda" at "http://repo.codahale.com")
 
 addSbtPlugin("me.lessis" % "ls-sbt" % "0.1.1")
-