December 2017 - tor-commits - lists.torproject.org

[metrics-web/master] Use commons-lang3 instead of commons-lang.
by karsten＠torproject.org 20 Dec '17

20 Dec '17

commit a5cb73891e6e2d9f9f1b8a8057a97a7372dad8fb Author: iwakeh <iwakeh(a)torproject.org> Date: Mon Dec 4 11:14:39 2017 +0000 Use commons-lang3 instead of commons-lang. --- src/main/java/org/torproject/metrics/web/TableServlet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/metrics/web/TableServlet.java b/src/main/java/org/torproject/metrics/web/TableServlet.java index d8ffbb1..650921a 100644 --- a/src/main/java/org/torproject/metrics/web/TableServlet.java +++ b/src/main/java/org/torproject/metrics/web/TableServlet.java @@ -6,7 +6,7 @@ package org.torproject.metrics.web; import org.torproject.metrics.web.graphs.RObjectGenerator; import org.torproject.metrics.web.graphs.TableParameterChecker; -import org.apache.commons.lang.text.StrSubstitutor; +import org.apache.commons.lang3.text.StrSubstitutor; import java.io.IOException; import java.text.SimpleDateFormat;

1 0

[metrics-web/master] Add ant task for war creation.
by karsten＠torproject.org 20 Dec '17

20 Dec '17

commit 32003c6e66b6f1169620fa2827360f3fabf0ebd5 Author: iwakeh <iwakeh(a)torproject.org> Date: Mon Dec 4 11:14:36 2017 +0000 Add ant task for war creation. Also move all website related java sources to main src folder. --- build.xml | 77 ++++++++++++++++++++++ .../org/torproject/metrics/web/AboutServlet.java | 0 .../org/torproject/metrics/web/AnyServlet.java | 0 .../java/org/torproject/metrics/web/Category.java | 0 .../torproject/metrics/web/CollecTorServlet.java | 0 .../metrics/web/CollectorDirectoryProvider.java | 0 .../torproject/metrics/web/ContentProvider.java | 0 .../torproject/metrics/web/DataSourceServlet.java | 0 .../torproject/metrics/web/DevelopmentServlet.java | 0 .../torproject/metrics/web/DirectoryListing.java | 0 .../org/torproject/metrics/web/ErrorServlet.java | 0 .../torproject/metrics/web/GlossaryServlet.java | 0 .../org/torproject/metrics/web/GraphServlet.java | 0 .../org/torproject/metrics/web/IndexServlet.java | 0 .../org/torproject/metrics/web/LinkServlet.java | 0 .../java/org/torproject/metrics/web/Metric.java | 0 .../org/torproject/metrics/web/MetricServlet.java | 0 .../torproject/metrics/web/MetricsLibServlet.java | 0 .../main/java/org/torproject/metrics/web/News.java | 0 .../org/torproject/metrics/web/NewsServlet.java | 0 .../org/torproject/metrics/web/OnionooServlet.java | 0 .../torproject/metrics/web/OperationServlet.java | 0 .../torproject/metrics/web/ResearchServlet.java | 0 .../torproject/metrics/web/ServicesServlet.java | 0 .../org/torproject/metrics/web/SourcesServlet.java | 0 .../org/torproject/metrics/web/StatsServlet.java | 0 .../org/torproject/metrics/web/TableServlet.java | 0 .../metrics/web/graphs/BubblesServlet.java | 0 .../torproject/metrics/web/graphs/Countries.java | 0 .../metrics/web/graphs/GraphImageServlet.java | 0 .../metrics/web/graphs/GraphParameterChecker.java | 0 .../org/torproject/metrics/web/graphs/RObject.java | 0 .../metrics/web/graphs/RObjectGenerator.java | 0 .../metrics/web/graphs/TableParameterChecker.java | 0 .../metrics/web/research/ResearchStatsServlet.java | 0 .../metrics/web/DirectoryListingTest.java | 0 36 files changed, 77 insertions(+) diff --git a/build.xml b/build.xml index 7bab38c..fbfa111 100644 --- a/build.xml +++ b/build.xml @@ -91,6 +91,83 @@ <patternset refid="web" /> </patternset> +  + <target name="war" + depends="submoduleupdate,compile"> + <echo message="Removing problematic service definitions from"/> + <echo message="${libs}/jetty9-apache-jsp${jetty.version}.jar and using "/> + <echo message="${libs}/jetty9-apache-jsp${jetty.version}-tweaked.jar below." /> + <delete file="${libs}/jetty9-apache-jsp${jetty.version}-tweaked.jar" + quiet="true" /> + + <jar destfile="${libs}/jetty9-apache-jsp${jetty.version}-tweaked.jar"> + <zipfileset src="${libs}/jetty9-apache-jsp${jetty.version}.jar" > + <exclude name="**/javax.servlet.ServletContainerInitializer"/> + </zipfileset> + </jar> + + <antcall target="generate-ml-javadoc" /> + + <war destfile="${dist}/${warfile}" + duplicate="fail" + webxml="${resources}/web.xml" + basedir="${classes}"> + <restrict> + <not> + <and> + <name name="META-INF/*" /> + <not> + <name name="META-INF/services/*" /> + </not> + </and> + </not> + <archives> + <zips> + <fileset dir="${libs}"> + <patternset refid="common" /> + <patternset refid="web" /> + <patternset refid="webruntime" /> + </fileset> + </zips> + </archives> + </restrict> + <exclude name="**/Test*.class" /> + <zipfileset dir="${resources}" + prefix="" + includes="logback.xml" /> + <zipfileset dir="${resources}/web" + prefix="" + includes="css/* images/* js/* fonts/**" /> + <zipfileset dir="${resources}/web/jsps" + prefix="WEB-INF" + includes="*.jsp"/> + <zipfileset dir="${resources}" + includes="*.properties" /> + <fileset dir="${resources}" includes="jetty.xml" /> + + <zipfileset dir="${resources}/web/json" + prefix="WEB-INF/json" + includes="metrics.json categories.json news.json"/> + + <zipfileset dir="${basedir}/src/submods/metrics-lib/generated/javadoc" + prefix="metrics-lib" /> + <zipfileset dir="${libs}" prefix="WEB-INF/lib" > + <include name="taglibs-standard-impl-1.2.5.jar"/> + </zipfileset> + + <metainf dir="${resources}" + includes="context.xml"/> + <manifest> + <attribute name="Implemented-By" value="The Tor Project" /> + <attribute name="Implementation-Title" value="TorMetricsWeb Server"/> + <attribute name="Implementation-Version" + value="${release.version}-${git.revision}"/> + <attribute name="Main-Class" + value="org.torproject.metrics.web.ServerMain" /> + </manifest> + </war> + </target> + <target name="generate-ml-javadoc" depends="submoduleupdate" > <mkdir dir="${basedir}/src/submods/metrics-lib/lib" /> <exec executable="ant" diff --git a/website/src/main/java/org/torproject/metrics/web/AboutServlet.java b/src/main/java/org/torproject/metrics/web/AboutServlet.java similarity index 100% rename from website/src/main/java/org/torproject/metrics/web/AboutServlet.java rename to src/main/java/org/torproject/metrics/web/AboutServlet.java diff --git a/website/src/main/java/org/torproject/metrics/web/AnyServlet.java b/src/main/java/org/torproject/metrics/web/AnyServlet.java similarity index 100% rename from website/src/main/java/org/torproject/metrics/web/AnyServlet.java rename to src/main/java/org/torproject/metrics/web/AnyServlet.java diff --git a/website/src/main/java/org/torproject/metrics/web/Category.java b/src/main/java/org/torproject/metrics/web/Category.java similarity index 100% rename from website/src/main/java/org/torproject/metrics/web/Category.java rename to src/main/java/org/torproject/metrics/web/Category.java diff --git a/website/src/main/java/org/torproject/metrics/web/CollecTorServlet.java b/src/main/java/org/torproject/metrics/web/CollecTorServlet.java similarity index 100% rename from website/src/main/java/org/torproject/metrics/web/CollecTorServlet.java rename to src/main/java/org/torproject/metrics/web/CollecTorServlet.java diff --git a/website/src/main/java/org/torproject/metrics/web/CollectorDirectoryProvider.java b/src/main/java/org/torproject/metrics/web/CollectorDirectoryProvider.java similarity index 100% rename from website/src/main/java/org/torproject/metrics/web/CollectorDirectoryProvider.java rename to src/main/java/org/torproject/metrics/web/CollectorDirectoryProvider.java diff --git a/website/src/main/java/org/torproject/metrics/web/ContentProvider.java b/src/main/java/org/torproject/metrics/web/ContentProvider.java similarity index 100% rename from website/src/main/java/org/torproject/metrics/web/ContentProvider.java rename to src/main/java/org/torproject/metrics/web/ContentProvider.java diff --git a/website/src/main/java/org/torproject/metrics/web/DataSourceServlet.java b/src/main/java/org/torproject/metrics/web/DataSourceServlet.java similarity index 100% rename from website/src/main/java/org/torproject/metrics/web/DataSourceServlet.java rename to src/main/java/org/torproject/metrics/web/DataSourceServlet.java diff --git a/website/src/main/java/org/torproject/metrics/web/DevelopmentServlet.java b/src/main/java/org/torproject/metrics/web/DevelopmentServlet.java similarity index 100% rename from website/src/main/java/org/torproject/metrics/web/DevelopmentServlet.java rename to src/main/java/org/torproject/metrics/web/DevelopmentServlet.java diff --git a/website/src/main/java/org/torproject/metrics/web/DirectoryListing.java b/src/main/java/org/torproject/metrics/web/DirectoryListing.java similarity index 100% rename from website/src/main/java/org/torproject/metrics/web/DirectoryListing.java rename to src/main/java/org/torproject/metrics/web/DirectoryListing.java diff --git a/website/src/main/java/org/torproject/metrics/web/ErrorServlet.java b/src/main/java/org/torproject/metrics/web/ErrorServlet.java similarity index 100% rename from website/src/main/java/org/torproject/metrics/web/ErrorServlet.java rename to src/main/java/org/torproject/metrics/web/ErrorServlet.java diff --git a/website/src/main/java/org/torproject/metrics/web/GlossaryServlet.java b/src/main/java/org/torproject/metrics/web/GlossaryServlet.java similarity index 100% rename from website/src/main/java/org/torproject/metrics/web/GlossaryServlet.java rename to src/main/java/org/torproject/metrics/web/GlossaryServlet.java diff --git a/website/src/main/java/org/torproject/metrics/web/GraphServlet.java b/src/main/java/org/torproject/metrics/web/GraphServlet.java similarity index 100% rename from website/src/main/java/org/torproject/metrics/web/GraphServlet.java rename to src/main/java/org/torproject/metrics/web/GraphServlet.java diff --git a/website/src/main/java/org/torproject/metrics/web/IndexServlet.java b/src/main/java/org/torproject/metrics/web/IndexServlet.java similarity index 100% rename from website/src/main/java/org/torproject/metrics/web/IndexServlet.java rename to src/main/java/org/torproject/metrics/web/IndexServlet.java diff --git a/website/src/main/java/org/torproject/metrics/web/LinkServlet.java b/src/main/java/org/torproject/metrics/web/LinkServlet.java similarity index 100% rename from website/src/main/java/org/torproject/metrics/web/LinkServlet.java rename to src/main/java/org/torproject/metrics/web/LinkServlet.java diff --git a/website/src/main/java/org/torproject/metrics/web/Metric.java b/src/main/java/org/torproject/metrics/web/Metric.java similarity index 100% rename from website/src/main/java/org/torproject/metrics/web/Metric.java rename to src/main/java/org/torproject/metrics/web/Metric.java diff --git a/website/src/main/java/org/torproject/metrics/web/MetricServlet.java b/src/main/java/org/torproject/metrics/web/MetricServlet.java similarity index 100% rename from website/src/main/java/org/torproject/metrics/web/MetricServlet.java rename to src/main/java/org/torproject/metrics/web/MetricServlet.java diff --git a/website/src/main/java/org/torproject/metrics/web/MetricsLibServlet.java b/src/main/java/org/torproject/metrics/web/MetricsLibServlet.java similarity index 100% rename from website/src/main/java/org/torproject/metrics/web/MetricsLibServlet.java rename to src/main/java/org/torproject/metrics/web/MetricsLibServlet.java diff --git a/website/src/main/java/org/torproject/metrics/web/News.java b/src/main/java/org/torproject/metrics/web/News.java similarity index 100% rename from website/src/main/java/org/torproject/metrics/web/News.java rename to src/main/java/org/torproject/metrics/web/News.java diff --git a/website/src/main/java/org/torproject/metrics/web/NewsServlet.java b/src/main/java/org/torproject/metrics/web/NewsServlet.java similarity index 100% rename from website/src/main/java/org/torproject/metrics/web/NewsServlet.java rename to src/main/java/org/torproject/metrics/web/NewsServlet.java diff --git a/website/src/main/java/org/torproject/metrics/web/OnionooServlet.java b/src/main/java/org/torproject/metrics/web/OnionooServlet.java similarity index 100% rename from website/src/main/java/org/torproject/metrics/web/OnionooServlet.java rename to src/main/java/org/torproject/metrics/web/OnionooServlet.java diff --git a/website/src/main/java/org/torproject/metrics/web/OperationServlet.java b/src/main/java/org/torproject/metrics/web/OperationServlet.java similarity index 100% rename from website/src/main/java/org/torproject/metrics/web/OperationServlet.java rename to src/main/java/org/torproject/metrics/web/OperationServlet.java diff --git a/website/src/main/java/org/torproject/metrics/web/ResearchServlet.java b/src/main/java/org/torproject/metrics/web/ResearchServlet.java similarity index 100% rename from website/src/main/java/org/torproject/metrics/web/ResearchServlet.java rename to src/main/java/org/torproject/metrics/web/ResearchServlet.java diff --git a/website/src/main/java/org/torproject/metrics/web/ServicesServlet.java b/src/main/java/org/torproject/metrics/web/ServicesServlet.java similarity index 100% rename from website/src/main/java/org/torproject/metrics/web/ServicesServlet.java rename to src/main/java/org/torproject/metrics/web/ServicesServlet.java diff --git a/website/src/main/java/org/torproject/metrics/web/SourcesServlet.java b/src/main/java/org/torproject/metrics/web/SourcesServlet.java similarity index 100% rename from website/src/main/java/org/torproject/metrics/web/SourcesServlet.java rename to src/main/java/org/torproject/metrics/web/SourcesServlet.java diff --git a/website/src/main/java/org/torproject/metrics/web/StatsServlet.java b/src/main/java/org/torproject/metrics/web/StatsServlet.java similarity index 100% rename from website/src/main/java/org/torproject/metrics/web/StatsServlet.java rename to src/main/java/org/torproject/metrics/web/StatsServlet.java diff --git a/website/src/main/java/org/torproject/metrics/web/TableServlet.java b/src/main/java/org/torproject/metrics/web/TableServlet.java similarity index 100% rename from website/src/main/java/org/torproject/metrics/web/TableServlet.java rename to src/main/java/org/torproject/metrics/web/TableServlet.java diff --git a/website/src/main/java/org/torproject/metrics/web/graphs/BubblesServlet.java b/src/main/java/org/torproject/metrics/web/graphs/BubblesServlet.java similarity index 100% rename from website/src/main/java/org/torproject/metrics/web/graphs/BubblesServlet.java rename to src/main/java/org/torproject/metrics/web/graphs/BubblesServlet.java diff --git a/website/src/main/java/org/torproject/metrics/web/graphs/Countries.java b/src/main/java/org/torproject/metrics/web/graphs/Countries.java similarity index 100% rename from website/src/main/java/org/torproject/metrics/web/graphs/Countries.java rename to src/main/java/org/torproject/metrics/web/graphs/Countries.java diff --git a/website/src/main/java/org/torproject/metrics/web/graphs/GraphImageServlet.java b/src/main/java/org/torproject/metrics/web/graphs/GraphImageServlet.java similarity index 100% rename from website/src/main/java/org/torproject/metrics/web/graphs/GraphImageServlet.java rename to src/main/java/org/torproject/metrics/web/graphs/GraphImageServlet.java diff --git a/website/src/main/java/org/torproject/metrics/web/graphs/GraphParameterChecker.java b/src/main/java/org/torproject/metrics/web/graphs/GraphParameterChecker.java similarity index 100% rename from website/src/main/java/org/torproject/metrics/web/graphs/GraphParameterChecker.java rename to src/main/java/org/torproject/metrics/web/graphs/GraphParameterChecker.java diff --git a/website/src/main/java/org/torproject/metrics/web/graphs/RObject.java b/src/main/java/org/torproject/metrics/web/graphs/RObject.java similarity index 100% rename from website/src/main/java/org/torproject/metrics/web/graphs/RObject.java rename to src/main/java/org/torproject/metrics/web/graphs/RObject.java diff --git a/website/src/main/java/org/torproject/metrics/web/graphs/RObjectGenerator.java b/src/main/java/org/torproject/metrics/web/graphs/RObjectGenerator.java similarity index 100% rename from website/src/main/java/org/torproject/metrics/web/graphs/RObjectGenerator.java rename to src/main/java/org/torproject/metrics/web/graphs/RObjectGenerator.java diff --git a/website/src/main/java/org/torproject/metrics/web/graphs/TableParameterChecker.java b/src/main/java/org/torproject/metrics/web/graphs/TableParameterChecker.java similarity index 100% rename from website/src/main/java/org/torproject/metrics/web/graphs/TableParameterChecker.java rename to src/main/java/org/torproject/metrics/web/graphs/TableParameterChecker.java diff --git a/website/src/main/java/org/torproject/metrics/web/research/ResearchStatsServlet.java b/src/main/java/org/torproject/metrics/web/research/ResearchStatsServlet.java similarity index 100% rename from website/src/main/java/org/torproject/metrics/web/research/ResearchStatsServlet.java rename to src/main/java/org/torproject/metrics/web/research/ResearchStatsServlet.java diff --git a/website/src/test/java/org/torproject/metrics/web/DirectoryListingTest.java b/src/test/java/org/torproject/metrics/web/DirectoryListingTest.java similarity index 100% rename from website/src/test/java/org/torproject/metrics/web/DirectoryListingTest.java rename to src/test/java/org/torproject/metrics/web/DirectoryListingTest.java

