[tor-commits] [metrics-web/master] Add and update redirects.
karsten at torproject.org
karsten at torproject.org
Wed Jan 20 08:35:46 UTC 2016
commit df2c34c9d9e903b96728c8e57dd81f8d7588954f
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date: Wed Jan 20 09:29:40 2016 +0100
Add and update redirects.
---
website/etc/web.xml | 134 +++-----------------
.../org/torproject/metrics/web/GraphsServlet.java | 21 ---
.../torproject/metrics/web/RedirectServlet.java | 65 ++++++++++
.../torproject/metrics/web/ResearchServlet.java | 21 ---
.../web/graphs/LegacyGraphsSubpagesServlet.java | 54 --------
.../metrics/web/research/ResearchDataServlet.java | 21 ---
.../web/research/ResearchFormatsServlet.java | 22 ----
.../web/research/ResearchPapersServlet.java | 22 ----
.../metrics/web/research/ResearchStatsServlet.java | 19 +--
.../metrics/web/research/ResearchToolsServlet.java | 22 ----
.../metrics/web/status/ConsensusHealthServlet.java | 22 ----
.../metrics/web/status/ExoneraTorServlet.java | 21 ---
.../metrics/web/status/RelaySearchServlet.java | 22 ----
website/web/WEB-INF/dir.jsp | 25 ----
website/web/WEB-INF/network.jsp | 39 ------
website/web/WEB-INF/performance.jsp | 37 ------
website/web/WEB-INF/stats.jsp | 39 ------
website/web/WEB-INF/users.jsp | 43 -------
website/web/robots.txt | 4 -
19 files changed, 86 insertions(+), 567 deletions(-)
diff --git a/website/etc/web.xml b/website/etc/web.xml
index 87dec8f..2081067 100644
--- a/website/etc/web.xml
+++ b/website/etc/web.xml
@@ -18,17 +18,6 @@
</servlet-mapping>
<servlet>
- <servlet-name>Graphs</servlet-name>
- <servlet-class>
- org.torproject.metrics.web.GraphsServlet
- </servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>Graphs</servlet-name>
- <url-pattern>/graphs.html</url-pattern>
- </servlet-mapping>
-
- <servlet>
<servlet-name>GraphsSubpages</servlet-name>
<servlet-class>
org.torproject.metrics.web.graphs.GraphsSubpagesServlet
@@ -73,19 +62,6 @@
</servlet-mapping>
<servlet>
- <servlet-name>LegacyGraphsSubpages</servlet-name>
- <servlet-class>
- org.torproject.metrics.web.graphs.LegacyGraphsSubpagesServlet
- </servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>LegacyGraphsSubpages</servlet-name>
- <url-pattern>/network.html</url-pattern>
- <url-pattern>/users.html</url-pattern>
- <url-pattern>/performance.html</url-pattern>
- </servlet-mapping>
-
- <servlet>
<servlet-name>Bubbles</servlet-name>
<servlet-class>
org.torproject.metrics.web.graphs.BubblesServlet
@@ -97,67 +73,6 @@
</servlet-mapping>
<servlet>
- <servlet-name>Research</servlet-name>
- <servlet-class>
- org.torproject.metrics.web.ResearchServlet
- </servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>Research</servlet-name>
- <url-pattern>/research.html</url-pattern>
- </servlet-mapping>
-
- <servlet>
- <servlet-name>ResearchData</servlet-name>
- <servlet-class>
- org.torproject.metrics.web.research.ResearchDataServlet
- </servlet-class>
- <init-param>
- <param-name>localDataDir</param-name>
- <param-value>
- /srv/metrics.torproject.org/db/data/
- </param-value>
- </init-param>
- </servlet>
- <servlet-mapping>
- <servlet-name>ResearchData</servlet-name>
- <url-pattern>/data.html</url-pattern>
- </servlet-mapping>
-
- <servlet>
- <servlet-name>ResearchPapers</servlet-name>
- <servlet-class>
- org.torproject.metrics.web.research.ResearchPapersServlet
- </servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>ResearchPapers</servlet-name>
- <url-pattern>/papers.html</url-pattern>
- </servlet-mapping>
-
- <servlet>
- <servlet-name>ResearchTools</servlet-name>
- <servlet-class>
- org.torproject.metrics.web.research.ResearchToolsServlet
- </servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>ResearchTools</servlet-name>
- <url-pattern>/tools.html</url-pattern>
- </servlet-mapping>
-
- <servlet>
- <servlet-name>ResearchFormats</servlet-name>
- <servlet-class>
- org.torproject.metrics.web.research.ResearchFormatsServlet
- </servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>ResearchFormats</servlet-name>
- <url-pattern>/formats.html</url-pattern>
- </servlet-mapping>
-
- <servlet>
<servlet-name>ResearchStats</servlet-name>
<servlet-class>
org.torproject.metrics.web.research.ResearchStatsServlet
@@ -172,18 +87,6 @@
<servlet-mapping>
<servlet-name>ResearchStats</servlet-name>
<url-pattern>/stats/*</url-pattern>
- <url-pattern>/stats.html</url-pattern>
- </servlet-mapping>
-
- <servlet>
- <servlet-name>RelaySearch</servlet-name>
- <servlet-class>
- org.torproject.metrics.web.status.RelaySearchServlet
- </servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>RelaySearch</servlet-name>
- <url-pattern>/relay-search.html</url-pattern>
</servlet-mapping>
<servlet>
@@ -263,36 +166,37 @@
</servlet-mapping>
<servlet>
- <servlet-name>ExoneraTor</servlet-name>
+ <servlet-name>AboutServlet</servlet-name>
<servlet-class>
- org.torproject.metrics.web.status.ExoneraTorServlet
+ org.torproject.metrics.web.AboutServlet
</servlet-class>
</servlet>
<servlet-mapping>
- <servlet-name>ExoneraTor</servlet-name>
- <url-pattern>/exonerator.html</url-pattern>
+ <servlet-name>AboutServlet</servlet-name>
+ <url-pattern>/about.html</url-pattern>
</servlet-mapping>
<servlet>
- <servlet-name>ConsensusHealthServlet</servlet-name>
+ <servlet-name>RedirectServlet</servlet-name>
<servlet-class>
- org.torproject.metrics.web.status.ConsensusHealthServlet
+ org.torproject.metrics.web.RedirectServlet
</servlet-class>
</servlet>
<servlet-mapping>
- <servlet-name>ConsensusHealthServlet</servlet-name>
+ <servlet-name>RedirectServlet</servlet-name>
<url-pattern>/consensus-health.html</url-pattern>
- </servlet-mapping>
-
- <servlet>
- <servlet-name>AboutServlet</servlet-name>
- <servlet-class>
- org.torproject.metrics.web.AboutServlet
- </servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>AboutServlet</servlet-name>
- <url-pattern>/about.html</url-pattern>
+ <url-pattern>/data.html</url-pattern>
+ <url-pattern>/exonerator.html</url-pattern>
+ <url-pattern>/formats.html</url-pattern>
+ <url-pattern>/graphs.html</url-pattern>
+ <url-pattern>/network.html</url-pattern>
+ <url-pattern>/papers.html</url-pattern>
+ <url-pattern>/performance.html</url-pattern>
+ <url-pattern>/relay-search.html</url-pattern>
+ <url-pattern>/research.html</url-pattern>
+ <url-pattern>/stats.html</url-pattern>
+ <url-pattern>/tools.html</url-pattern>
+ <url-pattern>/users.html</url-pattern>
</servlet-mapping>
<welcome-file-list>
diff --git a/website/src/org/torproject/metrics/web/GraphsServlet.java b/website/src/org/torproject/metrics/web/GraphsServlet.java
deleted file mode 100644
index 228a14a..0000000
--- a/website/src/org/torproject/metrics/web/GraphsServlet.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2011, 2012, 2014 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;
-
- at SuppressWarnings("serial")
-public class GraphsServlet extends HttpServlet {
-
- public void doGet(HttpServletRequest request,
- HttpServletResponse response) throws IOException, ServletException {
- response.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY);
- response.setHeader("Location", "https://metrics.torproject.org/");
- }
-}
-
diff --git a/website/src/org/torproject/metrics/web/RedirectServlet.java b/website/src/org/torproject/metrics/web/RedirectServlet.java
new file mode 100644
index 0000000..7c627d7
--- /dev/null
+++ b/website/src/org/torproject/metrics/web/RedirectServlet.java
@@ -0,0 +1,65 @@
+/* Copyright 2016 The Tor Project
+ * See LICENSE for licensing information */
+package org.torproject.metrics.web;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+ at SuppressWarnings("serial")
+public class RedirectServlet extends HttpServlet {
+
+ /* Available permanent internal and external redirects. */
+ private Map<String, String> redirects = new HashMap<String, String>();
+
+ public RedirectServlet() {
+
+ /* Internal redirects: */
+ this.redirects.put("/metrics/graphs.html",
+ "/?type=gr&level=bs&level=ad");
+ this.redirects.put("/metrics/network.html",
+ "/?tag=rl&tag=br&level=bs&level=ad");
+ this.redirects.put("/metrics/performance.html",
+ "/?tag=pf&level=bs&level=ad");
+ this.redirects.put("/metrics/stats.html",
+ "/?type=dt&level=bs&level=ad");
+ this.redirects.put("/metrics/users.html",
+ "/?tag=cl&level=bs&level=ad");
+
+ /* External redirects: */
+ this.redirects.put("/metrics/consensus-health.html",
+ "https://consensus-health.torproject.org/");
+ this.redirects.put("/metrics/data.html",
+ "https://collector.torproject.org/");
+ this.redirects.put("/metrics/exonerator.html",
+ "https://exonerator.torproject.org/");
+ this.redirects.put("/metrics/formats.html",
+ "https://collector.torproject.org/#data-formats");
+ this.redirects.put("/metrics/papers.html",
+ "https://research.torproject.org/techreports.html");
+ this.redirects.put("/metrics/relay-search.html",
+ "https://atlas.torproject.org/");
+ this.redirects.put("/metrics/research.html",
+ "https://research.torproject.org/");
+ this.redirects.put("/metrics/tools.html",
+ "https://collector.torproject.org/#related-work");
+ }
+
+ public void doGet(HttpServletRequest request,
+ HttpServletResponse response) throws IOException, ServletException {
+ String redirect = this.redirects.get(request.getRequestURI());
+ if (redirect == null) {
+ response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+ return;
+ } else {
+ response.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY);
+ response.setHeader("Location", redirect);
+ }
+ }
+}
+
diff --git a/website/src/org/torproject/metrics/web/ResearchServlet.java b/website/src/org/torproject/metrics/web/ResearchServlet.java
deleted file mode 100644
index 020d9c5..0000000
--- a/website/src/org/torproject/metrics/web/ResearchServlet.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2011--2014 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;
-
- at SuppressWarnings("serial")
-public class ResearchServlet extends HttpServlet {
-
- public void doGet(HttpServletRequest request,
- HttpServletResponse response) throws IOException, ServletException {
- response.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY);
- response.setHeader("Location", "https://research.torproject.org/");
- }
-}
-
diff --git a/website/src/org/torproject/metrics/web/graphs/LegacyGraphsSubpagesServlet.java b/website/src/org/torproject/metrics/web/graphs/LegacyGraphsSubpagesServlet.java
deleted file mode 100644
index 1fd1333..0000000
--- a/website/src/org/torproject/metrics/web/graphs/LegacyGraphsSubpagesServlet.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Copyright 2014 The Tor Project
- * See LICENSE for licensing information */
-package org.torproject.metrics.web.graphs;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
- at SuppressWarnings("serial")
-public class LegacyGraphsSubpagesServlet extends HttpServlet {
-
- /* Available graphs subpages with corresponding JSP to which requests
- * are forwarded. */
- private Map<String, String> availableGraphsSubpages;
-
- public LegacyGraphsSubpagesServlet() {
- this.availableGraphsSubpages = new HashMap<String, String>();
- this.availableGraphsSubpages.put("network.html",
- "WEB-INF/network.jsp");
- this.availableGraphsSubpages.put("users.html", "WEB-INF/users.jsp");
- this.availableGraphsSubpages.put("performance.html",
- "WEB-INF/performance.jsp");
- }
-
- public void doGet(HttpServletRequest request,
- HttpServletResponse response) throws IOException, ServletException {
-
- /* Find out which graph subpage was requested and look up which JSP
- * handles this subpage. */
- String requestedPage = request.getRequestURI();
- if (requestedPage == null) {
- response.sendError(HttpServletResponse.SC_BAD_REQUEST);
- return;
- }
- if (requestedPage.contains("/")) {
- requestedPage = requestedPage.substring(requestedPage.
- lastIndexOf("/") + 1);
- }
- if (!availableGraphsSubpages.containsKey(requestedPage)) {
- response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
- return;
- }
- String jsp = availableGraphsSubpages.get(requestedPage);
-
- /* Forward the request to the JSP that does all the hard work. */
- request.getRequestDispatcher(jsp).forward(request, response);
- }
-}
-
diff --git a/website/src/org/torproject/metrics/web/research/ResearchDataServlet.java b/website/src/org/torproject/metrics/web/research/ResearchDataServlet.java
deleted file mode 100644
index 578d052..0000000
--- a/website/src/org/torproject/metrics/web/research/ResearchDataServlet.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2011--2014 The Tor Project
- * See LICENSE for licensing information */
-package org.torproject.metrics.web.research;
-
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
- at SuppressWarnings("serial")
-public class ResearchDataServlet extends HttpServlet {
-
- public void doGet(HttpServletRequest request,
- HttpServletResponse response) throws IOException, ServletException {
- response.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY);
- response.setHeader("Location", "https://collector.torproject.org/");
- }
-}
-
diff --git a/website/src/org/torproject/metrics/web/research/ResearchFormatsServlet.java b/website/src/org/torproject/metrics/web/research/ResearchFormatsServlet.java
deleted file mode 100644
index 95ce1bb..0000000
--- a/website/src/org/torproject/metrics/web/research/ResearchFormatsServlet.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2011--2014 The Tor Project
- * See LICENSE for licensing information */
-package org.torproject.metrics.web.research;
-
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
- at SuppressWarnings("serial")
-public class ResearchFormatsServlet extends HttpServlet {
-
- public void doGet(HttpServletRequest request,
- HttpServletResponse response) throws IOException, ServletException {
- response.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY);
- response.setHeader("Location",
- "https://collector.torproject.org/formats.html");
- }
-}
-
diff --git a/website/src/org/torproject/metrics/web/research/ResearchPapersServlet.java b/website/src/org/torproject/metrics/web/research/ResearchPapersServlet.java
deleted file mode 100644
index 2aaa14a..0000000
--- a/website/src/org/torproject/metrics/web/research/ResearchPapersServlet.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2011--2014 The Tor Project
- * See LICENSE for licensing information */
-package org.torproject.metrics.web.research;
-
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
- at SuppressWarnings("serial")
-public class ResearchPapersServlet extends HttpServlet {
-
- public void doGet(HttpServletRequest request,
- HttpServletResponse response) throws IOException, ServletException {
- response.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY);
- response.setHeader("Location",
- "https://research.torproject.org/techreports.html");
- }
-}
-
diff --git a/website/src/org/torproject/metrics/web/research/ResearchStatsServlet.java b/website/src/org/torproject/metrics/web/research/ResearchStatsServlet.java
index 6504ee0..1e045c1 100644
--- a/website/src/org/torproject/metrics/web/research/ResearchStatsServlet.java
+++ b/website/src/org/torproject/metrics/web/research/ResearchStatsServlet.java
@@ -52,8 +52,6 @@ public class ResearchStatsServlet extends HttpServlet {
String requestURI = request.getRequestURI();
if (requestURI.equals("/metrics/stats/")) {
this.writeDirectoryListing(request, response);
- } else if (requestURI.equals("/metrics/stats.html")) {
- this.writeStatisticsPage(request, response);
} else {
File statsFile = this.determineStatsFile(request);
if (statsFile == null) {
@@ -67,25 +65,12 @@ public class ResearchStatsServlet extends HttpServlet {
private void writeDirectoryListing(HttpServletRequest request,
HttpServletResponse response) throws IOException, ServletException {
- request.setAttribute("directory", "/stats");
- request.setAttribute("extension", ".csv");
- request.setAttribute("files", this.availableStatisticsFiles);
- request.getRequestDispatcher("/WEB-INF/dir.jsp").forward(request,
- response);
- }
-
- private void writeStatisticsPage(HttpServletRequest request,
- HttpServletResponse response) throws IOException, ServletException {
- request.getRequestDispatcher("/WEB-INF/stats.jsp").forward(request,
- response);
+ response.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY);
+ response.setHeader("Location", "/?type=dt&level=ad");
}
private File determineStatsFile(HttpServletRequest request) {
String requestedStatsFile = request.getRequestURI();
- if (requestedStatsFile.equals("/metrics/stats/") ||
- requestedStatsFile.equals("/metrics/stats.html")) {
- return null;
- }
if (requestedStatsFile.endsWith(".csv")) {
requestedStatsFile = requestedStatsFile.substring(0,
requestedStatsFile.length() - ".csv".length());
diff --git a/website/src/org/torproject/metrics/web/research/ResearchToolsServlet.java b/website/src/org/torproject/metrics/web/research/ResearchToolsServlet.java
deleted file mode 100644
index 45346c5..0000000
--- a/website/src/org/torproject/metrics/web/research/ResearchToolsServlet.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2011--2014 The Tor Project
- * See LICENSE for licensing information */
-package org.torproject.metrics.web.research;
-
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
- at SuppressWarnings("serial")
-public class ResearchToolsServlet extends HttpServlet {
-
- public void doGet(HttpServletRequest request,
- HttpServletResponse response) throws IOException, ServletException {
- response.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY);
- response.setHeader("Location",
- "https://collector.torproject.org/#references");
- }
-}
-
diff --git a/website/src/org/torproject/metrics/web/status/ConsensusHealthServlet.java b/website/src/org/torproject/metrics/web/status/ConsensusHealthServlet.java
deleted file mode 100644
index fea0c91..0000000
--- a/website/src/org/torproject/metrics/web/status/ConsensusHealthServlet.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2011--2014 The Tor Project
- * See LICENSE for licensing information */
-package org.torproject.metrics.web.status;
-
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
- at SuppressWarnings("serial")
-public class ConsensusHealthServlet extends HttpServlet {
-
- public void doGet(HttpServletRequest request,
- HttpServletResponse response) throws IOException, ServletException {
- response.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY);
- response.setHeader("Location",
- "https://consensus-health.torproject.org");
- }
-}
-
diff --git a/website/src/org/torproject/metrics/web/status/ExoneraTorServlet.java b/website/src/org/torproject/metrics/web/status/ExoneraTorServlet.java
deleted file mode 100644
index fdcb177..0000000
--- a/website/src/org/torproject/metrics/web/status/ExoneraTorServlet.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2011--2014 The Tor Project
- * See LICENSE for licensing information */
-package org.torproject.metrics.web.status;
-
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
- at SuppressWarnings("serial")
-public class ExoneraTorServlet extends HttpServlet {
-
- public void doGet(HttpServletRequest request,
- HttpServletResponse response) throws IOException, ServletException {
- response.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY);
- response.setHeader("Location", "https://exonerator.torproject.org");
- }
-}
-
diff --git a/website/src/org/torproject/metrics/web/status/RelaySearchServlet.java b/website/src/org/torproject/metrics/web/status/RelaySearchServlet.java
deleted file mode 100644
index d3b189b..0000000
--- a/website/src/org/torproject/metrics/web/status/RelaySearchServlet.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2011--2014 The Tor Project
- * See LICENSE for licensing information */
-package org.torproject.metrics.web.status;
-
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
- at SuppressWarnings("serial")
-public class RelaySearchServlet extends HttpServlet {
-
- public void doGet(HttpServletRequest request,
- HttpServletResponse response) throws IOException,
- ServletException {
- response.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY);
- response.setHeader("Location", "https://atlas.torproject.org");
- }
-}
-
diff --git a/website/web/WEB-INF/dir.jsp b/website/web/WEB-INF/dir.jsp
deleted file mode 100644
index 4c7a20d..0000000
--- a/website/web/WEB-INF/dir.jsp
+++ /dev/null
@@ -1,25 +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 — Index of ${directory}</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><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Index of ${directory}</h2>
- <br>
- <c:forEach var="file" items="${files}" >
- <a href="${directory}/${file}${extension}">${file}${extension}</a><br>
- </c:forEach>
- </div>
- </div>
- <div class="bottom" id="bottom">
- <%@ include file="footer.jsp"%>
- </div>
-</body>
-</html>
diff --git a/website/web/WEB-INF/network.jsp b/website/web/WEB-INF/network.jsp
deleted file mode 100644
index 99d11f9..0000000
--- a/website/web/WEB-INF/network.jsp
+++ /dev/null
@@ -1,39 +0,0 @@
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
- <title>Tor Metrics — Servers</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><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Servers</h2>
-<br>
-
-<p>The graphs on this page have moved to their own subpages.
-This is part of an effort to make navigation on this website more intuitive.
-In the future, this page will go away, and all graphs/tables can be searched more easily from the start page.
-Sorry for any inconvenience caused by this.</p>
-
-<ul>
-<li><a href="networksize.html">Graph: Relays and bridges in the network</a></li>
-<li><a href="relayflags.html">Graph: Relays with Exit, Fast, Guard, Stable, and HSDir flags</a></li>
-<li><a href="versions.html">Graph: Relays by version</a></li>
-<li><a href="platforms.html">Graph: Relays by platform</a></li>
-<li><a href="cloudbridges.html">Graph: Tor Cloud bridges</a></li>
-<li><a href="servers-data.html">Data: Number of relays and bridges</a></li>
-</ul>
-
- </div>
- </div>
- <div class="bottom" id="bottom">
- <%@ include file="footer.jsp"%>
- </div>
-</body>
-</html>
diff --git a/website/web/WEB-INF/performance.jsp b/website/web/WEB-INF/performance.jsp
deleted file mode 100644
index 4ab0fb3..0000000
--- a/website/web/WEB-INF/performance.jsp
+++ /dev/null
@@ -1,37 +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 — Performance</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><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Performance</h2>
-<br>
-<p>The graphs on this page have moved to their own subpages.
-This is part of an effort to make navigation on this website more intuitive.
-In the future, this page will go away, and all graphs/tables can be searched more easily from the start page.
-Sorry for any inconvenience caused by this.</p>
-
-<ul>
-<li><a href="torperf.html">Graph: Time to download files over Tor</a></li>
-<li><a href="torperf-failures.html">Graph: Timeouts and failures of downloading files over Tor</a></li>
-<li><a href="connbidirect.html">Graph: Fraction of connections used uni-/bidirectionally</a></li>
-<li><a href="torperf-data.html">Data: Performance of downloading static files over Tor</a></li>
-<li><a href="connbidirect2-data.html">Data: Fraction of connections used uni-/bidirectionally</a></li>
-</ul>
-
- </div>
- </div>
- <div class="bottom" id="bottom">
- <%@ include file="footer.jsp"%>
- </div>
-</body>
-</html>
diff --git a/website/web/WEB-INF/stats.jsp b/website/web/WEB-INF/stats.jsp
deleted file mode 100644
index 3e5026a..0000000
--- a/website/web/WEB-INF/stats.jsp
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
- <title>Tor Metrics — Statistics</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><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Statistics</h2>
-<br>
-<p>The data file specifications on this page have moved to their own subpages.
-This is part of an effort to make navigation on this website more intuitive.
-In the future, this page will go away, and all data files can be searched more easily from the start page.
-Sorry for any inconvenience caused by this.</p>
-
-<ul>
-<li><a href="servers-data.html">Data: Number of relays and bridges</a></li>
-<li><a href="bandwidth-data.html">Data: Bandwidth provided and consumed by relays</a></li>
-<li><a href="advbwdist-data.html">Data: Advertised bandwidth distribution and n-th fastest relays</a></li>
-<li><a href="clients-data.html">Data: Estimated number of clients in the Tor network</a></li>
-<li><a href="torperf-data.html">Data: Performance of downloading static files over Tor</a></li>
-<li><a href="connbidirect2-data.html">Data: Fraction of connections used uni-/bidirectionally</a></li>
-</ul>
-
- </div>
- </div>
- <div class="bottom" id="bottom">
- <%@ include file="footer.jsp"%>
- </div>
-</body>
-</html>
-</body>
-</html>
-
diff --git a/website/web/WEB-INF/users.jsp b/website/web/WEB-INF/users.jsp
deleted file mode 100644
index 25e8f02..0000000
--- a/website/web/WEB-INF/users.jsp
+++ /dev/null
@@ -1,43 +0,0 @@
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
- <title>Tor Metrics — Users</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><a href="/"><img src="/images/metrics-wordmark-small.png" width="138" height="18" alt="Metrics wordmark"></a> — Users</h2>
-<br>
-
-<p>The graphs and tables on this page have moved to their own subpages.
-This is part of an effort to make navigation on this website more intuitive.
-In the future, this page will go away, and all graphs/tables can be searched more easily from the start page.
-Sorry for any inconvenience caused by this.</p>
-
-<ul>
-<li><a href="userstats-relay-country.html">Graph: Direct users by country</a></li>
-<li><a href="userstats-relay-table.html">Table: Top-10 countries by directly connecting users</a></li>
-<li><a href="userstats-censorship-events.html">Table: Top-10 countries by possible censorship events</a></li>
-<li><a href="userstats-bridge-country.html">Graph: Bridge users by country</a></li>
-<li><a href="userstats-bridge-table.html">Table: Top-10 countries by bridge users</a></li>
-<li><a href="userstats-bridge-transport.html">Graph: Bridge users by transport</a></li>
-<li><a href="userstats-bridge-version.html">Graph: Bridge users by IP version</a></li>
-<li><a href="oxford-anonymous-internet.html">Link: Tor users as percentage of larger Internet population</a></li>
-<li><a href="clients-data.html">Data: Estimated number of clients in the Tor network</a></li>
-</ul>
-
- </div>
- </div>
- <div class="bottom" id="bottom">
- <%@ include file="footer.jsp"%>
- </div>
-</body>
-</html>
diff --git a/website/web/robots.txt b/website/web/robots.txt
deleted file mode 100644
index 99c6c29..0000000
--- a/website/web/robots.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-User-agent: *
-Disallow: /relay.html
-Disallow: /csv/
-
More information about the tor-commits
mailing list