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
  • apps/jetty/build.xml

    r5c8eab9 r094cf14  
    223223
    224224    <target name="copyTomcatLib1" unless="${with-libservlet2.5-java}" >
     225        <condition property="with-libtomcat-java" >
     226            <or>
     227                <istrue value="${with-libtomcat6-java}" />
     228                <istrue value="${with-libtomcat7-java}" />
     229            </or>
     230        </condition>
     231    </target>
     232
     233
     234    <target name="copyTomcatLib2" unless="${with-libtomcat-java}" >
    225235        <!-- EL libs.
    226236             Tomcat 6 has EL 2.1.
     
    233243            <zipfileset excludes="META-INF/**/*" src="${tomcat.lib}/el-api.jar" />
    234244        </jar>
    235     </target>
    236 
    237     <target name="copyTomcatLib2" unless="${with-libtomcat6-java}" >
     245
    238246        <jar destfile="jettylib/jasper-runtime.jar" filesetmanifest="merge" >
    239247            <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/jasper.jar" />
     
    256264    </target>
    257265
    258     <target name="copyTomcatLib3" unless="${with-libtomcat7-java}" >
     266    <target name="copyTomcatLib3" unless="${with-libtomcat-java}" >
    259267        <jar destfile="jettylib/jasper-compiler.jar" >
    260268            <manifest>
Note: See TracChangeset for help on using the changeset viewer.