[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [metrics-web/master] Move web content and files to main src folder.
commit 338be5c1d24b4739c7fafa9870dc63bdda0ffe84
Author: iwakeh <iwakeh@xxxxxxxxxxxxxx>
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@xxxxxx | 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">
+ <!-- maybe add more handlers (statistics, logging, etc.) later -->
+ <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" />
+
+ <!-- a path and a prefix -->
+ <property name="logfile-base" value="${LOGBASE}/metrics-web-" />
+
+ <!-- log file names -->
+ <property name="fileall-logname" value="${logfile-base}all" />
+ <property name="fileerr-logname" value="${logfile-base}err" />
+ <property name="filestatistics-logname" value="${logfile-base}statistics" />
+
+ <!-- date pattern -->
+ <property name="utc-date-pattern" value="%date{ISO8601, UTC}" />
+
+ <!-- appender section -->
+ <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">
+ <!-- rollover daily -->
+ <FileNamePattern>${fileall-logname}.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+ <maxHistory>10</maxHistory>
+ <timeBasedFileNamingAndTriggeringPolicy
+ class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+ <!-- or whenever the file size reaches 1MB -->
+ <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>
+
+ <!-- ERROR or worse -->
+ <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+ <level>ERROR</level>
+ </filter>
+ </appender>
+
+ <!-- logger section -->
+ <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@xxxxxx b/src/main/resources/web/images/tor-metrics-white@xxxxxx
similarity index 100%
rename from website/src/main/resources/web/images/tor-metrics-white@xxxxxx
rename to src/main/resources/web/images/tor-metrics-white@xxxxxx
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>
-
- <!-- Create a .war file for deployment. -->
- <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
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits