finagle-stress => ostrich4

twitter · Mar 15, 2011 · ed0fbe7 · ed0fbe7
1 parent 65f09f7
commit ed0fbe7
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 15 deletions.
diff --git a/finagle-stress/src/main/scala/com/twitter/finagle/stress/EmbeddedServer.scala b/finagle-stress/src/main/scala/com/twitter/finagle/stress/EmbeddedServer.scala
@@ -14,7 +14,7 @@ import org.jboss.netty.handler.codec.http._
 
 import com.twitter.conversions.time._
 import com.twitter.util.{RandomSocket, Duration}
-import com.twitter.stats.StatsCollection
+import com.twitter.ostrich.stats.StatsCollection
 import com.twitter.finagle.util.Conversions._
 import com.twitter.finagle.util.Timer
 

diff --git a/finagle-stress/src/main/scala/com/twitter/finagle/stress/LoadBalancerTest.scala b/finagle-stress/src/main/scala/com/twitter/finagle/stress/LoadBalancerTest.scala
@@ -6,8 +6,8 @@ import java.util.concurrent.atomic.AtomicInteger
 
 import org.jboss.netty.handler.codec.http._
 
-import com.twitter.stats.{Stats => OstrichStats}
-import com.twitter.stats.{StatsCollection, StatsProvider}
+import com.twitter.ostrich.stats.{Stats => OstrichStats}
+import com.twitter.ostrich.stats.{StatsCollection, StatsProvider}
 import com.twitter.util.{Duration, CountDownLatch, Return, Throw, Time}
 import com.twitter.conversions.time._
 

diff --git a/finagle-stress/src/main/scala/com/twitter/finagle/stress/Stats.scala b/finagle-stress/src/main/scala/com/twitter/finagle/stress/Stats.scala
@@ -2,8 +2,8 @@ package com.twitter.finagle.stress
 
 import java.io.PrintStream
 
-import com.twitter.stats.{Stats => OstrichStats}
-import com.twitter.stats.StatsProvider
+import com.twitter.ostrich.stats.{Stats => OstrichStats}
+import com.twitter.ostrich.stats.StatsProvider
 
 object Stats {
   private[this] def print(message: String) {

diff --git a/project/build/Project.scala b/project/build/Project.scala
@@ -6,7 +6,7 @@ class Project(info: ProjectInfo) extends StandardParentProject(info)
 {
   override def subversionRepository = Some("http://svn.local.twitter.com/maven-public")
 
-  val twitterRepo  = "twitter.com" at "http://maven.twttr.com/"
+  val twitterRepo = "twitter.com" at "http://maven.twttr.com/"
 
   /**
    * finagle-core contains the finagle kernel itself, plus builders,
@@ -84,15 +84,17 @@ class Project(info: ProjectInfo) extends StandardParentProject(info)
    */
   val exampleProject = project(
     "finagle-example", "finagle-example",
-    new ExampleProject(_), coreProject, streamProject, thriftProject, memcachedProject, kestrelProject)
+    new ExampleProject(_),
+    coreProject, streamProject, thriftProject,
+    memcachedProject, kestrelProject)
 
   /**
    * finagle-stress has stress/integration test suites & tools for
    * development.
    */
   val stressProject = project(
     "finagle-stress", "finagle-stress",
-    new StressProject(_), coreProject, ostrich3Project, thriftProject)
+    new StressProject(_), coreProject, ostrich4Project, thriftProject)
 
   class CoreProject(info: ProjectInfo) extends StandardProject(info)
     with SubversionPublisher with AdhocInlines
@@ -101,12 +103,13 @@ class Project(info: ProjectInfo) extends StandardParentProject(info)
 
     val nettyRepo =
       "repository.jboss.org" at "http://repository.jboss.org/nexus/content/groups/public/"
-    val netty           = "org.jboss.netty"         %  "netty"           % "3.2.3.Final"
-    val utilCore        = "com.twitter"             %  "util-core"       % "1.8.1" relativePath("util")
-    val utilCollection  = "com.twitter"             %  "util-collection" % "1.8.1" relativePath("util")
+    val netty           = "org.jboss.netty" %  "netty"           % "3.2.3.Final"
+    val utilCore        = "com.twitter"     %  "util-core"       % "1.8.4" relativePath("util")
+    val utilCollection  = "com.twitter"     %  "util-collection" % "1.8.4" relativePath("util")
 
-    val mockito         = "org.mockito"             % "mockito-all"      % "1.8.5" % "test" withSources()
-    val specs           = "org.scala-tools.testing" % "specs_2.8.0"      % "1.6.5" % "test" withSources()
+    // Testing:
+    val mockito = "org.mockito"             % "mockito-all"      % "1.8.5" % "test" withSources()
+    val specs   = "org.scala-tools.testing" % "specs_2.8.0"      % "1.6.5" % "test" withSources()
   }
 
   class ThriftProject(info: ProjectInfo) extends StandardProject(info)

diff --git a/project/plugins/Plugins.scala b/project/plugins/Plugins.scala
@@ -2,6 +2,6 @@ import sbt._
 
 class Plugins(info: ProjectInfo) extends PluginDefinition(info) {
   val twitterMaven   = "twitter.com" at "http://maven.twttr.com/"
-  val defaultProject = "com.twitter" % "standard-project" % "0.11.0"
-  val sbtThrift      = "com.twitter" % "sbt-thrift" % "1.0.2"
+  val defaultProject = "com.twitter" % "standard-project" % "0.11.2"
+  val sbtThrift      = "com.twitter" % "sbt-thrift" % "1.2.0"
 }