Changeset 9478a84


Ignore:
Timestamp:
Apr 7, 2013 3:01:02 PM (7 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
bb8183d
Parents:
56eba28a
Message:
  • Switch from Jetty 7.6.8 to 7.6.10; check in jars
  • Re-enable web downloads for easy jetty updating
  • Add dependency checking in apps/jetty build
  • Other build.xml tweaks
Files:
14 added
2 edited

Legend:

Unmodified
Added
Removed
  • LICENSE.txt

    r56eba28a r9478a84  
    178178   See licenses/LICENSE-GPLv2.txt
    179179
    180    Jetty 7.6.8.v20121106:
     180   Jetty 7.6.10.v20130312:
    181181   See licenses/ABOUT-Jetty.html
    182182   See licenses/NOTICE-Jetty.html
  • apps/jetty/build.xml

    r56eba28a r9478a84  
    22<project basedir="." default="all" name="jetty">
    33
    4     <property name="jetty.ver" value="7.6.8.v20121106" />
     4    <property name="jetty.ver" value="7.6.10.v20130312" />
    55    <property name="jetty.base" value="jetty-distribution-${jetty.ver}" />
    6     <property name="jetty.sha1" value="6fcdc3f532c5ab72843e12cbac3d7cb797cdb5b9" />
     6    <property name="jetty.sha1" value="8c0ff0ad83756de118f5af71b88ca9c78ebf6420" />
    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}" />
     
    1313    <target name="all" depends="build" />
    1414
     15    <!--
     16      - We now check in the jars we need to ${jetty.base}, so
     17      - fetchJettylib, verifyJettylib, and extractJettylib are not used unless
     18      - updating to a new Jetty version by changing ${jetty.ver} and ${jetty.sha1} above.
     19     -->
     20
     21    <target name="ensureJettylib" >
     22        <available property="jetty.zip.extracted" file="${jetty.base}" type="dir" />
     23        <condition property="jetty.zip.available" >
     24            <or>
     25                <istrue value="${jetty.zip.extracted}" />
     26                <available file="${jetty.filename}" type="file" />
     27            </or>
     28        </condition>
     29        <ant target="copyJettylib" />
     30    </target>
    1531  <!--
    16     <target name="ensureJettylib" >
    17         <available property="jetty.zip.available" file="${jetty.filename}" type="file" />
    18         <available property="jetty.zip.extracted" file="jettylib" type="dir" />
    19         <ant target="fetchJettylib" />
    20         <ant target="verifyJettylib" />
    21         <ant target="extractJettylib" />
    22     </target>
     32    <target name="ensureJettylib" depends="extractJettylib" />
    2333   -->
    24     <target name="ensureJettylib" depends="extractJettylib" />
    2534
    2635    <target name="fetchJettylib" unless="jetty.zip.available" >
     
    4958
    5059    <condition property="verified.already" >
    51         <and>
    52             <available file="${jetty.filename}" />
    53             <uptodate property="foo.bar.baz" srcfile="${jetty.filename}" targetfile="${verified.filename}" />
    54         </and>
     60        <or>
     61            <istrue value="${jetty.zip.extracted}" />
     62            <and>
     63                <available file="${jetty.filename}" />
     64                <uptodate property="foo.bar.baz" srcfile="${jetty.filename}" targetfile="${verified.filename}" />
     65            </and>
     66        </or>
    5567    </condition>
    5668
    57     <target name="verifyJettylib" unless="verified.already" >
     69    <target name="verifyJettylib" depends="fetchJettylib" unless="verified.already" >
    5870        <condition property="jetty.zip.verified" >
    5971                <checksum file="${jetty.filename}" algorithm="SHA" property="${jetty.sha1}" />
     
    6981    </target>
    7082
    71   <!--
    72     <target name="extractJettylib" unless="jetty.zip.extracted" >
    73    -->
    74     <target name="extractJettylib" >
     83    <target name="extractJettylib" depends="verifyJettylib" unless="jetty.zip.extracted" >
    7584      <!-- for .tgz -->
    7685      <!--
     
    7988      -->
    8089      <!-- for .zip -->
    81       <!--
    8290        <unzip src="${jetty.filename}" dest="." />
    83       -->
     91    </target>
     92
     93    <target name="copyJettylib" depends="extractJettylib" >
    8494        <mkdir dir="jettylib" />
    8595      <!-- We copy everything to names without the version numbers so we
    86            can update them later. Where there was something similar in Jetty 5,
    87            we use the same names so they will overwrite the Jetty 5 jar on upgrade.
     96           can update them later. Where there was something similar in Jetty 5/6,
     97           we use the same names so they will overwrite the Jetty 5/6 jar on upgrade.
    8898           Otherwise we use the same name as the symlink in Ubuntu /usr/share/java.
    8999           Reasons for inclusion:
     
    124134            </manifest>
    125135        </jar>
     136      <!--
    126137        <delete file="jetty.tar" />
    127       <!--
    128138        <delete dir="${jetty.base}" />
    129139      -->
     
    177187    <target name="builddep" />
    178188
    179     <target name="compile" depends="builddep, ensureJettylib" >
     189    <condition property="depend.available">
     190        <typefound name="depend" />
     191    </condition>
     192
     193    <target name="depend" if="depend.available">
     194        <depend
     195            cache="../../build"
     196            srcdir="./java/src"
     197            destdir="./build/obj" >
     198            <classpath>
     199                <pathelement location="../../../core/java/build/i2p.jar" />
     200                <pathelement location="./jettylib/commons-logging.jar" />
     201                <pathelement location="./jettylib/org.mortbay.jetty.jar" />
     202                <pathelement location="./jettylib/javax.servlet.jar" />
     203                <pathelement location="./jettylib/jetty-http.jar" />
     204                <pathelement location="./jettylib/jetty-io.jar" />
     205                <pathelement location="./jettylib/jetty-util.jar" />
     206                <pathelement location="./jettylib/jetty-xml.jar" />
     207            </classpath>
     208        </depend>
     209    </target>
     210
     211    <target name="compile" depends="builddep, ensureJettylib, depend" >
    180212        <mkdir dir="./build" />
    181213        <mkdir dir="./build/obj" />
Note: See TracChangeset for help on using the changeset viewer.