From 43dfa35c041afb7071be97eb1ecdac034d9513d5 Mon Sep 17 00:00:00 2001
From: Peter MacKinnon <pmackinn@redhat.com>
Date: Wed, 8 Jan 2014 11:36:28 -0500
Subject: [PATCH 02/10] shims mods

---
 shims/ivy.xml                                                |  6 ++++++
 .../0.23/java/org/apache/hadoop/hive/shims/Jetty23Shims.java | 12 ++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/shims/ivy.xml b/shims/ivy.xml
index c0312bc..39ca73b 100644
--- a/shims/ivy.xml
+++ b/shims/ivy.xml
@@ -74,6 +74,9 @@
       <exclude org="commons-daemon" module="commons-daemon"/><!--bad POM-->
       <exclude org="org.apache.commons" module="commons-daemon"/><!--bad POM-->
     </dependency>
+    <dependency org="org.apache.hadoop" name="hadoop-hdfs-tests"
+                rev="${hadoop-0.23.version}"
+                conf="hadoop0.23.shim->default"/>
     <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-jobclient"
                 rev="${hadoop-0.23.version}"
                 conf="hadoop0.23.shim->default">
@@ -82,6 +85,9 @@
       <exclude org="commons-daemon" module="commons-daemon"/><!--bad POM-->
       <exclude org="org.apache.commons" module="commons-daemon"/><!--bad POM-->
     </dependency>
+    <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-jobclient-tests"
+                rev="${hadoop-0.23.version}"
+                conf="hadoop0.23.shim->default"/>
     <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-common"
                 rev="${hadoop-0.23.version}"
                 conf="hadoop0.23.shim->default">
diff --git a/shims/src/0.23/java/org/apache/hadoop/hive/shims/Jetty23Shims.java b/shims/src/0.23/java/org/apache/hadoop/hive/shims/Jetty23Shims.java
index 9328749..c1b3529 100644
--- a/shims/src/0.23/java/org/apache/hadoop/hive/shims/Jetty23Shims.java
+++ b/shims/src/0.23/java/org/apache/hadoop/hive/shims/Jetty23Shims.java
@@ -19,9 +19,9 @@
 
 import java.io.IOException;
 
-import org.mortbay.jetty.bio.SocketConnector;
-import org.mortbay.jetty.handler.RequestLogHandler;
-import org.mortbay.jetty.webapp.WebAppContext;
+import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.server.handler.RequestLogHandler;
+import org.eclipse.jetty.webapp.WebAppContext;
 
 /**
  * Jetty23Shims.
@@ -34,20 +34,20 @@ public Server startServer(String listen, int port) throws IOException {
     return s;
   }
 
-  private static class Server extends org.mortbay.jetty.Server implements JettyShims.Server {
+  private static class Server extends org.eclipse.jetty.server.Server implements JettyShims.Server {
     public void addWar(String war, String contextPath) {
       WebAppContext wac = new WebAppContext();
       wac.setContextPath(contextPath);
       wac.setWar(war);
       RequestLogHandler rlh = new RequestLogHandler();
       rlh.setHandler(wac);
-      this.addHandler(rlh);
+      this.setHandler(rlh);
     }
 
     public void setupListenerHostPort(String listen, int port)
         throws IOException {
 
-      SocketConnector connector = new SocketConnector();
+      ServerConnector connector = new ServerConnector(this);
       connector.setPort(port);
       connector.setHost(listen);
       this.addConnector(connector);
-- 
1.8.5.2