Changeset 92b9d0a for apps/jetty


Ignore:
Timestamp:
Dec 23, 2011 12:56:48 AM (9 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
99ad70e
Parents:
bd14dc3
Message:

First cut at migrating to Jetty 6 and prep for using an external
Jetty 6 package.

  • Add several jars from the Jetty 6 distribution
  • Update jetty.xml
  • Add context XML files
  • Update WorkingDir? to migrate the content XML files
  • Update RouterConsoleRunner? and LocaleWebAppHandler?
  • Remove all old Jetty 5.1.15 local mods; this will break Seedless using a custom Server() constructor
  • Update I2PRequestLog to be a mod of NCSARequestLog from 6.1.26
  • Put I2PRequestLog in its own jar
  • Copy MultiPartRequest? and other required classes from Jetty 5.1.15 and add it to susimail, as the replacement MultiPartFilter? in Jetty 6 is difficult to migrate to, and does not support content-type
  • Update i2psnark for Jetty 6
  • Disable i2psnark RunStandalone?, unused and instantiated Jetty 5
  • Fix up all webapp build.xml to reference new jars

Not yet working: Plugin/webapp run detection and stopping, eepsite CGI
Not well tested: Plugins, classpaths, webapps

Location:
apps/jetty
Files:
8 deleted
1 edited

Legend:

Unmodified
Added
Removed
  • apps/jetty/build.xml

    rbd14dc3 r92b9d0a  
    22<project basedir="." default="all" name="jetty">
    33
    4     <property name="jetty.base" value="jetty-5.1.15" />
    5     <property name="jetty.sha1" value="3a7a3de50f86f0cdb23c33aec632ea7f44132c5e" />
    6     <property name="jetty.filename" value="${jetty.base}.tgz" />
    7     <property name="jetty.url" value="http://dist.codehaus.org/jetty/jetty-5.1.x/${jetty.filename}" />
     4    <property name="jetty.ver" value="6.1.26" />
     5    <property name="jetty.base" value="jetty-${jetty.ver}" />
     6    <property name="jetty.sha1" value="9485913f1a1945a849a90f1a34853d22350bc524" />
     7    <property name="jetty.filename" value="${jetty.base}.zip" />
     8    <property name="jetty.url" value="http://dist.codehaus.org/jetty/${jetty.base}/${jetty.filename}" />
    89    <property name="verified.filename" value="verified.txt" />
    910    <property name="javac.compilerargs" value="" />
     
    6566
    6667    <target name="extractJettylib" unless="jetty.zip.extracted" >
     68      <!-- for .tgz -->
     69      <!--
    6770        <gunzip src="${jetty.filename}" dest="jetty.tar" />
    6871        <untar src="jetty.tar" dest="." />
     72      -->
     73      <!-- for .zip -->
     74        <unzip src="${jetty.filename}" dest="." />
    6975        <mkdir dir="jettylib" />
    70         <copy todir="jettylib" preservelastmodified="true" >
    71             <fileset dir="${jetty.base}/lib">
    72                 <include name="*.jar" />
    73             </fileset>
    74             <fileset dir="${jetty.base}/ext">
    75                 <include name="ant.jar" />
    76                 <include name="commons-el.jar" />
    77                 <include name="commons-logging.jar" />
    78                 <include name="jasper-compiler.jar" />
    79                 <include name="jasper-runtime.jar" />
    80             </fileset>
    81         </copy>
     76      <!-- We copy everything to names without the version numbers so we
     77           can update them later. Where there was something similar in Jetty 5,
     78           we use the same names.
     79           Reasons for inclusion:
     80              start.jar: Needed for clients.config startup of eepsites
     81              jetty-util-xxx.jar: LifeCycle (base class for stuff), URIUtil (used in i2psnark)
     82              jetty-sslengine-xxx.jar: SSL NIO Connector for console
     83              jetty-java5-threadpool-xxx.jar: Concurrent thread pool for eepsite
     84              commons-logging.jar: JspC compiler
     85              TODO which of these are available in the Ubuntu packages?
     86        -->
     87        <copy preservelastmodified="true" file="${jetty.base}/lib/${jetty.base}.jar" tofile="jettylib/org.mortbay.jetty.jar" />
     88        <copy preservelastmodified="true" file="${jetty.base}/lib/jetty-util-${jetty.ver}.jar" tofile="jettylib/jetty-util.jar" />
     89        <copy preservelastmodified="true" file="${jetty.base}/lib/servlet-api-2.5-20081211.jar" tofile="jettylib/javax.servlet.jar" />
     90        <copy preservelastmodified="true" file="${jetty.base}/lib/ext/jetty-sslengine-${jetty.ver}.jar" tofile="jettylib/jetty-sslengine.jar" />
     91        <copy preservelastmodified="true" file="${jetty.base}/lib/ext/jetty-java5-threadpool-${jetty.ver}.jar" tofile="jettylib/jetty-threadpool.jar" />
     92        <copy preservelastmodified="true" file="${jetty.base}/lib/jsp-2.0/ant-1.6.5.jar" tofile="jettylib/ant.jar" />
     93        <copy preservelastmodified="true" file="${jetty.base}/lib/jsp-2.0/commons-el-1.0.jar" tofile="jettylib/commons-el.jar" />
     94        <copy preservelastmodified="true" file="${jetty.base}/lib/jsp-2.0/jasper-compiler-5.5.15.jar" tofile="jettylib/jasper-compiler.jar" />
     95        <copy preservelastmodified="true" file="${jetty.base}/lib/jsp-2.0/jasper-runtime-5.5.15.jar" tofile="jettylib/jasper-runtime.jar" />
     96        <copy preservelastmodified="true" file="${jetty.base}/lib/jsp-2.0/jsp-api-2.0.jar" tofile="jettylib/jsp-api.jar" />
     97        <copy preservelastmodified="true" file="${jetty.base}/start.jar" tofile="jettylib/jetty-start.jar" />
    8298        <delete file="jetty.tar" />
    8399        <delete dir="${jetty.base}" />
     100        <!-- commons-logging.jar not in Jetty 6 but we have it in launch4j so copy it over, we need it
     101             for org.apache.jasper.JspC compiler
     102          -->
     103        <copy preservelastmodified="true" file="../../installer/lib/launch4j/lib/commons-logging.jar" todir="jettylib/" />
    84104    </target>
    85105
    86106    <target name="build" depends="jar" />
     107
    87108    <target name="builddep" />
    88109    <target name="compile" depends="builddep, ensureJettylib" >
     
    94115            destdir="./build/obj"
    95116            includeAntRuntime="false"
    96             classpath="./jettylib/commons-logging.jar:./jettylib/javax.servlet.jar:./jettylib/org.mortbay.jetty.jar" >
     117            classpath="./jettylib/commons-logging.jar:./jettylib/javax.servlet.jar:./jettylib/org.mortbay.jetty.jar:./jettylib/jetty-util.jar" >
    97118            <compilerarg line="${javac.compilerargs}" />
    98119        </javac>
     
    113134    </target>
    114135
     136    <!-- With Jetty 5 we replaced classes in the jar, but with Jetty 6 we
     137         put our stuff in its own jar so we can work with standard Jetty 6 packages
     138      -->
    115139    <target name="jar" depends="compile, jarUpToDate, listChangedFiles" unless="jar.uptodate" >
    116140        <!-- set if unset -->
    117141        <property name="workspace.changes.tr" value="" />
    118         <jar destfile="./jettylib/org.mortbay.jetty.jar" basedir="./build/obj" includes="**/*.class" update="true" >
     142        <jar destfile="./jettylib/jetty-i2p.jar" basedir="./build/obj" includes="**/*.class" >
    119143            <manifest>
    120144                <attribute name="Build-Date" value="${build.timestamp}" />
Note: See TracChangeset for help on using the changeset viewer.