From 5aac4c9343e2e91b9c014dd1b121ad9353494762 Mon Sep 17 00:00:00 2001
From: Schankula Christopher <schankuc@mcmaster.ca>
Date: Thu, 29 Mar 2018 11:52:26 -0400
Subject: [PATCH] update gitignore; delete work directory from git

---
 .gitignore                                    |   3 +-
 .../ROOT/org/apache/jsp/index_jsp.java        | 437 ------------------
 .../Trawl-Site/org/apache/jsp/result_jsp.java | 152 ------
 .../Trawl/org/apache/jsp/histogram_jsp.java   | 204 --------
 .../Trawl/org/apache/jsp/index_jsp.java       | 233 ----------
 .../Trawl/org/apache/jsp/result_jsp.java      | 178 -------
 .../org/apache/jsp/jsp/dates/date_jsp.java    | 186 --------
 .../jsp/jsp2/el/basic_002darithmetic_jsp.java | 231 ---------
 .../apache/jsp/WEB_002dINF/jsp/_401_jsp.java  | 186 --------
 .../apache/jsp/WEB_002dINF/jsp/_401_jsp.java  | 195 --------
 10 files changed, 1 insertion(+), 2004 deletions(-)
 delete mode 100644 tomcat/work/Catalina/localhost/ROOT/org/apache/jsp/index_jsp.java
 delete mode 100644 tomcat/work/Catalina/localhost/Trawl-Site/org/apache/jsp/result_jsp.java
 delete mode 100644 tomcat/work/Catalina/localhost/Trawl/org/apache/jsp/histogram_jsp.java
 delete mode 100644 tomcat/work/Catalina/localhost/Trawl/org/apache/jsp/index_jsp.java
 delete mode 100644 tomcat/work/Catalina/localhost/Trawl/org/apache/jsp/result_jsp.java
 delete mode 100644 tomcat/work/Catalina/localhost/examples/org/apache/jsp/jsp/dates/date_jsp.java
 delete mode 100644 tomcat/work/Catalina/localhost/examples/org/apache/jsp/jsp/jsp2/el/basic_002darithmetic_jsp.java
 delete mode 100644 tomcat/work/Catalina/localhost/host-manager/org/apache/jsp/WEB_002dINF/jsp/_401_jsp.java
 delete mode 100644 tomcat/work/Catalina/localhost/manager/org/apache/jsp/WEB_002dINF/jsp/_401_jsp.java

diff --git a/.gitignore b/.gitignore
index 28b9d7c..506bfba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,5 +12,4 @@
 .idea/
 *.class
 logs/