1 0

[metrics-web/master] Add main class for web server using an embedded jetty.
by karsten＠torproject.org 20 Dec '17

20 Dec '17

commit 811e621bab4b162e7c9007fb1a1de0f45533720c Author: iwakeh <iwakeh(a)torproject.org> Date: Mon Dec 4 11:14:41 2017 +0000 Add main class for web server using an embedded jetty. --- .../org/torproject/metrics/web/ServerMain.java | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/src/main/java/org/torproject/metrics/web/ServerMain.java b/src/main/java/org/torproject/metrics/web/ServerMain.java new file mode 100644 index 0000000..882ab80 --- /dev/null +++ b/src/main/java/org/torproject/metrics/web/ServerMain.java @@ -0,0 +1,32 @@ +/* Copyright 2017 The Tor Project + * See LICENSE for licensing information */ + +package org.torproject.metrics.web; + +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.util.resource.Resource; +import org.eclipse.jetty.xml.XmlConfiguration; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class ServerMain { + + private static final Logger log = LoggerFactory.getLogger(ServerMain.class); + + /** Starts the web server listening for incoming client connections. */ + public static void main(String[] args) { + try { + Resource jettyXml = Resource.newSystemResource("jetty.xml"); + log.info("Reading configuration from '{}'.", jettyXml); + XmlConfiguration configuration + = new XmlConfiguration(jettyXml.getInputStream()); + Server server = (Server) configuration.configure(); + server.start(); + server.join(); + } catch (Exception ex) { + log.error("Exiting, because of: {}.", ex.getMessage(), ex); + System.exit(1); + } + } +} +

1 0

[metrics-web/master] Make paths absolute and add concluding echo messages to helper tasks.
by karsten＠torproject.org 20 Dec '17

20 Dec '17

commit 940e00cc754f32721c04622081c7a924ba7d402e Author: iwakeh <iwakeh(a)torproject.org> Date: Mon Dec 4 11:14:53 2017 +0000 Make paths absolute and add concluding echo messages to helper tasks. --- build.xml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/build.xml b/build.xml index eaf8a3d..941cfc2 100644 --- a/build.xml +++ b/build.xml @@ -322,8 +322,8 @@ <param name="module.Rscript" value="merge-clients.R" /> </antcall> - <copy file="clients.csv" todir="${statsdir}" /> - <copy file="userstats-combined.csv" todir="${statsdir}" /> + <copy file="${localmoddir}/clients.csv" todir="${statsdir}" /> + <copy file="${localmoddir}/userstats-combined.csv" todir="${statsdir}" /> <antcall target="run-R" > <param name="module.Rscript" value="split-clients.R" /> @@ -350,7 +350,7 @@ <arg value="--no-save" /> <arg value="--quiet" /> <arg value="--RS-conf" /> - <arg value="Rserv.conf" /> + <arg value="${Rsources}/Rserv.conf" /> </exec> </target> @@ -397,6 +397,7 @@ <jvmarg value="-Duser.language=us" /> <jvmarg value="-Duser.region=US" /> </java> + <echo message="Java module ${module.name} finished. " /> </target> <target name="run-R" > @@ -410,6 +411,7 @@ <arg value="-f"/> <arg value="${Rscript}" /> </exec> + <echo message="R module ${module.name}, script ${module.Rscript} finished. " /> </target> <!-- The following line adds the common targets and properties

1 0

[metrics-web/master] Remove checkstyle complaints.
by karsten＠torproject.org 20 Dec '17

20 Dec '17

