Changeset 92b9d0a for build.xml


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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    rbd14dc3 r92b9d0a  
    195195        <copy file="apps/routerconsole/java/build/routerconsole.jar" todir="build/" />
    196196        <copy file="apps/routerconsole/java/build/routerconsole.war" todir="build/" />
    197         <copy file="apps/jetty/jettylib/org.mortbay.jetty.jar" todir="build/" />
    198         <copy file="apps/jetty/jettylib/jasper-compiler.jar" todir="build/" />
    199         <copy file="apps/jetty/jettylib/jasper-runtime.jar" todir="build/" />
    200         <copy file="apps/jetty/jettylib/commons-logging.jar" todir="build/" />
    201         <copy file="apps/jetty/jettylib/commons-el.jar" todir="build/" />
    202         <copy file="apps/jetty/jettylib/javax.servlet.jar" todir="build/" />
     197        <copy todir="build/" >
     198            <fileset dir="apps/jetty/jettylib" excludes="ant.jar" />
     199        </copy>
    203200    </target>
    204201
     
    392389            <group title="I2PSnark Application" packages="org.klomp.snark:org.klomp.snark.*" />
    393390            <group title="I2PTunnel Application" packages="net.i2p.i2ptunnel:net.i2p.i2ptunnel.*" />
     391            <group title="Jetty Logging" packages="org.mortbay.http" />
    394392            <group title="SAM Bridge" packages="net.i2p.sam:net.i2p.sam.client" />
    395393            <group title="SusiDNS Application" packages="i2p.susi.dns" />
    396             <group title="SusiMail Application" packages="i2p.susi.webmail:i2p.susi.webmail.*:i2p.susi.debug:i2p.susi.util" />
     394            <group title="SusiMail Application" packages="i2p.susi.webmail:i2p.susi.webmail.*:i2p.susi.debug:i2p.susi.util:org.mortbay.servlet:org.mortbay.util" />
    397395            <group title="Systray Application" packages="net.i2p.apps.systray" />
    398396            <sourcepath>
     
    413411                <pathelement location="apps/susidns/src/java/src" />
    414412                <pathelement location="apps/susimail/src/src" />
     413                <pathelement location="apps/jetty/java/src" />
    415414            </sourcepath>
    416415            <classpath>
    417416                <pathelement location="apps/jetty/jettylib/org.mortbay.jetty.jar" />
    418417                <pathelement location="apps/jetty/jettylib/javax.servlet.jar" />
     418                <pathelement location="apps/jetty/jettylib/jetty-sslengine.jar" />
     419                <pathelement location="apps/jetty/jettylib/jetty-start.jar" />
     420                <pathelement location="apps/jetty/jettylib/jetty-threadpool.jar" />
     421                <pathelement location="apps/jetty/jettylib/jetty-util.jar" />
     422                <pathelement location="apps/jetty/jettylib/jsp-api.jar" />
    419423                <pathelement location="apps/systray/java/lib/systray4j.jar" />
    420424                <pathelement location="apps/jrobin/jrobin-1.5.9.1.jar" />
     
    671675        <copy file="build/i2p.jar" todir="pkg-temp/lib/" />
    672676        <copy file="build/i2ptunnel.jar" todir="pkg-temp/lib/" />
    673         <copy file="build/jasper-compiler.jar" todir="pkg-temp/lib/" />
    674         <copy file="build/jasper-runtime.jar" todir="pkg-temp/lib/" />
    675         <copy file="build/commons-logging.jar" todir="pkg-temp/lib/" />
    676         <copy file="build/commons-el.jar" todir="pkg-temp/lib/" />
    677         <copy file="build/javax.servlet.jar" todir="pkg-temp/lib/" />
     677        <!-- all jetty stuff -->
     678        <copy todir="pkg-temp/lib" >
     679            <fileset dir="build" includes="commons*.jar jasper*.jar javax*.jar jetty*.jar jsp*.jar org.mortbay.jetty.jar" />
     680        </copy>
    678681        <copy file="build/mstreaming.jar" todir="pkg-temp/lib/" />
    679682        <copy file="build/streaming.jar" todir="pkg-temp/lib/" />
    680         <copy file="build/org.mortbay.jetty.jar" todir="pkg-temp/lib/" />
    681683        <copy file="build/router.jar" todir="pkg-temp/lib/" />
    682684        <copy file="build/desktopgui.jar" todir="pkg-temp/lib/" />
     
    725727        <!-- Eepsite stuff here -->
    726728        <mkdir dir="pkg-temp/eepsite" />
    727         <mkdir dir="pkg-temp/eepsite/webapps" />
    728         <mkdir dir="pkg-temp/eepsite/logs" />
    729         <mkdir dir="pkg-temp/eepsite/cgi-bin" />
    730         <mkdir dir="pkg-temp/eepsite/docroot" />
    731         <mkdir dir="pkg-temp/eepsite/docroot/help" />
    732         <mkdir dir="pkg-temp/eepsite/docroot/help/lib" />
    733         <copy todir="pkg-temp/eepsite/docroot/" >
    734             <fileset dir="installer/resources/eepsite.help/" />
     729        <copy todir="pkg-temp/eepsite/" >
     730            <fileset dir="installer/resources/eepsite/" />
    735731        </copy>
    736732        <copy todir="pkg-temp/eepsite/docroot/help/lib/" >
     
    738734        </copy>
    739735        <copy file="installer/resources/themes/console/images/favicon.ico" tofile="pkg-temp/eepsite/docroot/favicon.ico" />
    740         <copy file="installer/resources/jetty.xml" tofile="pkg-temp/eepsite/jetty.xml" />
    741736    </target>
    742737
     
    932927    </target>
    933928
     929    <!-- All jetty jars required for update.
     930         We don't need commons-el or commons-logging, they haven't changed.
     931         TODO do we need to bother updating jasper?
     932         TODO where is JMX? We don't need it I hope.
     933      -->
    934934    <target name="prepjupdate" depends="prepupdate, buildWEB">
    935         <copy file="build/jasper-compiler.jar" todir="pkg-temp/lib/" />
    936         <copy file="build/jasper-runtime.jar" todir="pkg-temp/lib/" />
    937         <copy file="build/commons-logging.jar" todir="pkg-temp/lib/" />
    938         <copy file="build/commons-el.jar" todir="pkg-temp/lib/" />
    939         <copy file="build/javax.servlet.jar" todir="pkg-temp/lib/" />
    940         <copy file="build/org.mortbay.jetty.jar" todir="pkg-temp/lib/" />
    941     </target>
     935        <copy todir="pkg-temp" >
     936            <fileset dir="build/lib" includes="jasper*.jar javax*.jar jetty*.jar jsp*.jar org.mortbay.jetty.jar" />
     937        </copy>
     938    </target>
     939
     940    <!-- just our jetty 5 fixes, not for jetty 6 -->
    942941    <target name="prepjupdatefixes" depends="prepupdate, buildWEB">
    943942        <copy file="build/org.mortbay.jetty.jar" todir="pkg-temp/lib/" />
Note: See TracChangeset for help on using the changeset viewer.