From 9a24d1a2d0deb5cbd96b806a1ef3afb9353872dd Mon Sep 17 00:00:00 2001
From: Patrick Wendell <pwendell@gmail.com>
Date: Fri, 21 Jun 2013 15:17:50 -0700
Subject: Using scala in XML imports

---
 core/src/main/scala/spark/deploy/worker/ui/IndexPage.scala | 4 ++--
 core/src/main/scala/spark/ui/JettyUtils.scala              | 3 +--
 core/src/main/scala/spark/ui/jobs/IndexPage.scala          | 3 +--
 core/src/main/scala/spark/ui/jobs/StagePage.scala          | 4 ++--
 core/src/main/scala/spark/ui/storage/IndexPage.scala       | 4 ++--
 core/src/main/scala/spark/ui/storage/RDDPage.scala         | 4 ++--
 6 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/core/src/main/scala/spark/deploy/worker/ui/IndexPage.scala b/core/src/main/scala/spark/deploy/worker/ui/IndexPage.scala
index a6aba59e9f..9e7b2bfd92 100644
--- a/core/src/main/scala/spark/deploy/worker/ui/IndexPage.scala
+++ b/core/src/main/scala/spark/deploy/worker/ui/IndexPage.scala
@@ -8,13 +8,13 @@ import javax.servlet.http.HttpServletRequest
 
 import net.liftweb.json.JsonAST.JValue
 
+import scala.xml.Node
+
 import spark.deploy.{RequestWorkerState, JsonProtocol, WorkerState}
 import spark.deploy.worker.ExecutorRunner
 import spark.Utils
 import spark.ui.UIUtils
 
-import xml.Node
-
 class IndexPage(parent: WorkerWebUI) {
   val worker = parent.worker
   val timeout = parent.timeout
diff --git a/core/src/main/scala/spark/ui/JettyUtils.scala b/core/src/main/scala/spark/ui/JettyUtils.scala
index 93e7129fc0..726a95594b 100644
--- a/core/src/main/scala/spark/ui/JettyUtils.scala
+++ b/core/src/main/scala/spark/ui/JettyUtils.scala
@@ -10,11 +10,10 @@ import org.eclipse.jetty.server.{Server, Request, Handler}
 import org.eclipse.jetty.server.handler.{ResourceHandler, HandlerList, ContextHandler, AbstractHandler}
 
 import scala.util.{Try, Success, Failure}
+import scala.xml.Node
 
 import spark.Logging
 
-import xml.Node
-
 /** Utilities for launching a web server using Jetty's HTTP Server class */
 private[spark] object JettyUtils extends Logging {
   // Base type for a function that returns something based on an HTTP request. Allows for
diff --git a/core/src/main/scala/spark/ui/jobs/IndexPage.scala b/core/src/main/scala/spark/ui/jobs/IndexPage.scala
index 8ebde7a379..87f3abc6b0 100644
--- a/core/src/main/scala/spark/ui/jobs/IndexPage.scala
+++ b/core/src/main/scala/spark/ui/jobs/IndexPage.scala
@@ -7,13 +7,12 @@ import java.util.Date
 import javax.servlet.http.HttpServletRequest
 
 import scala.Some
+import scala.xml.{NodeSeq, Node}
 
 import spark.scheduler.Stage
 import spark.ui.UIUtils._
 import spark.storage.StorageLevel
 
-import xml.{NodeSeq, Node}
-
 /** Page showing list of all ongoing and recently finished stages */
 class IndexPage(parent: JobProgressUI) {
   val listener = parent.listener
diff --git a/core/src/main/scala/spark/ui/jobs/StagePage.scala b/core/src/main/scala/spark/ui/jobs/StagePage.scala
index 3c23a86d12..d76c07e458 100644
--- a/core/src/main/scala/spark/ui/jobs/StagePage.scala
+++ b/core/src/main/scala/spark/ui/jobs/StagePage.scala
@@ -4,13 +4,13 @@ import java.util.Date
 
 import javax.servlet.http.HttpServletRequest
 
+import scala.xml.Node
+
 import spark.ui.UIUtils._
 import spark.util.Distribution
 import spark.scheduler.cluster.TaskInfo
 import spark.executor.TaskMetrics
 
-import xml.Node
-
 /** Page showing statistics and task list for a given stage */
 class StagePage(parent: JobProgressUI) {
   val listener = parent.listener
diff --git a/core/src/main/scala/spark/ui/storage/IndexPage.scala b/core/src/main/scala/spark/ui/storage/IndexPage.scala
index 1f9953fb6b..52b9087099 100644
--- a/core/src/main/scala/spark/ui/storage/IndexPage.scala
+++ b/core/src/main/scala/spark/ui/storage/IndexPage.scala
@@ -2,12 +2,12 @@ package spark.ui.storage
 
 import javax.servlet.http.HttpServletRequest
 
+import scala.xml.Node
+
 import spark.storage.{RDDInfo, StorageUtils}
 import spark.Utils
 import spark.ui.UIUtils._
 
-import xml.Node
-
 /** Page showing list of RDD's currently stored in the cluster */
 class IndexPage(parent: BlockManagerUI) {
   val sc = parent.sc
diff --git a/core/src/main/scala/spark/ui/storage/RDDPage.scala b/core/src/main/scala/spark/ui/storage/RDDPage.scala
index 466f4643bc..1031b2e17f 100644
--- a/core/src/main/scala/spark/ui/storage/RDDPage.scala
+++ b/core/src/main/scala/spark/ui/storage/RDDPage.scala
@@ -2,13 +2,13 @@ package spark.ui.storage
 
 import javax.servlet.http.HttpServletRequest
 
+import scala.xml.Node
+
 import spark.storage.{StorageStatus, StorageUtils}
 import spark.ui.UIUtils._
 import spark.Utils
 import spark.storage.BlockManagerMasterActor.BlockStatus
 
-import xml.Node
-
 /** Page showing storage details for a given RDD */
 class RDDPage(parent: BlockManagerUI) {
   val sc = parent.sc
-- 
cgit v1.2.3