diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2013-06-26 08:46:51 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2013-06-26 08:46:51 -0700 |
| commit | b14ad509ba4c00d57bd4a52a7b70a18325064a7b (patch) | |
| tree | 179f063a7afc4b75c82660bf5005eb0339f26aaf | |
| parent | 2cbaa0734b1a23e5d6ce1543a22358f436b5b1ef (diff) | |
| download | spark-b14ad509ba4c00d57bd4a52a7b70a18325064a7b.tar.gz spark-b14ad509ba4c00d57bd4a52a7b70a18325064a7b.tar.bz2 spark-b14ad509ba4c00d57bd4a52a7b70a18325064a7b.zip | |
Moving static ui package
| -rw-r--r-- | core/src/main/resources/spark/ui/static/bootstrap-responsive.min.css (renamed from core/src/main/resources/spark/webui/static/bootstrap-responsive.min.css) | 0 | ||||
| -rw-r--r-- | core/src/main/resources/spark/ui/static/bootstrap.min.css (renamed from core/src/main/resources/spark/webui/static/bootstrap.min.css) | 0 | ||||
| -rw-r--r-- | core/src/main/resources/spark/ui/static/sorttable.js (renamed from core/src/main/resources/spark/webui/static/sorttable.js) | 0 | ||||
| -rw-r--r-- | core/src/main/resources/spark/ui/static/spark_logo.png (renamed from core/src/main/resources/spark/webui/static/spark_logo.png) | bin | 14233 -> 14233 bytes | |||
| -rw-r--r-- | core/src/main/scala/spark/deploy/master/ui/MasterWebUI.scala | 2 | ||||
| -rw-r--r-- | core/src/main/scala/spark/deploy/worker/ui/WorkerWebUI.scala | 2 | ||||
| -rw-r--r-- | core/src/main/scala/spark/ui/SparkUI.scala | 2 |
7 files changed, 3 insertions, 3 deletions
diff --git a/core/src/main/resources/spark/webui/static/bootstrap-responsive.min.css b/core/src/main/resources/spark/ui/static/bootstrap-responsive.min.css index 1f55036a07..1f55036a07 100644 --- a/core/src/main/resources/spark/webui/static/bootstrap-responsive.min.css +++ b/core/src/main/resources/spark/ui/static/bootstrap-responsive.min.css diff --git a/core/src/main/resources/spark/webui/static/bootstrap.min.css b/core/src/main/resources/spark/ui/static/bootstrap.min.css index b74b4546a6..b74b4546a6 100644 --- a/core/src/main/resources/spark/webui/static/bootstrap.min.css +++ b/core/src/main/resources/spark/ui/static/bootstrap.min.css diff --git a/core/src/main/resources/spark/webui/static/sorttable.js b/core/src/main/resources/spark/ui/static/sorttable.js index 7abb9011cc..7abb9011cc 100644 --- a/core/src/main/resources/spark/webui/static/sorttable.js +++ b/core/src/main/resources/spark/ui/static/sorttable.js diff --git a/core/src/main/resources/spark/webui/static/spark_logo.png b/core/src/main/resources/spark/ui/static/spark_logo.png Binary files differindex 4b18734779..4b18734779 100644 --- a/core/src/main/resources/spark/webui/static/spark_logo.png +++ b/core/src/main/resources/spark/ui/static/spark_logo.png diff --git a/core/src/main/scala/spark/deploy/master/ui/MasterWebUI.scala b/core/src/main/scala/spark/deploy/master/ui/MasterWebUI.scala index 0cfe600043..82bc6961e2 100644 --- a/core/src/main/scala/spark/deploy/master/ui/MasterWebUI.scala +++ b/core/src/main/scala/spark/deploy/master/ui/MasterWebUI.scala @@ -54,6 +54,6 @@ class MasterWebUI(val master: ActorRef, requestedPort: Option[Int] = None) exten } private[spark] object MasterWebUI { - val STATIC_RESOURCE_DIR = "spark/webui/static" + val STATIC_RESOURCE_DIR = "spark/ui/static" val DEFAULT_PORT = "8080" }
\ No newline at end of file diff --git a/core/src/main/scala/spark/deploy/worker/ui/WorkerWebUI.scala b/core/src/main/scala/spark/deploy/worker/ui/WorkerWebUI.scala index 65bdba4735..2e6279566c 100644 --- a/core/src/main/scala/spark/deploy/worker/ui/WorkerWebUI.scala +++ b/core/src/main/scala/spark/deploy/worker/ui/WorkerWebUI.scala @@ -69,6 +69,6 @@ class WorkerWebUI(val worker: ActorRef, val workDir: File, requestedPort: Option } private[spark] object WorkerWebUI { - val STATIC_RESOURCE_DIR = "spark/webui/static" + val STATIC_RESOURCE_DIR = "spark/ui/static" val DEFAULT_PORT="8081" } diff --git a/core/src/main/scala/spark/ui/SparkUI.scala b/core/src/main/scala/spark/ui/SparkUI.scala index 86b394c09f..b3bdc2c490 100644 --- a/core/src/main/scala/spark/ui/SparkUI.scala +++ b/core/src/main/scala/spark/ui/SparkUI.scala @@ -59,5 +59,5 @@ private[spark] class SparkUI(sc: SparkContext) extends Logging { private[spark] object SparkUI { val DEFAULT_PORT = "33000" - val STATIC_RESOURCE_DIR = "spark/webui/static" + val STATIC_RESOURCE_DIR = "spark/ui/static" } |
