rename zipkin-finatra to zipkin-web

Author: @franklinhu
Fixes #191
URL: #191

README.md

@@ -14,7 +14,7 @@ To run a collector daemon: `bin/collector`
 
 To run a query daemon: `bin/query`
 
-To run a UI daemon: `bin/ui`
+To run a UI daemon: `bin/web`
 
 For a more in-depth installation guide, see: [http://twitter.github.com/zipkin/install.html](http://twitter.github.com/zipkin/install.html)
 

bin/web

@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+bin/sbt 'project zipkin-web' 'run -f zipkin-web/config/web-dev.scala'

doc/centos6-quickstart.txt

@@ -1,4 +1,4 @@
-This doc describes a quickstart to running the basic Zipkin/Finatra service, with everything running on one machine
+This doc describes a quickstart to running the basic Zipkin service, with everything running on one machine
 It presumes you have a clean-ish Centos 6 install, and a user with sudo capabilities (eg user is in wheel group and wheel group is allowed in /etc/sudoers)
 
 This includes building Zipkin from the current master branch from Github.
@@ -108,22 +108,22 @@ sudo service zookeeper-server start
 sudo mkdir /usr/local/zipkin
 sudo chown **MYUSERNAME** /usr/local/zipkin
 
-18. Expand out the required components (here collector, query and finatra)
+18. Expand out the required components (here collector, query and web)
 unzip -d /usr/local/zipkin/zipkin-server zipkin-server/dist/zipkin-server.zip
 unzip -d /usr/local/zipkin/zipkin-scribe  zipkin-scribe/dist/zipkin-scribe.zip
-unzip -d /usr/local/zipkin/zipkin-finatra zipkin-finatra/dist/zipkin-finatra.zip
+unzip -d /usr/local/zipkin/zipkin-web zipkin-web/dist/zipkin-web.zip
 
 19. Set scripts to be executable...
 cd /usr/local/zipkin/
 chmod +x zipkin-server/scripts/*
 chmod +x zipkin-scribe/scripts/*
-chmod +x zipkin-finatra/scripts/*
+chmod +x zipkin-web/scripts/*
 
 20. Run it up!
 
 zipkin-server/scripts/query.sh -f zipkin-server/config/query-dev.scala &
 zipkin-scribe/scripts/collector.sh -f zipkin-scribe/config/collector-dev.scala &
-zipkin-finatra/scripts/finatra.sh -f zipkin-finatra/config/web-localhost.scala &
+zipkin-web/scripts/web.sh -f zipkin-web/config/web-localhost.scala &
 
 
 

project/Project.scala

@@ -296,8 +296,8 @@ object Zipkin extends Build {
 
   lazy val web =
     Project(
-      id = "zipkin-finatra",
-      base = file("zipkin-finatra"),
+      id = "zipkin-web",
+      base = file("zipkin-web"),
       settings = defaultSettings
     ).settings(
       resolvers += "finatra" at "http://repo.juliocapote.com",
@@ -312,7 +312,7 @@ object Zipkin extends Build {
         "com.twitter" % "finagle-zipkin"     % FINAGLE_VERSION
       ) ++ testDependencies,
 
-      PackageDist.packageDistZipName := "zipkin-finatra.zip",
+      PackageDist.packageDistZipName := "zipkin-web.zip",
       BuildProperties.buildPropertiesPackage := "com.twitter.zipkin",
 
       /* Add configs to resource path for ConfigSpec */

zipkin-finatra/config/web-dev.scala → zipkin-web/config/web-dev.scala

@@ -27,7 +27,7 @@ new ZipkinWebConfig {
    * A simple hack is to stand up a simple Python HTTP server and point `resourcePathPrefix` it.
    * Example:
    *
-   * `cd zipkin-finatra/src/main/resources/public && python -m SimpleHTTPServer`
+   * `cd zipkin-web/src/main/resources/public && python -m SimpleHTTPServer`
    *
    * Then, set:
    * `val resourcePathPrefix = "http://localhost:8000"`

zipkin-web/src/scripts/web.sh

@@ -0,0 +1,3 @@
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+VERSION=@VERSION@
+java -cp "$DIR/../libs/*" -jar $DIR/../zipkin-web_2.9.1-$VERSION.jar $*