Changeset 3024b3f


Ignore:
Timestamp:
Jan 10, 2012 4:03:30 AM (9 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
8e20e7a
Parents:
51f7f3a
Message:
  • Move from Servlet 2.4/JSP 2.0 to Servlet 2.5/JSP 2.1
    • Replace Jasper 2.0 from Jetty 6 with Apache Tomcat 6.0.35 (CDDL 1.0 + GPLv2)
    • Replace JSTL 1.1.2 with JSTL 1.2 (CDDL 1.0 + GPLv2)
Files:
9 added
7 edited

Legend:

Unmodified
Added
Removed
  • LICENSE.txt

    r51f7f3a r3024b3f  
    217217   GPLv2 (or any later version)
    218218   See licenses/LICENSE-GPLv2.txt
    219        Uses Apache Jakarta Standard Tag Library 1.1.2:
    220        See licenses/LICENSE-Apache2.0.txt
     219       Uses Glassfish Standard Tag Library (JSTL) 1.2:
     220       Common Development and Distribution License (CDDL) version 1.0 + GNU General Public License (GPL) version 2
     221       See https://glassfish.dev.java.net/public/CDDL+GPL.html
     222       See licenses/LICENSE-GPLv2.txt
    221223
    222224   SusiMail:
     
    230232      See licenses/LICENSE-LGPLv2.1.txt
    231233
     234   Tomcat 6.0.35:
     235   Copyright 1999-2011 The Apache Software Foundation
     236   See licenses/LICENSE-Apache2.0.txt
     237   See licenses/NOTICE-Tomcat.txt
    232238
    233239
  • apps/jetty/build.xml

    r51f7f3a r3024b3f  
    99    <property name="verified.filename" value="verified.txt" />
    1010    <property name="javac.compilerargs" value="" />
     11    <property name="tomcat.lib" value="apache-tomcat-deployer/lib" />
    1112
    1213    <target name="all" depends="build" />
     
    8384              jetty-sslengine-xxx.jar: SSL NIO Connector for console
    8485              jetty-java5-threadpool-xxx.jar: Concurrent thread pool for eepsite
    85               jasper*, commons-logging.jar: JspC compiler, webapp runtime
     86              glassfish 2.1: Not used, too old, see Tomcat below.
    8687              jetty-rewrite-handler: Not used by I2P, but only 20KB and could be useful for eepsites
    8788              All of these are available in the Ubuntu packages libjetty-java and libjetty-extra-java
    8889        -->
    8990        <copy preservelastmodified="true" file="${jetty.base}/start.jar" tofile="jettylib/jetty-start.jar" />
    90         <copy preservelastmodified="true" file="${jetty.base}/lib/${jetty.base}.jar" tofile="jettylib/org.mortbay.jetty.jar" />
     91        <copy file="${jetty.base}/lib/${jetty.base}.jar" tofile="jettylib/org.mortbay.jetty.jar" />
    9192        <copy preservelastmodified="true" file="${jetty.base}/lib/jetty-util-${jetty.ver}.jar" tofile="jettylib/jetty-util.jar" />
    9293        <copy preservelastmodified="true" file="${jetty.base}/lib/ext/jetty-java5-threadpool-${jetty.ver}.jar" tofile="jettylib/jetty-java5-threadpool.jar" />
    9394        <copy preservelastmodified="true" file="${jetty.base}/lib/ext/jetty-rewrite-handler-${jetty.ver}.jar" tofile="jettylib/jetty-rewrite-handler.jar" />
    9495        <copy preservelastmodified="true" file="${jetty.base}/lib/ext/jetty-sslengine-${jetty.ver}.jar" tofile="jettylib/jetty-sslengine.jar" />
    95         <copy preservelastmodified="true" file="${jetty.base}/lib/jsp-2.0/ant-1.6.5.jar" tofile="jettylib/ant.jar" />
    96         <copy preservelastmodified="true" file="${jetty.base}/lib/jsp-2.0/commons-el-1.0.jar" tofile="jettylib/commons-el.jar" />
    97         <copy preservelastmodified="true" file="${jetty.base}/lib/jsp-2.0/jasper-compiler-5.5.15.jar" tofile="jettylib/jasper-compiler.jar" />
    98         <copy preservelastmodified="true" file="${jetty.base}/lib/jsp-2.0/jasper-runtime-5.5.15.jar" tofile="jettylib/jasper-runtime.jar" />
    99         <copy preservelastmodified="true" file="${jetty.base}/lib/jsp-2.0/jsp-api-2.0.jar" tofile="jettylib/jsp-api.jar" />
    100         <copy preservelastmodified="true" file="${jetty.base}/lib/servlet-api-2.5-20081211.jar" tofile="jettylib/javax.servlet.jar" />
     96        <copy file="${jetty.base}/lib/jsp-2.1/ant-1.6.5.jar" tofile="jettylib/ant.jar" />
    10197        <delete file="jetty.tar" />
    10298        <delete dir="${jetty.base}" />
     
    105101          -->
    106102        <copy preservelastmodified="true" file="../../installer/lib/launch4j/lib/commons-logging.jar" todir="jettylib/" />
     103        <ant target="copyTomcatLib" />
     104    </target>
     105
     106    <!-- Tomcat.
     107         The glassfish jars bundled in Jetty 6 are way too old.
     108         For compatibility with very old I2P installations where the classpath
     109         was set individually in wrapper.config, we rename and combine the jars as follows:
     110         jasper.jar : jasper-runtime.jar
     111         jasper-el.jar + el-api.jar : commons-el.jar
     112         servlet-api.jar + jsp-api.jar : javax.servlet.jar
     113         tomcat-juli.jar : commons-logging.jar
     114         empty jar : jasper-compiler.jar
     115     -->
     116    <target name="copyTomcatLib" >
     117        <copy file="${tomcat.lib}/jasper.jar" tofile="jettylib/jasper-runtime.jar" />
     118        <copy file="${tomcat.lib}/jasper-el.jar" tofile="jettylib/commons-el.jar" />
     119        <jar destfile="jettylib/commons-el.jar" duplicate="preserve" update="true" >
     120            <zipfileset excludes="META-INF/**/*" src="${tomcat.lib}/el-api.jar" />
     121        </jar>
     122        <copy file="${tomcat.lib}/servlet-api.jar" tofile="jettylib/javax.servlet.jar" />
     123        <jar destfile="jettylib/javax.servlet.jar" duplicate="preserve" update="true" >
     124            <zipfileset excludes="META-INF/**/*" src="${tomcat.lib}/jsp-api.jar" />
     125        </jar>
     126        <copy file="${tomcat.lib}/tomcat-juli.jar" tofile="jettylib/commons-logging.jar" />
     127        <jar destfile="jettylib/jasper-compiler.jar" />
    107128    </target>
    108129
  • build.xml

    r51f7f3a r3024b3f  
    568568    </target>
    569569
     570    <target name="webappDistclean">
     571        <ant dir="apps/i2ptunnel/java/" target="distclean" />
     572        <ant dir="apps/routerconsole/java/" target="distclean" />
     573        <ant dir="apps/addressbook/" target="distclean" />
     574        <ant dir="apps/susimail/" target="distclean" />
     575        <ant dir="apps/susidns/src/" target="distclean" />
     576        <ant dir="apps/i2psnark/java/" target="distclean" />
     577    </target>
     578
    570579    <target name="pkg" depends="distclean, updater, preppkg, installer" />
    571580
     
    759768         -->
    760769        <copy file="installer/lib/launch4j/head/LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-Launch4j.txt" />
     770        <copy file="apps/jetty/apache-tomcat-deployer/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />
    761771        <!--  Not sure if these are used or should be included -->
    762772        <copy file="installer/lib/launch4j/lib/foxtrot.LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-Foxtrot.txt" />
     
    948958    <target name="prepjupdate" depends="prepupdate, buildWEB">
    949959        <copy todir="pkg-temp/lib" >
    950             <fileset dir="build" includes="jasper*.jar javax*.jar jetty*.jar jsp*.jar org.mortbay.jetty.jar" />
     960            <fileset dir="build" includes="commons*.jar jasper*.jar javax*.jar jetty*.jar jsp*.jar org.mortbay.jetty.jar" />
    951961        </copy>
    952962        <!--  We have to package the new eepsite files for MigrateJetty.java, but we
  • installer/resources/deletelist.txt

    r51f7f3a r3024b3f  
    22# expired cert
    33certificates/r31453.ovh.net
     4# old jetty 5 libs
     5lib/org.mortbay.jmx.jar
  • router/java/src/net/i2p/router/Router.java

    r51f7f3a r3024b3f  
    13491349            // Ideally, do not use I2P classes at all, new or not.
    13501350            try {
    1351                 // TODO move deleteListedFiles() here after a few releases
    1352                 if (ok)
     1351                if (ok) {
     1352                    // We do this here so we may delete old jars before we restart
     1353                    deleteListedFiles();
    13531354                    System.out.println("INFO: Update installed");
    1354                 else
     1355                } else {
    13551356                    System.out.println("ERROR: Update failed!");
     1357                }
    13561358                if (!ok) {
    13571359                    // we can't leave the file in place or we'll continually restart, so rename it
     
    13841386        } else {
    13851387            deleteJbigiFiles();
    1386             // Here so it may be used in the 0.8.12 update
    1387             // TODO move up in a few releases so it is only run after an update
     1388            // It was here starting in 0.8.12 so it could be used the very first time
     1389            // Now moved up so it is usually run only after an update
     1390            // But the first time before jetty 6 it will run here...
     1391            // Here we can't remove jars
    13881392            deleteListedFiles();
    13891393        }
Note: See TracChangeset for help on using the changeset viewer.