From 9bb152d3ded84d0af1a04f91f60a0fe330b39bd8 Mon Sep 17 00:00:00 2001 From: Jonas Boner Date: Wed, 29 Jul 2009 17:01:13 +0200 Subject: [PATCH] fixed wrong path in embedded repository --- .../scala-json/{0.1 => 1.0}/scala-json-1.0.jar | Bin .../scala-json/{0.1 => 1.0}/scala-json-1.0.pom | 0 kernel/src/main/scala/Kernel.scala | 1 + kernel/src/test/scala/PersistentActorSpec.scala | 5 ++--- scripts/compile_etags_file.sh | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename embedded-repo/com/twitter/scala-json/{0.1 => 1.0}/scala-json-1.0.jar (100%) rename embedded-repo/com/twitter/scala-json/{0.1 => 1.0}/scala-json-1.0.pom (100%) diff --git a/embedded-repo/com/twitter/scala-json/0.1/scala-json-1.0.jar b/embedded-repo/com/twitter/scala-json/1.0/scala-json-1.0.jar similarity index 100% rename from embedded-repo/com/twitter/scala-json/0.1/scala-json-1.0.jar rename to embedded-repo/com/twitter/scala-json/1.0/scala-json-1.0.jar diff --git a/embedded-repo/com/twitter/scala-json/0.1/scala-json-1.0.pom b/embedded-repo/com/twitter/scala-json/1.0/scala-json-1.0.pom similarity index 100% rename from embedded-repo/com/twitter/scala-json/0.1/scala-json-1.0.pom rename to embedded-repo/com/twitter/scala-json/1.0/scala-json-1.0.pom diff --git a/kernel/src/main/scala/Kernel.scala b/kernel/src/main/scala/Kernel.scala index 7a9708aaea..80b268198f 100644 --- a/kernel/src/main/scala/Kernel.scala +++ b/kernel/src/main/scala/Kernel.scala @@ -117,6 +117,7 @@ object Kernel extends Logging { private[akka] def startCassandra = if (config.getBool("akka.storage.cassandra.service", true)) { System.setProperty("cassandra", "") System.setProperty("storage-config", akka.Boot.CONFIG + "/") + println("------------------------- " + akka.Boot.CONFIG + "/") CassandraStorage.start } diff --git a/kernel/src/test/scala/PersistentActorSpec.scala b/kernel/src/test/scala/PersistentActorSpec.scala index 3423dad84a..0d8b464dd1 100644 --- a/kernel/src/test/scala/PersistentActorSpec.scala +++ b/kernel/src/test/scala/PersistentActorSpec.scala @@ -59,8 +59,7 @@ class PersistentActor extends Actor { object PersistenceManager { @volatile var isRunning = false def init = if (!isRunning) { - System.setProperty("storage-config", "config") - Kernel.boot + Kernel.startCassandra isRunning = true } } @@ -135,4 +134,4 @@ class PersistentActorSpec extends TestCase { } catch {case e: RuntimeException => {}} assertEquals("init", (stateful !! GetRefState).get) // check that state is == init state } -} \ No newline at end of file +} diff --git a/scripts/compile_etags_file.sh b/scripts/compile_etags_file.sh index 72c9473f23..f3ddce96fd 100755 --- a/scripts/compile_etags_file.sh +++ b/scripts/compile_etags_file.sh @@ -1,2 +1,2 @@ #!/bin/sh -sctags.sh -E -R . -f TAGS +sctags.bat -E -R . -f TAGS