From b14ad509ba4c00d57bd4a52a7b70a18325064a7b Mon Sep 17 00:00:00 2001
From: Patrick Wendell <pwendell@gmail.com>
Date: Wed, 26 Jun 2013 08:46:51 -0700
Subject: [PATCH] Moving static ui package
---
.../static/bootstrap-responsive.min.css | 0
.../spark/{webui => ui}/static/bootstrap.min.css | 0
.../spark/{webui => ui}/static/sorttable.js | 0
.../spark/{webui => ui}/static/spark_logo.png | Bin
.../scala/spark/deploy/master/ui/MasterWebUI.scala | 2 +-
.../scala/spark/deploy/worker/ui/WorkerWebUI.scala | 2 +-
core/src/main/scala/spark/ui/SparkUI.scala | 2 +-
7 files changed, 3 insertions(+), 3 deletions(-)
rename core/src/main/resources/spark/{webui => ui}/static/bootstrap-responsive.min.css (100%)
rename core/src/main/resources/spark/{webui => ui}/static/bootstrap.min.css (100%)
rename core/src/main/resources/spark/{webui => ui}/static/sorttable.js (100%)
rename core/src/main/resources/spark/{webui => ui}/static/spark_logo.png (100%)
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
similarity index 100%
rename from core/src/main/resources/spark/webui/static/bootstrap-responsive.min.css
rename to 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
similarity index 100%
rename from core/src/main/resources/spark/webui/static/bootstrap.min.css
rename to 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
similarity index 100%
rename from core/src/main/resources/spark/webui/static/sorttable.js
rename to 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
similarity index 100%
rename from core/src/main/resources/spark/webui/static/spark_logo.png
rename to 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"
}
--
GitLab