Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Move collector service instantiation logic to zipkin-collector-service #157

Closed
wants to merge 1 commit into from

2 participants

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Sep 20, 2012
This page is out of date. Refresh to see the latest.
View
34 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(
View
0  ...llector-scribe/config/collector-dev.scala → ...lector-service/config/collector-dev.scala
File renamed without changes
View
0  ...a/com/twitter/zipkin/collector/Main.scala → ...a/com/twitter/zipkin/collector/Main.scala
File renamed without changes
View
0  ...collector-scribe/src/scripts/collector.sh → ...ollector-service/src/scripts/collector.sh
File renamed without changes
View
0  ...om/twitter/zipkin/config/ConfigSpec.scala → ...om/twitter/zipkin/config/ConfigSpec.scala
File renamed without changes
Something went wrong with that request. Please try again.