From b36c5bc3fd333d511833ed5db7c7cc6d41483486 Mon Sep 17 00:00:00 2001 From: David Greco Date: Thu, 23 Sep 2010 10:37:22 +0200 Subject: [PATCH 1/3] Modified the hbase storage backend dependencies to exclude sl4j --- project/build/AkkaProject.scala | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala index 28360f155b..e98d68d77a 100644 --- a/project/build/AkkaProject.scala +++ b/project/build/AkkaProject.scala @@ -229,7 +229,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) { lazy val hadoop_test = "org.apache.hadoop" % "hadoop-test" % "0.20.2" % "test" lazy val hbase_test = "org.apache.hbase" % "hbase-test" % "0.20.6" % "test" lazy val log4j = "log4j" % "log4j" % "1.2.15" % "test" - lazy val jett_mortbay = "org.mortbay.jetty" % "jetty" % "6.1.14" % "test" + lazy val jetty_mortbay = "org.mortbay.jetty" % "jetty" % "6.1.14" % "test" } // ------------------------------------------------------------------------------------------------------------------- @@ -531,15 +531,25 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) { // ------------------------------------------------------------------------------------------------------------------- class AkkaHbaseProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) { - val zookeeper = Dependencies.zookeeper - val hadoop_core = Dependencies.hadoop_core - val hbase_core = Dependencies.hbase_core - - // testing - val hadoop_test = Dependencies.hadoop_test - val hbase_test = Dependencies.hbase_test - val jetty = Dependencies.jett_mortbay - val log4j = Dependencies.log4j + override def ivyXML = + + + + + + + + + + + + + + + + + + override def testOptions = TestFilter((name: String) => name.endsWith("Test")) :: Nil } From a2fc40b5c6994b80ab3079bd9344a0e0db3f64c2 Mon Sep 17 00:00:00 2001 From: David Greco Date: Thu, 23 Sep 2010 11:16:00 +0200 Subject: [PATCH 2/3] renamed the files and the names of the habse tests, the names now ends with Test --- project/build/AkkaProject.scala | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala index e98d68d77a..75ea8522ec 100644 --- a/project/build/AkkaProject.scala +++ b/project/build/AkkaProject.scala @@ -533,21 +533,21 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) { class AkkaHbaseProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) { override def ivyXML = - + - + + + + + + - + - - + - - - - - + From dff036bdf9107cdf4896f2d66c888b3471b46464 Mon Sep 17 00:00:00 2001 From: David Greco Date: Thu, 23 Sep 2010 13:12:10 +0200 Subject: [PATCH 3/3] Modified the hbase storage backend dependencies to exclude sl4j --- project/build/AkkaProject.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala index 75ea8522ec..0829162a9e 100644 --- a/project/build/AkkaProject.scala +++ b/project/build/AkkaProject.scala @@ -533,11 +533,11 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) { class AkkaHbaseProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) { override def ivyXML = - + - + - +