diff --git shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Jetty23Shims.java shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Jetty23Shims.java deleted file mode 100644 index 9328749..0000000 --- shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Jetty23Shims.java +++ /dev/null @@ -1,56 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.hadoop.hive.shims; - -import java.io.IOException; - -import org.mortbay.jetty.bio.SocketConnector; -import org.mortbay.jetty.handler.RequestLogHandler; -import org.mortbay.jetty.webapp.WebAppContext; - -/** - * Jetty23Shims. - * - */ -public class Jetty23Shims implements JettyShims { - public Server startServer(String listen, int port) throws IOException { - Server s = new Server(); - s.setupListenerHostPort(listen, port); - return s; - } - - private static class Server extends org.mortbay.jetty.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); - } - - public void setupListenerHostPort(String listen, int port) - throws IOException { - - SocketConnector connector = new SocketConnector(); - connector.setPort(port); - connector.setHost(listen); - this.addConnector(connector); - } - } -} diff --git shims/common/src/main/java/org/apache/hadoop/hive/shims/ShimLoader.java shims/common/src/main/java/org/apache/hadoop/hive/shims/ShimLoader.java index f712c3c..0e27851 100644 --- shims/common/src/main/java/org/apache/hadoop/hive/shims/ShimLoader.java +++ shims/common/src/main/java/org/apache/hadoop/hive/shims/ShimLoader.java @@ -51,17 +51,6 @@ } /** - * The names of the classes for shimming Jetty for each major version of - * Hadoop. - */ - private static final HashMap JETTY_SHIM_CLASSES = - new HashMap(); - - static { - JETTY_SHIM_CLASSES.put(HADOOP23VERSIONNAME, "org.apache.hadoop.hive.shims.Jetty23Shims"); - } - - /** * The names of the classes for shimming Hadoop's event counter */ private static final HashMap EVENT_COUNTER_SHIM_CLASSES = @@ -107,17 +96,6 @@ public static HadoopShims getHadoopShims() { return hadoopShims; } - /** - * Factory method to get an instance of JettyShims based on the version - * of Hadoop on the classpath. - */ - public static synchronized JettyShims getJettyShims() { - if (jettyShims == null) { - jettyShims = loadShims(JETTY_SHIM_CLASSES, JettyShims.class); - } - return jettyShims; - } - public static synchronized AppenderSkeleton getEventCounter() { if (eventCounter == null) { eventCounter = loadShims(EVENT_COUNTER_SHIM_CLASSES, AppenderSkeleton.class);