commit 774d428699cf681abc47c1e4442746b5c766f1b5 Author: Karsten Loesing karsten.loesing@gmx.net Date: Wed Dec 14 20:32:46 2016 +0100
Remove Sources page. --- website/etc/web.xml | 11 ------ .../org/torproject/metrics/web/SourcesServlet.java | 26 ------------- website/web/WEB-INF/about.jsp | 1 - website/web/WEB-INF/graph.jsp | 1 - website/web/WEB-INF/index.jsp | 1 - website/web/WEB-INF/link.jsp | 1 - website/web/WEB-INF/news.jsp | 1 - website/web/WEB-INF/research.jsp | 1 - website/web/WEB-INF/sources.jsp | 44 ---------------------- website/web/WEB-INF/table.jsp | 1 - website/web/WEB-INF/tools.jsp | 1 - 11 files changed, 89 deletions(-)
diff --git a/website/etc/web.xml b/website/etc/web.xml index 17f6901..0e9011a 100644 --- a/website/etc/web.xml +++ b/website/etc/web.xml @@ -221,17 +221,6 @@ </servlet-mapping>
<servlet> - <servlet-name>SourcesServlet</servlet-name> - <servlet-class> - org.torproject.metrics.web.SourcesServlet - </servlet-class> - </servlet> - <servlet-mapping> - <servlet-name>SourcesServlet</servlet-name> - <url-pattern>/sources.html</url-pattern> - </servlet-mapping> - - <servlet> <servlet-name>ToolsServlet</servlet-name> <servlet-class> org.torproject.metrics.web.ToolsServlet diff --git a/website/src/org/torproject/metrics/web/SourcesServlet.java b/website/src/org/torproject/metrics/web/SourcesServlet.java deleted file mode 100644 index 98e37d1..0000000 --- a/website/src/org/torproject/metrics/web/SourcesServlet.java +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright 2016 The Tor Project - * See LICENSE for licensing information */ - -package org.torproject.metrics.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 SourcesServlet extends HttpServlet { - - private static final long serialVersionUID = 8809159168990390124L; - - @Override - public void doGet(HttpServletRequest request, - HttpServletResponse response) throws IOException, ServletException { - - /* Forward the request to the JSP that does all the hard work. */ - request.getRequestDispatcher("WEB-INF/sources.jsp").forward(request, - response); - } -} - diff --git a/website/web/WEB-INF/about.jsp b/website/web/WEB-INF/about.jsp index f16a114..3e8a309 100644 --- a/website/web/WEB-INF/about.jsp +++ b/website/web/WEB-INF/about.jsp @@ -22,7 +22,6 @@ of data, rather than just dogma or perspective." <a href="index.html">Metrics</a> | About | <a href="news.html">News</a> | - <a href="sources.html">Sources</a> | <a href="tools.html">Tools</a> | <a href="research.html">Research</a> <br> diff --git a/website/web/WEB-INF/graph.jsp b/website/web/WEB-INF/graph.jsp index aab373a..133fd80 100644 --- a/website/web/WEB-INF/graph.jsp +++ b/website/web/WEB-INF/graph.jsp @@ -24,7 +24,6 @@ of data, rather than just dogma or perspective." Metrics | <a href="about.html">About</a> | <a href="news.html">News</a> | - <a href="sources.html">Sources</a> | <a href="tools.html">Tools</a> | <a href="research.html">Research</a> <br> diff --git a/website/web/WEB-INF/index.jsp b/website/web/WEB-INF/index.jsp index 3e0d03a..55c882a 100644 --- a/website/web/WEB-INF/index.jsp +++ b/website/web/WEB-INF/index.jsp @@ -24,7 +24,6 @@ of data, rather than just dogma or perspective." Metrics | <a href="about.html">About</a> | <a href="news.html">News</a> | - <a href="sources.html">Sources</a> | <a href="tools.html">Tools</a> | <a href="research.html">Research</a> <br> diff --git a/website/web/WEB-INF/link.jsp b/website/web/WEB-INF/link.jsp index 096fddb..efff3b4 100644 --- a/website/web/WEB-INF/link.jsp +++ b/website/web/WEB-INF/link.jsp @@ -24,7 +24,6 @@ of data, rather than just dogma or perspective." Metrics | <a href="about.html">About</a> | <a href="news.html">News</a> | - <a href="sources.html">Sources</a> | <a href="tools.html">Tools</a> | <a href="research.html">Research</a> <br> diff --git a/website/web/WEB-INF/news.jsp b/website/web/WEB-INF/news.jsp index b99e260..fa9eb13 100644 --- a/website/web/WEB-INF/news.jsp +++ b/website/web/WEB-INF/news.jsp @@ -24,7 +24,6 @@ of data, rather than just dogma or perspective." <a href="index.html">Metrics</a> | <a href="about.html">About</a> | News | - <a href="sources.html">Sources</a> | <a href="tools.html">Tools</a> | <a href="research.html">Research</a> <br> diff --git a/website/web/WEB-INF/research.jsp b/website/web/WEB-INF/research.jsp index 52fd50e..2acff3d 100644 --- a/website/web/WEB-INF/research.jsp +++ b/website/web/WEB-INF/research.jsp @@ -24,7 +24,6 @@ of data, rather than just dogma or perspective." <a href="index.html">Metrics</a> | <a href="about.html">About</a> | <a href="news.html">News</a> | - <a href="sources.html">Sources</a> | <a href="tools.html">Tools</a> | Research <br> diff --git a/website/web/WEB-INF/sources.jsp b/website/web/WEB-INF/sources.jsp deleted file mode 100644 index dc53c52..0000000 --- a/website/web/WEB-INF/sources.jsp +++ /dev/null @@ -1,44 +0,0 @@ -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> -<html> -<head> - <title>Tor Metrics</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="css/bootstrap.min.css" type="text/css" rel="stylesheet"> - <link href="images/favicon.ico" type="image/x-icon" rel="shortcut icon"> -</head> -<body> - <div class="center"> - <div class="main-column"> - <h2><a href="/"><img src="images/metrics-logo.png" width="153" height="200" alt="Metrics logo"><img src="images/metrics-wordmark.png" width="384" height="50" alt="Metrics wordmark"></a></h2> - <br> - -<p>"Tor metrics are the ammunition that lets Tor and other security -advocates argue for a more private and secure Internet from a position -of data, rather than just dogma or perspective." -<i>- Bruce Schneier (June 1, 2016)</i></p> - - <!-- Navigation start --> - <a href="index.html">Metrics</a> | - <a href="about.html">About</a> | - <a href="news.html">News</a> | - Sources | - <a href="tools.html">Tools</a> | - <a href="research.html">Research</a> - <br> - <br> - <!-- Navigation end --> - -<h3>Sources</h3> -<br> - - </div> - </div> - <div class="bottom" id="bottom"> - <%@ include file="footer.jsp"%> - </div> -</body> -</html> - diff --git a/website/web/WEB-INF/table.jsp b/website/web/WEB-INF/table.jsp index 1e867a8..ab91db7 100644 --- a/website/web/WEB-INF/table.jsp +++ b/website/web/WEB-INF/table.jsp @@ -24,7 +24,6 @@ of data, rather than just dogma or perspective." Metrics | <a href="about.html">About</a> | <a href="news.html">News</a> | - <a href="sources.html">Sources</a> | <a href="tools.html">Tools</a> | <a href="research.html">Research</a> <br> diff --git a/website/web/WEB-INF/tools.jsp b/website/web/WEB-INF/tools.jsp index c1a2512..b68d6ba 100644 --- a/website/web/WEB-INF/tools.jsp +++ b/website/web/WEB-INF/tools.jsp @@ -24,7 +24,6 @@ of data, rather than just dogma or perspective." <a href="index.html">Metrics</a> | <a href="about.html">About</a> | <a href="news.html">News</a> | - <a href="sources.html">Sources</a> | Tools | <a href="research.html">Research</a> <br>
tor-commits@lists.torproject.org
-
karsten＠torproject.org