fix ostrich imports in template

twitter-archive · Mar 8, 2011 · 06ff363 · 06ff363
1 parent 169c726
commit 06ff363
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/lib/template/config/development.scala.erb b/lib/template/config/development.scala.erb
@@ -1,6 +1,6 @@
-import com.twitter.admin.config._
 import com.twitter.conversions.time._
 import com.twitter.logging.config._
+import com.twitter.ostrich.admin.config._
 import com.twitter.birdname.config._
 
 // development mode.

diff --git a/lib/template/config/production.scala.erb b/lib/template/config/production.scala.erb
@@ -1,6 +1,6 @@
-import com.twitter.admin.config._
 import com.twitter.conversions.time._
 import com.twitter.logging.config._
+import com.twitter.ostrich.admin.config._
 import com.twitter.birdname.config._
 
 // production mode.

diff --git a/lib/template/config/test.scala.erb b/lib/template/config/test.scala.erb
@@ -1,6 +1,6 @@
-import com.twitter.admin.config._
 import com.twitter.conversions.time._
 import com.twitter.logging.config._
+import com.twitter.ostrich.admin.config._
 import com.twitter.birdname.config._
 
 // test mode.

diff --git a/lib/template/src/main/scala/com/twitter/birdname/Main.scala.erb b/lib/template/src/main/scala/com/twitter/birdname/Main.scala.erb
@@ -1,6 +1,6 @@
 package com.twitter.birdname
 
-import com.twitter.admin._
+import com.twitter.ostrich.admin.RuntimeEnvironment
 
 object Main {
   def main(args: Array[String]) {

diff --git a/lib/template/src/main/scala/com/twitter/birdname/config/BirdNameServiceConfig.scala.erb b/lib/template/src/main/scala/com/twitter/birdname/config/BirdNameServiceConfig.scala.erb
@@ -1,11 +1,11 @@
 package com.twitter.birdname
 package config
 
-import com.twitter.admin.{RuntimeEnvironment, ServiceTracker}
-import com.twitter.admin.config._
 import com.twitter.logging.Logger
-import com.twitter.config._
 import com.twitter.logging.config._
+import com.twitter.ostrich.admin.{RuntimeEnvironment, ServiceTracker}
+import com.twitter.ostrich.admin.config._
+import com.twitter.util.Config
 
 class BirdNameServiceConfig extends ServerConfig[BirdNameService] {
   var thriftPort: Int = 9999

diff --git a/lib/template/src/test/scala/com/twitter/birdname/AbstractSpec.scala.erb b/lib/template/src/test/scala/com/twitter/birdname/AbstractSpec.scala.erb
@@ -1,7 +1,7 @@
 package com.twitter.birdname
 
 import org.specs.Specification
-import com.twitter.admin._
+import com.twitter.ostrich.admin._
 import com.twitter.util._
 
 abstract class AbstractSpec extends Specification {
@@ -14,4 +14,4 @@ abstract class AbstractSpec extends Specification {
     ServiceTracker.shutdown // all services
     out
   }
-}
+}