Merge branch 'master' of git@github.com:jboner/akka

This commit is contained in:
Jonas Bonér 2010-11-08 15:42:16 +01:00
commit 5c7c033f67
16 changed files with 482 additions and 155 deletions

View file

@ -276,10 +276,13 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
lazy val jetty_mortbay = "org.mortbay.jetty" % "jetty" % "6.1.14" % "test"
//voldemort testing
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 dbcp = "commons-dbcp" % "commons-dbcp" % "1.2.2" % "test"
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 dbcp = "commons-dbcp" % "commons-dbcp" % "1.2.2" % "test"
//memcached
lazy val spymemcached = "spy" % "memcached" % "2.5" % "compile"
}
// -------------------------------------------------------------------------------------------------------------------
@ -541,6 +544,8 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
new AkkaRiakProject(_), akka_persistence_common)
lazy val akka_persistence_couchdb = project("akka-persistence-couchdb", "akka-persistence-couchdb",
new AkkaCouchDBProject(_), akka_persistence_common)
lazy val akka_persistence_memcached= project("akka-persistence-memcached", "akka-persistence-memcached",
new AkkaMemcachedProject(_), akka_persistence_common)
}
// -------------------------------------------------------------------------------------------------------------------
@ -661,6 +666,15 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
override def testOptions = createTestFilter( _.endsWith("Test"))
}
class AkkaMemcachedProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) {
val memcached = Dependencies.spymemcached
val commons_codec = Dependencies.commons_codec
val scalatest = Dependencies.scalatest
override def testOptions = createTestFilter( _.endsWith("Test"))
}
// -------------------------------------------------------------------------------------------------------------------
// akka-kernel subproject
// -------------------------------------------------------------------------------------------------------------------