* Jetty:

- Update to Jetty 8.x, Servlet 3.0, JSP 2.2 - Require Java 6 - Use Servlet and JSP jars from Jetty instead of Tomcat - Tomcat remains at 6.0.37 supporting Servlet 2.5 / JSP 2.1 - Remove Jetty dependency in console error pages - Build files for Jetty 8.1.14 - Doc updates - Delete Jetty 7.6.14 - Jetty 8.1.14 not yet checked in, waiting to see if a new version is released soon, but build will download it for testing

* Jetty:
001b1272 · zzz · c59603d3 · 001b1272 · 001b1272 · 001b1272
Commit 001b1272 authored 11 years ago by zzz
--- a/apps/routerconsole/jsp/error.jsp
+++ b/apps/routerconsole/jsp/error.jsp
@@ -4,9 +4,12 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <%
    // Let's make this easy...
-    final Integer ERROR_CODE = (Integer) request.getAttribute(org.eclipse.jetty.server.Dispatcher.ERROR_STATUS_CODE);
-    final String ERROR_URI = (String) request.getAttribute(org.eclipse.jetty.server.Dispatcher.ERROR_REQUEST_URI);
-    final String ERROR_MESSAGE = (String) request.getAttribute(org.eclipse.jetty.server.Dispatcher.ERROR_MESSAGE);
+    // These are defined in Jetty 7 org.eclipse.jetty.server.Dispatcher,
+    // and in Servlet 3.0 (Jetty 8) javax.servlet.RequestDispatcher,
+    // just use the actual strings here to make it compatible with either
+    final Integer ERROR_CODE = (Integer) request.getAttribute("javax.servlet.error.status_code");
+    final String ERROR_URI = (String) request.getAttribute("javax.servlet.error.request_uri");
+    final String ERROR_MESSAGE = (String) request.getAttribute("javax.servlet.error.message");
    if (ERROR_CODE != null && ERROR_MESSAGE != null) {
        // this is deprecated but we don't want sendError()
        response.setStatus(ERROR_CODE.intValue(), ERROR_MESSAGE);

--- a/apps/routerconsole/jsp/error500.jsp
+++ b/apps/routerconsole/jsp/error500.jsp
@@ -3,11 +3,14 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <%
    // Let's make this easy...
-    final Integer ERROR_CODE = (Integer) request.getAttribute(org.eclipse.jetty.server.Dispatcher.ERROR_STATUS_CODE);
-    final String ERROR_URI = (String) request.getAttribute(org.eclipse.jetty.server.Dispatcher.ERROR_REQUEST_URI);
-    final String ERROR_MESSAGE = (String) request.getAttribute(org.eclipse.jetty.server.Dispatcher.ERROR_MESSAGE);
-    final Class ERROR_CLASS = (Class)request.getAttribute(org.eclipse.jetty.server.Dispatcher.ERROR_EXCEPTION_TYPE);
-    final Throwable ERROR_THROWABLE = (Throwable)request.getAttribute(org.eclipse.jetty.server.Dispatcher.ERROR_EXCEPTION);
+    // These are defined in Jetty 7 org.eclipse.jetty.server.Dispatcher,
+    // and in Servlet 3.0 (Jetty 8) javax.servlet.RequestDispatcher,
+    // just use the actual strings here to make it compatible with either
+    final Integer ERROR_CODE = (Integer) request.getAttribute("javax.servlet.error.status_code");
+    final String ERROR_URI = (String) request.getAttribute("javax.servlet.error.request_uri");
+    final String ERROR_MESSAGE = (String) request.getAttribute("javax.servlet.error.message");
+    final Class ERROR_CLASS = (Class) request.getAttribute("javax.servlet.error.exception_type");
+    final Throwable ERROR_THROWABLE = (Throwable) request.getAttribute("javax.servlet.error.exception");
    if (ERROR_CODE != null && ERROR_MESSAGE != null) {
        // this is deprecated but we don't want sendError()
        response.setStatus(ERROR_CODE.intValue(), ERROR_MESSAGE);

--- a/installer/i2pinstaller.xml
+++ b/installer/i2pinstaller.xml
@@ -7,7 +7,7 @@
  <customProcName>false</customProcName>
  <icon>resources/console.ico</icon>
  <jre>
-    <minVersion>1.5.0</minVersion>
+    <minVersion>1.6.0</minVersion>
  </jre>
  <!--
  <splash>

--- a/installer/i2pstandalone.xml
+++ b/installer/i2pstandalone.xml
@@ -7,7 +7,7 @@
  <customProcName>false</customProcName>
  <icon>resources/start.ico</icon>
  <jre>
-    <minVersion>1.5.0</minVersion>
+    <minVersion>1.6.0</minVersion>
    <!--
    <minHeapSize>64</minHeapSize>
    -->