diff --git a/akka-remote/src/main/scala/akka/package.scala b/akka-remote/src/main/scala/akka/package.scala deleted file mode 100644 index 39f4c4f97e..0000000000 --- a/akka-remote/src/main/scala/akka/package.scala +++ /dev/null @@ -1,13 +0,0 @@ -/** - * Copyright (C) 2009-2012 Typesafe Inc. - */ - -package akka - -package object serialization { - type JsValue = _root_.dispatch.json.JsValue - val JsValue = _root_.dispatch.json.JsValue - val Js = _root_.dispatch.json.Js - val JsonSerialization = sjson.json.JsonSerialization - val DefaultProtocol = sjson.json.DefaultProtocol -} diff --git a/akka-remote/src/main/scala/akka/serialization/Compression.scala b/akka-remote/src/main/scala/akka/serialization/Compression.scala deleted file mode 100644 index 0251ace964..0000000000 --- a/akka-remote/src/main/scala/akka/serialization/Compression.scala +++ /dev/null @@ -1,15 +0,0 @@ -/** - * Copyright (C) 2009-2012 Typesafe Inc. - */ - -package akka.serialization - -object Compression { - - object LZF { - import voldemort.store.compress.lzf._ - def compress(bytes: Array[Byte]): Array[Byte] = LZFEncoder encode bytes - def uncompress(bytes: Array[Byte]): Array[Byte] = LZFDecoder decode bytes - } -} - diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala index e2468ff26e..2c96c54ac9 100644 --- a/project/AkkaBuild.scala +++ b/project/AkkaBuild.scala @@ -420,11 +420,11 @@ object Dependencies { val actorTests = Seq( Test.junit, Test.scalatest, Test.commonsMath, Test.mockito, - Test.scalacheck, protobuf, jacksonMapper, sjson + Test.scalacheck, protobuf, jacksonMapper ) val remote = Seq( - netty, protobuf, sjson, h2Lzf, Test.junit, Test.scalatest, + netty, protobuf, Test.junit, Test.scalatest, Test.zookeeper, Test.log4j // needed for ZkBarrier in multi-jvm tests ) @@ -440,7 +440,7 @@ object Dependencies { val mailboxes = Seq(Test.scalatest, Test.junit) - val fileMailbox = Seq(Test.scalatest, Test.junit) + val fileMailbox = Seq(commonsIo, Test.scalatest, Test.junit) val beanstalkMailbox = Seq(beanstalk, Test.junit) @@ -459,7 +459,7 @@ object Dependencies { } - val zookeeperMailbox = Seq(zkClient, zookeeper, Test.junit) + val zookeeperMailbox = Seq(zkClient, zookeeper, commonsIo, Test.junit) val spring = Seq(springBeans, springContext, Test.junit, Test.scalatest) @@ -505,7 +505,6 @@ object Dependency { val commonsIo = "commons-io" % "commons-io" % "2.0.1" // ApacheV2 val commonsPool = "commons-pool" % "commons-pool" % "1.5.6" // ApacheV2 val guice = "org.guiceyfruit" % "guice-all" % "2.0" // ApacheV2 - val h2Lzf = "voldemort.store.compress" % "h2-lzf" % "1.0" // ApacheV2 val jacksonCore = "org.codehaus.jackson" % "jackson-core-asl" % V.Jackson // ApacheV2 val jacksonMapper = "org.codehaus.jackson" % "jackson-mapper-asl" % V.Jackson // ApacheV2 val jettyUtil = "org.eclipse.jetty" % "jetty-util" % V.Jetty // Eclipse license @@ -519,7 +518,6 @@ object Dependency { val rabbit = "com.rabbitmq" % "amqp-client" % V.Rabbit // Mozilla Public License val redis = "net.debasishg" % "redisclient_2.9.1" % "2.4.0" // ApacheV2 val scalaStm = "org.scala-tools" % "scala-stm_2.9.1" % V.ScalaStm // Modified BSD (Scala) - val sjson = "net.debasishg" % "sjson_2.9.1" % "0.15" // ApacheV2 val slf4jApi = "org.slf4j" % "slf4j-api" % V.Slf4j // MIT val springBeans = "org.springframework" % "spring-beans" % V.Spring // ApacheV2 val springContext = "org.springframework" % "spring-context" % V.Spring // ApacheV2