Merge branch 'master' of http://github.com/szegedi/kestrel

twitter-archive · Jul 28, 2010 · 3740385 · 3740385
2 parents 6baebef + 7727adf
commit 3740385
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/ivy/ivy.xml b/ivy/ivy.xml
@@ -20,6 +20,7 @@
     <dependency org="org.scala-lang" name="scala-library" rev="2.7.7" />
     <dependency org="org.scala-tools.testing" name="specs" rev="1.6.2.1" conf="test->*"/>
     <dependency org="com.twitter" name="xrayspecs" rev="1.0.7" />
+    <dependency org="com.twitter" name="twitterActors" rev="1.0.0" />
 
     <dependency org="net.lag" name="configgy" rev="1.5.3" />
     <dependency org="net.lag" name="naggati" rev="0.7.2" />

diff --git a/src/main/scala/net/lag/kestrel/Kestrel.scala b/src/main/scala/net/lag/kestrel/Kestrel.scala
@@ -20,8 +20,8 @@ package net.lag.kestrel
 import java.net.InetSocketAddress
 import java.util.concurrent.{CountDownLatch, Executors, ExecutorService, TimeUnit}
 import java.util.{Timer, TimerTask}
-import scala.actors.{Actor, Scheduler}
-import scala.actors.Actor._
+import com.twitter.actors.{Actor, Scheduler}
+import com.twitter.actors.Actor._
 import scala.collection.mutable
 import com.twitter.xrayspecs.Time
 import org.apache.mina.core.session.IoSession

diff --git a/src/main/scala/net/lag/kestrel/KestrelHandler.scala b/src/main/scala/net/lag/kestrel/KestrelHandler.scala
@@ -20,8 +20,8 @@ package net.lag.kestrel
 import java.io.IOException
 import java.net.InetSocketAddress
 import java.nio.ByteOrder
-import scala.actors.Actor
-import scala.actors.Actor._
+import com.twitter.actors.Actor
+import com.twitter.actors.Actor._
 import scala.collection.mutable
 import com.twitter.xrayspecs.Time
 import com.twitter.xrayspecs.TimeConversions._

diff --git a/src/main/scala/net/lag/kestrel/PersistentQueue.scala b/src/main/scala/net/lag/kestrel/PersistentQueue.scala
@@ -21,7 +21,7 @@ import java.io._
 import java.nio.{ByteBuffer, ByteOrder}
 import java.nio.channels.FileChannel
 import java.util.concurrent.CountDownLatch
-import scala.actors.{Actor, TIMEOUT}
+import com.twitter.actors.{Actor, TIMEOUT}
 import scala.collection.mutable
 import com.twitter.xrayspecs.Time
 import net.lag.configgy.{Config, Configgy, ConfigMap}

diff --git a/src/test/scala/net/lag/kestrel/PersistentQueueSpec.scala b/src/test/scala/net/lag/kestrel/PersistentQueueSpec.scala
@@ -19,7 +19,7 @@ package net.lag.kestrel
 
 import _root_.java.io.{File, FileInputStream}
 import _root_.java.util.concurrent.CountDownLatch
-import _root_.scala.actors.Actor.actor
+import _root_.com.twitter.actors.Actor.actor
 import _root_.scala.collection.mutable
 import _root_.com.twitter.xrayspecs.Time
 import _root_.com.twitter.xrayspecs.TimeConversions._