Move collector service instantiation logic to zipkin-collector-service

project/Project.scala

@@ -28,7 +28,7 @@ object Zipkin extends Build {
     Project(
       id = "zipkin",
       base = file(".")
-    ) aggregate(hadoop, hadoopjobrunner, test, thrift, server, common, scrooge, collectorScribe, web, cassandra, collectorCore)
+    ) aggregate(hadoop, hadoopjobrunner, test, thrift, server, common, scrooge, collectorScribe, web, cassandra, collectorCore, collectorService)
 
 
   lazy val hadoop = Project(
@@ -121,7 +121,7 @@ object Zipkin extends Build {
     name := "zipkin-test",
     version := "0.3.0-SNAPSHOT",
     libraryDependencies ++= testDependencies
-  ) dependsOn(server, collectorScribe)
+  ) dependsOn(server, collectorService)
 
   lazy val thrift =
     Project(
@@ -283,17 +283,29 @@ object Zipkin extends Build {
         TravisCiRepos.newSettings
     ).settings(
       version := "0.3.0-SNAPSHOT",
-      libraryDependencies ++= testDependencies,
+      libraryDependencies ++= testDependencies
+    ).dependsOn(collectorCore, scrooge)
 
-      PackageDist.packageDistZipName := "zipkin-scribe.zip",
-      BuildProperties.buildPropertiesPackage := "com.twitter.zipkin",
+  lazy val collectorService = Project(
+    id = "zipkin-collector-service",
+    base = file("zipkin-collector-service"),
+    settings = Project.defaultSettings ++
+      StandardProject.newSettings ++
+      SubversionPublisher.newSettings ++
+      TravisCiRepos.newSettings
+  ).settings(
+    version := "0.3.0-SNAPSHOT",
+    libraryDependencies ++= testDependencies,
 
-      /* Add configs to resource path for ConfigSpec */
-      unmanagedResourceDirectories in Test <<= baseDirectory {
-        base =>
-          (base / "config" +++ base / "src" / "test" / "resources").get
-      }
-    ).dependsOn(collectorCore, scrooge, cassandra)
+    PackageDist.packageDistZipName := "zipkin-collector-service.zip",
+    BuildProperties.buildPropertiesPackage := "com.twitter.zipkin",
+
+    /* Add configs to resource path for ConfigSpec */
+    unmanagedResourceDirectories in Test <<= baseDirectory {
+      base =>
+        (base / "config" +++ base / "src" / "test" / "resources").get
+    }
+  ).dependsOn(collectorCore, collectorScribe, cassandra)
 
   lazy val web =
     Project(