Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

rename zipkin-finatra to zipkin-web #191

Closed
wants to merge 5 commits into from

2 participants

@franklinhu

No description provided.

@franklinhu franklinhu closed this pull request from a commit
@franklinhu franklinhu rename zipkin-finatra to zipkin-web
Author: @franklinhu
Fixes #191
URL: #191
43454b1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Oct 24, 2012
  1. Rename zipkin-finatra to zipkin-web

    Franklin Hu authored
  2. Move web script

    Franklin Hu authored
  3. Update bin/ui script

    Franklin Hu authored
  4. Rename bin/ui to bin/web

    Franklin Hu authored
  5. Update readme

    Franklin Hu authored
This page is out of date. Refresh to see the latest.
Showing with 15 additions and 15 deletions.
  1. +1 −1  README.md
  2. +0 −2  bin/ui
  3. +2 −0  bin/web
  4. +5 −5 doc/centos6-quickstart.txt
  5. +3 −3 project/Project.scala
  6. +0 −3  zipkin-finatra/src/scripts/finatra.sh
  7. +1 −1  {zipkin-finatra → zipkin-web}/config/web-dev.scala
  8. 0  {zipkin-finatra → zipkin-web}/config/web-localhost.scala
  9. 0  {zipkin-finatra → zipkin-web}/src/main/resources/public/css/aggregates.css
  10. 0  {zipkin-finatra → zipkin-web}/src/main/resources/public/css/application.css
  11. 0  {zipkin-finatra → zipkin-web}/src/main/resources/public/css/bootstrap-responsive.css
  12. 0  {zipkin-finatra → zipkin-web}/src/main/resources/public/css/bootstrap.css
  13. 0  {zipkin-finatra → zipkin-web}/src/main/resources/public/css/datepicker.css
  14. 0  {zipkin-finatra → zipkin-web}/src/main/resources/public/img/glyphicons-halflings-white.png
  15. 0  {zipkin-finatra → zipkin-web}/src/main/resources/public/img/glyphicons-halflings.png
  16. 0  {zipkin-finatra → zipkin-web}/src/main/resources/public/js/application-aggregates.js
  17. 0  {zipkin-finatra → zipkin-web}/src/main/resources/public/js/application-index.js
  18. 0  {zipkin-finatra → zipkin-web}/src/main/resources/public/js/application-models.js
  19. 0  {zipkin-finatra → zipkin-web}/src/main/resources/public/js/application-show.js
  20. 0  {zipkin-finatra → zipkin-web}/src/main/resources/public/js/application-static.js
  21. 0  {zipkin-finatra → zipkin-web}/src/main/resources/public/js/application-views.js
  22. 0  {zipkin-finatra → zipkin-web}/src/main/resources/public/js/application.js
  23. 0  {zipkin-finatra → zipkin-web}/src/main/resources/public/js/backbone-0.9.2.js
  24. 0  {zipkin-finatra → zipkin-web}/src/main/resources/public/js/bootstrap.js
  25. 0  {zipkin-finatra → zipkin-web}/src/main/resources/public/js/d3-2.9.1.js
  26. 0  {zipkin-finatra → zipkin-web}/src/main/resources/public/js/datepicker.js
  27. 0  {zipkin-finatra → zipkin-web}/src/main/resources/public/js/hogan-2.0.0.js
  28. 0  {zipkin-finatra → zipkin-web}/src/main/resources/public/js/sankey.js
  29. 0  {zipkin-finatra → zipkin-web}/src/main/resources/public/js/underscore-1.3.3.js
  30. 0  {zipkin-finatra → zipkin-web}/src/main/resources/public/js/zipkin-annotation.js
  31. 0  {zipkin-finatra → zipkin-web}/src/main/resources/public/js/zipkin-config.js
  32. 0  {zipkin-finatra → zipkin-web}/src/main/resources/public/js/zipkin-filter-span.js
  33. 0  {zipkin-finatra → zipkin-web}/src/main/resources/public/js/zipkin-global-dependency.js
  34. 0  {zipkin-finatra → zipkin-web}/src/main/resources/public/js/zipkin-kv-annotation.js
  35. 0  {zipkin-finatra → zipkin-web}/src/main/resources/public/js/zipkin-lazy-tree.js
  36. 0  {zipkin-finatra → zipkin-web}/src/main/resources/public/js/zipkin-node.js
  37. 0  {zipkin-finatra → zipkin-web}/src/main/resources/public/js/zipkin-onebox.js
  38. 0  {zipkin-finatra → zipkin-web}/src/main/resources/public/js/zipkin-span.js
  39. 0  {zipkin-finatra → zipkin-web}/src/main/resources/public/js/zipkin-trace-dependency.js
  40. 0  {zipkin-finatra → zipkin-web}/src/main/resources/public/js/zipkin-trace-summary.js
  41. 0  {zipkin-finatra → zipkin-web}/src/main/resources/public/js/zipkin-tree.js
  42. 0  {zipkin-finatra → zipkin-web}/src/main/resources/public/js/zipkin.js
  43. 0  {zipkin-finatra → zipkin-web}/src/main/resources/public/templates/get-trace.mustache
  44. 0  {zipkin-finatra → zipkin-web}/src/main/resources/public/templates/onebox-left.mustache
  45. 0  {zipkin-finatra → zipkin-web}/src/main/resources/public/templates/onebox-right.mustache
  46. 0  {zipkin-finatra → zipkin-web}/src/main/resources/public/templates/query-add-annotation.mustache
  47. 0  {zipkin-finatra → zipkin-web}/src/main/resources/public/templates/query-add-kv.mustache
  48. 0  {zipkin-finatra → zipkin-web}/src/main/resources/public/templates/query.mustache
  49. 0  {zipkin-finatra → zipkin-web}/src/main/resources/public/templates/service-tag.mustache
  50. 0  {zipkin-finatra → zipkin-web}/src/main/resources/public/templates/simple-table.mustache
  51. 0  {zipkin-finatra → zipkin-web}/src/main/resources/public/templates/span-details.mustache
  52. 0  {zipkin-finatra → zipkin-web}/src/main/resources/templates/aggregates.mustache
  53. 0  {zipkin-finatra → zipkin-web}/src/main/resources/templates/index.mustache
  54. 0  {zipkin-finatra → zipkin-web}/src/main/resources/templates/layouts/application.mustache
  55. 0  {zipkin-finatra → zipkin-web}/src/main/resources/templates/show.mustache
  56. 0  {zipkin-finatra → zipkin-web}/src/main/resources/templates/static.mustache
  57. 0  {zipkin-finatra → zipkin-web}/src/main/scala/com/twitter/zipkin/common/json/JsonBinaryAnnotation.scala
  58. 0  {zipkin-finatra → zipkin-web}/src/main/scala/com/twitter/zipkin/common/json/JsonSpan.scala
  59. 0  {zipkin-finatra → zipkin-web}/src/main/scala/com/twitter/zipkin/common/json/JsonTimelineAnnotation.scala
  60. 0  {zipkin-finatra → zipkin-web}/src/main/scala/com/twitter/zipkin/common/json/JsonTrace.scala
  61. 0  {zipkin-finatra → zipkin-web}/src/main/scala/com/twitter/zipkin/common/json/JsonTraceCombo.scala
  62. 0  {zipkin-finatra → zipkin-web}/src/main/scala/com/twitter/zipkin/common/json/JsonTraceSummary.scala
  63. 0  {zipkin-finatra → zipkin-web}/src/main/scala/com/twitter/zipkin/common/json/JsonTraceTimeline.scala
  64. 0  {zipkin-finatra → zipkin-web}/src/main/scala/com/twitter/zipkin/config/CssConfig.scala
  65. 0  {zipkin-finatra → zipkin-web}/src/main/scala/com/twitter/zipkin/config/JsConfig.scala
  66. 0  {zipkin-finatra → zipkin-web}/src/main/scala/com/twitter/zipkin/config/StaticResourceConfig.scala
  67. 0  {zipkin-finatra → zipkin-web}/src/main/scala/com/twitter/zipkin/config/ZipkinWebConfig.scala
  68. 0  {zipkin-finatra → zipkin-web}/src/main/scala/com/twitter/zipkin/conversions/json.scala
  69. 0  {zipkin-finatra → zipkin-web}/src/main/scala/com/twitter/zipkin/web/App.scala
  70. 0  {zipkin-finatra → zipkin-web}/src/main/scala/com/twitter/zipkin/web/Constants.scala
  71. 0  {zipkin-finatra → zipkin-web}/src/main/scala/com/twitter/zipkin/web/Main.scala
  72. 0  {zipkin-finatra → zipkin-web}/src/main/scala/com/twitter/zipkin/web/QueryExtractor.scala
  73. 0  {zipkin-finatra → zipkin-web}/src/main/scala/com/twitter/zipkin/web/TracedService.scala
  74. 0  {zipkin-finatra → zipkin-web}/src/main/scala/com/twitter/zipkin/web/ZipkinWeb.scala
  75. +3 −0  zipkin-web/src/scripts/web.sh
  76. 0  {zipkin-finatra → zipkin-web}/src/test/scala/com/twitter/zipkin/config/ZipkinWebConfigSpec.scala
  77. 0  {zipkin-finatra → zipkin-web}/src/test/scala/com/twitter/zipkin/conversions/JsonSpec.scala
  78. 0  {zipkin-finatra → zipkin-web}/src/test/scala/com/twitter/zipkin/web/JsonSerializationSpec.scala
  79. 0  {zipkin-finatra → zipkin-web}/src/test/scala/com/twitter/zipkin/web/QueryExtractorSpec.scala