commit 44d17331863fa1163accf0f4043e642847b6863c Author: iwakeh <iwakeh(a)torproject.org> Date: Mon Dec 4 11:14:37 2017 +0000 Remove checkstyle complaints. --- src/main/java/org/torproject/metrics/connbidirect/Main.java | 3 ++- src/main/java/org/torproject/metrics/onionperf/Main.java | 3 ++- .../java/org/torproject/metrics/web/CollectorDirectoryProvider.java | 6 ------ src/test/java/org/torproject/metrics/web/DirectoryListingTest.java | 5 ----- 4 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/torproject/metrics/connbidirect/Main.java b/src/main/java/org/torproject/metrics/connbidirect/Main.java index 1624fa9..6e23ea7 100644 --- a/src/main/java/org/torproject/metrics/connbidirect/Main.java +++ b/src/main/java/org/torproject/metrics/connbidirect/Main.java @@ -429,7 +429,8 @@ public class Main { SortedSet<RawStat> rawStats) { DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); - SortedMap<String, List<Short>> fractionsByDateAndDirection = new TreeMap<>(); + SortedMap<String, List<Short>> fractionsByDateAndDirection + = new TreeMap<>(); final String[] directions = new String[] { "read", "write", "both" }; for (RawStat rawStat : rawStats) { if (rawStat.fingerprint != null) { diff --git a/src/main/java/org/torproject/metrics/onionperf/Main.java b/src/main/java/org/torproject/metrics/onionperf/Main.java index 04c5dd5..f77b85d 100644 --- a/src/main/java/org/torproject/metrics/onionperf/Main.java +++ b/src/main/java/org/torproject/metrics/onionperf/Main.java @@ -233,7 +233,8 @@ public class Main { SortedSet<String> statistics) throws IOException { webstatsPath.toFile().getParentFile().mkdirs(); List<String> lines = new ArrayList<>(); - lines.add("date,filesize,source,server,q1,md,q3,timeouts,failures,requests"); + lines + .add("date,filesize,source,server,q1,md,q3,timeouts,failures,requests"); lines.addAll(statistics); log.info("Writing {} lines to {}.", lines.size(), webstatsPath.toFile().getAbsolutePath()); diff --git a/src/main/java/org/torproject/metrics/web/CollectorDirectoryProvider.java b/src/main/java/org/torproject/metrics/web/CollectorDirectoryProvider.java index 9cd1e1e..ca0e0af 100644 --- a/src/main/java/org/torproject/metrics/web/CollectorDirectoryProvider.java +++ b/src/main/java/org/torproject/metrics/web/CollectorDirectoryProvider.java @@ -3,16 +3,10 @@ package org.torproject.metrics.web; -import org.torproject.descriptor.index.DirectoryNode; -import org.torproject.descriptor.index.FileNode; import org.torproject.descriptor.index.IndexNode; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.SortedSet; -import java.util.TreeSet; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; diff --git a/src/test/java/org/torproject/metrics/web/DirectoryListingTest.java b/src/test/java/org/torproject/metrics/web/DirectoryListingTest.java index 5c6b37a..509785e 100644 --- a/src/test/java/org/torproject/metrics/web/DirectoryListingTest.java +++ b/src/test/java/org/torproject/metrics/web/DirectoryListingTest.java @@ -11,12 +11,7 @@ import org.torproject.descriptor.index.IndexNode; import org.junit.Test; import java.io.ByteArrayInputStream; -import java.util.ArrayList; import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; public class DirectoryListingTest {

1 0

[metrics-web/master] Remove obsolete build files.
by karsten＠torproject.org 20 Dec '17

20 Dec '17

commit 889083a1fb3edf9ea72ca67b7d9887f43fe402f9 Author: iwakeh <iwakeh(a)torproject.org> Date: Mon Dec 4 11:14:34 2017 +0000 Remove obsolete build files. --- shared/.gitignore | 4 - shared/build-base.xml | 107 ----------------- shared/build.xml | 51 --------- shared/resources/metrics_checks.xml | 221 ------------------------------------ 4 files changed, 383 deletions(-) diff --git a/shared/.gitignore b/shared/.gitignore deleted file mode 100644 index c3e32d5..0000000 --- a/shared/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/generated/ -/lib/ -/stats/ - diff --git a/shared/build-base.xml b/shared/build-base.xml deleted file mode 100644 index d27757b..0000000 --- a/shared/build-base.xml +++ /dev/null @@ -1,107 +0,0 @@ -<project basedir="."> - - <property name="sources" value="src/main/java"/> - <property name="resources" value="src/main/resources"/> - <property name="testsources" value="src/test/java"/> - <property name="libs" value="../../shared/lib"/> - <property name="generated" value="generated"/> - <property name="classes" value="${generated}/classes/"/> - <property name="testclasses" value="${generated}/test-classes/"/> - <property name="source-and-target-java-version" value="1.8" /> - <property name="metricslibversion" value="2.0.0" /> - - <path id="base.classpath"> - <pathelement path="${classes}"/> - <fileset dir="${libs}"> - <include name="commons-codec-1.10.jar"/> - <include name="commons-compress-1.13.jar"/> - <include name="commons-lang-2.6.jar"/> - <include name="metrics-lib-${metricslibversion}.jar"/> - <include name="slf4j-api-1.7.22.jar"/> - <include name="logback-core-1.1.9.jar"/> - <include name="logback-classic-1.1.9.jar"/> - <include name="gson-2.4.jar"/> - <include name="xz-1.6.jar"/> - </fileset> - </path> - - <path id="classpath"> - <pathelement path="${classes}"/> - <path refid="base.classpath" /> - </path> - - <path id="base.testclasspath"> - <pathelement path="${base.testclasses}"/> - <pathelement path="base.classpath"/> - <fileset dir="${libs}"> - <include name="hamcrest-core-1.3.jar"/> - <include name="junit4-4.12.jar"/> - </fileset> - </path> - - <path id="testclasspath"> - <pathelement path="${testclasses}"/> - <path refid="base.testclasspath" /> - <path refid="base.classpath" /> - </path> - - <target name="clean"> - <delete includeEmptyDirs="true" quiet="true"> - <fileset dir="${generated}" defaultexcludes="false" includes="**" /> - </delete> - </target> - - <target name="init"> - <mkdir dir="${classes}"/> - <mkdir dir="${testclasses}"/> - </target> - - <target name="compile" depends="init" > - <javac destdir="${classes}" - srcdir="${sources}" - source="${source-and-target-java-version}" - target="${source-and-target-java-version}" - debug="true" debuglevel="lines,source" - deprecation="true" - optimize="false" - failonerror="true" - includeantruntime="false"> - <classpath refid="classpath"/> - </javac> - </target> - - <target name="testcompile" depends="compile" > - <javac destdir="${testclasses}" - srcdir="${testsources}" - source="${source-and-target-java-version}" - target="${source-and-target-java-version}" - debug="true" debuglevel="lines,source" - deprecation="true" - optimize="false" - failonerror="true" - includeantruntime="false"> - <classpath refid="testclasspath"/> - </javac> - </target> - - <target name="test" depends="testcompile"> - <junit fork="true" haltonfailure="true" printsummary="off"> - <classpath refid="testclasspath"/> - <formatter type="plain" usefile="false"/> - <batchtest> - <fileset dir="${testclasses}" - includes="**/*Test.class"/> - </batchtest> - </junit> - </target> - - <target name="run" depends="init,compile"> - <java fork="true" - maxmemory="2g" - classname="${mainclass}"> - <classpath refid="classpath"/> - </java> - </target> - -</project> - diff --git a/shared/build.xml b/shared/build.xml deleted file mode 100644 index 3b0a799..0000000 --- a/shared/build.xml +++ /dev/null @@ -1,51 +0,0 @@ -<project default="checks" name="metrics-web" basedir="."> - <property name="libs" value="lib"/> - <property name="checks" value="resources/metrics_checks.xml"/> - <property name="generated" value="generated/"/> - <property name="report" value="${generated}/checkstyle_report.txt"/> - <path id="checkstyle.classpath" > - <fileset dir="${libs}"> - <include name="checkstyle-6.17-all.jar" /> - </fileset> - </path> - <target name="init"> - <mkdir dir="${generated}"/> - </target> - <target name="clean"> - <delete includeEmptyDirs="true" quiet="true"> - <fileset dir="${generated}" defaultexcludes="false" includes="**" /> - </delete> - </target> - <taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties"> - <classpath refid="checkstyle.classpath" /> - </taskdef> - <target name="checks" depends="init"> - <checkstyle config="${checks}"> - <fileset dir="../website/src" includes="**/*.java"/> - <fileset dir="../modules/advbwdist/src" includes="**/*.java"/> - <fileset dir="../modules/clients/src" includes="**/*.java"/> - <fileset dir="../modules/collectdescs/src" includes="**/*.java"/> - <fileset dir="../modules/connbidirect/src" includes="**/*.java"/> - <fileset dir="../modules/hidserv/src" includes="**/*.java"/> - <fileset dir="../modules/legacy/src" includes="**/*.java"/> - <fileset dir="../modules/onionperf/src" includes="**/*.java"/> - <fileset dir="../modules/webstats/src" includes="**/*.java"/> - <classpath> - <path refid="checkstyle.classpath" /> - </classpath> - <formatter type="plain" toFile="${report}" /> - </checkstyle> - <exec executable="cat" outputproperty="checkstyle.result"> - <arg value="${generated}/checkstyle_report.txt" /> - </exec> - <fail message="Checkstyle complaints: ${checkstyle.result}" > - <condition> - <not> - <length string="${checkstyle.result}" - length="29" /> - </not> - </condition> - </fail> - </target> -</project> - diff --git a/shared/resources/metrics_checks.xml b/shared/resources/metrics_checks.xml deleted file mode 100644 index 2df2f2a..0000000 --- a/shared/resources/metrics_checks.xml +++ /dev/null @@ -1,221 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE module PUBLIC - "-//Puppy Crawl//DTD Check Configuration 1.3//EN" - "http://www.puppycrawl.com/dtds/configuration_1_3.dtd"> - - - -<module name = "Checker"> - <property name="charset" value="UTF-8"/> - - <property name="severity" value="warning"/> - - <property name="fileExtensions" value="java, properties, xml"/> -  -  - <module name="FileTabCharacter"> - <property name="eachLine" value="true"/> - </module> - - <module name="SuppressWarningsFilter" /> - <module name="TreeWalker"> - <module name="OuterTypeFilename"/> - <module name="IllegalTokenText"> - <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/> - <property name="format" value="\\u00(08|09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/> - <property name="message" value="Avoid using corresponding octal or Unicode escape."/> - </module> - <module name="AvoidEscapedUnicodeCharacters"> - <property name="allowEscapesForControlCharacters" value="true"/> - <property name="allowByTailComment" value="true"/> - <property name="allowNonPrintableEscapes" value="true"/> - </module> - <module name="LineLength"> - <property name="max" value="100"/> - <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/> - </module> - <module name="AvoidStarImport"/> - <module name="OneTopLevelClass"/> - <module name="NoLineWrap"/> - <module name="EmptyBlock"> - <property name="option" value="TEXT"/> - <property name="tokens" value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/> - </module> - <module name="NeedBraces"/> - <module name="LeftCurly"> - <property name="maxLineLength" value="100"/> - </module> - <module name="RightCurly"/> - <module name="RightCurly"> - <property name="option" value="alone"/> - <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT"/> - </module> - <module name="WhitespaceAround"> - <property name="allowEmptyConstructors" value="true"/> - <property name="allowEmptyMethods" value="true"/> - <property name="allowEmptyTypes" value="true"/> - <property name="allowEmptyLoops" value="true"/> - <message key="ws.notFollowed" - value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/> - <message key="ws.notPreceded" - value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/> - </module> - <module name="OneStatementPerLine"/> - <module name="MultipleVariableDeclarations"/> - <module name="ArrayTypeStyle"/> - <module name="MissingSwitchDefault"/> - <module name="FallThrough"/> - <module name="UpperEll"/> - <module name="ModifierOrder"/> - <module name="EmptyLineSeparator"> - <property name="allowNoEmptyLineBetweenFields" value="true"/> - </module> - <module name="SeparatorWrap"> - <property name="tokens" value="DOT"/> - <property name="option" value="nl"/> - </module> - <module name="SeparatorWrap"> - <property name="tokens" value="COMMA"/> - <property name="option" value="EOL"/> - </module> - <module name="PackageName"> - <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/> - <message key="name.invalidPattern" - value="Package name ''{0}'' must match pattern ''{1}''."/> - </module> - <module name="TypeName"> - <message key="name.invalidPattern" - value="Type name ''{0}'' must match pattern ''{1}''."/> - </module> - <module name="MemberName"> - <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/> - <message key="name.invalidPattern" - value="Member name ''{0}'' must match pattern ''{1}''."/> - </module> - <module name="ParameterName"> - <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/> - <message key="name.invalidPattern" - value="Parameter name ''{0}'' must match pattern ''{1}''."/> - </module> - <module name="CatchParameterName"> - <property name="format" value="^[a-z][a-zA-Z0-9]*$"/> - <message key="name.invalidPattern" - value="Catch parameter name ''{0}'' must match pattern ''{1}''."/> - </module> - <module name="LocalVariableName"> - <property name="tokens" value="VARIABLE_DEF"/> - <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/> - <property name="allowOneCharVarInForLoop" value="true"/> - <message key="name.invalidPattern" - value="Local variable name ''{0}'' must match pattern ''{1}''."/> - </module> - <module name="ClassTypeParameterName"> - <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/> - <message key="name.invalidPattern" - value="Class type name ''{0}'' must match pattern ''{1}''."/> - </module> - <module name="MethodTypeParameterName"> - <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/> - <message key="name.invalidPattern" - value="Method type name ''{0}'' must match pattern ''{1}''."/> - </module> - <module name="InterfaceTypeParameterName"> - <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/> - <message key="name.invalidPattern" - value="Interface type name ''{0}'' must match pattern ''{1}''."/> - </module> - <module name="NoFinalizer"/> - <module name="GenericWhitespace"> - <message key="ws.followed" - value="GenericWhitespace ''{0}'' is followed by whitespace."/> - <message key="ws.preceded" - value="GenericWhitespace ''{0}'' is preceded with whitespace."/> - <message key="ws.illegalFollow" - value="GenericWhitespace ''{0}'' should followed by whitespace."/> - <message key="ws.notPreceded" - value="GenericWhitespace ''{0}'' is not preceded with whitespace."/> - </module> - <module name="Indentation"> - <property name="basicOffset" value="2"/> - <property name="braceAdjustment" value="0"/> - <property name="caseIndent" value="2"/> - <property name="throwsIndent" value="4"/> - <property name="lineWrappingIndentation" value="4"/> - <property name="arrayInitIndent" value="2"/> - </module> - <module name="AbbreviationAsWordInName"> - <property name="ignoreFinal" value="false"/> - <property name="allowedAbbreviationLength" value="1"/> - </module> - <module name="OverloadMethodsDeclarationOrder"/> - <module name="VariableDeclarationUsageDistance"/> - <module name="CustomImportOrder"> - <property name="specialImportsRegExp" value="org.torproject"/> - <property name="sortImportsInGroupAlphabetically" value="true"/> - <property name="customImportOrderRules" value="STATIC###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE###STANDARD_JAVA_PACKAGE"/> - </module> - <module name="MethodParamPad"/> - <module name="OperatorWrap"> - <property name="option" value="NL"/> - <property name="tokens" value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR "/> - </module> - <module name="AnnotationLocation"> - <property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF"/> - </module> - <module name="AnnotationLocation"> - <property name="tokens" value="VARIABLE_DEF"/> - <property name="allowSamelineMultipleAnnotations" value="true"/> - </module> - <module name="NonEmptyAtclauseDescription"/> - <module name="JavadocTagContinuationIndentation"/> - <module name="SummaryJavadoc"> - <property name="forbiddenSummaryFragments" value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/> - </module> - <module name="JavadocParagraph"/> - <module name="AtclauseOrder"> - <property name="tagOrder" value="@param, @return, @throws, @deprecated"/> - <property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/> - </module> - <module name="JavadocMethod"> - <property name="scope" value="public"/> - <property name="allowMissingParamTags" value="true"/> - <property name="allowMissingThrowsTags" value="true"/> - <property name="allowMissingReturnTag" value="true"/> - <property name="minLineCount" value="2"/> - <property name="allowedAnnotations" value="Override, Test"/> - <property name="allowThrowsTagsForSubclasses" value="true"/> - </module> - <module name="MethodName"> - <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/> - <message key="name.invalidPattern" - value="Method name ''{0}'' must match pattern ''{1}''."/> - </module> - <module name="SingleLineJavadoc"> - <property name="ignoreInlineTags" value="false"/> - </module> - <module name="EmptyCatchBlock"> - <property name="exceptionVariableName" value="expected"/> - </module> - <module name="CommentsIndentation"/> - <module name="SuppressWarningsHolder" /> - </module> -</module>

1 0

[metrics-web/master] Remove catch for exception that is not thrown.
by karsten＠torproject.org 20 Dec '17

20 Dec '17

commit cc979dae8b17f864dd3d720b5fc7aae15c681b5f Author: iwakeh <iwakeh(a)torproject.org> Date: Mon Dec 4 11:14:38 2017 +0000 Remove catch for exception that is not thrown. --- .../java/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java b/src/main/java/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java index 026707b..36f2102 100644 --- a/src/main/java/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java +++ b/src/main/java/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java @@ -386,7 +386,7 @@ public final class RelayDescriptorDatabaseImporter { + (ports != null ? ports : "\\N") + "\t"); this.statusentryOut.write(PGbytea.toPGString(rawDescriptor) .replaceAll("\\\\", "\\\\\\\\") + "\n"); - } catch (SQLException | IOException e) { + } catch (IOException e) { this.logger.log(Level.WARNING, "Could not write network status " + "consensus entry to raw database import file. We won't " + "make any further attempts to write raw import files in "

1 0

[metrics-web/master] Add outdated-warning to README.
by karsten＠torproject.org 20 Dec '17

20 Dec '17

commit 0aed44785b053a2847a573aabe438fd745c58ae9 Author: iwakeh <iwakeh(a)torproject.org> Date: Mon Dec 4 11:14:32 2017 +0000 Add outdated-warning to README. The update of the build information is part of a different ticket. --- README | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README b/README index 1bd3d8f..bebcd67 100644 --- a/README +++ b/README @@ -1,3 +1,5 @@ +This file contains outdated information and will be updated soon! + Tor Metrics ===========

1 0

[metrics-web/master] Move web content and files to main src folder.
by karsten＠torproject.org 20 Dec '17

20 Dec '17

commit 338be5c1d24b4739c7fafa9870dc63bdda0ffe84 Author: iwakeh <iwakeh(a)torproject.org> Date: Mon Dec 4 11:14:43 2017 +0000 Move web content and files to main src folder. --- .../etc => src/main/resources}/context.xml | 0 src/main/resources/jetty.xml | 74 +++++++++++++++++++ src/main/resources/logback.xml | 58 +++++++++++++++ .../src => src}/main/resources/spec/README.txt | 0 .../main/resources/spec/bridge-descriptors.xml | 0 .../src => src}/main/resources/spec/convert.awk | 0 .../src => src}/main/resources/spec/convert.sh | 0 .../main/resources/spec/rfc2629-other.ent | 0 .../main/resources/spec/rfc2629-xhtml.ent | 0 .../src => src}/main/resources/spec/rfc2629.dtd | 0 .../src => src}/main/resources/spec/rfc2629.xslt | 0 .../main/resources/spec/web-server-logs.xml | 0 .../resources/etc => src/main/resources}/web.xml | 40 +++++++++-- .../main/resources/web/css/bootstrap.min.css | 0 .../main/resources/web/css/font-awesome.min.css | 0 .../src => src}/main/resources/web/css/prism.css | 0 .../src => src}/main/resources/web/css/style.css | 0 .../web/fonts/EOT/SourceSansPro-Black.eot | Bin .../web/fonts/EOT/SourceSansPro-BlackIt.eot | Bin .../resources/web/fonts/EOT/SourceSansPro-Bold.eot | Bin .../web/fonts/EOT/SourceSansPro-BoldIt.eot | Bin .../web/fonts/EOT/SourceSansPro-ExtraLight.eot | Bin .../web/fonts/EOT/SourceSansPro-ExtraLightIt.eot | Bin .../resources/web/fonts/EOT/SourceSansPro-It.eot | Bin .../web/fonts/EOT/SourceSansPro-Light.eot | Bin .../web/fonts/EOT/SourceSansPro-LightIt.eot | Bin .../web/fonts/EOT/SourceSansPro-Regular.eot | Bin .../web/fonts/EOT/SourceSansPro-Semibold.eot | Bin .../web/fonts/EOT/SourceSansPro-SemiboldIt.eot | Bin .../main/resources/web/fonts/FontAwesome.otf | Bin .../web/fonts/OTF/SourceSansPro-Black.otf | Bin .../web/fonts/OTF/SourceSansPro-BlackIt.otf | Bin .../resources/web/fonts/OTF/SourceSansPro-Bold.otf | Bin .../web/fonts/OTF/SourceSansPro-BoldIt.otf | Bin .../web/fonts/OTF/SourceSansPro-ExtraLight.otf | Bin .../web/fonts/OTF/SourceSansPro-ExtraLightIt.otf | Bin .../resources/web/fonts/OTF/SourceSansPro-It.otf | Bin .../web/fonts/OTF/SourceSansPro-Light.otf | Bin .../web/fonts/OTF/SourceSansPro-LightIt.otf | Bin .../web/fonts/OTF/SourceSansPro-Regular.otf | Bin .../web/fonts/OTF/SourceSansPro-Semibold.otf | Bin .../web/fonts/OTF/SourceSansPro-SemiboldIt.otf | Bin .../web/fonts/TTF/SourceSansPro-Black.ttf | Bin .../web/fonts/TTF/SourceSansPro-BlackIt.ttf | Bin .../resources/web/fonts/TTF/SourceSansPro-Bold.ttf | Bin .../web/fonts/TTF/SourceSansPro-BoldIt.ttf | Bin .../web/fonts/TTF/SourceSansPro-ExtraLight.ttf | Bin .../web/fonts/TTF/SourceSansPro-ExtraLightIt.ttf | Bin .../resources/web/fonts/TTF/SourceSansPro-It.ttf | Bin .../web/fonts/TTF/SourceSansPro-Light.ttf | Bin .../web/fonts/TTF/SourceSansPro-LightIt.ttf | Bin .../web/fonts/TTF/SourceSansPro-Regular.ttf | Bin .../web/fonts/TTF/SourceSansPro-Semibold.ttf | Bin .../web/fonts/TTF/SourceSansPro-SemiboldIt.ttf | Bin .../fonts/WOFF/OTF/SourceSansPro-Black.otf.woff | Bin .../fonts/WOFF/OTF/SourceSansPro-BlackIt.otf.woff | Bin .../web/fonts/WOFF/OTF/SourceSansPro-Bold.otf.woff | Bin .../fonts/WOFF/OTF/SourceSansPro-BoldIt.otf.woff | Bin .../WOFF/OTF/SourceSansPro-ExtraLight.otf.woff | Bin .../WOFF/OTF/SourceSansPro-ExtraLightIt.otf.woff | Bin .../web/fonts/WOFF/OTF/SourceSansPro-It.otf.woff | Bin .../fonts/WOFF/OTF/SourceSansPro-Light.otf.woff | Bin .../fonts/WOFF/OTF/SourceSansPro-LightIt.otf.woff | Bin .../fonts/WOFF/OTF/SourceSansPro-Regular.otf.woff | Bin .../fonts/WOFF/OTF/SourceSansPro-Semibold.otf.woff | Bin .../WOFF/OTF/SourceSansPro-SemiboldIt.otf.woff | Bin .../fonts/WOFF/TTF/SourceSansPro-Black.ttf.woff | Bin .../fonts/WOFF/TTF/SourceSansPro-BlackIt.ttf.woff | Bin .../web/fonts/WOFF/TTF/SourceSansPro-Bold.ttf.woff | Bin .../fonts/WOFF/TTF/SourceSansPro-BoldIt.ttf.woff | Bin .../WOFF/TTF/SourceSansPro-ExtraLight.ttf.woff | Bin .../WOFF/TTF/SourceSansPro-ExtraLightIt.ttf.woff | Bin .../web/fonts/WOFF/TTF/SourceSansPro-It.ttf.woff | Bin .../fonts/WOFF/TTF/SourceSansPro-Light.ttf.woff | Bin .../fonts/WOFF/TTF/SourceSansPro-LightIt.ttf.woff | Bin .../fonts/WOFF/TTF/SourceSansPro-Regular.ttf.woff | Bin .../fonts/WOFF/TTF/SourceSansPro-Semibold.ttf.woff | Bin .../WOFF/TTF/SourceSansPro-SemiboldIt.ttf.woff | Bin .../fonts/WOFF2/OTF/SourceSansPro-Black.otf.woff2 | Bin .../WOFF2/OTF/SourceSansPro-BlackIt.otf.woff2 | Bin .../fonts/WOFF2/OTF/SourceSansPro-Bold.otf.woff2 | Bin .../fonts/WOFF2/OTF/SourceSansPro-BoldIt.otf.woff2 | Bin .../WOFF2/OTF/SourceSansPro-ExtraLight.otf.woff2 | Bin .../WOFF2/OTF/SourceSansPro-ExtraLightIt.otf.woff2 | Bin .../web/fonts/WOFF2/OTF/SourceSansPro-It.otf.woff2 | Bin .../fonts/WOFF2/OTF/SourceSansPro-Light.otf.woff2 | Bin .../WOFF2/OTF/SourceSansPro-LightIt.otf.woff2 | Bin .../WOFF2/OTF/SourceSansPro-Regular.otf.woff2 | Bin .../WOFF2/OTF/SourceSansPro-Semibold.otf.woff2 | Bin .../WOFF2/OTF/SourceSansPro-SemiboldIt.otf.woff2 | Bin .../fonts/WOFF2/TTF/SourceSansPro-Black.ttf.woff2 | Bin .../WOFF2/TTF/SourceSansPro-BlackIt.ttf.woff2 | Bin .../fonts/WOFF2/TTF/SourceSansPro-Bold.ttf.woff2 | Bin .../fonts/WOFF2/TTF/SourceSansPro-BoldIt.ttf.woff2 | Bin .../WOFF2/TTF/SourceSansPro-ExtraLight.ttf.woff2 | Bin .../WOFF2/TTF/SourceSansPro-ExtraLightIt.ttf.woff2 | Bin .../web/fonts/WOFF2/TTF/SourceSansPro-It.ttf.woff2 | Bin .../fonts/WOFF2/TTF/SourceSansPro-Light.ttf.woff2 | Bin .../WOFF2/TTF/SourceSansPro-LightIt.ttf.woff2 | Bin .../WOFF2/TTF/SourceSansPro-Regular.ttf.woff2 | Bin .../WOFF2/TTF/SourceSansPro-Semibold.ttf.woff2 | Bin .../WOFF2/TTF/SourceSansPro-SemiboldIt.ttf.woff2 | Bin .../resources/web/fonts/fontawesome-webfont.eot | Bin .../resources/web/fonts/fontawesome-webfont.svg | 0 .../resources/web/fonts/fontawesome-webfont.ttf | Bin .../resources/web/fonts/fontawesome-webfont.woff | Bin .../resources/web/fonts/fontawesome-webfont.woff2 | Bin .../web/fonts/glyphicons-halflings-regular.eot | Bin .../web/fonts/glyphicons-halflings-regular.svg | 0 .../web/fonts/glyphicons-halflings-regular.ttf | Bin .../web/fonts/glyphicons-halflings-regular.woff | Bin .../web/fonts/glyphicons-halflings-regular.woff2 | Bin .../main/resources/web/fonts/source-sans-pro.css | 0 .../main/resources/web/images/ajax-loader.gif | Bin .../main/resources/web/images/android-icon.png | Bin .../web/images/apple-touch-icon-152x152.png | Bin .../main/resources/web/images/collector-logo.png | Bin .../main/resources/web/images/favicon.ico | Bin .../main/resources/web/images/largetile.png | Bin .../main/resources/web/images/mediumtile.png | Bin .../main/resources/web/images/networkchurn.png | Bin .../web/images/oxford-anonymous-internet.png | Bin .../main/resources/web/images/smalltile.png | Bin .../resources/web/images/tor-metrics-white.png | Bin .../resources/web/images/tor-metrics-white(a)2x.png | Bin .../resources/web/images/uncharted-data-flow.png | Bin .../main/resources/web/images/uptimes.jpg | Bin .../main/resources/web/images/widetile.png | Bin .../main/resources/web/js/bootstrap.min.js | 0 .../src => src}/main/resources/web/js/bubbles.js | 0 .../src => src}/main/resources/web/js/d3.min.js | 0 .../main/resources/web/js/jquery-3.2.1.min.js | 0 .../src => src}/main/resources/web/js/prism.js | 0 .../src => src}/main/resources/web/js/script.js | 0 .../main/resources/web/json}/categories.json | 0 .../main/resources/web/json}/logging.properties | 0 .../main/resources/web/json}/metrics.json | 0 .../etc => src/main/resources/web/json}/news.json | 0 .../main/resources/web/jsps}/about.jsp | 0 .../main/resources/web/jsps}/bottom.jsp | 0 .../resources/web/jsps}/bridge-descriptors.jsp | 0 .../main/resources/web/jsps}/bubbles.jsp | 0 .../main/resources/web/jsps}/collector-files.jsp | 0 .../main/resources/web/jsps}/collector.jsp | 0 .../main/resources/web/jsps}/development.jsp | 0 .../main/resources/web/jsps}/error.jsp | 0 .../main/resources/web/jsps}/glossary.jsp | 0 .../main/resources/web/jsps}/graph.jsp | 0 .../main/resources/web/jsps}/index.jsp | 0 .../main/resources/web/jsps}/link.jsp | 0 .../main/resources/web/jsps}/metrics-lib.jsp | 0 .../main/resources/web/jsps}/news.jsp | 0 .../main/resources/web/jsps}/onionoo.jsp | 0 .../main/resources/web/jsps}/operation.jsp | 0 .../main/resources/web/jsps}/research.jsp | 0 .../main/resources/web/jsps}/services.jsp | 0 .../main/resources/web/jsps}/sources.jsp | 0 .../main/resources/web/jsps}/stats.jsp | 0 .../main/resources/web/jsps}/table.jsp | 0 .../main/resources/web/jsps}/top.jsp | 0 .../main/resources/web/jsps}/web-server-logs.jsp | 0 website/build.xml | 80 --------------------- .../src/main/resources/bootstrap-development.sh | 9 --- 163 files changed, 168 insertions(+), 93 deletions(-) diff --git a/website/src/main/resources/etc/context.xml b/src/main/resources/context.xml similarity index 100% rename from website/src/main/resources/etc/context.xml rename to src/main/resources/context.xml diff --git a/src/main/resources/jetty.xml b/src/main/resources/jetty.xml new file mode 100644 index 0000000..3f1d117 --- /dev/null +++ b/src/main/resources/jetty.xml @@ -0,0 +1,74 @@ +<?xml version="1.0"?> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" + "http://www.eclipse.org/jetty/configure.dtd"> + +<Configure id="server" class="org.eclipse.jetty.server.Server" > + <Set name="dumpAfterStart">false</Set> + + <New class="org.eclipse.jetty.util.thread.QueuedThreadPool"> + <Set name="minThreads">25</Set> + <Set name="maxThreads">250</Set> + <Set name="detailedDump">false</Set> + </New> + + <New id="webAppContext" class="org.eclipse.jetty.webapp.WebAppContext"> + <Set name="logUrlOnStart">true</Set> + <Set name="war"> + <SystemProperty name="java.class.path" /> + </Set> + <Call name="setAttribute" > + <Arg>org.apache.tomcat.JarScanner</Arg> + <Arg> + <New class="org.apache.tomcat.util.scan.StandardJarScanner" /> + </Arg> + </Call> + </New> + + <Call class="org.eclipse.jetty.webapp.Configuration$ClassList" name="setServerDefault"> + <Arg><Ref refid="server" /></Arg> + <Call name="addBefore"> + <Arg name="beforeClass">org.eclipse.jetty.webapp.JettyWebXmlConfiguration</Arg> + <Arg> + <Array type="String"> + <Item>org.eclipse.jetty.annotations.AnnotationConfiguration</Item> + </Array> + </Arg> + </Call> + <Call name="addAfter"> + <Arg name="afterClass">org.eclipse.jetty.webapp.FragmentConfiguration</Arg> + <Arg> + <Array type="String"> + <Item>org.eclipse.jetty.plus.webapp.EnvConfiguration</Item> + <Item>org.eclipse.jetty.plus.webapp.PlusConfiguration</Item> + </Array> + </Arg> + </Call> + </Call> + + <Call name="addConnector"> + <Arg> + <New class="org.eclipse.jetty.server.ServerConnector"> + <Arg> + <Ref id="server"/> + </Arg> + <Set name="port"> + <SystemProperty name="web.jetty.port" default="8080" /> + </Set> + <Set name="host">127.0.0.1</Set> + </New> + </Arg> + </Call> + + <Set name="handler"> +  + <New class="org.eclipse.jetty.server.handler.ContextHandlerCollection"> + <Call name="addHandler"> + <Arg> + <Ref id="webAppContext"/> + </Arg> + </Call> + </New> + </Set> + +</Configure> + diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml new file mode 100644 index 0000000..7789feb --- /dev/null +++ b/src/main/resources/logback.xml @@ -0,0 +1,58 @@ +<configuration debug="false"> + <statusListener class="ch.qos.logback.core.status.NopStatusListener" /> + +  + <property name="logfile-base" value="${LOGBASE}/metrics-web-" /> + +  + <property name="fileall-logname" value="${logfile-base}all" /> + <property name="fileerr-logname" value="${logfile-base}err" /> + <property name="filestatistics-logname" value="${logfile-base}statistics" /> + +  + <property name="utc-date-pattern" value="%date{ISO8601, UTC}" /> + +  + <appender name="FILEALL" class="ch.qos.logback.core.rolling.RollingFileAppender"> + <file>${fileall-logname}.log</file> + <encoder> + <pattern>${utc-date-pattern} %level %logger{20}:%line %msg%n</pattern> + </encoder> + <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> +  + <FileNamePattern>${fileall-logname}.%d{yyyy-MM-dd}.%i.log</FileNamePattern> + <maxHistory>10</maxHistory> + <timeBasedFileNamingAndTriggeringPolicy + class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> +  + <maxFileSize>1MB</maxFileSize> + </timeBasedFileNamingAndTriggeringPolicy> + </rollingPolicy> + </appender> + + <appender name="FILEERR" class="ch.qos.logback.core.FileAppender"> + <file>${fileerr-logname}.log</file> + <encoder> + <pattern>${utc-date-pattern} %level %logger{20}:%line %msg%n</pattern> + </encoder> + +  + <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> + <level>ERROR</level> + </filter> + </appender> + +  + <logger name="org.torproject" > + <appender-ref ref="FILEERR" /> + </logger> + + <logger name="org.eclipse" level="INFO" /> + <logger name="org.apache" level="INFO" /> + + <root level="ALL"> + <appender-ref ref="FILEALL" /> + </root> + +</configuration> + diff --git a/website/src/main/resources/spec/README.txt b/src/main/resources/spec/README.txt similarity index 100% rename from website/src/main/resources/spec/README.txt rename to src/main/resources/spec/README.txt diff --git a/website/src/main/resources/spec/bridge-descriptors.xml b/src/main/resources/spec/bridge-descriptors.xml similarity index 100% rename from website/src/main/resources/spec/bridge-descriptors.xml rename to src/main/resources/spec/bridge-descriptors.xml diff --git a/website/src/main/resources/spec/convert.awk b/src/main/resources/spec/convert.awk similarity index 100% rename from website/src/main/resources/spec/convert.awk rename to src/main/resources/spec/convert.awk diff --git a/website/src/main/resources/spec/convert.sh b/src/main/resources/spec/convert.sh similarity index 100% rename from website/src/main/resources/spec/convert.sh rename to src/main/resources/spec/convert.sh diff --git a/website/src/main/resources/spec/rfc2629-other.ent b/src/main/resources/spec/rfc2629-other.ent similarity index 100% rename from website/src/main/resources/spec/rfc2629-other.ent rename to src/main/resources/spec/rfc2629-other.ent diff --git a/website/src/main/resources/spec/rfc2629-xhtml.ent b/src/main/resources/spec/rfc2629-xhtml.ent similarity index 100% rename from website/src/main/resources/spec/rfc2629-xhtml.ent rename to src/main/resources/spec/rfc2629-xhtml.ent diff --git a/website/src/main/resources/spec/rfc2629.dtd b/src/main/resources/spec/rfc2629.dtd similarity index 100% rename from website/src/main/resources/spec/rfc2629.dtd rename to src/main/resources/spec/rfc2629.dtd diff --git a/website/src/main/resources/spec/rfc2629.xslt b/src/main/resources/spec/rfc2629.xslt similarity index 100% rename from website/src/main/resources/spec/rfc2629.xslt rename to src/main/resources/spec/rfc2629.xslt diff --git a/website/src/main/resources/spec/web-server-logs.xml b/src/main/resources/spec/web-server-logs.xml similarity index 100% rename from website/src/main/resources/spec/web-server-logs.xml rename to src/main/resources/spec/web-server-logs.xml diff --git a/website/src/main/resources/etc/web.xml b/src/main/resources/web.xml similarity index 91% rename from website/src/main/resources/etc/web.xml rename to src/main/resources/web.xml index 2d63643..26acb8f 100644 --- a/website/src/main/resources/etc/web.xml +++ b/src/main/resources/web.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<web-app version="2.4" - xmlns="http://java.sun.com/xml/ns/j2ee" +<web-app version="3.1" + xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee - http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" > + xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee + http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" + metadata-complete="false" > <servlet> <servlet-name>Index</servlet-name> @@ -329,6 +330,37 @@ <url-pattern>/error.html</url-pattern> </servlet-mapping> + <servlet> + <servlet-name>Default</servlet-name> + <servlet-class> + org.eclipse.jetty.servlet.DefaultServlet + </servlet-class> + <init-param> + <param-name>aliases</param-name> + <param-value>false</param-value> + </init-param> + <init-param> + <param-name>acceptRanges</param-name> + <param-value>true</param-value> + </init-param> + <init-param> + <param-name>dirAllowed</param-name> + <param-value>false</param-value> + </init-param> + <init-param> + <param-name>welcomeServlets</param-name> + <param-value>true</param-value> + </init-param> + <init-param> + <param-name>redirectWelcome</param-name> + <param-value>false</param-value> + </init-param> + </servlet> + <servlet-mapping> + <servlet-name>Default</servlet-name> + <url-pattern>/</url-pattern> + </servlet-mapping> + <error-page> <error-code>400</error-code> <location>/error.html</location> diff --git a/website/src/main/resources/web/css/bootstrap.min.css b/src/main/resources/web/css/bootstrap.min.css similarity index 100% rename from website/src/main/resources/web/css/bootstrap.min.css rename to src/main/resources/web/css/bootstrap.min.css diff --git a/website/src/main/resources/web/css/font-awesome.min.css b/src/main/resources/web/css/font-awesome.min.css similarity index 100% rename from website/src/main/resources/web/css/font-awesome.min.css rename to src/main/resources/web/css/font-awesome.min.css diff --git a/website/src/main/resources/web/css/prism.css b/src/main/resources/web/css/prism.css similarity index 100% rename from website/src/main/resources/web/css/prism.css rename to src/main/resources/web/css/prism.css diff --git a/website/src/main/resources/web/css/style.css b/src/main/resources/web/css/style.css similarity index 100% rename from website/src/main/resources/web/css/style.css rename to src/main/resources/web/css/style.css diff --git a/website/src/main/resources/web/fonts/EOT/SourceSansPro-Black.eot b/src/main/resources/web/fonts/EOT/SourceSansPro-Black.eot similarity index 100% rename from website/src/main/resources/web/fonts/EOT/SourceSansPro-Black.eot rename to src/main/resources/web/fonts/EOT/SourceSansPro-Black.eot diff --git a/website/src/main/resources/web/fonts/EOT/SourceSansPro-BlackIt.eot b/src/main/resources/web/fonts/EOT/SourceSansPro-BlackIt.eot similarity index 100% rename from website/src/main/resources/web/fonts/EOT/SourceSansPro-BlackIt.eot rename to src/main/resources/web/fonts/EOT/SourceSansPro-BlackIt.eot diff --git a/website/src/main/resources/web/fonts/EOT/SourceSansPro-Bold.eot b/src/main/resources/web/fonts/EOT/SourceSansPro-Bold.eot similarity index 100% rename from website/src/main/resources/web/fonts/EOT/SourceSansPro-Bold.eot rename to src/main/resources/web/fonts/EOT/SourceSansPro-Bold.eot diff --git a/website/src/main/resources/web/fonts/EOT/SourceSansPro-BoldIt.eot b/src/main/resources/web/fonts/EOT/SourceSansPro-BoldIt.eot similarity index 100% rename from website/src/main/resources/web/fonts/EOT/SourceSansPro-BoldIt.eot rename to src/main/resources/web/fonts/EOT/SourceSansPro-BoldIt.eot diff --git a/website/src/main/resources/web/fonts/EOT/SourceSansPro-ExtraLight.eot b/src/main/resources/web/fonts/EOT/SourceSansPro-ExtraLight.eot similarity index 100% rename from website/src/main/resources/web/fonts/EOT/SourceSansPro-ExtraLight.eot rename to src/main/resources/web/fonts/EOT/SourceSansPro-ExtraLight.eot diff --git a/website/src/main/resources/web/fonts/EOT/SourceSansPro-ExtraLightIt.eot b/src/main/resources/web/fonts/EOT/SourceSansPro-ExtraLightIt.eot similarity index 100% rename from website/src/main/resources/web/fonts/EOT/SourceSansPro-ExtraLightIt.eot rename to src/main/resources/web/fonts/EOT/SourceSansPro-ExtraLightIt.eot diff --git a/website/src/main/resources/web/fonts/EOT/SourceSansPro-It.eot b/src/main/resources/web/fonts/EOT/SourceSansPro-It.eot similarity index 100% rename from website/src/main/resources/web/fonts/EOT/SourceSansPro-It.eot rename to src/main/resources/web/fonts/EOT/SourceSansPro-It.eot diff --git a/website/src/main/resources/web/fonts/EOT/SourceSansPro-Light.eot b/src/main/resources/web/fonts/EOT/SourceSansPro-Light.eot similarity index 100% rename from website/src/main/resources/web/fonts/EOT/SourceSansPro-Light.eot rename to src/main/resources/web/fonts/EOT/SourceSansPro-Light.eot diff --git a/website/src/main/resources/web/fonts/EOT/SourceSansPro-LightIt.eot b/src/main/resources/web/fonts/EOT/SourceSansPro-LightIt.eot similarity index 100% rename from website/src/main/resources/web/fonts/EOT/SourceSansPro-LightIt.eot rename to src/main/resources/web/fonts/EOT/SourceSansPro-LightIt.eot diff --git a/website/src/main/resources/web/fonts/EOT/SourceSansPro-Regular.eot b/src/main/resources/web/fonts/EOT/SourceSansPro-Regular.eot similarity index 100% rename from website/src/main/resources/web/fonts/EOT/SourceSansPro-Regular.eot rename to src/main/resources/web/fonts/EOT/SourceSansPro-Regular.eot diff --git a/website/src/main/resources/web/fonts/EOT/SourceSansPro-Semibold.eot b/src/main/resources/web/fonts/EOT/SourceSansPro-Semibold.eot similarity index 100% rename from website/src/main/resources/web/fonts/EOT/SourceSansPro-Semibold.eot rename to src/main/resources/web/fonts/EOT/SourceSansPro-Semibold.eot diff --git a/website/src/main/resources/web/fonts/EOT/SourceSansPro-SemiboldIt.eot b/src/main/resources/web/fonts/EOT/SourceSansPro-SemiboldIt.eot similarity index 100% rename from website/src/main/resources/web/fonts/EOT/SourceSansPro-SemiboldIt.eot rename to src/main/resources/web/fonts/EOT/SourceSansPro-SemiboldIt.eot diff --git a/website/src/main/resources/web/fonts/FontAwesome.otf b/src/main/resources/web/fonts/FontAwesome.otf similarity index 100% rename from website/src/main/resources/web/fonts/FontAwesome.otf rename to src/main/resources/web/fonts/FontAwesome.otf diff --git a/website/src/main/resources/web/fonts/OTF/SourceSansPro-Black.otf b/src/main/resources/web/fonts/OTF/SourceSansPro-Black.otf similarity index 100% rename from website/src/main/resources/web/fonts/OTF/SourceSansPro-Black.otf rename to src/main/resources/web/fonts/OTF/SourceSansPro-Black.otf diff --git a/website/src/main/resources/web/fonts/OTF/SourceSansPro-BlackIt.otf b/src/main/resources/web/fonts/OTF/SourceSansPro-BlackIt.otf similarity index 100% rename from website/src/main/resources/web/fonts/OTF/SourceSansPro-BlackIt.otf rename to src/main/resources/web/fonts/OTF/SourceSansPro-BlackIt.otf diff --git a/website/src/main/resources/web/fonts/OTF/SourceSansPro-Bold.otf b/src/main/resources/web/fonts/OTF/SourceSansPro-Bold.otf similarity index 100% rename from website/src/main/resources/web/fonts/OTF/SourceSansPro-Bold.otf rename to src/main/resources/web/fonts/OTF/SourceSansPro-Bold.otf diff --git a/website/src/main/resources/web/fonts/OTF/SourceSansPro-BoldIt.otf b/src/main/resources/web/fonts/OTF/SourceSansPro-BoldIt.otf similarity index 100% rename from website/src/main/resources/web/fonts/OTF/SourceSansPro-BoldIt.otf rename to src/main/resources/web/fonts/OTF/SourceSansPro-BoldIt.otf diff --git a/website/src/main/resources/web/fonts/OTF/SourceSansPro-ExtraLight.otf b/src/main/resources/web/fonts/OTF/SourceSansPro-ExtraLight.otf similarity index 100% rename from website/src/main/resources/web/fonts/OTF/SourceSansPro-ExtraLight.otf rename to src/main/resources/web/fonts/OTF/SourceSansPro-ExtraLight.otf diff --git a/website/src/main/resources/web/fonts/OTF/SourceSansPro-ExtraLightIt.otf b/src/main/resources/web/fonts/OTF/SourceSansPro-ExtraLightIt.otf similarity index 100% rename from website/src/main/resources/web/fonts/OTF/SourceSansPro-ExtraLightIt.otf rename to src/main/resources/web/fonts/OTF/SourceSansPro-ExtraLightIt.otf diff --git a/website/src/main/resources/web/fonts/OTF/SourceSansPro-It.otf b/src/main/resources/web/fonts/OTF/SourceSansPro-It.otf similarity index 100% rename from website/src/main/resources/web/fonts/OTF/SourceSansPro-It.otf rename to src/main/resources/web/fonts/OTF/SourceSansPro-It.otf diff --git a/website/src/main/resources/web/fonts/OTF/SourceSansPro-Light.otf b/src/main/resources/web/fonts/OTF/SourceSansPro-Light.otf similarity index 100% rename from website/src/main/resources/web/fonts/OTF/SourceSansPro-Light.otf rename to src/main/resources/web/fonts/OTF/SourceSansPro-Light.otf diff --git a/website/src/main/resources/web/fonts/OTF/SourceSansPro-LightIt.otf b/src/main/resources/web/fonts/OTF/SourceSansPro-LightIt.otf similarity index 100% rename from website/src/main/resources/web/fonts/OTF/SourceSansPro-LightIt.otf rename to src/main/resources/web/fonts/OTF/SourceSansPro-LightIt.otf diff --git a/website/src/main/resources/web/fonts/OTF/SourceSansPro-Regular.otf b/src/main/resources/web/fonts/OTF/SourceSansPro-Regular.otf similarity index 100% rename from website/src/main/resources/web/fonts/OTF/SourceSansPro-Regular.otf rename to src/main/resources/web/fonts/OTF/SourceSansPro-Regular.otf diff --git a/website/src/main/resources/web/fonts/OTF/SourceSansPro-Semibold.otf b/src/main/resources/web/fonts/OTF/SourceSansPro-Semibold.otf similarity index 100% rename from website/src/main/resources/web/fonts/OTF/SourceSansPro-Semibold.otf rename to src/main/resources/web/fonts/OTF/SourceSansPro-Semibold.otf diff --git a/website/src/main/resources/web/fonts/OTF/SourceSansPro-SemiboldIt.otf b/src/main/resources/web/fonts/OTF/SourceSansPro-SemiboldIt.otf similarity index 100% rename from website/src/main/resources/web/fonts/OTF/SourceSansPro-SemiboldIt.otf rename to src/main/resources/web/fonts/OTF/SourceSansPro-SemiboldIt.otf diff --git a/website/src/main/resources/web/fonts/TTF/SourceSansPro-Black.ttf b/src/main/resources/web/fonts/TTF/SourceSansPro-Black.ttf similarity index 100% rename from website/src/main/resources/web/fonts/TTF/SourceSansPro-Black.ttf rename to src/main/resources/web/fonts/TTF/SourceSansPro-Black.ttf diff --git a/website/src/main/resources/web/fonts/TTF/SourceSansPro-BlackIt.ttf b/src/main/resources/web/fonts/TTF/SourceSansPro-BlackIt.ttf similarity index 100% rename from website/src/main/resources/web/fonts/TTF/SourceSansPro-BlackIt.ttf rename to src/main/resources/web/fonts/TTF/SourceSansPro-BlackIt.ttf diff --git a/website/src/main/resources/web/fonts/TTF/SourceSansPro-Bold.ttf b/src/main/resources/web/fonts/TTF/SourceSansPro-Bold.ttf similarity index 100% rename from website/src/main/resources/web/fonts/TTF/SourceSansPro-Bold.ttf rename to src/main/resources/web/fonts/TTF/SourceSansPro-Bold.ttf diff --git a/website/src/main/resources/web/fonts/TTF/SourceSansPro-BoldIt.ttf b/src/main/resources/web/fonts/TTF/SourceSansPro-BoldIt.ttf similarity index 100% rename from website/src/main/resources/web/fonts/TTF/SourceSansPro-BoldIt.ttf rename to src/main/resources/web/fonts/TTF/SourceSansPro-BoldIt.ttf diff --git a/website/src/main/resources/web/fonts/TTF/SourceSansPro-ExtraLight.ttf b/src/main/resources/web/fonts/TTF/SourceSansPro-ExtraLight.ttf similarity index 100% rename from website/src/main/resources/web/fonts/TTF/SourceSansPro-ExtraLight.ttf rename to src/main/resources/web/fonts/TTF/SourceSansPro-ExtraLight.ttf diff --git a/website/src/main/resources/web/fonts/TTF/SourceSansPro-ExtraLightIt.ttf b/src/main/resources/web/fonts/TTF/SourceSansPro-ExtraLightIt.ttf similarity index 100% rename from website/src/main/resources/web/fonts/TTF/SourceSansPro-ExtraLightIt.ttf rename to src/main/resources/web/fonts/TTF/SourceSansPro-ExtraLightIt.ttf diff --git a/website/src/main/resources/web/fonts/TTF/SourceSansPro-It.ttf b/src/main/resources/web/fonts/TTF/SourceSansPro-It.ttf similarity index 100% rename from website/src/main/resources/web/fonts/TTF/SourceSansPro-It.ttf rename to src/main/resources/web/fonts/TTF/SourceSansPro-It.ttf diff --git a/website/src/main/resources/web/fonts/TTF/SourceSansPro-Light.ttf b/src/main/resources/web/fonts/TTF/SourceSansPro-Light.ttf similarity index 100% rename from website/src/main/resources/web/fonts/TTF/SourceSansPro-Light.ttf rename to src/main/resources/web/fonts/TTF/SourceSansPro-Light.ttf diff --git a/website/src/main/resources/web/fonts/TTF/SourceSansPro-LightIt.ttf b/src/main/resources/web/fonts/TTF/SourceSansPro-LightIt.ttf similarity index 100% rename from website/src/main/resources/web/fonts/TTF/SourceSansPro-LightIt.ttf rename to src/main/resources/web/fonts/TTF/SourceSansPro-LightIt.ttf diff --git a/website/src/main/resources/web/fonts/TTF/SourceSansPro-Regular.ttf b/src/main/resources/web/fonts/TTF/SourceSansPro-Regular.ttf similarity index 100% rename from website/src/main/resources/web/fonts/TTF/SourceSansPro-Regular.ttf rename to src/main/resources/web/fonts/TTF/SourceSansPro-Regular.ttf diff --git a/website/src/main/resources/web/fonts/TTF/SourceSansPro-Semibold.ttf b/src/main/resources/web/fonts/TTF/SourceSansPro-Semibold.ttf similarity index 100% rename from website/src/main/resources/web/fonts/TTF/SourceSansPro-Semibold.ttf rename to src/main/resources/web/fonts/TTF/SourceSansPro-Semibold.ttf diff --git a/website/src/main/resources/web/fonts/TTF/SourceSansPro-SemiboldIt.ttf b/src/main/resources/web/fonts/TTF/SourceSansPro-SemiboldIt.ttf similarity index 100% rename from website/src/main/resources/web/fonts/TTF/SourceSansPro-SemiboldIt.ttf rename to src/main/resources/web/fonts/TTF/SourceSansPro-SemiboldIt.ttf diff --git a/website/src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-Black.otf.woff b/src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-Black.otf.woff similarity index 100% rename from website/src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-Black.otf.woff rename to src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-Black.otf.woff diff --git a/website/src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-BlackIt.otf.woff b/src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-BlackIt.otf.woff similarity index 100% rename from website/src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-BlackIt.otf.woff rename to src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-BlackIt.otf.woff diff --git a/website/src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-Bold.otf.woff b/src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-Bold.otf.woff similarity index 100% rename from website/src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-Bold.otf.woff rename to src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-Bold.otf.woff diff --git a/website/src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-BoldIt.otf.woff b/src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-BoldIt.otf.woff similarity index 100% rename from website/src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-BoldIt.otf.woff rename to src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-BoldIt.otf.woff diff --git a/website/src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-ExtraLight.otf.woff b/src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-ExtraLight.otf.woff similarity index 100% rename from website/src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-ExtraLight.otf.woff rename to src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-ExtraLight.otf.woff diff --git a/website/src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-ExtraLightIt.otf.woff b/src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-ExtraLightIt.otf.woff similarity index 100% rename from website/src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-ExtraLightIt.otf.woff rename to src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-ExtraLightIt.otf.woff diff --git a/website/src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-It.otf.woff b/src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-It.otf.woff similarity index 100% rename from website/src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-It.otf.woff rename to src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-It.otf.woff diff --git a/website/src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-Light.otf.woff b/src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-Light.otf.woff similarity index 100% rename from website/src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-Light.otf.woff rename to src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-Light.otf.woff diff --git a/website/src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-LightIt.otf.woff b/src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-LightIt.otf.woff similarity index 100% rename from website/src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-LightIt.otf.woff rename to src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-LightIt.otf.woff diff --git a/website/src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-Regular.otf.woff b/src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-Regular.otf.woff similarity index 100% rename from website/src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-Regular.otf.woff rename to src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-Regular.otf.woff diff --git a/website/src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-Semibold.otf.woff b/src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-Semibold.otf.woff similarity index 100% rename from website/src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-Semibold.otf.woff rename to src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-Semibold.otf.woff diff --git a/website/src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-SemiboldIt.otf.woff b/src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-SemiboldIt.otf.woff similarity index 100% rename from website/src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-SemiboldIt.otf.woff rename to src/main/resources/web/fonts/WOFF/OTF/SourceSansPro-SemiboldIt.otf.woff diff --git a/website/src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-Black.ttf.woff b/src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-Black.ttf.woff similarity index 100% rename from website/src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-Black.ttf.woff rename to src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-Black.ttf.woff diff --git a/website/src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-BlackIt.ttf.woff b/src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-BlackIt.ttf.woff similarity index 100% rename from website/src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-BlackIt.ttf.woff rename to src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-BlackIt.ttf.woff diff --git a/website/src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-Bold.ttf.woff b/src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-Bold.ttf.woff similarity index 100% rename from website/src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-Bold.ttf.woff rename to src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-Bold.ttf.woff diff --git a/website/src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-BoldIt.ttf.woff b/src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-BoldIt.ttf.woff similarity index 100% rename from website/src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-BoldIt.ttf.woff rename to src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-BoldIt.ttf.woff diff --git a/website/src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-ExtraLight.ttf.woff b/src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-ExtraLight.ttf.woff similarity index 100% rename from website/src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-ExtraLight.ttf.woff rename to src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-ExtraLight.ttf.woff diff --git a/website/src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-ExtraLightIt.ttf.woff b/src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-ExtraLightIt.ttf.woff similarity index 100% rename from website/src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-ExtraLightIt.ttf.woff rename to src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-ExtraLightIt.ttf.woff diff --git a/website/src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-It.ttf.woff b/src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-It.ttf.woff similarity index 100% rename from website/src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-It.ttf.woff rename to src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-It.ttf.woff diff --git a/website/src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-Light.ttf.woff b/src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-Light.ttf.woff similarity index 100% rename from website/src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-Light.ttf.woff rename to src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-Light.ttf.woff diff --git a/website/src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-LightIt.ttf.woff b/src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-LightIt.ttf.woff similarity index 100% rename from website/src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-LightIt.ttf.woff rename to src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-LightIt.ttf.woff diff --git a/website/src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-Regular.ttf.woff b/src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-Regular.ttf.woff similarity index 100% rename from website/src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-Regular.ttf.woff rename to src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-Regular.ttf.woff diff --git a/website/src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-Semibold.ttf.woff b/src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-Semibold.ttf.woff similarity index 100% rename from website/src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-Semibold.ttf.woff rename to src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-Semibold.ttf.woff diff --git a/website/src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-SemiboldIt.ttf.woff b/src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-SemiboldIt.ttf.woff similarity index 100% rename from website/src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-SemiboldIt.ttf.woff rename to src/main/resources/web/fonts/WOFF/TTF/SourceSansPro-SemiboldIt.ttf.woff diff --git a/website/src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-Black.otf.woff2 b/src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-Black.otf.woff2 similarity index 100% rename from website/src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-Black.otf.woff2 rename to src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-Black.otf.woff2 diff --git a/website/src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-BlackIt.otf.woff2 b/src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-BlackIt.otf.woff2 similarity index 100% rename from website/src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-BlackIt.otf.woff2 rename to src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-BlackIt.otf.woff2 diff --git a/website/src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-Bold.otf.woff2 b/src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-Bold.otf.woff2 similarity index 100% rename from website/src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-Bold.otf.woff2 rename to src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-Bold.otf.woff2 diff --git a/website/src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-BoldIt.otf.woff2 b/src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-BoldIt.otf.woff2 similarity index 100% rename from website/src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-BoldIt.otf.woff2 rename to src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-BoldIt.otf.woff2 diff --git a/website/src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-ExtraLight.otf.woff2 b/src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-ExtraLight.otf.woff2 similarity index 100% rename from website/src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-ExtraLight.otf.woff2 rename to src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-ExtraLight.otf.woff2 diff --git a/website/src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-ExtraLightIt.otf.woff2 b/src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-ExtraLightIt.otf.woff2 similarity index 100% rename from website/src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-ExtraLightIt.otf.woff2 rename to src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-ExtraLightIt.otf.woff2 diff --git a/website/src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-It.otf.woff2 b/src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-It.otf.woff2 similarity index 100% rename from website/src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-It.otf.woff2 rename to src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-It.otf.woff2 diff --git a/website/src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-Light.otf.woff2 b/src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-Light.otf.woff2 similarity index 100% rename from website/src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-Light.otf.woff2 rename to src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-Light.otf.woff2 diff --git a/website/src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-LightIt.otf.woff2 b/src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-LightIt.otf.woff2 similarity index 100% rename from website/src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-LightIt.otf.woff2 rename to src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-LightIt.otf.woff2 diff --git a/website/src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-Regular.otf.woff2 b/src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-Regular.otf.woff2 similarity index 100% rename from website/src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-Regular.otf.woff2 rename to src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-Regular.otf.woff2 diff --git a/website/src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-Semibold.otf.woff2 b/src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-Semibold.otf.woff2 similarity index 100% rename from website/src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-Semibold.otf.woff2 rename to src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-Semibold.otf.woff2 diff --git a/website/src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-SemiboldIt.otf.woff2 b/src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-SemiboldIt.otf.woff2 similarity index 100% rename from website/src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-SemiboldIt.otf.woff2 rename to src/main/resources/web/fonts/WOFF2/OTF/SourceSansPro-SemiboldIt.otf.woff2 diff --git a/website/src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-Black.ttf.woff2 b/src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-Black.ttf.woff2 similarity index 100% rename from website/src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-Black.ttf.woff2 rename to src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-Black.ttf.woff2 diff --git a/website/src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-BlackIt.ttf.woff2 b/src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-BlackIt.ttf.woff2 similarity index 100% rename from website/src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-BlackIt.ttf.woff2 rename to src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-BlackIt.ttf.woff2 diff --git a/website/src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-Bold.ttf.woff2 b/src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-Bold.ttf.woff2 similarity index 100% rename from website/src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-Bold.ttf.woff2 rename to src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-Bold.ttf.woff2 diff --git a/website/src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-BoldIt.ttf.woff2 b/src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-BoldIt.ttf.woff2 similarity index 100% rename from website/src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-BoldIt.ttf.woff2 rename to src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-BoldIt.ttf.woff2 diff --git a/website/src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-ExtraLight.ttf.woff2 b/src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-ExtraLight.ttf.woff2 similarity index 100% rename from website/src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-ExtraLight.ttf.woff2 rename to src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-ExtraLight.ttf.woff2 diff --git a/website/src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-ExtraLightIt.ttf.woff2 b/src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-ExtraLightIt.ttf.woff2 similarity index 100% rename from website/src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-ExtraLightIt.ttf.woff2 rename to src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-ExtraLightIt.ttf.woff2 diff --git a/website/src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-It.ttf.woff2 b/src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-It.ttf.woff2 similarity index 100% rename from website/src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-It.ttf.woff2 rename to src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-It.ttf.woff2 diff --git a/website/src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-Light.ttf.woff2 b/src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-Light.ttf.woff2 similarity index 100% rename from website/src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-Light.ttf.woff2 rename to src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-Light.ttf.woff2 diff --git a/website/src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-LightIt.ttf.woff2 b/src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-LightIt.ttf.woff2 similarity index 100% rename from website/src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-LightIt.ttf.woff2 rename to src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-LightIt.ttf.woff2 diff --git a/website/src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-Regular.ttf.woff2 b/src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-Regular.ttf.woff2 similarity index 100% rename from website/src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-Regular.ttf.woff2 rename to src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-Regular.ttf.woff2 diff --git a/website/src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-Semibold.ttf.woff2 b/src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-Semibold.ttf.woff2 similarity index 100% rename from website/src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-Semibold.ttf.woff2 rename to src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-Semibold.ttf.woff2 diff --git a/website/src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-SemiboldIt.ttf.woff2 b/src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-SemiboldIt.ttf.woff2 similarity index 100% rename from website/src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-SemiboldIt.ttf.woff2 rename to src/main/resources/web/fonts/WOFF2/TTF/SourceSansPro-SemiboldIt.ttf.woff2 diff --git a/website/src/main/resources/web/fonts/fontawesome-webfont.eot b/src/main/resources/web/fonts/fontawesome-webfont.eot similarity index 100% rename from website/src/main/resources/web/fonts/fontawesome-webfont.eot rename to src/main/resources/web/fonts/fontawesome-webfont.eot diff --git a/website/src/main/resources/web/fonts/fontawesome-webfont.svg b/src/main/resources/web/fonts/fontawesome-webfont.svg similarity index 100% rename from website/src/main/resources/web/fonts/fontawesome-webfont.svg rename to src/main/resources/web/fonts/fontawesome-webfont.svg diff --git a/website/src/main/resources/web/fonts/fontawesome-webfont.ttf b/src/main/resources/web/fonts/fontawesome-webfont.ttf similarity index 100% rename from website/src/main/resources/web/fonts/fontawesome-webfont.ttf rename to src/main/resources/web/fonts/fontawesome-webfont.ttf diff --git a/website/src/main/resources/web/fonts/fontawesome-webfont.woff b/src/main/resources/web/fonts/fontawesome-webfont.woff similarity index 100% rename from website/src/main/resources/web/fonts/fontawesome-webfont.woff rename to src/main/resources/web/fonts/fontawesome-webfont.woff diff --git a/website/src/main/resources/web/fonts/fontawesome-webfont.woff2 b/src/main/resources/web/fonts/fontawesome-webfont.woff2 similarity index 100% rename from website/src/main/resources/web/fonts/fontawesome-webfont.woff2 rename to src/main/resources/web/fonts/fontawesome-webfont.woff2 diff --git a/website/src/main/resources/web/fonts/glyphicons-halflings-regular.eot b/src/main/resources/web/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from website/src/main/resources/web/fonts/glyphicons-halflings-regular.eot rename to src/main/resources/web/fonts/glyphicons-halflings-regular.eot diff --git a/website/src/main/resources/web/fonts/glyphicons-halflings-regular.svg b/src/main/resources/web/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from website/src/main/resources/web/fonts/glyphicons-halflings-regular.svg rename to src/main/resources/web/fonts/glyphicons-halflings-regular.svg diff --git a/website/src/main/resources/web/fonts/glyphicons-halflings-regular.ttf b/src/main/resources/web/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from website/src/main/resources/web/fonts/glyphicons-halflings-regular.ttf rename to src/main/resources/web/fonts/glyphicons-halflings-regular.ttf diff --git a/website/src/main/resources/web/fonts/glyphicons-halflings-regular.woff b/src/main/resources/web/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from website/src/main/resources/web/fonts/glyphicons-halflings-regular.woff rename to src/main/resources/web/fonts/glyphicons-halflings-regular.woff diff --git a/website/src/main/resources/web/fonts/glyphicons-halflings-regular.woff2 b/src/main/resources/web/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from website/src/main/resources/web/fonts/glyphicons-halflings-regular.woff2 rename to src/main/resources/web/fonts/glyphicons-halflings-regular.woff2 diff --git a/website/src/main/resources/web/fonts/source-sans-pro.css b/src/main/resources/web/fonts/source-sans-pro.css similarity index 100% rename from website/src/main/resources/web/fonts/source-sans-pro.css rename to src/main/resources/web/fonts/source-sans-pro.css diff --git a/website/src/main/resources/web/images/ajax-loader.gif b/src/main/resources/web/images/ajax-loader.gif similarity index 100% rename from website/src/main/resources/web/images/ajax-loader.gif rename to src/main/resources/web/images/ajax-loader.gif diff --git a/website/src/main/resources/web/images/android-icon.png b/src/main/resources/web/images/android-icon.png similarity index 100% rename from website/src/main/resources/web/images/android-icon.png rename to src/main/resources/web/images/android-icon.png diff --git a/website/src/main/resources/web/images/apple-touch-icon-152x152.png b/src/main/resources/web/images/apple-touch-icon-152x152.png similarity index 100% rename from website/src/main/resources/web/images/apple-touch-icon-152x152.png rename to src/main/resources/web/images/apple-touch-icon-152x152.png diff --git a/website/src/main/resources/web/images/collector-logo.png b/src/main/resources/web/images/collector-logo.png similarity index 100% rename from website/src/main/resources/web/images/collector-logo.png rename to src/main/resources/web/images/collector-logo.png diff --git a/website/src/main/resources/web/images/favicon.ico b/src/main/resources/web/images/favicon.ico similarity index 100% rename from website/src/main/resources/web/images/favicon.ico rename to src/main/resources/web/images/favicon.ico diff --git a/website/src/main/resources/web/images/largetile.png b/src/main/resources/web/images/largetile.png similarity index 100% rename from website/src/main/resources/web/images/largetile.png rename to src/main/resources/web/images/largetile.png diff --git a/website/src/main/resources/web/images/mediumtile.png b/src/main/resources/web/images/mediumtile.png similarity index 100% rename from website/src/main/resources/web/images/mediumtile.png rename to src/main/resources/web/images/mediumtile.png diff --git a/website/src/main/resources/web/images/networkchurn.png b/src/main/resources/web/images/networkchurn.png similarity index 100% rename from website/src/main/resources/web/images/networkchurn.png rename to src/main/resources/web/images/networkchurn.png diff --git a/website/src/main/resources/web/images/oxford-anonymous-internet.png b/src/main/resources/web/images/oxford-anonymous-internet.png similarity index 100% rename from website/src/main/resources/web/images/oxford-anonymous-internet.png rename to src/main/resources/web/images/oxford-anonymous-internet.png diff --git a/website/src/main/resources/web/images/smalltile.png b/src/main/resources/web/images/smalltile.png similarity index 100% rename from website/src/main/resources/web/images/smalltile.png rename to src/main/resources/web/images/smalltile.png diff --git a/website/src/main/resources/web/images/tor-metrics-white.png b/src/main/resources/web/images/tor-metrics-white.png similarity index 100% rename from website/src/main/resources/web/images/tor-metrics-white.png rename to src/main/resources/web/images/tor-metrics-white.png diff --git a/website/src/main/resources/web/images/tor-metrics-white(a)2x.png b/src/main/resources/web/images/tor-metrics-white(a)2x.png similarity index 100% rename from website/src/main/resources/web/images/tor-metrics-white(a)2x.png rename to src/main/resources/web/images/tor-metrics-white(a)2x.png diff --git a/website/src/main/resources/web/images/uncharted-data-flow.png b/src/main/resources/web/images/uncharted-data-flow.png similarity index 100% rename from website/src/main/resources/web/images/uncharted-data-flow.png rename to src/main/resources/web/images/uncharted-data-flow.png diff --git a/website/src/main/resources/web/images/uptimes.jpg b/src/main/resources/web/images/uptimes.jpg similarity index 100% rename from website/src/main/resources/web/images/uptimes.jpg rename to src/main/resources/web/images/uptimes.jpg diff --git a/website/src/main/resources/web/images/widetile.png b/src/main/resources/web/images/widetile.png similarity index 100% rename from website/src/main/resources/web/images/widetile.png rename to src/main/resources/web/images/widetile.png diff --git a/website/src/main/resources/web/js/bootstrap.min.js b/src/main/resources/web/js/bootstrap.min.js similarity index 100% rename from website/src/main/resources/web/js/bootstrap.min.js rename to src/main/resources/web/js/bootstrap.min.js diff --git a/website/src/main/resources/web/js/bubbles.js b/src/main/resources/web/js/bubbles.js similarity index 100% rename from website/src/main/resources/web/js/bubbles.js rename to src/main/resources/web/js/bubbles.js diff --git a/website/src/main/resources/web/js/d3.min.js b/src/main/resources/web/js/d3.min.js similarity index 100% rename from website/src/main/resources/web/js/d3.min.js rename to src/main/resources/web/js/d3.min.js diff --git a/website/src/main/resources/web/js/jquery-3.2.1.min.js b/src/main/resources/web/js/jquery-3.2.1.min.js similarity index 100% rename from website/src/main/resources/web/js/jquery-3.2.1.min.js rename to src/main/resources/web/js/jquery-3.2.1.min.js diff --git a/website/src/main/resources/web/js/prism.js b/src/main/resources/web/js/prism.js similarity index 100% rename from website/src/main/resources/web/js/prism.js rename to src/main/resources/web/js/prism.js diff --git a/website/src/main/resources/web/js/script.js b/src/main/resources/web/js/script.js similarity index 100% rename from website/src/main/resources/web/js/script.js rename to src/main/resources/web/js/script.js diff --git a/website/src/main/resources/etc/categories.json b/src/main/resources/web/json/categories.json similarity index 100% rename from website/src/main/resources/etc/categories.json rename to src/main/resources/web/json/categories.json diff --git a/website/src/main/resources/etc/logging.properties b/src/main/resources/web/json/logging.properties similarity index 100% rename from website/src/main/resources/etc/logging.properties rename to src/main/resources/web/json/logging.properties diff --git a/website/src/main/resources/etc/metrics.json b/src/main/resources/web/json/metrics.json similarity index 100% rename from website/src/main/resources/etc/metrics.json rename to src/main/resources/web/json/metrics.json diff --git a/website/src/main/resources/etc/news.json b/src/main/resources/web/json/news.json similarity index 100% rename from website/src/main/resources/etc/news.json rename to src/main/resources/web/json/news.json diff --git a/website/src/main/resources/web/WEB-INF/about.jsp b/src/main/resources/web/jsps/about.jsp similarity index 100% rename from website/src/main/resources/web/WEB-INF/about.jsp rename to src/main/resources/web/jsps/about.jsp diff --git a/website/src/main/resources/web/WEB-INF/bottom.jsp b/src/main/resources/web/jsps/bottom.jsp similarity index 100% rename from website/src/main/resources/web/WEB-INF/bottom.jsp rename to src/main/resources/web/jsps/bottom.jsp diff --git a/website/src/main/resources/web/WEB-INF/bridge-descriptors.jsp b/src/main/resources/web/jsps/bridge-descriptors.jsp similarity index 100% rename from website/src/main/resources/web/WEB-INF/bridge-descriptors.jsp rename to src/main/resources/web/jsps/bridge-descriptors.jsp diff --git a/website/src/main/resources/web/WEB-INF/bubbles.jsp b/src/main/resources/web/jsps/bubbles.jsp similarity index 100% rename from website/src/main/resources/web/WEB-INF/bubbles.jsp rename to src/main/resources/web/jsps/bubbles.jsp diff --git a/website/src/main/resources/web/WEB-INF/collector-files.jsp b/src/main/resources/web/jsps/collector-files.jsp similarity index 100% rename from website/src/main/resources/web/WEB-INF/collector-files.jsp rename to src/main/resources/web/jsps/collector-files.jsp diff --git a/website/src/main/resources/web/WEB-INF/collector.jsp b/src/main/resources/web/jsps/collector.jsp similarity index 100% rename from website/src/main/resources/web/WEB-INF/collector.jsp rename to src/main/resources/web/jsps/collector.jsp diff --git a/website/src/main/resources/web/WEB-INF/development.jsp b/src/main/resources/web/jsps/development.jsp similarity index 100% rename from website/src/main/resources/web/WEB-INF/development.jsp rename to src/main/resources/web/jsps/development.jsp diff --git a/website/src/main/resources/web/WEB-INF/error.jsp b/src/main/resources/web/jsps/error.jsp similarity index 100% rename from website/src/main/resources/web/WEB-INF/error.jsp rename to src/main/resources/web/jsps/error.jsp diff --git a/website/src/main/resources/web/WEB-INF/glossary.jsp b/src/main/resources/web/jsps/glossary.jsp similarity index 100% rename from website/src/main/resources/web/WEB-INF/glossary.jsp rename to src/main/resources/web/jsps/glossary.jsp diff --git a/website/src/main/resources/web/WEB-INF/graph.jsp b/src/main/resources/web/jsps/graph.jsp similarity index 100% rename from website/src/main/resources/web/WEB-INF/graph.jsp rename to src/main/resources/web/jsps/graph.jsp diff --git a/website/src/main/resources/web/WEB-INF/index.jsp b/src/main/resources/web/jsps/index.jsp similarity index 100% rename from website/src/main/resources/web/WEB-INF/index.jsp rename to src/main/resources/web/jsps/index.jsp diff --git a/website/src/main/resources/web/WEB-INF/link.jsp b/src/main/resources/web/jsps/link.jsp similarity index 100% rename from website/src/main/resources/web/WEB-INF/link.jsp rename to src/main/resources/web/jsps/link.jsp diff --git a/website/src/main/resources/web/WEB-INF/metrics-lib.jsp b/src/main/resources/web/jsps/metrics-lib.jsp similarity index 100% rename from website/src/main/resources/web/WEB-INF/metrics-lib.jsp rename to src/main/resources/web/jsps/metrics-lib.jsp diff --git a/website/src/main/resources/web/WEB-INF/news.jsp b/src/main/resources/web/jsps/news.jsp similarity index 100% rename from website/src/main/resources/web/WEB-INF/news.jsp rename to src/main/resources/web/jsps/news.jsp diff --git a/website/src/main/resources/web/WEB-INF/onionoo.jsp b/src/main/resources/web/jsps/onionoo.jsp similarity index 100% rename from website/src/main/resources/web/WEB-INF/onionoo.jsp rename to src/main/resources/web/jsps/onionoo.jsp diff --git a/website/src/main/resources/web/WEB-INF/operation.jsp b/src/main/resources/web/jsps/operation.jsp similarity index 100% rename from website/src/main/resources/web/WEB-INF/operation.jsp rename to src/main/resources/web/jsps/operation.jsp diff --git a/website/src/main/resources/web/WEB-INF/research.jsp b/src/main/resources/web/jsps/research.jsp similarity index 100% rename from website/src/main/resources/web/WEB-INF/research.jsp rename to src/main/resources/web/jsps/research.jsp diff --git a/website/src/main/resources/web/WEB-INF/services.jsp b/src/main/resources/web/jsps/services.jsp similarity index 100% rename from website/src/main/resources/web/WEB-INF/services.jsp rename to src/main/resources/web/jsps/services.jsp diff --git a/website/src/main/resources/web/WEB-INF/sources.jsp b/src/main/resources/web/jsps/sources.jsp similarity index 100% rename from website/src/main/resources/web/WEB-INF/sources.jsp rename to src/main/resources/web/jsps/sources.jsp diff --git a/website/src/main/resources/web/WEB-INF/stats.jsp b/src/main/resources/web/jsps/stats.jsp similarity index 100% rename from website/src/main/resources/web/WEB-INF/stats.jsp rename to src/main/resources/web/jsps/stats.jsp diff --git a/website/src/main/resources/web/WEB-INF/table.jsp b/src/main/resources/web/jsps/table.jsp similarity index 100% rename from website/src/main/resources/web/WEB-INF/table.jsp rename to src/main/resources/web/jsps/table.jsp diff --git a/website/src/main/resources/web/WEB-INF/top.jsp b/src/main/resources/web/jsps/top.jsp similarity index 100% rename from website/src/main/resources/web/WEB-INF/top.jsp rename to src/main/resources/web/jsps/top.jsp diff --git a/website/src/main/resources/web/WEB-INF/web-server-logs.jsp b/src/main/resources/web/jsps/web-server-logs.jsp similarity index 100% rename from website/src/main/resources/web/WEB-INF/web-server-logs.jsp rename to src/main/resources/web/jsps/web-server-logs.jsp diff --git a/website/build.xml b/website/build.xml deleted file mode 100644 index 07bf84e..0000000 --- a/website/build.xml +++ /dev/null @@ -1,80 +0,0 @@ -<project default="war" name="metrics-web" basedir="."> - - <property name="metricslibversion" value="2.0.0"/> - - <property name="libs" value="../shared/lib"/> - - <include file="../shared/build-base.xml" as="basetask"/> - <target name="clean" depends="basetask.clean"/> - <target name="compile" depends="basetask.compile"/> - <target name="test" depends="basetask.test"/> - - <patternset id="compile.libs" > - <include name="postgresql-jdbc3-9.2.jar"/> - <include name="REngine.jar"/> - <include name="Rserve.jar"/> - </patternset> - - <patternset id="war.libs" > - <patternset refid="compile.libs" /> - <include name="jstl1.1-1.1.2.jar"/> - <include name="standard-1.1.2.jar"/> - <include name="commons-codec-1.10.jar"/> - <include name="commons-lang-2.6.jar"/> - <include name="gson-2.4.jar"/> - <include name="metrics-lib-${metricslibversion}.jar"/> - <include name="commons-compress-1.13.jar"/> - <include name="slf4j-api-1.7.22.jar"/> - </patternset> - - <path id="classpath"> - <pathelement path="${classes}"/> - <path refid="base.classpath" /> - <fileset dir="${libs}"> - <patternset refid="compile.libs" /> - <include name="servlet-api-3.1.jar"/> - </fileset> - </path> - - <target name="submoduleupdate" > - <exec executable="git" failonerror="false"> - <arg value="submodule" /> - <arg value="update" /> - <arg value="--remote" /> - <arg value="--merge" /> - </exec> - </target> - -  - <target name="war" - depends="submoduleupdate,compile"> - <exec executable="src/main/resources/web-prepare.sh" > - <arg value="${basedir}/../submods" /> - </exec> - <war destfile="metrics.war" - webxml="${resources}/etc/web.xml"> - <fileset dir="${resources}/web"/> - <lib dir="${libs}"> - <patternset refid="war.libs" /> - </lib> - <classes dir="${classes}"/> - <zipfileset dir="${resources}/etc" - prefix="WEB-INF/classes" - includes="logging.properties"/> - <zipfileset dir="${resources}/etc" - prefix="WEB-INF/classes" - includes="metrics.json"/> - <zipfileset dir="${resources}/etc" - prefix="WEB-INF/classes" - includes="categories.json"/> - <zipfileset dir="${resources}/etc" - prefix="WEB-INF/classes" - includes="news.json"/> - <metainf dir="${resources}/etc" - includes="context.xml"/> - <zipfileset dir="${basedir}/../submods/metrics-lib/generated/javadoc" - prefix="metrics-lib" /> - </war> - </target> -</project> - diff --git a/website/src/main/resources/bootstrap-development.sh b/website/src/main/resources/bootstrap-development.sh deleted file mode 100755 index a99ebf2..0000000 --- a/website/src/main/resources/bootstrap-development.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -# -# Copyright 2017 The Tor Project -# See LICENSE for licensing information -# -# Use for submodule initialization and checkout. -# Only necessary after very first checkout without recursion. -# -git submodule update --init --remote

1 0

[metrics-web/master] Added default in switch statement.
by karsten＠torproject.org 20 Dec '17

20 Dec '17

commit 4cdd00dae29fb17d6a496984e2362639f2fe348e Author: iwakeh <iwakeh(a)torproject.org> Date: Mon Dec 18 09:11:59 2017 +0000 Added default in switch statement. Avoid checkstyle complaint. --- src/main/java/org/torproject/metrics/web/GraphServlet.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/torproject/metrics/web/GraphServlet.java b/src/main/java/org/torproject/metrics/web/GraphServlet.java index 02f1cee..7df5294 100644 --- a/src/main/java/org/torproject/metrics/web/GraphServlet.java +++ b/src/main/java/org/torproject/metrics/web/GraphServlet.java @@ -241,6 +241,7 @@ public class GraphServlet extends MetricServlet { case "events": eventsParameter = checkedParameter.getValue()[0]; break; + default: // don't care about other parameters } } }

1 0