Merge pull request akka#5 from typesafehub/wip-rp1-update-multi-node-…

…tesing-sample-ban =sam akka#2 Update multi node testing sample to RP 15v01p01
yhtsnda · Dec 15, 2014 · 186661f · 186661f
2 parents 094f41c + 595cb2d
commit 186661f
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 15 deletions.
diff --git a/akka-samples/akka-sample-multi-node-scala/.gitignore b/akka-samples/akka-sample-multi-node-scala/.gitignore
@@ -0,0 +1,19 @@
+*#
+*-shim.sbt
+*.iml
+*.ipr
+*.iws
+*.pyc
+*.tm.epoch
+*.vim
+.cache
+.classpath
+.DS_Store
+.idea/
+.project
+.settings
+/logs
+/project/plugins/project
+project/boot
+project/typesafe.properties
+target/
diff --git a/akka-samples/akka-sample-multi-node-scala/activator.properties b/akka-samples/akka-sample-multi-node-scala/activator.properties
@@ -1,7 +1,7 @@
-name=akka-sample-multi-node-scala
-title=Akka Multi-Node Testing Sample with Scala
+name=akka-sample-multi-node-scala-reactive-platform-15v01
+title=Akka Multi-Node Testing Sample with Scala (Reactive Platform 15v01)
 description=Sample containing sbt build settings and test classes for illustrating multi-node testing with Akka and Scala
-tags=akka,testing,scala,sample
+tags=reactive-platform,akka,testing,scala,sample
 authorName=Akka Team
 authorLink=http://akka.io/
 sourceLink=https://github.com/akka/akka
diff --git a/akka-samples/akka-sample-multi-node-scala/build.sbt b/akka-samples/akka-sample-multi-node-scala/build.sbt
@@ -1,19 +1,17 @@
 import com.typesafe.sbt.SbtMultiJvm
 import com.typesafe.sbt.SbtMultiJvm.MultiJvmKeys.MultiJvm
 
-val akkaVersion = "2.3-SNAPSHOT"
-
 val project = Project(
   id = "akka-sample-multi-node-scala",
   base = file("."),
   settings = Project.defaultSettings ++ SbtMultiJvm.multiJvmSettings ++ Seq(
     name := "akka-sample-multi-node-scala",
-    version := "2.3-SNAPSHOT",
-    scalaVersion := "2.10.4",
+    version := "15v01p01",
+    // scalaVersion := provided by Typesafe Reactive Platform
     libraryDependencies ++= Seq(
-      "com.typesafe.akka" %% "akka-remote" % akkaVersion,
-      "com.typesafe.akka" %% "akka-multi-node-testkit" % akkaVersion,
-      "org.scalatest" %% "scalatest" % "2.0" % "test"),
+      TypesafeLibrary.akkaActor.value,
+      TypesafeLibrary.akkaMultiNodeTestkit.value,
+      "org.scalatest" %% "scalatest" % "2.2.2" % "test"),
     // make sure that MultiJvm test are compiled by the default test compilation
     compile in MultiJvm <<= (compile in MultiJvm) triggeredBy (compile in Test),
     // disable parallel tests

diff --git a/akka-samples/akka-sample-multi-node-scala/project/build.properties b/akka-samples/akka-sample-multi-node-scala/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.1
+sbt.version=0.13.7
diff --git a/akka-samples/akka-sample-multi-node-scala/project/project/typesafe.sbt b/akka-samples/akka-sample-multi-node-scala/project/project/typesafe.sbt
@@ -0,0 +1,9 @@
+addSbtPlugin("com.typesafe.rp" % "sbt-typesafe-rp" % "15v01p01")
+
+val typesafeUrl = "https://private-repo.typesafe.com/typesafe/for-subscribers-only/DFDB5DD187A28462DDAF7AB39A95A6AE65983B23"
+
+resolvers += "typesafe-rp-mvn" at typesafeUrl
+
+resolvers += Resolver.url("typesafe-rp-ivy", url(typesafeUrl))(Resolver.ivyStylePatterns)
+
+resolvers += "typesafe-releases" at "https://repo.typesafe.com/typesafe/releases/"
diff --git a/akka-samples/akka-sample-multi-node-scala/tutorial/index.html b/akka-samples/akka-sample-multi-node-scala/tutorial/index.html
@@ -13,12 +13,12 @@
 
 <p>
 Please refer to the full documentation of 
-<a href="http://doc.akka.io/docs/akka/2.3-SNAPSHOT/dev/multi-node-testing.html" target="_blank">multi-node testing</a>
+<a href="http://doc.akka.io/docs/akka/2.3.7/dev/multi-node-testing.html" target="_blank">multi-node testing</a>
 and the closely related
-<a href="http://doc.akka.io/docs/akka/2.3-SNAPSHOT/dev/multi-jvm-testing.html" target="_blank">multi-jvm testing</a>
+<a href="http://doc.akka.io/docs/akka/2.3.7/dev/multi-jvm-testing.html" target="_blank">multi-jvm testing</a>
 for details.
 There is also an section on 
-<a href="http://doc.akka.io/docs/akka/2.3-SNAPSHOT/scala/cluster-usage.html#How_to_Test" target="_blank">cluster testing</a>.
+<a href="http://doc.akka.io/docs/akka/2.3.7/scala/cluster-usage.html#How_to_Test" target="_blank">cluster testing</a>.
 </p>
 
 </div>
@@ -79,7 +79,7 @@ <h2>Tests</h2>
 
 <p>
 The same test can be run on multiple machines as described in the
-<a href="http://doc.akka.io/docs/akka/2.3-SNAPSHOT/dev/multi-node-testing.html" target="_blank">multi-node testing documentation</a>.
+<a href="http://doc.akka.io/docs/akka/2.3.7/dev/multi-node-testing.html" target="_blank">multi-node testing documentation</a>.
 </p>