Changeset 094cf14 for build.xml


Ignore:
Timestamp:
Apr 7, 2016 2:38:30 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
5a2975b
Parents:
5c8eab9
Message:

Debian:
Prep for dependency on libtomcat7
Doesn't work yet, breaks susidns.
glassfish-javaee for jstl.jar and standard.jar version 1.2 won't work with tomcat7,
it's ancient and not compatible with recent el libs.
Add back option to depend on libjakarta-taglibs-standard and libjstl1.1-java which are version 1.1.2,
but not clear if they will work with tomcat7 either, even though they are
dependencies of libjetty8-extra-java.
We switched from JSTL 1.1.2 to JSTL 1.2 when we went from Jetty 5 to Jetty 6 in 2012.
1.2 libs are not available anywhere except for Glassfish, and
Debian only has the ancient Java EE 5 Glassfish 2.1.
Not clear there's any way to get susidns (and bote) to work with both Tomcat 6 and 7.

  • Fix wrong jsp-api version
  • Fix other minor errors in install and links files.
  • Log stack trace for Jetty warnings if log level is WARN
  • SusiDNS: Move standard.jar and jstl.jar out of WEB-INF/lib, where Tomcat 7 build refuses to find them
File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r5c8eab9 r094cf14  
    524524    <!-- Custom target to collect the jars that I2P-Bote needs to compile, so it can compile from source. -->
    525525    <target name="jarBote" depends="buildRouter, buildStreaming, buildJetty" >
    526         <copy file="apps/susidns/src/WEB-INF/lib/jstl.jar" todir="build/" />
    527         <copy file="apps/susidns/src/WEB-INF/lib/standard.jar" todir="build/" />
     526        <copy file="apps/susidns/src/lib/jstl.jar" todir="build/" />
     527        <copy file="apps/susidns/src/lib/standard.jar" todir="build/" />
    528528    </target>
    529529
     
    12161216    </target>
    12171217
    1218     <target name="copytomcat-unlesspkg" unless="${with-libservlet2.5-java}" >
     1218    <!-- todo handle alt package too -->
     1219    <target name="copytomcat-unlesspkg" unless="${with-libtomcat7-java}" >
    12191220        <copy todir="pkg-temp/lib" >
    12201221            <fileset dir="build" includes="commons*.jar jasper*.jar javax*.jar" />
     
    12221223    </target>
    12231224
     1225    <!-- todo handle alt package too -->
    12241226    <target name="copyjstl-unlesspkg" unless="${with-glassfish-javaee}" >
    1225         <copy file="apps/susidns/src/WEB-INF/lib/jstl.jar" todir="pkg-temp/lib/" />
    1226     </target>
    1227 
     1227        <copy file="apps/susidns/src/lib/jstl.jar" todir="pkg-temp/lib/" />
     1228    </target>
     1229
     1230    <!-- todo handle alt package too -->
    12281231    <target name="copystandard-unlesspkg" unless="${with-glassfish-javaee}" >
    1229         <copy file="apps/susidns/src/WEB-INF/lib/standard.jar" todir="pkg-temp/lib/" />
     1232        <copy file="apps/susidns/src/lib/standard.jar" todir="pkg-temp/lib/" />
    12301233    </target>
    12311234
     
    14601463        <copy file="build/imagegen.war" todir="pkg-temp/webapps/" />
    14611464        <!-- as of 0.7.12; someday, we can remove these from the updater -->
    1462         <copy file="apps/susidns/src/WEB-INF/lib/jstl.jar" todir="pkg-temp/lib/" />
    1463         <copy file="apps/susidns/src/WEB-INF/lib/standard.jar" todir="pkg-temp/lib/" />
     1465        <copy file="apps/susidns/src/lib/jstl.jar" todir="pkg-temp/lib/" />
     1466        <copy file="apps/susidns/src/lib/standard.jar" todir="pkg-temp/lib/" />
    14641467        <copy file="build/i2psnark.war" todir="pkg-temp/webapps/" />
    14651468        <copy file="history.txt" todir="pkg-temp/" />
     
    18261829            <arg value="i2p.fba"/>
    18271830            <arg value="-auxclasspath"/>
    1828             <arg value="build/commons-el.jar:build/commons-logging.jar:build/jasper-runtime.jar:build/javax.servlet.jar:build/org.mortbay.jetty.jar:apps/jrobin/jrobin-1.5.9.1.jar:apps/systray/java/lib/systray4j.jar:installer/lib/wrapper/all/wrapper.jar:apps/susidns/src/WEB-INF/lib/standard.jar:apps/susidns/src/WEB-INF/lib/jstl.jar:apps/jrobin/jrobin-1.5.9.1.jar"/>
     1831            <arg value="build/commons-el.jar:build/commons-logging.jar:build/jasper-runtime.jar:build/javax.servlet.jar:build/org.mortbay.jetty.jar:apps/jrobin/jrobin-1.5.9.1.jar:apps/systray/java/lib/systray4j.jar:installer/lib/wrapper/all/wrapper.jar:apps/susidns/src/lib/standard.jar:apps/susidns/src/lib/jstl.jar:apps/jrobin/jrobin-1.5.9.1.jar"/>
    18291832            <arg value="-sourcepath"/>
    18301833            <arg value="apps/BOB/src/:apps/addressbook/java/src/:apps/i2psnark/java/src/:apps/i2ptunnel/java/src/:apps/ministreaming/java/src/:apps/routerconsole/java/src/:apps/sam/java/src/:apps/streaming/java/src/:apps/susidns/src/java/src/:apps/susimail/src/src/:apps/systray/java/src/:core/java/src/:router/java/src/:installer/java/src"/>
     
    20152018            <fileset dir="../i2p-${Extended.Version}/Slackware" />
    20162019            <fileset dir="../i2p-${Extended.Version}/_MTN" />
     2020            <!-- geoip-database -->
    20172021            <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
    20182022            <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
     2023            <!-- libjetty8-java -->
    20192024            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.17.v20150415" />
    2020             <file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/jstl.jar" />
    2021             <file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/standard.jar" />
     2025            <!-- libjstl1.1-java or glassfish-javaee -->
     2026            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
     2027            <!-- libjakarta-taglibs-standard-java or glassfish-javaee -->
     2028            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
     2029            <!-- libtomcat6-java or libtomcat7-java -->
    20222030          <!--
    20232031            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat" />
     
    20352043                <exclude name="installer/resources/geoipv6.dat.gz"/>
    20362044                <exclude name="apps/jetty/jetty-distribution-*/**"/>
    2037                 <exclude name="apps/susidns/src/WEB-INF/lib/jstl.jar" />
    2038                 <exclude name="apps/susidns/src/WEB-INF/lib/standard.jar" />
     2045                <exclude name="apps/susidns/src/lib/jstl.jar" />
     2046                <exclude name="apps/susidns/src/lib/standard.jar" />
    20392047          <!--
    20402048                <exclude name="apps/jetty/apache-tomcat/**"/>
     
    20782086            <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
    20792087            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.17.v20150415" />
    2080             <file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/jstl.jar" />
    2081             <file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/standard.jar" />
     2088            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
     2089            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
    20822090          <!--
    20832091            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat" />
     
    20952103                <exclude name="installer/resources/geoipv6.dat.gz"/>
    20962104                <exclude name="apps/jetty/jetty-distribution-*/**"/>
    2097                 <exclude name="apps/susidns/src/WEB-INF/lib/jstl.jar" />
    2098                 <exclude name="apps/susidns/src/WEB-INF/lib/standard.jar" />
     2105                <exclude name="apps/susidns/src/lib/jstl.jar" />
     2106                <exclude name="apps/susidns/src/lib/standard.jar" />
    20992107          <!--
    21002108                <exclude name="apps/jetty/apache-tomcat/**"/>
Note: See TracChangeset for help on using the changeset viewer.