commit 3ddc1b1ece1151b7ee2c4f9f83229f3aa674a2ca Author: Karsten Loesing karsten.loesing@gmx.net Date: Thu Dec 13 12:23:59 2012 +0100
Remove website parts that were deprecated 10 months ago.
relay.html was changed to say "Sorry, this page has been discontinued." in February 2012 and was overlooked when removing similar website parts in March 2012. Removing it now. --- etc/web.xml | 11 ----------- src/org/torproject/ernie/web/RelayServlet.java | 24 ------------------------ web/WEB-INF/relay.jsp | 23 ----------------------- 3 files changed, 0 insertions(+), 58 deletions(-)
diff --git a/etc/web.xml b/etc/web.xml index c7262ef..176b84f 100644 --- a/etc/web.xml +++ b/etc/web.xml @@ -128,17 +128,6 @@ </servlet-mapping>
<servlet> - <servlet-name>Relay</servlet-name> - <servlet-class> - org.torproject.ernie.web.RelayServlet - </servlet-class> - </servlet> - <servlet-mapping> - <servlet-name>Relay</servlet-name> - <url-pattern>/relay.html</url-pattern> - </servlet-mapping> - - <servlet> <servlet-name>RelaySearch</servlet-name> <servlet-class> org.torproject.ernie.web.RelaySearchServlet diff --git a/src/org/torproject/ernie/web/RelayServlet.java b/src/org/torproject/ernie/web/RelayServlet.java deleted file mode 100644 index 6f120e5..0000000 --- a/src/org/torproject/ernie/web/RelayServlet.java +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2011, 2012 The Tor Project - * See LICENSE for licensing information */ -package org.torproject.ernie.web; - -import java.io.IOException; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -public class RelayServlet extends HttpServlet { - - private static final long serialVersionUID = 2375986581752040224L; - - public void doGet(HttpServletRequest request, - HttpServletResponse response) throws IOException, ServletException { - - /* Forward the request to the JSP. */ - request.getRequestDispatcher("WEB-INF/relay.jsp").forward( - request, response); - } -} - diff --git a/web/WEB-INF/relay.jsp b/web/WEB-INF/relay.jsp deleted file mode 100644 index 952133a..0000000 --- a/web/WEB-INF/relay.jsp +++ /dev/null @@ -1,23 +0,0 @@ -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> -<html> -<head> - <title>Tor Metrics Portal: Relay</title> - <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> - <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> - <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> -</head> -<body> - <div class="center"> - <%@ include file="banner.jsp"%> - <div class="main-column"> - <h2>Tor Metrics Portal: Relay</h2> - <br> - <p>Sorry, this page has been discontinued.</p> - </div> - </div> - <div class="bottom" id="bottom"> - <%@ include file="footer.jsp"%> - </div> -</body> -</html>