Changeset 001b127


Ignore:
Timestamp:
Feb 3, 2014 11:24:45 PM (7 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
fe391ff2
Parents:
c59603d
Message:
  • 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
Files:
16 deleted
8 edited

Legend:

Unmodified
Added
Removed
  • INSTALL-headless.txt

    rc59603d r001b127  
    4040
    4141Supported JVMs:
    42   Windows: Latest available from http://java.com/download (1.5+ supported)
    43   Linux:   Latest available from http://java.com/download (1.5+ supported)
    44   FreeBSD: 1.5-compatible (NIO required)
    45   Other operating systems and JVMs: See https://trac.i2p2.de/wiki/java
     42  All platforms: Java 1.6 or higher required; 1.7 or higher recommended
     43  Windows: OpenJDK or Oracle from http://java.com/download
     44  Linux:   OpenJDK or Oracle from http://java.com/download
     45  FreeBSD: OpenJDK or Oracle from http://java.com/download
     46  Raspberry Pi: Oracle 8 Early Access https://jdk8.java.net/download.html
     47  PowerPC: IBM SDK 7 http://www.ibm.com/developerworks/java/jdk/linux/download.html
     48  Other operating systems and JVMs: See https://trac.i2p2.de/wiki/java or https://geti2p.net/download
  • LICENSE.txt

    rc59603d r001b127  
    178178   See licenses/LICENSE-GPLv2.txt
    179179
    180    Jetty 7.6.14.v20131031:
     180   Jetty 8.1.14.v20131031:
    181181   See licenses/ABOUT-Jetty.html
    182182   See licenses/NOTICE-Jetty.html
  • apps/jetty/apache-tomcat-deployer/README-i2p.txt

    rc59603d r001b127  
    77minus the following files and directores:
    88
    9 build.xml
    10 deployer-howto.html
    11 images/*
    12 lib/catalina*
    13 LICENSE (see ../../../licenses/LICENSE-Apache2.0.txt, it's also inside every jar)
    14 RELEASE-NOTES
     9        build.xml
     10        deployer-howto.html
     11        images/*
     12        lib/catalina*
     13        lib/jsp-api.jar (see below)
     14        lib/servlet-api.jar (see below)
     15        LICENSE (see ../../../licenses/LICENSE-Apache2.0.txt, it's also inside every jar)
     16        RELEASE-NOTES
     17
     18
     19We could use the following API jars from Apache Tomcat 7.x, supporting Servlet 3.0 and JSP 2.2,
     20that are required for Jetty 8, but we just bundle the ones from Jetty 8 instead:
     21
     22        lib/jsp-api.jar
     23        lib/servlet-api.jar
     24
     25For more info:
     26http://tomcat.apache.org/whichversion.html
  • apps/jetty/build.xml

    rc59603d r001b127  
    22<project basedir="." default="all" name="jetty">
    33
    4     <property name="jetty.ver" value="7.6.14.v20131031" />
     4    <property name="jetty.ver" value="8.1.14.v20131031" />
    55    <property name="jetty.base" value="jetty-distribution-${jetty.ver}" />
    6     <property name="jetty.sha1" value="f83894b5641f920ed8ac31501b473528e52a23fd" />
     6    <property name="jetty.sha1" value="a6690261a822157c82fcc6327d05ac8c7dfed0a3" />
    77    <property name="jetty.filename" value="${jetty.base}.zip" />
    88    <property name="jetty.url" value="http://download.eclipse.org/jetty/${jetty.ver}/dist/${jetty.filename}" />
     
    105105              jetty-sslengine-xxx.jar: Old Jetty 6, now a dummy
    106106              jetty-java5-threadpool-xxx.jar: Old Jetty 6, now a dummy
    107               glassfish 2.1: Not used, too old, see Tomcat below.
    108107              jetty-rewrite-handler: Not used by I2P, but only 20KB and could be useful for eepsites
    109108              jetty-management: Not used by I2P, but only 34KB and could be useful for eepsites, and we bundled it with Jetty 5
     109              javax.servlet.jsp-2.2.0.v201112011158.jar: Required API
     110              servlet-api-3.0.jar: Required API
    110111              All of these are available in the Ubuntu packages libjetty-java and libjetty-extra-java
    111112        -->
     
    134135            </manifest>
    135136        </jar>
     137        <jar destfile="jettylib/javax.servlet.jar" duplicate="preserve" filesetmanifest="mergewithoutmain" >
     138            <zipfileset excludes="about.html about_files about_files/* META-INF/ECLIPSEF.* META-INF/eclipse.inf plugin.properties" src="${jetty.base}/lib/servlet-api-3.0.jar" />
     139            <zipfileset excludes="about.html about_files about_files/* META-INF/ECLIPSEF.* META-INF/eclipse.inf plugin.properties" src="${jetty.base}/lib/jsp/javax.servlet.jsp-2.2.0.v201112011158.jar" />
     140        </jar>
    136141      <!--
    137142        <delete file="jetty.tar" />
     
    153158         jasper.jar : jasper-runtime.jar
    154159         jasper-el.jar + el-api.jar : commons-el.jar
    155          servlet-api.jar + jsp-api.jar : javax.servlet.jar
    156160         tomcat-juli.jar : Add to commons-logging.jar
    157161         empty jar : jasper-compiler.jar
    158162         Also, take NOTICE and LICENSE out of each one, we bundle those separately.
     163
     164         Not as of Jetty 8 (using from Jetty):
     165         servlet-api.jar + jsp-api.jar : javax.servlet.jar
     166         If we go to Tomcat 7:
     167         tomcat-api.jar + tomcat-util.jar: Add to javax.servlet.jar (as of Tomcat 7 / Jetty 8)
    159168     -->
    160169    <target name="copyTomcatLib" >
     
    166175            <zipfileset excludes="META-INF/**/*" src="${tomcat.lib}/el-api.jar" />
    167176        </jar>
     177<!--
    168178        <jar destfile="jettylib/javax.servlet.jar" duplicate="preserve" filesetmanifest="mergewithoutmain" >
    169179            <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/servlet-api.jar" />
    170180            <zipfileset excludes="META-INF/**/*" src="${tomcat.lib}/jsp-api.jar" />
    171         </jar>
     181            <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/tomcat-api.jar" />
     182            <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/tomcat-util.jar" />
     183        </jar>
     184-->
    172185        <!-- Ant bug, don't set update and filesetmanifest or the update doesn't happen,
    173186             Their bug tracker claims fixed in 1.8.0 but broken for me in 1.8.1
  • apps/routerconsole/jsp/error.jsp

    rc59603d r001b127  
    55<%
    66    // Let's make this easy...
    7     final Integer ERROR_CODE = (Integer) request.getAttribute(org.eclipse.jetty.server.Dispatcher.ERROR_STATUS_CODE);
    8     final String ERROR_URI = (String) request.getAttribute(org.eclipse.jetty.server.Dispatcher.ERROR_REQUEST_URI);
    9     final String ERROR_MESSAGE = (String) request.getAttribute(org.eclipse.jetty.server.Dispatcher.ERROR_MESSAGE);
     7    // These are defined in Jetty 7 org.eclipse.jetty.server.Dispatcher,
     8    // and in Servlet 3.0 (Jetty 8) javax.servlet.RequestDispatcher,
     9    // just use the actual strings here to make it compatible with either
     10    final Integer ERROR_CODE = (Integer) request.getAttribute("javax.servlet.error.status_code");
     11    final String ERROR_URI = (String) request.getAttribute("javax.servlet.error.request_uri");
     12    final String ERROR_MESSAGE = (String) request.getAttribute("javax.servlet.error.message");
    1013    if (ERROR_CODE != null && ERROR_MESSAGE != null) {
    1114        // this is deprecated but we don't want sendError()
  • apps/routerconsole/jsp/error500.jsp

    rc59603d r001b127  
    44<%
    55    // Let's make this easy...
    6     final Integer ERROR_CODE = (Integer) request.getAttribute(org.eclipse.jetty.server.Dispatcher.ERROR_STATUS_CODE);
    7     final String ERROR_URI = (String) request.getAttribute(org.eclipse.jetty.server.Dispatcher.ERROR_REQUEST_URI);
    8     final String ERROR_MESSAGE = (String) request.getAttribute(org.eclipse.jetty.server.Dispatcher.ERROR_MESSAGE);
    9     final Class ERROR_CLASS = (Class)request.getAttribute(org.eclipse.jetty.server.Dispatcher.ERROR_EXCEPTION_TYPE);
    10     final Throwable ERROR_THROWABLE = (Throwable)request.getAttribute(org.eclipse.jetty.server.Dispatcher.ERROR_EXCEPTION);
     6    // These are defined in Jetty 7 org.eclipse.jetty.server.Dispatcher,
     7    // and in Servlet 3.0 (Jetty 8) javax.servlet.RequestDispatcher,
     8    // just use the actual strings here to make it compatible with either
     9    final Integer ERROR_CODE = (Integer) request.getAttribute("javax.servlet.error.status_code");
     10    final String ERROR_URI = (String) request.getAttribute("javax.servlet.error.request_uri");
     11    final String ERROR_MESSAGE = (String) request.getAttribute("javax.servlet.error.message");
     12    final Class ERROR_CLASS = (Class) request.getAttribute("javax.servlet.error.exception_type");
     13    final Throwable ERROR_THROWABLE = (Throwable) request.getAttribute("javax.servlet.error.exception");
    1114    if (ERROR_CODE != null && ERROR_MESSAGE != null) {
    1215        // this is deprecated but we don't want sendError()
  • installer/i2pinstaller.xml

    rc59603d r001b127  
    88  <icon>resources/console.ico</icon>
    99  <jre>
    10     <minVersion>1.5.0</minVersion>
     10    <minVersion>1.6.0</minVersion>
    1111  </jre>
    1212  <!--
  • installer/i2pstandalone.xml

    rc59603d r001b127  
    88  <icon>resources/start.ico</icon>
    99  <jre>
    10     <minVersion>1.5.0</minVersion>
     10    <minVersion>1.6.0</minVersion>
    1111    <!--
    1212    <minHeapSize>64</minHeapSize>
Note: See TracChangeset for help on using the changeset viewer.