From 264225a160373c848fdf99989d2132d0e0786d6b Mon Sep 17 00:00:00 2001 From: ticktock Date: Thu, 23 Sep 2010 10:57:14 -0400 Subject: [PATCH] Removing BDB as a test-runtime dependency --- .../src/test/resources/config/server.properties | 2 ++ .../src/test/resources/config/stores.xml | 10 +++++----- .../src/test/scala/EmbeddedVoldemort.scala | 3 +++ project/build/AkkaProject.scala | 4 ---- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/akka-persistence/akka-persistence-voldemort/src/test/resources/config/server.properties b/akka-persistence/akka-persistence-voldemort/src/test/resources/config/server.properties index 8f5a8ff884..6dcd5bb340 100644 --- a/akka-persistence/akka-persistence-voldemort/src/test/resources/config/server.properties +++ b/akka-persistence/akka-persistence-voldemort/src/test/resources/config/server.properties @@ -1,2 +1,4 @@ node.id=0 enable.rebalancing=false +enable.bdb.engine=false +slop.enable=false diff --git a/akka-persistence/akka-persistence-voldemort/src/test/resources/config/stores.xml b/akka-persistence/akka-persistence-voldemort/src/test/resources/config/stores.xml index f2dd6ac099..26832d93fe 100644 --- a/akka-persistence/akka-persistence-voldemort/src/test/resources/config/stores.xml +++ b/akka-persistence/akka-persistence-voldemort/src/test/resources/config/stores.xml @@ -6,7 +6,7 @@ 1 1 1 - bdb + memory client string @@ -23,7 +23,7 @@ 1 1 1 - bdb + memory client identity @@ -39,7 +39,7 @@ 1 1 1 - bdb + memory client string @@ -56,7 +56,7 @@ 1 1 1 - bdb + memory client identity @@ -72,7 +72,7 @@ 1 1 1 - bdb + memory client string diff --git a/akka-persistence/akka-persistence-voldemort/src/test/scala/EmbeddedVoldemort.scala b/akka-persistence/akka-persistence-voldemort/src/test/scala/EmbeddedVoldemort.scala index 034b493006..422d54c4ec 100644 --- a/akka-persistence/akka-persistence-voldemort/src/test/scala/EmbeddedVoldemort.scala +++ b/akka-persistence/akka-persistence-voldemort/src/test/scala/EmbeddedVoldemort.scala @@ -8,6 +8,8 @@ import org.scalatest.junit.JUnitRunner import voldemort.utils.Utils import java.io.File import se.scalablesolutions.akka.util.{Logging, UUID} +import collection.JavaConversions +import voldemort.store.memory.InMemoryStorageConfiguration @RunWith(classOf[JUnitRunner]) trait EmbeddedVoldemort extends BeforeAndAfterAll with Logging { @@ -21,6 +23,7 @@ trait EmbeddedVoldemort extends BeforeAndAfterAll with Logging { val home = new File(dir) log.info("Creating Voldemort Config") val config = VoldemortConfig.loadFromVoldemortHome(home.getCanonicalPath) + config.setStorageConfigurations(JavaConversions.asList(List(classOf[InMemoryStorageConfiguration].getName))) log.info("Starting Voldemort") server = new VoldemortServer(config) server.start diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala index 6d800cdc36..e120f38d86 100644 --- a/project/build/AkkaProject.scala +++ b/project/build/AkkaProject.scala @@ -52,7 +52,6 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) { lazy val SonatypeSnapshotRepo = MavenRepository("Sonatype OSS Repo", "http://oss.sonatype.org/content/repositories/releases") lazy val SunJDMKRepo = MavenRepository("Sun JDMK Repo", "http://wp5.e-taxonomy.eu/cdmlib/mavenrepo") lazy val ClojarsRepo = MavenRepository("Clojars Repo", "http://clojars.org/repo") - lazy val OracleRepo = MavenRepository("Oracle Repo", "http://download.oracle.com/maven") } // ------------------------------------------------------------------------------------------------------------------- @@ -82,7 +81,6 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) { lazy val casbahModuleConfig = ModuleConfiguration("com.novus", CasbahRepo) lazy val timeModuleConfig = ModuleConfiguration("org.scala-tools", "time", CasbahSnapshotRepo) lazy val voldemortModuleConfig = ModuleConfiguration("voldemort", ClojarsRepo) - lazy val sleepycatModuleConfig = ModuleConfiguration("com.sleepycat", OracleRepo) lazy val embeddedRepo = EmbeddedRepo // This is the only exception, because the embedded repo is fast! // ------------------------------------------------------------------------------------------------------------------- @@ -230,7 +228,6 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) { lazy val jdom = "org.jdom" % "jdom" % "1.1" % "test" lazy val vold_jetty = "org.mortbay.jetty" % "jetty" % "6.1.18" % "test" lazy val velocity = "org.apache.velocity" % "velocity" % "1.6.2" % "test" - lazy val bdb = "com.sleepycat" % "je" % "4.0.103" % "test" lazy val dbcp = "commons-dbcp" % "commons-dbcp" % "1.2.2" % "test" } @@ -543,7 +540,6 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) { val jdom = Dependencies.jdom val jetty = Dependencies.vold_jetty val velocity = Dependencies.velocity - val bdb = Dependencies.bdb val dbcp = Dependencies.dbcp val sjson = Dependencies.sjson_test