Changeset ed443fe


Ignore:
Timestamp:
Jan 31, 2010 5:06:50 AM (11 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
bfd1306
Parents:
390981e
Message:

jetty 5.1.15

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • apps/i2psnark/jetty-i2psnark.xml

    r390981e red443fe  
    5959  </Call>
    6060
     61  <!-- this is so we can find the css -->
     62  <Call name="addContext">
     63    <Arg>
     64      <New class="org.mortbay.http.HttpContext">
     65        <Set name="contextPath">/themes</Set>
     66        <Set name="resourceBase">./docs/themes</Set>
     67        <Call name="addHandler">
     68          <Arg>
     69            <New class="org.mortbay.http.handler.ResourceHandler">
     70              <Set name="redirectWelcome">FALSE</Set>
     71            </New>
     72          </Arg>
     73        </Call>
     74      </New>
     75    </Arg>
     76  </Call>
     77 
    6178  <!-- =============================================================== -->
    6279  <!-- Configure the Other Server Options                              -->
  • apps/jetty/build.xml

    r390981e red443fe  
    22<project basedir="." default="all" name="jetty">
    33
    4     <property name="jetty.sha1" value="021164f84da7304bd1ff07c268b45aa3e0b13322" />
    5     <property name="jetty.md5" value="a61adc832be6baf2678935506743cfc3" />
    6     <property name="jetty.url" value="http://dist.codehaus.org/jetty/jetty-5.1.x/jetty-5.1.12.zip" />
    7     <property name="jetty.filename" value="jetty-5.1.12.zip" />
     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}" />
    88    <property name="verified.filename" value="verified.txt" />
    99    <property name="javac.compilerargs" value="" />
     
    3333        <echo message="still attempt to verify its checksums, which must be:" />
    3434        <echo message="SHA1 ${jetty.sha1}" />
    35         <echo message="MD5 ${jetty.md5}" />
    3635        <echo message="" />
    3736        <input message="Download Jetty archive automatically?" validargs="y,n" addproperty="jetty.download" />
     
    4847    <target name="verifyJettylib" unless="verified.already" >
    4948        <condition property="jetty.zip.verified" >
    50             <and>
    5149                <checksum file="${jetty.filename}" algorithm="SHA" property="${jetty.sha1}" />
    52                 <checksum file="${jetty.filename}" algorithm="MD5" property="${jetty.md5}" />
    53             </and>
    5450        </condition>
    55         <fail message="Jetty archive does not match its checksums!" >
     51        <fail message="Jetty archive does not match its checksum!" >
    5652            <condition>
    5753                <not>
     
    6460
    6561    <target name="extractJettylib" unless="jetty.zip.extracted" >
    66         <unzip src="${jetty.filename}" dest="." />
     62        <gunzip src="${jetty.filename}" dest="jetty.tar" />
     63        <untar src="jetty.tar" dest="." />
    6764        <mkdir dir="jettylib" />
    6865        <copy todir="jettylib">
    69             <fileset dir="jetty-5.1.12/lib">
     66            <fileset dir="${jetty.base}/lib">
    7067                <include name="*.jar" />
    7168            </fileset>
    7269        </copy>
    7370        <copy todir="jettylib">
    74             <fileset dir="jetty-5.1.12/ext">
     71            <fileset dir="${jetty.base}/ext">
    7572                <include name="ant.jar" />
    7673                <include name="commons-el.jar" />
     
    8279            </fileset>
    8380        </copy>
    84         <delete dir="jetty-5.1.12" />
     81        <delete file="jetty.tar" />
     82        <delete dir="${jetty.base}" />
    8583    </target>
    8684
     
    129127        <unzip src="${jetty.filename}" dest="./build/javadoc" >
    130128            <patternset>
    131                 <include name="jetty-5.1.12/javadoc/" />
     129                <include name="${jetty.base}/javadoc/" />
    132130            </patternset>
    133             <mapper type="glob" from="jetty-5.1.12/javadoc/*" to="javadoc/*" />
     131            <mapper type="glob" from="${jetty.base}/javadoc/*" to="javadoc/*" />
    134132        </unzip>
    135133    </target>
  • build.xml

    r390981e red443fe  
    256256    </target>
    257257
    258     <target name="pkg" depends="distclean, updater, preppkg, installer" />
     258    <!-- A few reeleases only, then back to updater. First release was 0.7.11 -->
     259    <target name="pkg" depends="distclean, updaterWithJettyFixes, preppkg, installer" />
    259260
    260261    <target name="pkgclean" depends="deletepkg-temp">
  • history.txt

    r390981e red443fe  
     12010-01-31 zzz
     2    * i2psnark standalone: Fix CSS
     3    * Jetty: Update to 5.1.15 to get ResourceHandler fix
     4
    152010-01-30 sponge
    26    * Fix NPE in TCPtoI2P when a lookup fails, report the error to the stream.
  • installer/resources/jetty.xml

    r390981e red443fe  
    1818<!--           war files placed in the webapps/ dir.                           -->
    1919<!--                                                                           -->
    20 <!-- I2P uses Jetty 5.1.12. We have no plans to upgrade to Jetty 6, due to     -->
     20<!-- I2P uses Jetty 5.1.15. We have no plans to upgrade to Jetty 6, due to     -->
    2121<!-- the significant changes in the API. If you need web server features not   -->
    2222<!-- found in Jetty 5, you may install and run Jetty 6 in a different JVM,     -->
  • router/java/src/net/i2p/router/RouterVersion.java

    r390981e red443fe  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 5;
     21    public final static long BUILD = 6;
    2222
    2323    /** for example "-test" */
Note: See TracChangeset for help on using the changeset viewer.