Changeset 3024b3f for build.xml


Ignore:
Timestamp:
Jan 10, 2012 4:03:30 AM (9 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
8e20e7a
Parents:
51f7f3a
Message:
  • Move from Servlet 2.4/JSP 2.0 to Servlet 2.5/JSP 2.1
    • Replace Jasper 2.0 from Jetty 6 with Apache Tomcat 6.0.35 (CDDL 1.0 + GPLv2)
    • Replace JSTL 1.1.2 with JSTL 1.2 (CDDL 1.0 + GPLv2)
File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r51f7f3a r3024b3f  
    568568    </target>
    569569
     570    <target name="webappDistclean">
     571        <ant dir="apps/i2ptunnel/java/" target="distclean" />
     572        <ant dir="apps/routerconsole/java/" target="distclean" />
     573        <ant dir="apps/addressbook/" target="distclean" />
     574        <ant dir="apps/susimail/" target="distclean" />
     575        <ant dir="apps/susidns/src/" target="distclean" />
     576        <ant dir="apps/i2psnark/java/" target="distclean" />
     577    </target>
     578
    570579    <target name="pkg" depends="distclean, updater, preppkg, installer" />
    571580
     
    759768         -->
    760769        <copy file="installer/lib/launch4j/head/LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-Launch4j.txt" />
     770        <copy file="apps/jetty/apache-tomcat-deployer/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />
    761771        <!--  Not sure if these are used or should be included -->
    762772        <copy file="installer/lib/launch4j/lib/foxtrot.LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-Foxtrot.txt" />
     
    948958    <target name="prepjupdate" depends="prepupdate, buildWEB">
    949959        <copy todir="pkg-temp/lib" >
    950             <fileset dir="build" includes="jasper*.jar javax*.jar jetty*.jar jsp*.jar org.mortbay.jetty.jar" />
     960            <fileset dir="build" includes="commons*.jar jasper*.jar javax*.jar jetty*.jar jsp*.jar org.mortbay.jetty.jar" />
    951961        </copy>
    952962        <!--  We have to package the new eepsite files for MigrateJetty.java, but we
Note: See TracChangeset for help on using the changeset viewer.