Changeset d28220c for build.xml


Ignore:
Timestamp:
Nov 22, 2017 2:49:22 PM (3 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
700c843
Parents:
ad056bc
Message:

Tomcat 8.5.23
Prior to Jetty 9, we used the Tomcat 6 distribution.
As of Jetty 9, we used Tomcat 8.0.33 that was included in the Jetty 9 distribution,
but that is old and doesn't get updated.
Now use the latest Tomcat 8 distribution, and pick the same packages
as Jetty 9 did in their distribution.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    rad056bc rd28220c  
    12981298
    12991299    <target name="preplicenses-unlesspkg" depends="settomcatprop" unless="${with-libtomcat-java}" >
    1300 <!--  replacement?
    1301         <copy file="apps/jetty/apache-tomcat-deployer/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />
    1302 -->
     1300        <copy file="apps/jetty/apache-tomcat-8.5.23/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />
    13031301    </target>
    13041302
     
    22682266            <!-- libjetty9-java -->
    22692267            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.22.v20170606" />
     2268            <!-- libtomcat8-java -->
     2269            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.23" />
    22702270            <!-- libjstl1.1-java or glassfish-javaee -->
    22712271          <!--
     
    22852285                <exclude name="installer/resources/geoipv6.dat.gz"/>
    22862286                <exclude name="apps/jetty/jetty-distribution-*/**"/>
     2287                <exclude name="apps/jetty/apache-tomcat-*/**"/>
    22872288          <!--
    22882289                <exclude name="apps/susidns/src/lib/jstl.jar" />
     
    23422343          <!--
    23432344            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.22.v20170606" />
     2345            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.23" />
    23442346           -->
    23452347            <!-- libjstl1.1-java or glassfish-javaee -->
     
    23612363          <!--
    23622364                <exclude name="apps/jetty/jetty-distribution-*/**"/>
     2365                <exclude name="apps/jetty/apache-tomcat-*/**"/>
    23632366           -->
    23642367          <!--
     
    24102413            <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
    24112414            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.22.v20170606" />
     2415            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.23" />
    24122416          <!--
    24132417            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
     
    24252429                <exclude name="installer/resources/geoipv6.dat.gz"/>
    24262430                <exclude name="apps/jetty/jetty-distribution-*/**"/>
     2431                <exclude name="apps/jetty/apache-tomcat-*/**"/>
    24272432          <!--
    24282433                <exclude name="apps/susidns/src/lib/jstl.jar" />
Note: See TracChangeset for help on using the changeset viewer.