raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Merge branch 'master' into new_master

Browse source
This commit is contained in:
Viktor Klang 2010-09-22 22:48:02 +02:00
commit b53389263a
6 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
akka-persistence/akka-persistence-hbase/src/main/scala/HbaseStorageBackend.scala
View file

@ -25,7 +25,6 @@ import org.apache.hadoop.hbase.util.Bytes
*/
private[akka] object HbaseStorageBackend extends MapStorageBackend[Array[Byte], Array[Byte]] with VectorStorageBackend[Array[Byte]] with RefStorageBackend[Array[Byte]] with Logging {
val EMPTY_BYTE_ARRAY = new Array[Byte](0)
val HBASE_ZOOKEEPER_QUORUM = config.getString("akka.storage.hbase.zookeeper-quorum", "localhost")
val CONFIGURATION = new HBaseConfiguration
val REF_TABLE_NAME = "__REF_TABLE"

2
akka-persistence/akka-persistence-hbase/src/test/scala/HbasePersistentActorSpec.scala → akka-persistence/akka-persistence-hbase/src/test/scala/HbasePersistentActorSpecTest.scala
View file

@ -76,7 +76,7 @@ class PersistentFailerActor extends Transactor {
}
}
class HbasePersistentActorSpec extends JUnitSuite with BeforeAndAfterAll {
class HbasePersistentActorSpecTest extends JUnitSuite with BeforeAndAfterAll {
val testUtil = new HBaseTestingUtility

2
akka-persistence/akka-persistence-hbase/src/test/scala/HbaseStorageSpec.scala → akka-persistence/akka-persistence-hbase/src/test/scala/HbaseStorageSpecTest.scala
View file

@ -5,7 +5,7 @@ import org.scalatest.matchers.ShouldMatchers
import org.scalatest.BeforeAndAfterAll
import org.scalatest.BeforeAndAfterEach
class HbaseStorageSpec extends
class HbaseStorageSpecTest extends
Spec with
ShouldMatchers with
BeforeAndAfterAll with

2
akka-persistence/akka-persistence-hbase/src/test/scala/HbaseTicket343Spec.scala → akka-persistence/akka-persistence-hbase/src/test/scala/HbaseTicket343SpecTest.scala
View file

@ -171,7 +171,7 @@ object Storage {
import Storage._
@RunWith(classOf[JUnitRunner])
class HbaseTicket343Spec extends Spec with ShouldMatchers with BeforeAndAfterAll with BeforeAndAfterEach {
class HbaseTicket343SpecTest extends Spec with ShouldMatchers with BeforeAndAfterAll with BeforeAndAfterEach {
import org.apache.hadoop.hbase.HBaseTestingUtility

2
akka-persistence/akka-persistence-hbase/src/test/scala/SimpleHbaseTest.scala → akka-persistence/akka-persistence-hbase/src/test/scala/SimpleHbaseSpecTest.scala
View file

@ -10,7 +10,7 @@ import org.junit.Test
import org.apache.hadoop.hbase.HBaseTestingUtility
@RunWith(classOf[JUnitRunner])
class PersistenceSpec extends Spec with BeforeAndAfterAll with ShouldMatchers {
class PersistenceSpecTest extends Spec with BeforeAndAfterAll with ShouldMatchers {
import org.apache.hadoop.hbase.HBaseTestingUtility

4
project/build/AkkaProject.scala
View file

@ -95,7 +95,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
lazy val DISPATCH_VERSION = "0.7.4"
lazy val HAWT_DISPATCH_VERSION = "1.0"
lazy val JACKSON_VERSION = "1.2.1"
lazy val JERSEY_VERSION = "1.2"
lazy val JERSEY_VERSION = "1.3"
lazy val MULTIVERSE_VERSION = "0.6.1"
lazy val SCALATEST_VERSION = "1.2-for-scala-2.8.0.final-SNAPSHOT"
lazy val LOGBACK_VERSION = "0.9.24"
@ -543,6 +543,8 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
val hbase_test = Dependencies.hbase_test
val jetty = Dependencies.jett_mortbay
val log4j = Dependencies.log4j
override def testOptions = TestFilter((name: String) => name.endsWith("Test")) :: Nil
}
// -------------------------------------------------------------------------------------------------------------------