-tomcat/work/Catalina/localhost/Trawl/org/apache
-
+tomcat/work/*
diff --git a/tomcat/work/Catalina/localhost/ROOT/org/apache/jsp/index_jsp.java b/tomcat/work/Catalina/localhost/ROOT/org/apache/jsp/index_jsp.java
deleted file mode 100644
index ba307a3..0000000
--- a/tomcat/work/Catalina/localhost/ROOT/org/apache/jsp/index_jsp.java
+++ /dev/null
@@ -1,437 +0,0 @@
-/*
- * Generated by the Jasper component of Apache Tomcat
- * Version: Apache Tomcat/9.0.6
- * Generated at: 2018-03-29 13:38:27 UTC
- * Note: The last modified time of this file was set to
- *       the last modified time of the source file after
- *       generation to assist with modification tracking.
- */
-package org.apache.jsp;
-
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-
-public final class index_jsp extends org.apache.jasper.runtime.HttpJspBase
-    implements org.apache.jasper.runtime.JspSourceDependent,
-                 org.apache.jasper.runtime.JspSourceImports {
-
-  private static final javax.servlet.jsp.JspFactory _jspxFactory =
-          javax.servlet.jsp.JspFactory.getDefaultFactory();
-
-  private static java.util.Map<java.lang.String,java.lang.Long> _jspx_dependants;
-
-  private static final java.util.Set<java.lang.String> _jspx_imports_packages;
-
-  private static final java.util.Set<java.lang.String> _jspx_imports_classes;
-
-  static {
-    _jspx_imports_packages = new java.util.HashSet<>();
-    _jspx_imports_packages.add("javax.servlet");
-    _jspx_imports_packages.add("javax.servlet.http");
-    _jspx_imports_packages.add("javax.servlet.jsp");
-    _jspx_imports_classes = null;
-  }
-
-  private volatile javax.el.ExpressionFactory _el_expressionfactory;
-  private volatile org.apache.tomcat.InstanceManager _jsp_instancemanager;
-
-  public java.util.Map<java.lang.String,java.lang.Long> getDependants() {
-    return _jspx_dependants;
-  }
-
-  public java.util.Set<java.lang.String> getPackageImports() {
-    return _jspx_imports_packages;
-  }
-
-  public java.util.Set<java.lang.String> getClassImports() {
-    return _jspx_imports_classes;
-  }
-
-  public javax.el.ExpressionFactory _jsp_getExpressionFactory() {
-    if (_el_expressionfactory == null) {
-      synchronized (this) {
-        if (_el_expressionfactory == null) {
-          _el_expressionfactory = _jspxFactory.getJspApplicationContext(getServletConfig().getServletContext()).getExpressionFactory();
-        }
-      }
-    }
-    return _el_expressionfactory;
-  }
-
-  public org.apache.tomcat.InstanceManager _jsp_getInstanceManager() {
-    if (_jsp_instancemanager == null) {
-      synchronized (this) {
-        if (_jsp_instancemanager == null) {
-          _jsp_instancemanager = org.apache.jasper.runtime.InstanceManagerFactory.getInstanceManager(getServletConfig());
-        }
-      }
-    }
-    return _jsp_instancemanager;
-  }
-
-  public void _jspInit() {
-  }
-
-  public void _jspDestroy() {
-  }
-
-  public void _jspService(final javax.servlet.http.HttpServletRequest request, final javax.servlet.http.HttpServletResponse response)
-      throws java.io.IOException, javax.servlet.ServletException {
-
-    if (!javax.servlet.DispatcherType.ERROR.equals(request.getDispatcherType())) {
-      final java.lang.String _jspx_method = request.getMethod();
-      if ("OPTIONS".equals(_jspx_method)) {
-        response.setHeader("Allow","GET, HEAD, POST, OPTIONS");
-        return;
-      }
-      if (!"GET".equals(_jspx_method) && !"POST".equals(_jspx_method) && !"HEAD".equals(_jspx_method)) {
-        response.setHeader("Allow","GET, HEAD, POST, OPTIONS");
-        response.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED, "JSPs only permit GET, POST or HEAD. Jasper also permits OPTIONS");
-        return;
-      }
-    }
-
-    final javax.servlet.jsp.PageContext pageContext;
-    final javax.servlet.ServletContext application;
-    final javax.servlet.ServletConfig config;
-    javax.servlet.jsp.JspWriter out = null;
-    final java.lang.Object page = this;
-    javax.servlet.jsp.JspWriter _jspx_out = null;
-    javax.servlet.jsp.PageContext _jspx_page_context = null;
-
-
-    try {
-      response.setContentType("text/html; charset=UTF-8");
-      pageContext = _jspxFactory.getPageContext(this, request, response,
-      			null, false, 8192, true);
-      _jspx_page_context = pageContext;
-      application = pageContext.getServletContext();
-      config = pageContext.getServletConfig();
-      out = pageContext.getOut();
-      _jspx_out = out;
-
-      out.write("\r\n");
-      out.write("\r\n");
-
-java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("yyyy");
-request.setAttribute("year", sdf.format(new java.util.Date()));
-request.setAttribute("tomcatUrl", "http://tomcat.apache.org/");
-request.setAttribute("tomcatDocUrl", "/docs/");
-request.setAttribute("tomcatExamplesUrl", "/examples/");
-
-      out.write("\r\n");
-      out.write("<!DOCTYPE html>\r\n");
-      out.write("<html lang=\"en\">\r\n");
-      out.write("    <head>\r\n");
-      out.write("        <meta charset=\"UTF-8\" />\r\n");
-      out.write("        <title>");
-      out.print(request.getServletContext().getServerInfo() );
-      out.write("</title>\r\n");
-      out.write("        <link href=\"favicon.ico\" rel=\"icon\" type=\"image/x-icon\" />\r\n");
-      out.write("        <link href=\"favicon.ico\" rel=\"shortcut icon\" type=\"image/x-icon\" />\r\n");
-      out.write("        <link href=\"tomcat.css\" rel=\"stylesheet\" type=\"text/css\" />\r\n");
-      out.write("    </head>\r\n");
-      out.write("\r\n");
-      out.write("    <body>\r\n");
-      out.write("        <div id=\"wrapper\">\r\n");
-      out.write("            <div id=\"navigation\" class=\"curved container\">\r\n");
-      out.write("                <span id=\"nav-home\"><a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("\">Home</a></span>\r\n");
-      out.write("                <span id=\"nav-hosts\"><a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("\">Documentation</a></span>\r\n");
-      out.write("                <span id=\"nav-config\"><a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("config/\">Configuration</a></span>\r\n");
-      out.write("                <span id=\"nav-examples\"><a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatExamplesUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("\">Examples</a></span>\r\n");
-      out.write("                <span id=\"nav-wiki\"><a href=\"http://wiki.apache.org/tomcat/FrontPage\">Wiki</a></span>\r\n");
-      out.write("                <span id=\"nav-lists\"><a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("lists.html\">Mailing Lists</a></span>\r\n");
-      out.write("                <span id=\"nav-help\"><a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("findhelp.html\">Find Help</a></span>\r\n");
-      out.write("                <br class=\"separator\" />\r\n");
-      out.write("            </div>\r\n");
-      out.write("            <div id=\"asf-box\">\r\n");
-      out.write("                <h1>");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${pageContext.servletContext.serverInfo}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("</h1>\r\n");
-      out.write("            </div>\r\n");
-      out.write("            <div id=\"upper\" class=\"curved container\">\r\n");
-      out.write("                <div id=\"congrats\" class=\"curved container\">\r\n");
-      out.write("                    <h2>If you're seeing this, you've successfully installed Tomcat. Congratulations!</h2>\r\n");
-      out.write("                </div>\r\n");
-      out.write("                <div id=\"notice\">\r\n");
-      out.write("                    <img src=\"tomcat.png\" alt=\"[tomcat logo]\" />\r\n");
-      out.write("                    <div id=\"tasks\">\r\n");
-      out.write("                        <h3>Recommended Reading:</h3>\r\n");
-      out.write("                        <h4><a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("security-howto.html\">Security Considerations HOW-TO</a></h4>\r\n");
-      out.write("                        <h4><a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("manager-howto.html\">Manager Application HOW-TO</a></h4>\r\n");
-      out.write("                        <h4><a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("cluster-howto.html\">Clustering/Session Replication HOW-TO</a></h4>\r\n");
-      out.write("                    </div>\r\n");
-      out.write("                </div>\r\n");
-      out.write("                <div id=\"actions\">\r\n");
-      out.write("                    <div class=\"button\">\r\n");
-      out.write("                        <a class=\"container shadow\" href=\"/manager/status\"><span>Server Status</span></a>\r\n");
-      out.write("                    </div>\r\n");
-      out.write("                    <div class=\"button\">\r\n");
-      out.write("                        <a class=\"container shadow\" href=\"/manager/html\"><span>Manager App</span></a>\r\n");
-      out.write("                    </div>\r\n");
-      out.write("                    <div class=\"button\">\r\n");
-      out.write("                        <a class=\"container shadow\" href=\"/host-manager/html\"><span>Host Manager</span></a>\r\n");
-      out.write("                    </div>\r\n");
-      out.write("                </div>\r\n");
-      out.write("                <!--\r\n");
-      out.write("                <br class=\"separator\" />\r\n");
-      out.write("                -->\r\n");
-      out.write("                <br class=\"separator\" />\r\n");
-      out.write("            </div>\r\n");
-      out.write("            <div id=\"middle\" class=\"curved container\">\r\n");
-      out.write("                <h3>Developer Quick Start</h3>\r\n");
-      out.write("                <div class=\"col25\">\r\n");
-      out.write("                    <div class=\"container\">\r\n");
-      out.write("                        <p><a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("setup.html\">Tomcat Setup</a></p>\r\n");
-      out.write("                        <p><a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("appdev/\">First Web Application</a></p>\r\n");
-      out.write("                    </div>\r\n");
-      out.write("                </div>\r\n");
-      out.write("                <div class=\"col25\">\r\n");
-      out.write("                    <div class=\"container\">\r\n");
-      out.write("                        <p><a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("realm-howto.html\">Realms &amp; AAA</a></p>\r\n");
-      out.write("                        <p><a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("jndi-datasource-examples-howto.html\">JDBC DataSources</a></p>\r\n");
-      out.write("                    </div>\r\n");
-      out.write("                </div>\r\n");
-      out.write("                <div class=\"col25\">\r\n");
-      out.write("                    <div class=\"container\">\r\n");
-      out.write("                        <p><a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatExamplesUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("\">Examples</a></p>\r\n");
-      out.write("                    </div>\r\n");
-      out.write("                </div>\r\n");
-      out.write("                <div class=\"col25\">\r\n");
-      out.write("                    <div class=\"container\">\r\n");
-      out.write("                        <p><a href=\"http://wiki.apache.org/tomcat/Specifications\">Servlet Specifications</a></p>\r\n");
-      out.write("                        <p><a href=\"http://wiki.apache.org/tomcat/TomcatVersions\">Tomcat Versions</a></p>\r\n");
-      out.write("                    </div>\r\n");
-      out.write("                </div>\r\n");
-      out.write("                <br class=\"separator\" />\r\n");
-      out.write("            </div>\r\n");
-      out.write("            <div id=\"lower\">\r\n");
-      out.write("                <div id=\"low-manage\" class=\"\">\r\n");
-      out.write("                    <div class=\"curved container\">\r\n");
-      out.write("                        <h3>Managing Tomcat</h3>\r\n");
-      out.write("                        <p>For security, access to the <a href=\"/manager/html\">manager webapp</a> is restricted.\r\n");
-      out.write("                        Users are defined in:</p>\r\n");
-      out.write("                        <pre>$CATALINA_HOME/conf/tomcat-users.xml</pre>\r\n");
-      out.write("                        <p>In Tomcat 9.0 access to the manager application is split between\r\n");
-      out.write("                           different users. &nbsp; <a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("manager-howto.html\">Read more...</a></p>\r\n");
-      out.write("                        <br />\r\n");
-      out.write("                        <h4><a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("RELEASE-NOTES.txt\">Release Notes</a></h4>\r\n");
-      out.write("                        <h4><a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("changelog.html\">Changelog</a></h4>\r\n");
-      out.write("                        <h4><a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("migration.html\">Migration Guide</a></h4>\r\n");
-      out.write("                        <h4><a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("security.html\">Security Notices</a></h4>\r\n");
-      out.write("                    </div>\r\n");
-      out.write("                </div>\r\n");
-      out.write("                <div id=\"low-docs\" class=\"\">\r\n");
-      out.write("                    <div class=\"curved container\">\r\n");
-      out.write("                        <h3>Documentation</h3>\r\n");
-      out.write("                        <h4><a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("\">Tomcat 9.0 Documentation</a></h4>\r\n");
-      out.write("                        <h4><a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("config/\">Tomcat 9.0 Configuration</a></h4>\r\n");
-      out.write("                        <h4><a href=\"http://wiki.apache.org/tomcat/FrontPage\">Tomcat Wiki</a></h4>\r\n");
-      out.write("                        <p>Find additional important configuration information in:</p>\r\n");
-      out.write("                        <pre>$CATALINA_HOME/RUNNING.txt</pre>\r\n");
-      out.write("                        <p>Developers may be interested in:</p>\r\n");
-      out.write("                        <ul>\r\n");
-      out.write("                            <li><a href=\"http://tomcat.apache.org/bugreport.html\">Tomcat 9.0 Bug Database</a></li>\r\n");
-      out.write("                            <li><a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("api/index.html\">Tomcat 9.0 JavaDocs</a></li>\r\n");
-      out.write("                            <li><a href=\"http://svn.apache.org/repos/asf/tomcat/tc9.0.x/\">Tomcat 9.0 SVN Repository</a></li>\r\n");
-      out.write("                        </ul>\r\n");
-      out.write("                    </div>\r\n");
-      out.write("                </div>\r\n");
-      out.write("                <div id=\"low-help\" class=\"\">\r\n");
-      out.write("                    <div class=\"curved container\">\r\n");
-      out.write("                        <h3>Getting Help</h3>\r\n");
-      out.write("                        <h4><a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("faq/\">FAQ</a> and <a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("lists.html\">Mailing Lists</a></h4>\r\n");
-      out.write("                        <p>The following mailing lists are available:</p>\r\n");
-      out.write("                        <ul>\r\n");
-      out.write("                            <li id=\"list-announce\"><strong><a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("lists.html#tomcat-announce\">tomcat-announce</a><br />\r\n");
-      out.write("                                Important announcements, releases, security vulnerability notifications. (Low volume).</strong>\r\n");
-      out.write("                            </li>\r\n");
-      out.write("                            <li><a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("lists.html#tomcat-users\">tomcat-users</a><br />\r\n");
-      out.write("                                User support and discussion\r\n");
-      out.write("                            </li>\r\n");
-      out.write("                            <li><a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("lists.html#taglibs-user\">taglibs-user</a><br />\r\n");
-      out.write("                                User support and discussion for <a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("taglibs/\">Apache Taglibs</a>\r\n");
-      out.write("                            </li>\r\n");
-      out.write("                            <li><a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("lists.html#tomcat-dev\">tomcat-dev</a><br />\r\n");
-      out.write("                                Development mailing list, including commit messages\r\n");
-      out.write("                            </li>\r\n");
-      out.write("                        </ul>\r\n");
-      out.write("                    </div>\r\n");
-      out.write("                </div>\r\n");
-      out.write("                <br class=\"separator\" />\r\n");
-      out.write("            </div>\r\n");
-      out.write("            <div id=\"footer\" class=\"curved container\">\r\n");
-      out.write("                <div class=\"col20\">\r\n");
-      out.write("                    <div class=\"container\">\r\n");
-      out.write("                        <h4>Other Downloads</h4>\r\n");
-      out.write("                        <ul>\r\n");
-      out.write("                            <li><a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("download-connectors.cgi\">Tomcat Connectors</a></li>\r\n");
-      out.write("                            <li><a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("download-native.cgi\">Tomcat Native</a></li>\r\n");
-      out.write("                            <li><a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("taglibs/\">Taglibs</a></li>\r\n");
-      out.write("                            <li><a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("deployer-howto.html\">Deployer</a></li>\r\n");
-      out.write("                        </ul>\r\n");
-      out.write("                    </div>\r\n");
-      out.write("                </div>\r\n");
-      out.write("                <div class=\"col20\">\r\n");
-      out.write("                    <div class=\"container\">\r\n");
-      out.write("                        <h4>Other Documentation</h4>\r\n");
-      out.write("                        <ul>\r\n");
-      out.write("                            <li><a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("connectors-doc/\">Tomcat Connectors</a></li>\r\n");
-      out.write("                            <li><a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("connectors-doc/\">mod_jk Documentation</a></li>\r\n");
-      out.write("                            <li><a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("native-doc/\">Tomcat Native</a></li>\r\n");
-      out.write("                            <li><a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatDocUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("deployer-howto.html\">Deployer</a></li>\r\n");
-      out.write("                        </ul>\r\n");
-      out.write("                    </div>\r\n");
-      out.write("                </div>\r\n");
-      out.write("                <div class=\"col20\">\r\n");
-      out.write("                    <div class=\"container\">\r\n");
-      out.write("                        <h4>Get Involved</h4>\r\n");
-      out.write("                        <ul>\r\n");
-      out.write("                            <li><a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("getinvolved.html\">Overview</a></li>\r\n");
-      out.write("                            <li><a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("svn.html\">SVN Repositories</a></li>\r\n");
-      out.write("                            <li><a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("lists.html\">Mailing Lists</a></li>\r\n");
-      out.write("                            <li><a href=\"http://wiki.apache.org/tomcat/FrontPage\">Wiki</a></li>\r\n");
-      out.write("                        </ul>\r\n");
-      out.write("                    </div>\r\n");
-      out.write("                </div>\r\n");
-      out.write("                <div class=\"col20\">\r\n");
-      out.write("                    <div class=\"container\">\r\n");
-      out.write("                        <h4>Miscellaneous</h4>\r\n");
-      out.write("                        <ul>\r\n");
-      out.write("                            <li><a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("contact.html\">Contact</a></li>\r\n");
-      out.write("                            <li><a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("legal.html\">Legal</a></li>\r\n");
-      out.write("                            <li><a href=\"http://www.apache.org/foundation/sponsorship.html\">Sponsorship</a></li>\r\n");
-      out.write("                            <li><a href=\"http://www.apache.org/foundation/thanks.html\">Thanks</a></li>\r\n");
-      out.write("                        </ul>\r\n");
-      out.write("                    </div>\r\n");
-      out.write("                </div>\r\n");
-      out.write("                <div class=\"col20\">\r\n");
-      out.write("                    <div class=\"container\">\r\n");
-      out.write("                        <h4>Apache Software Foundation</h4>\r\n");
-      out.write("                        <ul>\r\n");
-      out.write("                            <li><a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("whoweare.html\">Who We Are</a></li>\r\n");
-      out.write("                            <li><a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("heritage.html\">Heritage</a></li>\r\n");
-      out.write("                            <li><a href=\"http://www.apache.org\">Apache Home</a></li>\r\n");
-      out.write("                            <li><a href=\"");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${tomcatUrl}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("resources.html\">Resources</a></li>\r\n");
-      out.write("                        </ul>\r\n");
-      out.write("                    </div>\r\n");
-      out.write("                </div>\r\n");
-      out.write("                <br class=\"separator\" />\r\n");
-      out.write("            </div>\r\n");
-      out.write("            <p class=\"copyright\">Copyright &copy;1999-");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${year}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write(" Apache Software Foundation.  All Rights Reserved</p>\r\n");
-      out.write("        </div>\r\n");
-      out.write("    </body>\r\n");
-      out.write("\r\n");
-      out.write("</html>\r\n");
-    } catch (java.lang.Throwable t) {
-      if (!(t instanceof javax.servlet.jsp.SkipPageException)){
-        out = _jspx_out;
-        if (out != null && out.getBufferSize() != 0)
-          try {
-            if (response.isCommitted()) {
-              out.flush();
-            } else {
-              out.clearBuffer();
-            }
-          } catch (java.io.IOException e) {}
-        if (_jspx_page_context != null) _jspx_page_context.handlePageException(t);
-        else throw new ServletException(t);
-      }
-    } finally {
-      _jspxFactory.releasePageContext(_jspx_page_context);
-    }
-  }
-}
diff --git a/tomcat/work/Catalina/localhost/Trawl-Site/org/apache/jsp/result_jsp.java b/tomcat/work/Catalina/localhost/Trawl-Site/org/apache/jsp/result_jsp.java
deleted file mode 100644
index 5726e8f..0000000
--- a/tomcat/work/Catalina/localhost/Trawl-Site/org/apache/jsp/result_jsp.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Generated by the Jasper component of Apache Tomcat
- * Version: Apache Tomcat/9.0.6
- * Generated at: 2018-03-12 20:54:09 UTC
- * Note: The last modified time of this file was set to
- *       the last modified time of the source file after
- *       generation to assist with modification tracking.
- */
-package org.apache.jsp;
-
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-import java.util.*;
-
-public final class result_jsp extends org.apache.jasper.runtime.HttpJspBase
-    implements org.apache.jasper.runtime.JspSourceDependent,
-                 org.apache.jasper.runtime.JspSourceImports {
-
-  private static final javax.servlet.jsp.JspFactory _jspxFactory =
-          javax.servlet.jsp.JspFactory.getDefaultFactory();
-
-  private static java.util.Map<java.lang.String,java.lang.Long> _jspx_dependants;
-
-  private static final java.util.Set<java.lang.String> _jspx_imports_packages;
-
-  private static final java.util.Set<java.lang.String> _jspx_imports_classes;
-
-  static {
-    _jspx_imports_packages = new java.util.HashSet<>();
-    _jspx_imports_packages.add("javax.servlet");
-    _jspx_imports_packages.add("java.util");
-    _jspx_imports_packages.add("javax.servlet.http");
-    _jspx_imports_packages.add("javax.servlet.jsp");
-    _jspx_imports_classes = null;
-  }
-
-  private volatile javax.el.ExpressionFactory _el_expressionfactory;
-  private volatile org.apache.tomcat.InstanceManager _jsp_instancemanager;
-
-  public java.util.Map<java.lang.String,java.lang.Long> getDependants() {
-    return _jspx_dependants;
-  }
-
-  public java.util.Set<java.lang.String> getPackageImports() {
-    return _jspx_imports_packages;
-  }
-
-  public java.util.Set<java.lang.String> getClassImports() {
-    return _jspx_imports_classes;
-  }
-
-  public javax.el.ExpressionFactory _jsp_getExpressionFactory() {
-    if (_el_expressionfactory == null) {
-      synchronized (this) {
-        if (_el_expressionfactory == null) {
-          _el_expressionfactory = _jspxFactory.getJspApplicationContext(getServletConfig().getServletContext()).getExpressionFactory();
-        }
-      }
-    }
-    return _el_expressionfactory;
-  }
-
-  public org.apache.tomcat.InstanceManager _jsp_getInstanceManager() {
-    if (_jsp_instancemanager == null) {
-      synchronized (this) {
-        if (_jsp_instancemanager == null) {
-          _jsp_instancemanager = org.apache.jasper.runtime.InstanceManagerFactory.getInstanceManager(getServletConfig());
-        }
-      }
-    }
-    return _jsp_instancemanager;
-  }
-
-  public void _jspInit() {
-  }
-
-  public void _jspDestroy() {
-  }
-
-  public void _jspService(final javax.servlet.http.HttpServletRequest request, final javax.servlet.http.HttpServletResponse response)
-      throws java.io.IOException, javax.servlet.ServletException {
-
-    if (!javax.servlet.DispatcherType.ERROR.equals(request.getDispatcherType())) {
-      final java.lang.String _jspx_method = request.getMethod();
-      if ("OPTIONS".equals(_jspx_method)) {
-        response.setHeader("Allow","GET, HEAD, POST, OPTIONS");
-        return;
-      }
-      if (!"GET".equals(_jspx_method) && !"POST".equals(_jspx_method) && !"HEAD".equals(_jspx_method)) {
-        response.setHeader("Allow","GET, HEAD, POST, OPTIONS");
-        response.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED, "JSPs only permit GET, POST or HEAD. Jasper also permits OPTIONS");
-        return;
-      }
-    }
-
-    final javax.servlet.jsp.PageContext pageContext;
-    javax.servlet.http.HttpSession session = null;
-    final javax.servlet.ServletContext application;
-    final javax.servlet.ServletConfig config;
-    javax.servlet.jsp.JspWriter out = null;
-    final java.lang.Object page = this;
-    javax.servlet.jsp.JspWriter _jspx_out = null;
-    javax.servlet.jsp.PageContext _jspx_page_context = null;
-
-
-    try {
-      response.setContentType("text/html");
-      pageContext = _jspxFactory.getPageContext(this, request, response,
-      			null, true, 8192, true);
-      _jspx_page_context = pageContext;
-      application = pageContext.getServletContext();
-      config = pageContext.getServletConfig();
-      session = pageContext.getSession();
-      out = pageContext.getOut();
-      _jspx_out = out;
-
-      out.write("\r\n");
-      out.write("<html>\r\n");
-      out.write("<body>\r\n");
-      out.write("<h1 align=\"center\">Beer Recommendations JSP</h1>\r\n");
-      out.write("<p>\r\n");
-      out.write("\r\n");
-
-	List styles = (List)request.getAttribute("styles");
-	Iterator it = styles.iterator();
-	while (it.hasNext()) {
-		out.print("<br>TRY: " + it.next());
-	}
-
-      out.write("\r\n");
-      out.write("</body>\r\n");
-      out.write("</html>");
-    } catch (java.lang.Throwable t) {
-      if (!(t instanceof javax.servlet.jsp.SkipPageException)){
-        out = _jspx_out;
-        if (out != null && out.getBufferSize() != 0)
-          try {
-            if (response.isCommitted()) {
-              out.flush();
-            } else {
-              out.clearBuffer();
-            }
-          } catch (java.io.IOException e) {}
-        if (_jspx_page_context != null) _jspx_page_context.handlePageException(t);
-        else throw new ServletException(t);
-      }
-    } finally {
-      _jspxFactory.releasePageContext(_jspx_page_context);
-    }
-  }
-}
diff --git a/tomcat/work/Catalina/localhost/Trawl/org/apache/jsp/histogram_jsp.java b/tomcat/work/Catalina/localhost/Trawl/org/apache/jsp/histogram_jsp.java
deleted file mode 100644
index db5d405..0000000
--- a/tomcat/work/Catalina/localhost/Trawl/org/apache/jsp/histogram_jsp.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Generated by the Jasper component of Apache Tomcat
- * Version: Apache Tomcat/9.0.6
- * Generated at: 2018-03-28 13:41:27 UTC
- * Note: The last modified time of this file was set to
- *       the last modified time of the source file after
- *       generation to assist with modification tracking.
- */
-package org.apache.jsp;
-
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-import java.util.*;
-import data.Record;
-import model.TrawlExpert;
-import search.BST;
-import search.BasicSearchResult;
-
-public final class histogram_jsp extends org.apache.jasper.runtime.HttpJspBase
-    implements org.apache.jasper.runtime.JspSourceDependent,
-                 org.apache.jasper.runtime.JspSourceImports {
-
-  private static final javax.servlet.jsp.JspFactory _jspxFactory =
-          javax.servlet.jsp.JspFactory.getDefaultFactory();
-
-  private static java.util.Map<java.lang.String,java.lang.Long> _jspx_dependants;
-
-  private static final java.util.Set<java.lang.String> _jspx_imports_packages;
-
-  private static final java.util.Set<java.lang.String> _jspx_imports_classes;
-
-  static {
-    _jspx_imports_packages = new java.util.HashSet<>();
-    _jspx_imports_packages.add("javax.servlet");
-    _jspx_imports_packages.add("java.util");
-    _jspx_imports_packages.add("javax.servlet.http");
-    _jspx_imports_packages.add("javax.servlet.jsp");
-    _jspx_imports_classes = new java.util.HashSet<>();
-    _jspx_imports_classes.add("data.Record");
-    _jspx_imports_classes.add("search.BST");
-    _jspx_imports_classes.add("search.BasicSearchResult");
-    _jspx_imports_classes.add("model.TrawlExpert");
-  }
-
-  private volatile javax.el.ExpressionFactory _el_expressionfactory;
-  private volatile org.apache.tomcat.InstanceManager _jsp_instancemanager;
-
-  public java.util.Map<java.lang.String,java.lang.Long> getDependants() {
-    return _jspx_dependants;
-  }
-
-  public java.util.Set<java.lang.String> getPackageImports() {
-    return _jspx_imports_packages;
-  }
-
-  public java.util.Set<java.lang.String> getClassImports() {
-    return _jspx_imports_classes;
-  }
-
-  public javax.el.ExpressionFactory _jsp_getExpressionFactory() {
-    if (_el_expressionfactory == null) {
-      synchronized (this) {
-        if (_el_expressionfactory == null) {
-          _el_expressionfactory = _jspxFactory.getJspApplicationContext(getServletConfig().getServletContext()).getExpressionFactory();
-        }
-      }
-    }
-    return _el_expressionfactory;
-  }
-
-  public org.apache.tomcat.InstanceManager _jsp_getInstanceManager() {
-    if (_jsp_instancemanager == null) {
-      synchronized (this) {
-        if (_jsp_instancemanager == null) {
-          _jsp_instancemanager = org.apache.jasper.runtime.InstanceManagerFactory.getInstanceManager(getServletConfig());
-        }
-      }
-    }
-    return _jsp_instancemanager;
-  }
-
-  public void _jspInit() {
-  }
-
-  public void _jspDestroy() {
-  }
-
-  public void _jspService(final javax.servlet.http.HttpServletRequest request, final javax.servlet.http.HttpServletResponse response)
-      throws java.io.IOException, javax.servlet.ServletException {
-
-    if (!javax.servlet.DispatcherType.ERROR.equals(request.getDispatcherType())) {
-      final java.lang.String _jspx_method = request.getMethod();
-      if ("OPTIONS".equals(_jspx_method)) {
-        response.setHeader("Allow","GET, HEAD, POST, OPTIONS");
-        return;
-      }
-      if (!"GET".equals(_jspx_method) && !"POST".equals(_jspx_method) && !"HEAD".equals(_jspx_method)) {
-        response.setHeader("Allow","GET, HEAD, POST, OPTIONS");
-        response.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED, "JSPs only permit GET, POST or HEAD. Jasper also permits OPTIONS");
-        return;
-      }
-    }
-
-    final javax.servlet.jsp.PageContext pageContext;
-    javax.servlet.http.HttpSession session = null;
-    final javax.servlet.ServletContext application;
-    final javax.servlet.ServletConfig config;
-    javax.servlet.jsp.JspWriter out = null;
-    final java.lang.Object page = this;
-    javax.servlet.jsp.JspWriter _jspx_out = null;
-    javax.servlet.jsp.PageContext _jspx_page_context = null;
-
-
-    try {
-      response.setContentType("text/html");
-      pageContext = _jspxFactory.getPageContext(this, request, response,
-      			null, true, 8192, true);
-      _jspx_page_context = pageContext;
-      application = pageContext.getServletContext();
-      config = pageContext.getServletConfig();
-      session = pageContext.getSession();
-      out = pageContext.getOut();
-      _jspx_out = out;
-
-      out.write("\r\n");
-      out.write("<head>\r\n");
-      out.write("  <!-- Plotly.js -->\r\n");
-      out.write("  <script src=\"https://cdn.plot.ly/plotly-latest.min.js\"></script>\r\n");
-      out.write("</head>\r\n");
-      out.write("\r\n");
-      out.write("<body>\r\n");
-      out.write("  \r\n");
-      out.write("  <div id=\"histogram\"><!-- Plotly chart will be drawn inside this DIV --></div>\r\n");
-      out.write("  <script src=\"https://cdn.plot.ly/plotly-latest.min.js\"></script>\r\n");
-      out.write("\t<script>\r\n");
-      out.write("\r\n");
-      out.write("\t");
-
-
-		TrawlExpert te = (TrawlExpert)request.getServletContext().getAttribute("trawl");
-		BasicSearchResult result = te.rangeSearch(2, 1960, 2016);
-
-		BST<Integer, Integer> histogram = result.histogram();
-		Iterable<Integer> results = histogram.keys();
-		out.print("var y=[];");
-		out.print("var x=[];");
-		for (Integer year: results){
-			out.print("\ty.push("+ histogram.get(year) +");\n");
-			out.print("\tx.push('"+ year +"');\n");
-		}
-		
-	
-      out.write("\r\n");
-      out.write("\r\n");
-      out.write("\tvar data = [\r\n");
-      out.write("  \t{ \tx: x,\r\n");
-      out.write("    \ty: y,\r\n");
-      out.write("    \ttype: 'bar',\r\n");
-      out.write("     \tmarker: {\r\n");
-      out.write("    \tcolor: 'blue',\r\n");
-      out.write("    \t},\r\n");
-      out.write("  \t}\r\n");
-      out.write("\t];\r\n");
-      out.write("\r\n");
-      out.write("\tvar layout = {\r\n");
-      out.write("\t\ttitle: 'Individual count vs Year',\r\n");
-      out.write("    \txaxis:{title: 'Year',\r\n");
-      out.write("    \t\ttitlefont: {\r\n");
-      out.write("      \t\t\tfamily: 'Courier New, monospace',\r\n");
-      out.write("      \t\t\tsize: 18,\r\n");
-      out.write("      \t\t\tcolor: '#7f7f7f'\r\n");
-      out.write("    \t\t\t}\r\n");
-      out.write("    \t},\r\n");
-      out.write("    \tyaxis:{title: 'Individual count',\r\n");
-      out.write("    \t\ttitlefont: {\r\n");
-      out.write("      \t\t\tfamily: 'Courier New, monospace',\r\n");
-      out.write("      \t\t\tsize: 18,\r\n");
-      out.write("      \t\t\tcolor: '#7f7f7f'\r\n");
-      out.write("    \t\t\t}\r\n");
-      out.write("    \t\t}\r\n");
-      out.write("\t}\r\n");
-      out.write("\tPlotly.newPlot('histogram', data,layout);  \r\n");
-      out.write("\t</script>\r\n");
-      out.write("</body>");
-    } catch (java.lang.Throwable t) {
-      if (!(t instanceof javax.servlet.jsp.SkipPageException)){
-        out = _jspx_out;
-        if (out != null && out.getBufferSize() != 0)
-          try {
-            if (response.isCommitted()) {
-              out.flush();
-            } else {
-              out.clearBuffer();
-            }
-          } catch (java.io.IOException e) {}
-        if (_jspx_page_context != null) _jspx_page_context.handlePageException(t);
-        else throw new ServletException(t);
-      }
-    } finally {
-      _jspxFactory.releasePageContext(_jspx_page_context);
-    }
-  }
-}
diff --git a/tomcat/work/Catalina/localhost/Trawl/org/apache/jsp/index_jsp.java b/tomcat/work/Catalina/localhost/Trawl/org/apache/jsp/index_jsp.java
deleted file mode 100644
index 79b4e8e..0000000
--- a/tomcat/work/Catalina/localhost/Trawl/org/apache/jsp/index_jsp.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * Generated by the Jasper component of Apache Tomcat
- * Version: Apache Tomcat/9.0.6
- * Generated at: 2018-03-29 13:42:06 UTC
- * Note: The last modified time of this file was set to
- *       the last modified time of the source file after
- *       generation to assist with modification tracking.
- */
-package org.apache.jsp;
-
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-import java.util.*;
-
-public final class index_jsp extends org.apache.jasper.runtime.HttpJspBase
-    implements org.apache.jasper.runtime.JspSourceDependent,
-                 org.apache.jasper.runtime.JspSourceImports {
-
-  private static final javax.servlet.jsp.JspFactory _jspxFactory =
-          javax.servlet.jsp.JspFactory.getDefaultFactory();
-
-  private static java.util.Map<java.lang.String,java.lang.Long> _jspx_dependants;
-
-  private static final java.util.Set<java.lang.String> _jspx_imports_packages;
-
-  private static final java.util.Set<java.lang.String> _jspx_imports_classes;
-
-  static {
-    _jspx_imports_packages = new java.util.HashSet<>();
-    _jspx_imports_packages.add("javax.servlet");
-    _jspx_imports_packages.add("java.util");
-    _jspx_imports_packages.add("javax.servlet.http");
-    _jspx_imports_packages.add("javax.servlet.jsp");
-    _jspx_imports_classes = null;
-  }
-
-  private volatile javax.el.ExpressionFactory _el_expressionfactory;
-  private volatile org.apache.tomcat.InstanceManager _jsp_instancemanager;
-
-  public java.util.Map<java.lang.String,java.lang.Long> getDependants() {
-    return _jspx_dependants;
-  }
-
-  public java.util.Set<java.lang.String> getPackageImports() {
-    return _jspx_imports_packages;
-  }
-
-  public java.util.Set<java.lang.String> getClassImports() {
-    return _jspx_imports_classes;
-  }
-
-  public javax.el.ExpressionFactory _jsp_getExpressionFactory() {
-    if (_el_expressionfactory == null) {
-      synchronized (this) {
-        if (_el_expressionfactory == null) {
-          _el_expressionfactory = _jspxFactory.getJspApplicationContext(getServletConfig().getServletContext()).getExpressionFactory();
-        }
-      }
-    }
-    return _el_expressionfactory;
-  }
-
-  public org.apache.tomcat.InstanceManager _jsp_getInstanceManager() {
-    if (_jsp_instancemanager == null) {
-      synchronized (this) {
-        if (_jsp_instancemanager == null) {
-          _jsp_instancemanager = org.apache.jasper.runtime.InstanceManagerFactory.getInstanceManager(getServletConfig());
-        }
-      }
-    }
-    return _jsp_instancemanager;
-  }
-
-  public void _jspInit() {
-  }
-
-  public void _jspDestroy() {
-  }
-
-  public void _jspService(final javax.servlet.http.HttpServletRequest request, final javax.servlet.http.HttpServletResponse response)
-      throws java.io.IOException, javax.servlet.ServletException {
-
-    if (!javax.servlet.DispatcherType.ERROR.equals(request.getDispatcherType())) {
-      final java.lang.String _jspx_method = request.getMethod();
-      if ("OPTIONS".equals(_jspx_method)) {
-        response.setHeader("Allow","GET, HEAD, POST, OPTIONS");
-        return;
-      }
-      if (!"GET".equals(_jspx_method) && !"POST".equals(_jspx_method) && !"HEAD".equals(_jspx_method)) {
-        response.setHeader("Allow","GET, HEAD, POST, OPTIONS");
-        response.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED, "JSPs only permit GET, POST or HEAD. Jasper also permits OPTIONS");
-        return;
-      }
-    }
-
-    final javax.servlet.jsp.PageContext pageContext;
-    javax.servlet.http.HttpSession session = null;
-    final javax.servlet.ServletContext application;
-    final javax.servlet.ServletConfig config;
-    javax.servlet.jsp.JspWriter out = null;
-    final java.lang.Object page = this;
-    javax.servlet.jsp.JspWriter _jspx_out = null;
-    javax.servlet.jsp.PageContext _jspx_page_context = null;
-
-
-    try {
-      response.setContentType("text/html");
-      pageContext = _jspxFactory.getPageContext(this, request, response,
-      			null, true, 8192, true);
-      _jspx_page_context = pageContext;
-      application = pageContext.getServletContext();
-      config = pageContext.getServletConfig();
-      session = pageContext.getSession();
-      out = pageContext.getOut();
-      _jspx_out = out;
-
-      out.write("\r\n");
-      out.write("<!--\r\n");
-      out.write("Double Handle Slider Modified from: http://jqueryui.com/slider/#range\r\n");
-      out.write("-->\r\n");
-      out.write("\r\n");
-      out.write("<!DOCTYPE html>\r\n");
-      out.write("<html lang=\"en\">\r\n");
-      out.write("<head>\r\n");
-      out.write("    <meta charset=\"UTF-8\">\r\n");
-      out.write("    <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">\r\n");
-      out.write("    <meta name=\"keywords\" content=\"insert, some, keywords\"> <!--TODO-->\r\n");
-      out.write("    <meta name=\"description\" content=\"insert a description\"> <!--TODO-->\r\n");
-      out.write("    <title>TrawlTool</title>\r\n");
-      out.write("    <link rel=\"stylesheet\" type=\"text/css\" href=\"style.css\">\r\n");
-      out.write("\r\n");
-      out.write("    <!--JQuery-->\r\n");
-      out.write("    <script src=\"https://code.jquery.com/jquery-1.12.4.js\"></script>\r\n");
-      out.write("    <script src=\"https://code.jquery.com/ui/1.12.1/jquery-ui.js\"></script>\r\n");
-      out.write("    <link rel=\"stylesheet\" href=\"//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css\">\r\n");
-      out.write("\r\n");
-      out.write("    <!-- MUST load JQuery Library before loading this-->\r\n");
-      out.write("    <script src=\"script.js\"></script>\r\n");
-      out.write("\r\n");
-      out.write("    <!--Fonts-->\r\n");
-      out.write("    <!--Open Sans Rg-400/Semi-600/Bd-700-->\r\n");
-      out.write("    <link href=\"https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700\" rel=\"stylesheet\">\r\n");
-      out.write("\r\n");
-      out.write("    <!--Plugins-->\r\n");
-      out.write("</head>\r\n");
-      out.write("<body>\r\n");
-      out.write("    <header>\r\n");
-      out.write("        <div class=\"headerWrapper\">\r\n");
-      out.write("            <a href=\"index.jsp\" >TrawlTool</a>\r\n");
-      out.write("            <span class=\"nav-bar\">\r\n");
-      out.write("                <a href=\"about.html\">About</a> |\r\n");
-      out.write("                <a href=\"index.html\" target=\"_blank\">Gitlab/Github Nonfunc!</a>\r\n");
-      out.write("            </span>\r\n");
-      out.write("        </div>\r\n");
-      out.write("    </header>\r\n");
-      out.write("\r\n");
-      out.write("    <section id=\"main\">\r\n");
-      out.write("        <section id=\"formWrapper\">\r\n");
-      out.write("            <section id=\"pickSciRanks\">\r\n");
-      out.write("                Phylum:\r\n");
-      out.write("                <select name=\"pickSciR\" id=\"pickPhylum\" size=\"1\" onChange=\"changedSciR('phylum')\"><!--Dynamically Filled--></select>\r\n");
-      out.write("\r\n");
-      out.write("                Class:\r\n");
-      out.write("                <select name=\"pickSciR\" id=\"pickClass\" size=\"1\" onChange=\"changedSciR('class')\">\r\n");
-      out.write("                    <option value=\"00\">Arthropoda</option>\r\n");
-      out.write("                    <option value=\"01\">Chordata</option>\r\n");
-      out.write("                    <option value=\"03\">Mollusca</option>\r\n");
-      out.write("                </select>\r\n");
-      out.write("                Order:\r\n");
-      out.write("                <select name=\"pickSciR\" size=\"1\" onChange=\"alert()\"><!--Dynamically Filled--></select>\r\n");
-      out.write("                Family:\r\n");
-      out.write("                <select name=\"pickSciR\" size=\"1\"><!--Dynamically Filled--></select>\r\n");
-      out.write("                Genus:\r\n");
-      out.write("                <select name=\"pickSciR\" size=\"1\"><!--Dynamically Filled--></select>\r\n");
-      out.write("                Species:\r\n");
-      out.write("                <select name=\"pickSciR\" size=\"1\"><!--Dynamically Filled--></select>\r\n");
-      out.write("            </section>\r\n");
-      out.write("\r\n");
-      out.write("            <section id=\"yearIn\">\r\n");
-      out.write("                Year Range:\r\n");
-      out.write("                <span id=\"fromtoYear\">InnerHtml</span>\r\n");
-      out.write("                <form>\r\n");
-      out.write("                    <div id=\"slider-range\"></div>\r\n");
-      out.write("                </form>\r\n");
-      out.write("            </section>\r\n");
-      out.write("\r\n");
-      out.write("            <section id=\"outputIn\">\r\n");
-      out.write("                ");
-      out.write("\r\n");
-      out.write("                <input type=\"radio\" name=\"pickOutput\" value=\"map\"> Map\r\n");
-      out.write("                <input type=\"radio\" name=\"pickOutput\" value=\"histogram\" checked> Histogram\r\n");
-      out.write("                <button type=\"button\" onclick=\"\">Load</button>\r\n");
-      out.write("                <button type=\"button\" onclick=\"\">View Individual Records</button> <!--To records.html-->\r\n");
-      out.write("            </section>\r\n");
-      out.write("        </section>\r\n");
-      out.write("\r\n");
-      out.write("\r\n");
-      out.write("        <section id=\"outputWrapper\">\r\n");
-      out.write("            <section id=\"outputDetails\">Stuff like population count, entries found, etc. go here</section>\r\n");
-      out.write("            <section id=\"outputBox\">Map, Histogram Box. Histogram selected by default but we might want to have a loading screen instead.\r\n");
-      out.write("                <div id=\"console\">~~~ PSEUDO-CONSOLE ~~~<br></div>\r\n");
-      out.write("            </section>\r\n");
-      out.write("        </section>\r\n");
-      out.write("    </section>\r\n");
-      out.write("    ");
-      out.write("\r\n");
-      out.write("        ");
-      out.write("\r\n");
-      out.write("    ");
-      out.write("\r\n");
-      out.write("</body>\r\n");
-      out.write("</html>\r\n");
-      out.write("\r\n");
-    } catch (java.lang.Throwable t) {
-      if (!(t instanceof javax.servlet.jsp.SkipPageException)){
-        out = _jspx_out;
-        if (out != null && out.getBufferSize() != 0)
-          try {
-            if (response.isCommitted()) {
-              out.flush();
-            } else {
-              out.clearBuffer();
-            }
-          } catch (java.io.IOException e) {}
-        if (_jspx_page_context != null) _jspx_page_context.handlePageException(t);
-        else throw new ServletException(t);
-      }
-    } finally {
-      _jspxFactory.releasePageContext(_jspx_page_context);
-    }
-  }
-}
diff --git a/tomcat/work/Catalina/localhost/Trawl/org/apache/jsp/result_jsp.java b/tomcat/work/Catalina/localhost/Trawl/org/apache/jsp/result_jsp.java
deleted file mode 100644
index 988a068..0000000
--- a/tomcat/work/Catalina/localhost/Trawl/org/apache/jsp/result_jsp.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Generated by the Jasper component of Apache Tomcat
- * Version: Apache Tomcat/9.0.6
- * Generated at: 2018-03-29 13:42:08 UTC
- * Note: The last modified time of this file was set to
- *       the last modified time of the source file after
- *       generation to assist with modification tracking.
- */
-package org.apache.jsp;
-
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-import search.BasicSearchResult;
-import java.util.*;
-import data.Record;
-import model.TrawlExpert;
-
-public final class result_jsp extends org.apache.jasper.runtime.HttpJspBase
-    implements org.apache.jasper.runtime.JspSourceDependent,
-                 org.apache.jasper.runtime.JspSourceImports {
-
-  private static final javax.servlet.jsp.JspFactory _jspxFactory =
-          javax.servlet.jsp.JspFactory.getDefaultFactory();
-
-  private static java.util.Map<java.lang.String,java.lang.Long> _jspx_dependants;
-
-  private static final java.util.Set<java.lang.String> _jspx_imports_packages;
-
-  private static final java.util.Set<java.lang.String> _jspx_imports_classes;
-
-  static {
-    _jspx_imports_packages = new java.util.HashSet<>();
-    _jspx_imports_packages.add("javax.servlet");
-    _jspx_imports_packages.add("java.util");
-    _jspx_imports_packages.add("javax.servlet.http");
-    _jspx_imports_packages.add("javax.servlet.jsp");
-    _jspx_imports_classes = new java.util.HashSet<>();
-    _jspx_imports_classes.add("data.Record");
-    _jspx_imports_classes.add("search.BasicSearchResult");
-    _jspx_imports_classes.add("model.TrawlExpert");
-  }
-
-  private volatile javax.el.ExpressionFactory _el_expressionfactory;
-  private volatile org.apache.tomcat.InstanceManager _jsp_instancemanager;
-
-  public java.util.Map<java.lang.String,java.lang.Long> getDependants() {
-    return _jspx_dependants;
-  }
-
-  public java.util.Set<java.lang.String> getPackageImports() {
-    return _jspx_imports_packages;
-  }
-
-  public java.util.Set<java.lang.String> getClassImports() {
-    return _jspx_imports_classes;
-  }
-
-  public javax.el.ExpressionFactory _jsp_getExpressionFactory() {
-    if (_el_expressionfactory == null) {
-      synchronized (this) {
-        if (_el_expressionfactory == null) {
-          _el_expressionfactory = _jspxFactory.getJspApplicationContext(getServletConfig().getServletContext()).getExpressionFactory();
-        }
-      }
-    }
-    return _el_expressionfactory;
-  }
-
-  public org.apache.tomcat.InstanceManager _jsp_getInstanceManager() {
-    if (_jsp_instancemanager == null) {
-      synchronized (this) {
-        if (_jsp_instancemanager == null) {
-          _jsp_instancemanager = org.apache.jasper.runtime.InstanceManagerFactory.getInstanceManager(getServletConfig());
-        }
-      }
-    }
-    return _jsp_instancemanager;
-  }
-
-  public void _jspInit() {
-  }
-
-  public void _jspDestroy() {
-  }
-
-  public void _jspService(final javax.servlet.http.HttpServletRequest request, final javax.servlet.http.HttpServletResponse response)
-      throws java.io.IOException, javax.servlet.ServletException {
-
-    if (!javax.servlet.DispatcherType.ERROR.equals(request.getDispatcherType())) {
-      final java.lang.String _jspx_method = request.getMethod();
-      if ("OPTIONS".equals(_jspx_method)) {
-        response.setHeader("Allow","GET, HEAD, POST, OPTIONS");
-        return;
-      }
-      if (!"GET".equals(_jspx_method) && !"POST".equals(_jspx_method) && !"HEAD".equals(_jspx_method)) {
-        response.setHeader("Allow","GET, HEAD, POST, OPTIONS");
-        response.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED, "JSPs only permit GET, POST or HEAD. Jasper also permits OPTIONS");
-        return;
-      }
-    }
-
-    final javax.servlet.jsp.PageContext pageContext;
-    javax.servlet.http.HttpSession session = null;
-    final javax.servlet.ServletContext application;
-    final javax.servlet.ServletConfig config;
-    javax.servlet.jsp.JspWriter out = null;
-    final java.lang.Object page = this;
-    javax.servlet.jsp.JspWriter _jspx_out = null;
-    javax.servlet.jsp.PageContext _jspx_page_context = null;
-
-
-    try {
-      response.setContentType("text/html");
-      pageContext = _jspxFactory.getPageContext(this, request, response,
-      			null, true, 8192, true);
-      _jspx_page_context = pageContext;
-      application = pageContext.getServletContext();
-      config = pageContext.getServletConfig();
-      session = pageContext.getSession();
-      out = pageContext.getOut();
-      _jspx_out = out;
-
-      out.write("\r\n");
-      out.write("\r\n");
-      out.write("<html>\r\n");
-      out.write("<body>\r\n");
-      out.write("<h1 align=\"center\">Trawl Results</h1>\r\n");
-      out.write("<p>\r\n");
-      out.write("\r\n");
-      out.write("<table>\r\n");
-      out.write("<tr>\r\n");
-      out.write("\t<th>Scientific Name</th>\r\n");
-      out.write("\t<th>Year</th>\r\n");
-      out.write("\t<th>Month</th>\r\n");
-      out.write("\t<th>Day</th>\r\n");
-      out.write("\t<th>Latitude</th>\r\n");
-      out.write("\t<th>Longitude</th>\r\n");
-      out.write("\t<th>Individual Count</th>\r\n");
-      out.write("</tr>\r\n");
-
-	TrawlExpert te = (TrawlExpert)request.getServletContext().getAttribute("trawl");
-	BasicSearchResult results = te.rangeSearch(159512, 1960, 2016);
-	for (Record r: results.results()){
-		out.print("<tr>\n");
-		out.print("<th>" + te.getTaxonRecord(r.getTaxonId()).getName() + "</th>\n");
-		out.print("<th>" + r.getDate().getYear() + "</th>\n");
-		out.print("<th>" + r.getDate().getMonth() + "</th>\n");
-		out.print("<th>" + r.getDate().getDay() + "</th>\n");
-		out.print("<th>" + r.getLatitude() + "</th>\n");
-		out.print("<th>" + r.getLongitude() + "</th>\n");
-		out.print("<th>" + r.getCount() + "</th>\n");
-		out.print("</tr>\n");
-	}
-
-      out.write("\r\n");
-      out.write("</table>\r\n");
-      out.write("</body>\r\n");
-      out.write("</html>");
-    } catch (java.lang.Throwable t) {
-      if (!(t instanceof javax.servlet.jsp.SkipPageException)){
-        out = _jspx_out;
-        if (out != null && out.getBufferSize() != 0)
-          try {
-            if (response.isCommitted()) {
-              out.flush();
-            } else {
-              out.clearBuffer();
-            }
-          } catch (java.io.IOException e) {}
-        if (_jspx_page_context != null) _jspx_page_context.handlePageException(t);
-        else throw new ServletException(t);
-      }
-    } finally {
-      _jspxFactory.releasePageContext(_jspx_page_context);
-    }
-  }
-}
diff --git a/tomcat/work/Catalina/localhost/examples/org/apache/jsp/jsp/dates/date_jsp.java b/tomcat/work/Catalina/localhost/examples/org/apache/jsp/jsp/dates/date_jsp.java
deleted file mode 100644
index 4dccab7..0000000
--- a/tomcat/work/Catalina/localhost/examples/org/apache/jsp/jsp/dates/date_jsp.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Generated by the Jasper component of Apache Tomcat
- * Version: Apache Tomcat/9.0.6
- * Generated at: 2018-03-21 13:35:58 UTC
- * Note: The last modified time of this file was set to
- *       the last modified time of the source file after
- *       generation to assist with modification tracking.
- */
-package org.apache.jsp.jsp.dates;
-
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-
-public final class date_jsp extends org.apache.jasper.runtime.HttpJspBase
-    implements org.apache.jasper.runtime.JspSourceDependent,
-                 org.apache.jasper.runtime.JspSourceImports {
-
-  private static final javax.servlet.jsp.JspFactory _jspxFactory =
-          javax.servlet.jsp.JspFactory.getDefaultFactory();
-
-  private static java.util.Map<java.lang.String,java.lang.Long> _jspx_dependants;
-
-  private static final java.util.Set<java.lang.String> _jspx_imports_packages;
-
-  private static final java.util.Set<java.lang.String> _jspx_imports_classes;
-
-  static {
-    _jspx_imports_packages = new java.util.HashSet<>();
-    _jspx_imports_packages.add("javax.servlet");
-    _jspx_imports_packages.add("javax.servlet.http");
-    _jspx_imports_packages.add("javax.servlet.jsp");
-    _jspx_imports_classes = null;
-  }
-
-  private volatile javax.el.ExpressionFactory _el_expressionfactory;
-  private volatile org.apache.tomcat.InstanceManager _jsp_instancemanager;
-
-  public java.util.Map<java.lang.String,java.lang.Long> getDependants() {
-    return _jspx_dependants;
-  }
-
-  public java.util.Set<java.lang.String> getPackageImports() {
-    return _jspx_imports_packages;
-  }
-
-  public java.util.Set<java.lang.String> getClassImports() {
-    return _jspx_imports_classes;
-  }
-
-  public javax.el.ExpressionFactory _jsp_getExpressionFactory() {
-    if (_el_expressionfactory == null) {
-      synchronized (this) {
-        if (_el_expressionfactory == null) {
-          _el_expressionfactory = _jspxFactory.getJspApplicationContext(getServletConfig().getServletContext()).getExpressionFactory();
-        }
-      }
-    }
-    return _el_expressionfactory;
-  }
-
-  public org.apache.tomcat.InstanceManager _jsp_getInstanceManager() {
-    if (_jsp_instancemanager == null) {
-      synchronized (this) {
-        if (_jsp_instancemanager == null) {
-          _jsp_instancemanager = org.apache.jasper.runtime.InstanceManagerFactory.getInstanceManager(getServletConfig());
-        }
-      }
-    }
-    return _jsp_instancemanager;
-  }
-
-  public void _jspInit() {
-  }
-
-  public void _jspDestroy() {
-  }
-
-  public void _jspService(final javax.servlet.http.HttpServletRequest request, final javax.servlet.http.HttpServletResponse response)
-      throws java.io.IOException, javax.servlet.ServletException {
-
-    if (!javax.servlet.DispatcherType.ERROR.equals(request.getDispatcherType())) {
-      final java.lang.String _jspx_method = request.getMethod();
-      if ("OPTIONS".equals(_jspx_method)) {
-        response.setHeader("Allow","GET, HEAD, POST, OPTIONS");
-        return;
-      }
-      if (!"GET".equals(_jspx_method) && !"POST".equals(_jspx_method) && !"HEAD".equals(_jspx_method)) {
-        response.setHeader("Allow","GET, HEAD, POST, OPTIONS");
-        response.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED, "JSPs only permit GET, POST or HEAD. Jasper also permits OPTIONS");
-        return;
-      }
-    }
-
-    final javax.servlet.jsp.PageContext pageContext;
-    final javax.servlet.ServletContext application;
-    final javax.servlet.ServletConfig config;
-    javax.servlet.jsp.JspWriter out = null;
-    final java.lang.Object page = this;
-    javax.servlet.jsp.JspWriter _jspx_out = null;
-    javax.servlet.jsp.PageContext _jspx_page_context = null;
-
-
-    try {
-      response.setContentType("text/html");
-      pageContext = _jspxFactory.getPageContext(this, request, response,
-      			null, false, 8192, true);
-      _jspx_page_context = pageContext;
-      application = pageContext.getServletContext();
-      config = pageContext.getServletConfig();
-      out = pageContext.getOut();
-      _jspx_out = out;
-
-      out.write("\r\n");
-      out.write("<html>\r\n");
-      out.write("\r\n");
-      out.write("\r\n");
-      out.write("\r\n");
-      out.write("<body bgcolor=\"white\">\r\n");
-      dates.JspCalendar clock = null;
-      clock = (dates.JspCalendar) _jspx_page_context.getAttribute("clock", javax.servlet.jsp.PageContext.PAGE_SCOPE);
-      if (clock == null){
-        clock = new dates.JspCalendar();
-        _jspx_page_context.setAttribute("clock", clock, javax.servlet.jsp.PageContext.PAGE_SCOPE);
-      }
-      out.write("\r\n");
-      out.write("\r\n");
-      out.write("<font size=4>\r\n");
-      out.write("<ul>\r\n");
-      out.write("<li>    Day of month: is  ");
-      out.write(org.apache.jasper.runtime.JspRuntimeLibrary.toString((((dates.JspCalendar)_jspx_page_context.findAttribute("clock")).getDayOfMonth())));
-      out.write("\r\n");
-      out.write("<li>    Year: is  ");
-      out.write(org.apache.jasper.runtime.JspRuntimeLibrary.toString((((dates.JspCalendar)_jspx_page_context.findAttribute("clock")).getYear())));
-      out.write("\r\n");
-      out.write("<li>    Month: is  ");
-      out.write(org.apache.jasper.runtime.JspRuntimeLibrary.toString((((dates.JspCalendar)_jspx_page_context.findAttribute("clock")).getMonth())));
-      out.write("\r\n");
-      out.write("<li>    Time: is  ");
-      out.write(org.apache.jasper.runtime.JspRuntimeLibrary.toString((((dates.JspCalendar)_jspx_page_context.findAttribute("clock")).getTime())));
-      out.write("\r\n");
-      out.write("<li>    Date: is  ");
-      out.write(org.apache.jasper.runtime.JspRuntimeLibrary.toString((((dates.JspCalendar)_jspx_page_context.findAttribute("clock")).getDate())));
-      out.write("\r\n");
-      out.write("<li>    Day: is  ");
-      out.write(org.apache.jasper.runtime.JspRuntimeLibrary.toString((((dates.JspCalendar)_jspx_page_context.findAttribute("clock")).getDay())));
-      out.write("\r\n");
-      out.write("<li>    Day Of Year: is  ");
-      out.write(org.apache.jasper.runtime.JspRuntimeLibrary.toString((((dates.JspCalendar)_jspx_page_context.findAttribute("clock")).getDayOfYear())));
-      out.write("\r\n");
-      out.write("<li>    Week Of Year: is  ");
-      out.write(org.apache.jasper.runtime.JspRuntimeLibrary.toString((((dates.JspCalendar)_jspx_page_context.findAttribute("clock")).getWeekOfYear())));
-      out.write("\r\n");
-      out.write("<li>    era: is  ");
-      out.write(org.apache.jasper.runtime.JspRuntimeLibrary.toString((((dates.JspCalendar)_jspx_page_context.findAttribute("clock")).getEra())));
-      out.write("\r\n");
-      out.write("<li>    DST Offset: is  ");
-      out.write(org.apache.jasper.runtime.JspRuntimeLibrary.toString((((dates.JspCalendar)_jspx_page_context.findAttribute("clock")).getDSTOffset())));
-      out.write("\r\n");
-      out.write("<li>    Zone Offset: is  ");
-      out.write(org.apache.jasper.runtime.JspRuntimeLibrary.toString((((dates.JspCalendar)_jspx_page_context.findAttribute("clock")).getZoneOffset())));
-      out.write("\r\n");
-      out.write("</ul>\r\n");
-      out.write("</font>\r\n");
-      out.write("\r\n");
-      out.write("</body>\r\n");
-      out.write("</html>\r\n");
-    } catch (java.lang.Throwable t) {
-      if (!(t instanceof javax.servlet.jsp.SkipPageException)){
-        out = _jspx_out;
-        if (out != null && out.getBufferSize() != 0)
-          try {
-            if (response.isCommitted()) {
-              out.flush();
-            } else {
-              out.clearBuffer();
-            }
-          } catch (java.io.IOException e) {}
-        if (_jspx_page_context != null) _jspx_page_context.handlePageException(t);
-        else throw new ServletException(t);
-      }
-    } finally {
-      _jspxFactory.releasePageContext(_jspx_page_context);
-    }
-  }
-}
diff --git a/tomcat/work/Catalina/localhost/examples/org/apache/jsp/jsp/jsp2/el/basic_002darithmetic_jsp.java b/tomcat/work/Catalina/localhost/examples/org/apache/jsp/jsp/jsp2/el/basic_002darithmetic_jsp.java
deleted file mode 100644
index ca04e49..0000000
--- a/tomcat/work/Catalina/localhost/examples/org/apache/jsp/jsp/jsp2/el/basic_002darithmetic_jsp.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
- * Generated by the Jasper component of Apache Tomcat
- * Version: Apache Tomcat/9.0.6
- * Generated at: 2018-03-21 13:31:45 UTC
- * Note: The last modified time of this file was set to
- *       the last modified time of the source file after
- *       generation to assist with modification tracking.
- */
-package org.apache.jsp.jsp.jsp2.el;
-
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-
-public final class basic_002darithmetic_jsp extends org.apache.jasper.runtime.HttpJspBase
-    implements org.apache.jasper.runtime.JspSourceDependent,
-                 org.apache.jasper.runtime.JspSourceImports {
-
-  private static final javax.servlet.jsp.JspFactory _jspxFactory =
-          javax.servlet.jsp.JspFactory.getDefaultFactory();
-
-  private static java.util.Map<java.lang.String,java.lang.Long> _jspx_dependants;
-
-  private static final java.util.Set<java.lang.String> _jspx_imports_packages;
-
-  private static final java.util.Set<java.lang.String> _jspx_imports_classes;
-
-  static {
-    _jspx_imports_packages = new java.util.HashSet<>();
-    _jspx_imports_packages.add("javax.servlet");
-    _jspx_imports_packages.add("javax.servlet.http");
-    _jspx_imports_packages.add("javax.servlet.jsp");
-    _jspx_imports_classes = null;
-  }
-
-  private volatile javax.el.ExpressionFactory _el_expressionfactory;
-  private volatile org.apache.tomcat.InstanceManager _jsp_instancemanager;
-
-  public java.util.Map<java.lang.String,java.lang.Long> getDependants() {
-    return _jspx_dependants;
-  }
-
-  public java.util.Set<java.lang.String> getPackageImports() {
-    return _jspx_imports_packages;
-  }
-
-  public java.util.Set<java.lang.String> getClassImports() {
-    return _jspx_imports_classes;
-  }
-
-  public javax.el.ExpressionFactory _jsp_getExpressionFactory() {
-    if (_el_expressionfactory == null) {
-      synchronized (this) {
-        if (_el_expressionfactory == null) {
-          _el_expressionfactory = _jspxFactory.getJspApplicationContext(getServletConfig().getServletContext()).getExpressionFactory();
-        }
-      }
-    }
-    return _el_expressionfactory;
-  }
-
-  public org.apache.tomcat.InstanceManager _jsp_getInstanceManager() {
-    if (_jsp_instancemanager == null) {
-      synchronized (this) {
-        if (_jsp_instancemanager == null) {
-          _jsp_instancemanager = org.apache.jasper.runtime.InstanceManagerFactory.getInstanceManager(getServletConfig());
-        }
-      }
-    }
-    return _jsp_instancemanager;
-  }
-
-  public void _jspInit() {
-  }
-
-  public void _jspDestroy() {
-  }
-
-  public void _jspService(final javax.servlet.http.HttpServletRequest request, final javax.servlet.http.HttpServletResponse response)
-      throws java.io.IOException, javax.servlet.ServletException {
-
-    if (!javax.servlet.DispatcherType.ERROR.equals(request.getDispatcherType())) {
-      final java.lang.String _jspx_method = request.getMethod();
-      if ("OPTIONS".equals(_jspx_method)) {
-        response.setHeader("Allow","GET, HEAD, POST, OPTIONS");
-        return;
-      }
-      if (!"GET".equals(_jspx_method) && !"POST".equals(_jspx_method) && !"HEAD".equals(_jspx_method)) {
-        response.setHeader("Allow","GET, HEAD, POST, OPTIONS");
-        response.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED, "JSPs only permit GET, POST or HEAD. Jasper also permits OPTIONS");
-        return;
-      }
-    }
-
-    final javax.servlet.jsp.PageContext pageContext;
-    javax.servlet.http.HttpSession session = null;
-    final javax.servlet.ServletContext application;
-    final javax.servlet.ServletConfig config;
-    javax.servlet.jsp.JspWriter out = null;
-    final java.lang.Object page = this;
-    javax.servlet.jsp.JspWriter _jspx_out = null;
-    javax.servlet.jsp.PageContext _jspx_page_context = null;
-
-
-    try {
-      response.setContentType("text/html");
-      pageContext = _jspxFactory.getPageContext(this, request, response,
-      			null, true, 8192, true);
-      _jspx_page_context = pageContext;
-      application = pageContext.getServletContext();
-      config = pageContext.getServletConfig();
-      session = pageContext.getSession();
-      out = pageContext.getOut();
-      _jspx_out = out;
-
-      out.write("\r\n");
-      out.write("<html>\r\n");
-      out.write("  <head>\r\n");
-      out.write("    <title>JSP 2.0 Expression Language - Basic Arithmetic</title>\r\n");
-      out.write("  </head>\r\n");
-      out.write("  <body>\r\n");
-      out.write("    <h1>JSP 2.0 Expression Language - Basic Arithmetic</h1>\r\n");
-      out.write("    <hr>\r\n");
-      out.write("    This example illustrates basic Expression Language arithmetic.\r\n");
-      out.write("    Addition (+), subtraction (-), multiplication (*), division (/ or div),\r\n");
-      out.write("    and modulus (% or mod) are all supported.  Error conditions, like\r\n");
-      out.write("    division by zero, are handled gracefully.\r\n");
-      out.write("    <br>\r\n");
-      out.write("    <blockquote>\r\n");
-      out.write("      <code>\r\n");
-      out.write("        <table border=\"1\">\r\n");
-      out.write("          <thead>\r\n");
-      out.write("        <td><b>EL Expression</b></td>\r\n");
-      out.write("        <td><b>Result</b></td>\r\n");
-      out.write("      </thead>\r\n");
-      out.write("      <tr>\r\n");
-      out.write("        <td>${1}</td>\r\n");
-      out.write("        <td>");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${1}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("</td>\r\n");
-      out.write("      </tr>\r\n");
-      out.write("      <tr>\r\n");
-      out.write("        <td>${1 + 2}</td>\r\n");
-      out.write("        <td>");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${1 + 2}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("</td>\r\n");
-      out.write("      </tr>\r\n");
-      out.write("      <tr>\r\n");
-      out.write("        <td>${1.2 + 2.3}</td>\r\n");
-      out.write("        <td>");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${1.2 + 2.3}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("</td>\r\n");
-      out.write("      </tr>\r\n");
-      out.write("      <tr>\r\n");
-      out.write("        <td>${1.2E4 + 1.4}</td>\r\n");
-      out.write("        <td>");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${1.2E4 + 1.4}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("</td>\r\n");
-      out.write("      </tr>\r\n");
-      out.write("      <tr>\r\n");
-      out.write("        <td>${-4 - 2}</td>\r\n");
-      out.write("        <td>");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${-4 - 2}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("</td>\r\n");
-      out.write("      </tr>\r\n");
-      out.write("      <tr>\r\n");
-      out.write("        <td>${21 * 2}</td>\r\n");
-      out.write("        <td>");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${21 * 2}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("</td>\r\n");
-      out.write("      </tr>\r\n");
-      out.write("      <tr>\r\n");
-      out.write("        <td>${3/4}</td>\r\n");
-      out.write("        <td>");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${3/4}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("</td>\r\n");
-      out.write("      </tr>\r\n");
-      out.write("      <tr>\r\n");
-      out.write("        <td>${3 div 4}</td>\r\n");
-      out.write("        <td>");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${3 div 4}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("</td>\r\n");
-      out.write("      </tr>\r\n");
-      out.write("      <tr>\r\n");
-      out.write("        <td>${3/0}</td>\r\n");
-      out.write("        <td>");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${3/0}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("</td>\r\n");
-      out.write("      </tr>\r\n");
-      out.write("      <tr>\r\n");
-      out.write("        <td>${10%4}</td>\r\n");
-      out.write("        <td>");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${10%4}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("</td>\r\n");
-      out.write("      </tr>\r\n");
-      out.write("      <tr>\r\n");
-      out.write("        <td>${10 mod 4}</td>\r\n");
-      out.write("        <td>");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${10 mod 4}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("</td>\r\n");
-      out.write("      </tr>\r\n");
-      out.write("    <tr>\r\n");
-      out.write("      <td>${(1==2) ? 3 : 4}</td>\r\n");
-      out.write("      <td>");
-      out.write((java.lang.String) org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${(1==2) ? 3 : 4}", java.lang.String.class, (javax.servlet.jsp.PageContext)_jspx_page_context, null));
-      out.write("</td>\r\n");
-      out.write("    </tr>\r\n");
-      out.write("    </table>\r\n");
-      out.write("      </code>\r\n");
-      out.write("    </blockquote>\r\n");
-      out.write("  </body>\r\n");
-      out.write("</html>\r\n");
-    } catch (java.lang.Throwable t) {
-      if (!(t instanceof javax.servlet.jsp.SkipPageException)){
-        out = _jspx_out;
-        if (out != null && out.getBufferSize() != 0)
-          try {
-            if (response.isCommitted()) {
-              out.flush();
-            } else {
-              out.clearBuffer();
-            }
-          } catch (java.io.IOException e) {}
-        if (_jspx_page_context != null) _jspx_page_context.handlePageException(t);
-        else throw new ServletException(t);
-      }
-    } finally {
-      _jspxFactory.releasePageContext(_jspx_page_context);
-    }
-  }
-}
diff --git a/tomcat/work/Catalina/localhost/host-manager/org/apache/jsp/WEB_002dINF/jsp/_401_jsp.java b/tomcat/work/Catalina/localhost/host-manager/org/apache/jsp/WEB_002dINF/jsp/_401_jsp.java
deleted file mode 100644
index 659b3b4..0000000
--- a/tomcat/work/Catalina/localhost/host-manager/org/apache/jsp/WEB_002dINF/jsp/_401_jsp.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Generated by the Jasper component of Apache Tomcat
- * Version: Apache Tomcat/9.0.6
- * Generated at: 2018-03-21 13:30:48 UTC
- * Note: The last modified time of this file was set to
- *       the last modified time of the source file after
- *       generation to assist with modification tracking.
- */
-package org.apache.jsp.WEB_002dINF.jsp;
-
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-
-public final class _401_jsp extends org.apache.jasper.runtime.HttpJspBase
-    implements org.apache.jasper.runtime.JspSourceDependent,
-                 org.apache.jasper.runtime.JspSourceImports {
-
-  private static final javax.servlet.jsp.JspFactory _jspxFactory =
-          javax.servlet.jsp.JspFactory.getDefaultFactory();
-
-  private static java.util.Map<java.lang.String,java.lang.Long> _jspx_dependants;
-
-  private static final java.util.Set<java.lang.String> _jspx_imports_packages;
-
-  private static final java.util.Set<java.lang.String> _jspx_imports_classes;
-
-  static {
-    _jspx_imports_packages = new java.util.HashSet<>();
-    _jspx_imports_packages.add("javax.servlet");
-    _jspx_imports_packages.add("javax.servlet.http");
-    _jspx_imports_packages.add("javax.servlet.jsp");
-    _jspx_imports_classes = null;
-  }
-
-  private volatile javax.el.ExpressionFactory _el_expressionfactory;
-  private volatile org.apache.tomcat.InstanceManager _jsp_instancemanager;
-
-  public java.util.Map<java.lang.String,java.lang.Long> getDependants() {
-    return _jspx_dependants;
-  }
-
-  public java.util.Set<java.lang.String> getPackageImports() {
-    return _jspx_imports_packages;
-  }
-
-  public java.util.Set<java.lang.String> getClassImports() {
-    return _jspx_imports_classes;
-  }
-
-  public javax.el.ExpressionFactory _jsp_getExpressionFactory() {
-    if (_el_expressionfactory == null) {
-      synchronized (this) {
-        if (_el_expressionfactory == null) {
-          _el_expressionfactory = _jspxFactory.getJspApplicationContext(getServletConfig().getServletContext()).getExpressionFactory();
-        }
-      }
-    }
-    return _el_expressionfactory;
-  }
-
-  public org.apache.tomcat.InstanceManager _jsp_getInstanceManager() {
-    if (_jsp_instancemanager == null) {
-      synchronized (this) {
-        if (_jsp_instancemanager == null) {
-          _jsp_instancemanager = org.apache.jasper.runtime.InstanceManagerFactory.getInstanceManager(getServletConfig());
-        }
-      }
-    }
-    return _jsp_instancemanager;
-  }
-
-  public void _jspInit() {
-  }
-
-  public void _jspDestroy() {
-  }
-
-  public void _jspService(final javax.servlet.http.HttpServletRequest request, final javax.servlet.http.HttpServletResponse response)
-      throws java.io.IOException, javax.servlet.ServletException {
-
-    if (!javax.servlet.DispatcherType.ERROR.equals(request.getDispatcherType())) {
-      final java.lang.String _jspx_method = request.getMethod();
-      if ("OPTIONS".equals(_jspx_method)) {
-        response.setHeader("Allow","GET, HEAD, POST, OPTIONS");
-        return;
-      }
-      if (!"GET".equals(_jspx_method) && !"POST".equals(_jspx_method) && !"HEAD".equals(_jspx_method)) {
-        response.setHeader("Allow","GET, HEAD, POST, OPTIONS");
-        response.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED, "JSPs only permit GET, POST or HEAD. Jasper also permits OPTIONS");
-        return;
-      }
-    }
-
-    final javax.servlet.jsp.PageContext pageContext;
-    final javax.servlet.ServletContext application;
-    final javax.servlet.ServletConfig config;
-    javax.servlet.jsp.JspWriter out = null;
-    final java.lang.Object page = this;
-    javax.servlet.jsp.JspWriter _jspx_out = null;
-    javax.servlet.jsp.PageContext _jspx_page_context = null;
-
-
-    try {
-      response.setContentType("text/html");
-      pageContext = _jspxFactory.getPageContext(this, request, response,
-      			null, false, 8192, true);
-      _jspx_page_context = pageContext;
-      application = pageContext.getServletContext();
-      config = pageContext.getServletConfig();
-      out = pageContext.getOut();
-      _jspx_out = out;
-
-      out.write("<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">\r\n");
-      out.write("<html>\r\n");
-      out.write(" <head>\r\n");
-      out.write("  <title>401 Unauthorized</title>\r\n");
-      out.write("  <style type=\"text/css\">\r\n");
-      out.write("    <!--\r\n");
-      out.write("    BODY {font-family:Tahoma,Arial,sans-serif;color:black;background-color:white;font-size:12px;}\r\n");
-      out.write("    H1 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:22px;}\r\n");
-      out.write("    PRE, TT {border: 1px dotted #525D76}\r\n");
-      out.write("    A {color : black;}A.name {color : black;}\r\n");
-      out.write("    -->\r\n");
-      out.write("  </style>\r\n");
-      out.write(" </head>\r\n");
-      out.write(" <body>\r\n");
-      out.write("   <h1>401 Unauthorized</h1>\r\n");
-      out.write("   <p>\r\n");
-      out.write("    You are not authorized to view this page. If you have not changed\r\n");
-      out.write("    any configuration files, please examine the file\r\n");
-      out.write("    <tt>conf/tomcat-users.xml</tt> in your installation. That\r\n");
-      out.write("    file must contain the credentials to let you use this webapp.\r\n");
-      out.write("   </p>\r\n");
-      out.write("   <p>\r\n");
-      out.write("    For example, to add the <tt>admin-gui</tt> role to a user named\r\n");
-      out.write("    <tt>tomcat</tt> with a password of <tt>s3cret</tt>, add the following to the\r\n");
-      out.write("    config file listed above.\r\n");
-      out.write("   </p>\r\n");
-      out.write("<pre>\r\n");
-      out.write("&lt;role rolename=\"admin-gui\"/&gt;\r\n");
-      out.write("&lt;user username=\"tomcat\" password=\"s3cret\" roles=\"admin-gui\"/&gt;\r\n");
-      out.write("</pre>\r\n");
-      out.write("   <p>\r\n");
-      out.write("    Note that for Tomcat 7 onwards, the roles required to use the host manager\r\n");
-      out.write("    application were changed from the single <tt>admin</tt> role to the\r\n");
-      out.write("    following two roles. You will need to assign the role(s) required for\r\n");
-      out.write("    the functionality you wish to access.\r\n");
-      out.write("   </p>\r\n");
-      out.write("    <ul>\r\n");
-      out.write("      <li><tt>admin-gui</tt> - allows access to the HTML GUI</li>\r\n");
-      out.write("      <li><tt>admin-script</tt> - allows access to the text interface</li>\r\n");
-      out.write("    </ul>\r\n");
-      out.write("   <p>\r\n");
-      out.write("    The HTML interface is protected against CSRF but the text interface is not.\r\n");
-      out.write("    To maintain the CSRF protection:\r\n");
-      out.write("   </p>\r\n");
-      out.write("   <ul>\r\n");
-      out.write("    <li>Users with the <tt>admin-gui</tt> role should not be granted the\r\n");
-      out.write("       <tt>admin-script</tt> role.</li>\r\n");
-      out.write("    <li>If the text interface is accessed through a browser (e.g. for testing\r\n");
-      out.write("        since this interface is intended for tools not humans) then the browser\r\n");
-      out.write("        must be closed afterwards to terminate the session.</li>\r\n");
-      out.write("   </ul>\r\n");
-      out.write(" </body>\r\n");
-      out.write("\r\n");
-      out.write("</html>\r\n");
-    } catch (java.lang.Throwable t) {
-      if (!(t instanceof javax.servlet.jsp.SkipPageException)){
-        out = _jspx_out;
-        if (out != null && out.getBufferSize() != 0)
-          try {
-            if (response.isCommitted()) {
-              out.flush();
-            } else {
-              out.clearBuffer();
-            }
-          } catch (java.io.IOException e) {}
-        if (_jspx_page_context != null) _jspx_page_context.handlePageException(t);
-        else throw new ServletException(t);
-      }
-    } finally {
-      _jspxFactory.releasePageContext(_jspx_page_context);
-    }
-  }
-}
diff --git a/tomcat/work/Catalina/localhost/manager/org/apache/jsp/WEB_002dINF/jsp/_401_jsp.java b/tomcat/work/Catalina/localhost/manager/org/apache/jsp/WEB_002dINF/jsp/_401_jsp.java
deleted file mode 100644
index e1d2a08..0000000
--- a/tomcat/work/Catalina/localhost/manager/org/apache/jsp/WEB_002dINF/jsp/_401_jsp.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Generated by the Jasper component of Apache Tomcat
- * Version: Apache Tomcat/9.0.6
- * Generated at: 2018-03-12 20:42:32 UTC
- * Note: The last modified time of this file was set to
- *       the last modified time of the source file after
- *       generation to assist with modification tracking.
- */
-package org.apache.jsp.WEB_002dINF.jsp;
-
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-
-public final class _401_jsp extends org.apache.jasper.runtime.HttpJspBase
-    implements org.apache.jasper.runtime.JspSourceDependent,
-                 org.apache.jasper.runtime.JspSourceImports {
-
-  private static final javax.servlet.jsp.JspFactory _jspxFactory =
-          javax.servlet.jsp.JspFactory.getDefaultFactory();
-
-  private static java.util.Map<java.lang.String,java.lang.Long> _jspx_dependants;
-
-  private static final java.util.Set<java.lang.String> _jspx_imports_packages;
-
-  private static final java.util.Set<java.lang.String> _jspx_imports_classes;
-
-  static {
-    _jspx_imports_packages = new java.util.HashSet<>();
-    _jspx_imports_packages.add("javax.servlet");
-    _jspx_imports_packages.add("javax.servlet.http");
-    _jspx_imports_packages.add("javax.servlet.jsp");
-    _jspx_imports_classes = null;
-  }
-
-  private volatile javax.el.ExpressionFactory _el_expressionfactory;
-  private volatile org.apache.tomcat.InstanceManager _jsp_instancemanager;
-
-  public java.util.Map<java.lang.String,java.lang.Long> getDependants() {
-    return _jspx_dependants;
-  }
-
-  public java.util.Set<java.lang.String> getPackageImports() {
-    return _jspx_imports_packages;
-  }
-
-  public java.util.Set<java.lang.String> getClassImports() {
-    return _jspx_imports_classes;
-  }
-
-  public javax.el.ExpressionFactory _jsp_getExpressionFactory() {
-    if (_el_expressionfactory == null) {
-      synchronized (this) {
-        if (_el_expressionfactory == null) {
-          _el_expressionfactory = _jspxFactory.getJspApplicationContext(getServletConfig().getServletContext()).getExpressionFactory();
-        }
-      }
-    }
-    return _el_expressionfactory;
-  }
-
-  public org.apache.tomcat.InstanceManager _jsp_getInstanceManager() {
-    if (_jsp_instancemanager == null) {
-      synchronized (this) {
-        if (_jsp_instancemanager == null) {
-          _jsp_instancemanager = org.apache.jasper.runtime.InstanceManagerFactory.getInstanceManager(getServletConfig());
-        }
-      }
-    }
-    return _jsp_instancemanager;
-  }
-
-  public void _jspInit() {
-  }
-
-  public void _jspDestroy() {
-  }
-
-  public void _jspService(final javax.servlet.http.HttpServletRequest request, final javax.servlet.http.HttpServletResponse response)
-      throws java.io.IOException, javax.servlet.ServletException {
-
-    if (!javax.servlet.DispatcherType.ERROR.equals(request.getDispatcherType())) {
-      final java.lang.String _jspx_method = request.getMethod();
-      if ("OPTIONS".equals(_jspx_method)) {
-        response.setHeader("Allow","GET, HEAD, POST, OPTIONS");
-        return;
-      }
-      if (!"GET".equals(_jspx_method) && !"POST".equals(_jspx_method) && !"HEAD".equals(_jspx_method)) {
-        response.setHeader("Allow","GET, HEAD, POST, OPTIONS");
-        response.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED, "JSPs only permit GET, POST or HEAD. Jasper also permits OPTIONS");
-        return;
-      }
-    }
-
-    final javax.servlet.jsp.PageContext pageContext;
-    final javax.servlet.ServletContext application;
-    final javax.servlet.ServletConfig config;
-    javax.servlet.jsp.JspWriter out = null;
-    final java.lang.Object page = this;
-    javax.servlet.jsp.JspWriter _jspx_out = null;
-    javax.servlet.jsp.PageContext _jspx_page_context = null;
-
-
-    try {
-      response.setContentType("text/html");
-      pageContext = _jspxFactory.getPageContext(this, request, response,
-      			null, false, 8192, true);
-      _jspx_page_context = pageContext;
-      application = pageContext.getServletContext();
-      config = pageContext.getServletConfig();
-      out = pageContext.getOut();
-      _jspx_out = out;
-
-      out.write("<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">\r\n");
-      out.write("<html>\r\n");
-      out.write(" <head>\r\n");
-      out.write("  <title>401 Unauthorized</title>\r\n");
-      out.write("  <style type=\"text/css\">\r\n");
-      out.write("    <!--\r\n");
-      out.write("    BODY {font-family:Tahoma,Arial,sans-serif;color:black;background-color:white;font-size:12px;}\r\n");
-      out.write("    H1 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:22px;}\r\n");
-      out.write("    PRE, TT {border: 1px dotted #525D76}\r\n");
-      out.write("    A {color : black;}A.name {color : black;}\r\n");
-      out.write("    -->\r\n");
-      out.write("  </style>\r\n");
-      out.write(" </head>\r\n");
-      out.write(" <body>\r\n");
-      out.write("   <h1>401 Unauthorized</h1>\r\n");
-      out.write("   <p>\r\n");
-      out.write("    You are not authorized to view this page. If you have not changed\r\n");
-      out.write("    any configuration files, please examine the file\r\n");
-      out.write("    <tt>conf/tomcat-users.xml</tt> in your installation. That\r\n");
-      out.write("    file must contain the credentials to let you use this webapp.\r\n");
-      out.write("   </p>\r\n");
-      out.write("   <p>\r\n");
-      out.write("    For example, to add the <tt>manager-gui</tt> role to a user named\r\n");
-      out.write("    <tt>tomcat</tt> with a password of <tt>s3cret</tt>, add the following to the\r\n");
-      out.write("    config file listed above.\r\n");
-      out.write("   </p>\r\n");
-      out.write("<pre>\r\n");
-      out.write("&lt;role rolename=\"manager-gui\"/&gt;\r\n");
-      out.write("&lt;user username=\"tomcat\" password=\"s3cret\" roles=\"manager-gui\"/&gt;\r\n");
-      out.write("</pre>\r\n");
-      out.write("   <p>\r\n");
-      out.write("    Note that for Tomcat 7 onwards, the roles required to use the manager\r\n");
-      out.write("    application were changed from the single <tt>manager</tt> role to the\r\n");
-      out.write("    following four roles. You will need to assign the role(s) required for\r\n");
-      out.write("    the functionality you wish to access.\r\n");
-      out.write("   </p>\r\n");
-      out.write("    <ul>\r\n");
-      out.write("      <li><tt>manager-gui</tt> - allows access to the HTML GUI and the status\r\n");
-      out.write("          pages</li>\r\n");
-      out.write("      <li><tt>manager-script</tt> - allows access to the text interface and the\r\n");
-      out.write("          status pages</li>\r\n");
-      out.write("      <li><tt>manager-jmx</tt> - allows access to the JMX proxy and the status\r\n");
-      out.write("          pages</li>\r\n");
-      out.write("      <li><tt>manager-status</tt> - allows access to the status pages only</li>\r\n");
-      out.write("    </ul>\r\n");
-      out.write("   <p>\r\n");
-      out.write("    The HTML interface is protected against CSRF but the text and JMX interfaces\r\n");
-      out.write("    are not. To maintain the CSRF protection:\r\n");
-      out.write("   </p>\r\n");
-      out.write("   <ul>\r\n");
-      out.write("    <li>Users with the <tt>manager-gui</tt> role should not be granted either\r\n");
-      out.write("        the <tt>manager-script</tt> or <tt>manager-jmx</tt> roles.</li>\r\n");
-      out.write("    <li>If the text or jmx interfaces are accessed through a browser (e.g. for\r\n");
-      out.write("        testing since these interfaces are intended for tools not humans) then\r\n");
-      out.write("        the browser must be closed afterwards to terminate the session.</li>\r\n");
-      out.write("   </ul>\r\n");
-      out.write("   <p>\r\n");
-      out.write("    For more information - please see the\r\n");
-      out.write("    <a href=\"/docs/manager-howto.html\">Manager App HOW-TO</a>.\r\n");
-      out.write("   </p>\r\n");
-      out.write(" </body>\r\n");
-      out.write("\r\n");
-      out.write("</html>\r\n");
-    } catch (java.lang.Throwable t) {
-      if (!(t instanceof javax.servlet.jsp.SkipPageException)){
-        out = _jspx_out;
-        if (out != null && out.getBufferSize() != 0)
-          try {
-            if (response.isCommitted()) {
-              out.flush();
-            } else {
-              out.clearBuffer();
-            }
-          } catch (java.io.IOException e) {}
-        if (_jspx_page_context != null) _jspx_page_context.handlePageException(t);
-        else throw new ServletException(t);
-      }
-    } finally {
-      _jspxFactory.releasePageContext(_jspx_page_context);
-    }
-  }
-}
-- 
GitLab