View
2  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)
View
2  bin/ui
@@ -1,2 +0,0 @@
-#!/usr/bin/env sh
-bin/sbt 'project zipkin-finatra' 'run -f zipkin-finatra/config/web-dev.scala'
View
2  bin/web
@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+bin/sbt 'project zipkin-web' 'run -f zipkin-web/config/web-dev.scala'
View
10 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 &
View
6 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 */
View
3  zipkin-finatra/src/scripts/finatra.sh
@@ -1,3 +0,0 @@
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-VERSION=@VERSION@
-java -cp "$DIR/../libs/*" -jar $DIR/../zipkin-finatra_2.9.1-$VERSION.jar $*
View
2  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"`
View
0  zipkin-finatra/config/web-localhost.scala → zipkin-web/config/web-localhost.scala
File renamed without changes
View
0  .../main/resources/public/css/aggregates.css → .../main/resources/public/css/aggregates.css
File renamed without changes
View
0  ...main/resources/public/css/application.css → ...main/resources/public/css/application.css
File renamed without changes
View
0  ...urces/public/css/bootstrap-responsive.css → ...urces/public/css/bootstrap-responsive.css
File renamed without changes
View
0  ...c/main/resources/public/css/bootstrap.css → ...c/main/resources/public/css/bootstrap.css
File renamed without changes
View
0  .../main/resources/public/css/datepicker.css → .../main/resources/public/css/datepicker.css
File renamed without changes
View
0  ...public/img/glyphicons-halflings-white.png → ...public/img/glyphicons-halflings-white.png
File renamed without changes
View
0  ...urces/public/img/glyphicons-halflings.png → ...urces/public/img/glyphicons-halflings.png
File renamed without changes
View
0  ...urces/public/js/application-aggregates.js → ...urces/public/js/application-aggregates.js
File renamed without changes
View
0  .../resources/public/js/application-index.js → .../resources/public/js/application-index.js
File renamed without changes
View
0  ...resources/public/js/application-models.js → ...resources/public/js/application-models.js
File renamed without changes
View
0  ...n/resources/public/js/application-show.js → ...n/resources/public/js/application-show.js
File renamed without changes
View
0  ...resources/public/js/application-static.js → ...resources/public/js/application-static.js
File renamed without changes
View
0  .../resources/public/js/application-views.js → .../resources/public/js/application-views.js
File renamed without changes
View
0  ...c/main/resources/public/js/application.js → ...c/main/resources/public/js/application.js
File renamed without changes
View
0  ...ain/resources/public/js/backbone-0.9.2.js → ...ain/resources/public/js/backbone-0.9.2.js
File renamed without changes
View
0  ...src/main/resources/public/js/bootstrap.js → ...src/main/resources/public/js/bootstrap.js
File renamed without changes
View
0  .../src/main/resources/public/js/d3-2.9.1.js → .../src/main/resources/public/js/d3-2.9.1.js
File renamed without changes
View
0  ...rc/main/resources/public/js/datepicker.js → ...rc/main/resources/public/js/datepicker.js
File renamed without changes
View
0  ...c/main/resources/public/js/hogan-2.0.0.js → ...c/main/resources/public/js/hogan-2.0.0.js
File renamed without changes
View
0  ...ra/src/main/resources/public/js/sankey.js → ...eb/src/main/resources/public/js/sankey.js
File renamed without changes
View
0  ...n/resources/public/js/underscore-1.3.3.js → ...n/resources/public/js/underscore-1.3.3.js
File renamed without changes
View
0  .../resources/public/js/zipkin-annotation.js → .../resources/public/js/zipkin-annotation.js
File renamed without changes
View
0  ...main/resources/public/js/zipkin-config.js → ...main/resources/public/js/zipkin-config.js
File renamed without changes
View
0  ...resources/public/js/zipkin-filter-span.js → ...resources/public/js/zipkin-filter-span.js
File renamed without changes
View
0  ...ces/public/js/zipkin-global-dependency.js → ...ces/public/js/zipkin-global-dependency.js
File renamed without changes
View
0  ...sources/public/js/zipkin-kv-annotation.js → ...sources/public/js/zipkin-kv-annotation.js
File renamed without changes
View
0  ...n/resources/public/js/zipkin-lazy-tree.js → ...n/resources/public/js/zipkin-lazy-tree.js
File renamed without changes
View
0  ...c/main/resources/public/js/zipkin-node.js → ...c/main/resources/public/js/zipkin-node.js
File renamed without changes
View
0  ...main/resources/public/js/zipkin-onebox.js → ...main/resources/public/js/zipkin-onebox.js
File renamed without changes
View
0  ...c/main/resources/public/js/zipkin-span.js → ...c/main/resources/public/js/zipkin-span.js
File renamed without changes
View
0  ...rces/public/js/zipkin-trace-dependency.js → ...rces/public/js/zipkin-trace-dependency.js
File renamed without changes
View
0  ...sources/public/js/zipkin-trace-summary.js → ...sources/public/js/zipkin-trace-summary.js
File renamed without changes
View
0  ...c/main/resources/public/js/zipkin-tree.js → ...c/main/resources/public/js/zipkin-tree.js
File renamed without changes
View
0  ...ra/src/main/resources/public/js/zipkin.js → ...eb/src/main/resources/public/js/zipkin.js
File renamed without changes
View
0  ...urces/public/templates/get-trace.mustache → ...urces/public/templates/get-trace.mustache
File renamed without changes
View
0  ...ces/public/templates/onebox-left.mustache → ...ces/public/templates/onebox-left.mustache
File renamed without changes
View
0  ...es/public/templates/onebox-right.mustache → ...es/public/templates/onebox-right.mustache
File renamed without changes
View
0  ...c/templates/query-add-annotation.mustache → ...c/templates/query-add-annotation.mustache
File renamed without changes
View
0  ...es/public/templates/query-add-kv.mustache → ...es/public/templates/query-add-kv.mustache
File renamed without changes
View
0  ...resources/public/templates/query.mustache → ...resources/public/templates/query.mustache
File renamed without changes
View
0  ...ces/public/templates/service-tag.mustache → ...ces/public/templates/service-tag.mustache
File renamed without changes
View
0  ...es/public/templates/simple-table.mustache → ...es/public/templates/simple-table.mustache
File renamed without changes
View
0  ...es/public/templates/span-details.mustache → ...es/public/templates/span-details.mustache
File renamed without changes
View
0  ...n/resources/templates/aggregates.mustache → ...n/resources/templates/aggregates.mustache
File renamed without changes
View
0  ...c/main/resources/templates/index.mustache → ...c/main/resources/templates/index.mustache
File renamed without changes
View
0  ...es/templates/layouts/application.mustache → ...es/templates/layouts/application.mustache
File renamed without changes
View
0  ...rc/main/resources/templates/show.mustache → ...rc/main/resources/templates/show.mustache
File renamed without changes
View
0  .../main/resources/templates/static.mustache → .../main/resources/templates/static.mustache
File renamed without changes
View
0  ...in/common/json/JsonBinaryAnnotation.scala → ...in/common/json/JsonBinaryAnnotation.scala
File renamed without changes
View
0  ...twitter/zipkin/common/json/JsonSpan.scala → ...twitter/zipkin/common/json/JsonSpan.scala
File renamed without changes
View
0  .../common/json/JsonTimelineAnnotation.scala → .../common/json/JsonTimelineAnnotation.scala
File renamed without changes
View
0  ...witter/zipkin/common/json/JsonTrace.scala → ...witter/zipkin/common/json/JsonTrace.scala
File renamed without changes
View
0  ...r/zipkin/common/json/JsonTraceCombo.scala → ...r/zipkin/common/json/JsonTraceCombo.scala
File renamed without changes
View
0  ...zipkin/common/json/JsonTraceSummary.scala → ...zipkin/common/json/JsonTraceSummary.scala
File renamed without changes
View
0  ...ipkin/common/json/JsonTraceTimeline.scala → ...ipkin/common/json/JsonTraceTimeline.scala
File renamed without changes
View
0  ...com/twitter/zipkin/config/CssConfig.scala → ...com/twitter/zipkin/config/CssConfig.scala
File renamed without changes
View
0  .../com/twitter/zipkin/config/JsConfig.scala → .../com/twitter/zipkin/config/JsConfig.scala
File renamed without changes
View
0  .../zipkin/config/StaticResourceConfig.scala → .../zipkin/config/StaticResourceConfig.scala
File renamed without changes
View
0  ...itter/zipkin/config/ZipkinWebConfig.scala → ...itter/zipkin/config/ZipkinWebConfig.scala
File renamed without changes
View
0  ...com/twitter/zipkin/conversions/json.scala → ...com/twitter/zipkin/conversions/json.scala
File renamed without changes
View
0  ...in/scala/com/twitter/zipkin/web/App.scala → ...in/scala/com/twitter/zipkin/web/App.scala
File renamed without changes
View
0  ...la/com/twitter/zipkin/web/Constants.scala → ...la/com/twitter/zipkin/web/Constants.scala
File renamed without changes
View
0  ...n/scala/com/twitter/zipkin/web/Main.scala → ...n/scala/com/twitter/zipkin/web/Main.scala
File renamed without changes
View
0  ...m/twitter/zipkin/web/QueryExtractor.scala → ...m/twitter/zipkin/web/QueryExtractor.scala
File renamed without changes
View
0  ...om/twitter/zipkin/web/TracedService.scala → ...om/twitter/zipkin/web/TracedService.scala
File renamed without changes
View
0  ...la/com/twitter/zipkin/web/ZipkinWeb.scala → ...la/com/twitter/zipkin/web/ZipkinWeb.scala
File renamed without changes
View
3  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 $*
View
0  ...r/zipkin/config/ZipkinWebConfigSpec.scala → ...r/zipkin/config/ZipkinWebConfigSpec.scala
File renamed without changes
View
0  ...twitter/zipkin/conversions/JsonSpec.scala → ...twitter/zipkin/conversions/JsonSpec.scala
File renamed without changes
View
0  ...er/zipkin/web/JsonSerializationSpec.scala → ...er/zipkin/web/JsonSerializationSpec.scala
File renamed without changes
View
0  ...itter/zipkin/web/QueryExtractorSpec.scala → ...itter/zipkin/web/QueryExtractorSpec.scala
File renamed without changes
Something went wrong with that request. Please try again.