Changeset 094cf14


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
Files:
13 edited
3 moved

Legend:

Unmodified
Added
Removed
  • apps/i2ptunnel/java/build.xml

    r5c8eab9 r094cf14  
    261261                <!-- jsp-api.jar only present for debian builds -->
    262262                <pathelement location="../../jetty/jettylib/jsp-api.jar" />
     263                <!-- tomcat-api.jar only present for debian builds -->
     264                <pathelement location="../../jetty/jettylib/tomcat-api.jar" />
     265                <!-- jasper-el.jar only present for debian builds -->
     266                <pathelement location="../../jetty/jettylib/jasper-el.jar" />
    263267                <pathelement location="../../jetty/jettylib/commons-logging.jar" />
    264268                <pathelement location="../../jetty/jettylib/commons-el.jar" />
     
    287291                <!-- jsp-api.jar only present for debian builds -->
    288292                <pathelement location="../../jetty/jettylib/jsp-api.jar" />
     293                <!-- tomcat-api.jar only present for debian builds -->
     294                <pathelement location="../../jetty/jettylib/tomcat-api.jar" />
     295                <!-- jasper-el.jar only present for debian builds -->
     296                <pathelement location="../../jetty/jettylib/jasper-el.jar" />
    289297                <pathelement location="../../jetty/jettylib/commons-logging.jar" />
    290298                <pathelement location="../../jetty/jettylib/commons-el.jar" />
  • 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>
  • apps/jetty/java/src/net/i2p/jetty/I2PLogger.java

    r5c8eab9 r094cf14  
    116116        // some of these are serious, some aren't
    117117        // no way to get it right
    118         if (th != null)
    119             _log.logAlways(Log.WARN, msg + ": " + th);
    120         else
     118        if (th != null) {
     119            if (_log.shouldLog(Log.WARN))
     120                _log.warn(msg, th);
     121            else
     122                _log.logAlways(Log.WARN, msg + ": " + th);
     123        } else {
    121124            _log.logAlways(Log.WARN, msg);
     125        }
    122126    }
    123127   
  • apps/routerconsole/java/build.xml

    r5c8eab9 r094cf14  
    348348                <!-- jsp-api.jar only present for debian builds -->
    349349                <pathelement location="../../jetty/jettylib/jsp-api.jar" />
     350                <!-- tomcat-api.jar only present for debian builds -->
     351                <pathelement location="../../jetty/jettylib/tomcat-api.jar" />
     352                <!-- jasper-el.jar only present for debian builds -->
     353                <pathelement location="../../jetty/jettylib/jasper-el.jar" />
    350354                <pathelement location="../../jetty/jettylib/commons-logging.jar" />
    351355                <pathelement location="../../jetty/jettylib/commons-el.jar" />
     
    383387                <!-- jsp-api.jar only present for debian builds -->
    384388                <pathelement location="../../jetty/jettylib/jsp-api.jar" />
     389                <!-- tomcat-api.jar only present for debian builds -->
     390                <pathelement location="../../jetty/jettylib/tomcat-api.jar" />
    385391                <pathelement location="../../jetty/jettylib/commons-logging.jar" />
    386392                <pathelement location="../../jetty/jettylib/commons-el.jar" />
  • apps/susidns/src/build.xml

    r5c8eab9 r094cf14  
    1111                <pathelement path="${classpath}" />
    1212                <pathelement location="${bin}" />
     13                <!-- commons-el MUST be first to ensure we get the right (2.2) version
     14                  -  otherwise:
     15                  -  Exception in thread "main" java.lang.NoSuchMethodError: javax.el.ExpressionFactory.newInstance()Ljavax/el/ExpressionFactory;
     16                  -->
     17                <pathelement location="${lib}/commons-el.jar" />
    1318                <pathelement location="${lib}/javax.servlet.jar"/>
    1419                <!-- jsp-api.jar only present for debian builds -->
    1520                <pathelement location="${lib}/jsp-api.jar" />
    16                 <pathelement location="WEB-INF/lib/jstl.jar" />
    17                 <pathelement location="WEB-INF/lib/standard.jar" />
     21                <!-- tomcat-api.jar only present for debian builds -->
     22                <pathelement location="${lib}/tomcat-api.jar" />
     23                <!-- tomcat-util.jar only present for debian builds -->
     24                <pathelement location="${lib}/tomcat-util.jar" />
     25                <pathelement location="lib/jstl.jar" />
     26                <pathelement location="lib/standard.jar" />
    1827                <pathelement location="${lib}/jasper-runtime.jar" />
    1928                <pathelement location="${lib}/commons-logging.jar" />
    20                 <pathelement location="${lib}/commons-el.jar" />
     29                <!-- jasper-el.jar only present for debian builds -->
     30                <pathelement location="${lib}/jasper-el.jar" />
    2131                <pathelement location="${ant.home}/lib/ant.jar" />
    2232                <pathelement location="../../../core/java/build/i2p.jar" />
     
    6373        <copy file="WEB-INF/web-template.xml" tofile="WEB-INF/web-out.xml" />
    6474        <loadfile property="jspc.web.fragment" srcfile="WEB-INF/web-fragment.xml" />
    65         <replace file="WEB-INF//web-out.xml">
     75        <replace file="WEB-INF/web-out.xml">
    6676            <replacefilter token="&lt;!-- precompiled servlets --&gt;" value="${jspc.web.fragment}" />
    6777        </replace>
  • apps/susimail/build.xml

    r5c8eab9 r094cf14  
    2727                <pathelement location="../jetty/jettylib/javax.servlet.jar" />
    2828                <!-- jsp-api.jar only present for debian builds -->
    29                 <pathelement location="../../jetty/jettylib/jsp-api.jar" />
     29                <pathelement location="../jetty/jettylib/jsp-api.jar" />
     30                <!-- tomcat-api.jar only present for debian builds -->
     31                <pathelement location="../jetty/jettylib/tomcat-api.jar" />
    3032                <pathelement location="../jetty/jettylib/jetty-i2p.jar" />
    3133            </classpath>
     
    4244            <compilerarg line="${javac.compilerargs}" />
    4345            <classpath>
     46                <pathelement location="../../core/java/build/i2p.jar" />
    4447                <pathelement location="../jetty/jettylib/javax.servlet.jar" />
    4548                <!-- jsp-api.jar only present for debian builds -->
    46                 <pathelement location="../../jetty/jettylib/jsp-api.jar" />
     49                <pathelement location="../jetty/jettylib/jsp-api.jar" />
     50                <!-- tomcat-api.jar only present for debian builds -->
     51                <pathelement location="../jetty/jettylib/tomcat-api.jar" />
    4752                <pathelement location="../jetty/jettylib/jetty-i2p.jar" />
    48                 <pathelement location="../../core/java/build/i2p.jar" />
    4953            </classpath>
    5054        </javac>
  • build.properties

    r5c8eab9 r094cf14  
    120120# Don't include jetty files, we will use libjetty8-java package
    121121#with-libjetty8-java=true
    122 # Don't include tomcat files, we will use libservlet2.5-java package
    123 #with-libservlet2.5-java=true
    124 # Don't include tomcat juli files, we will use libtomcat6-java package
     122# Don't include tomcat files, we will use libtomcat6-java package
    125123#with-libtomcat6-java=true
    126 # Don't build with bundled tomcat 6, we will use libtomcat7-java package
     124# Don't include tomcat files, we will use libtomcat7-java package
    127125#with-libtomcat7-java=true
    128126# Don't include jstl.jar and standard.jar, we will use glassfish-javaee package
    129127#with-glassfish-javaee=true
     128# Don't include standard.jar, we will use libjakarta-taglibs-standard-java package
     129#with-libjakarta-taglibs-standard-java=true
     130# Don't include jstl.jar, we will use libjstl1.1-java package
     131#with-libjstl1.1-java=true
  • 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/**"/>
  • debian/control

    r5c8eab9 r094cf14  
    55Priority: optional
    66Bugs: mailto:zzz@i2pmail.org
    7 Homepage: https://geti2p.net
     7Homepage: https://geti2p.net/
    88Build-Depends: debhelper (>= 7.0.50~)
    99 ,ant (>= 1.8)
     
    4646Priority: optional
    4747Depends: ${shlibs:Depends}, i2p-router
    48 Homepage: http://www.i2p2.de/jbigi
     48Homepage: https://geti2p.net/
    4949Description: Java Big Integer library
    5050 This Package contains the libjbigi JNI library (and on x86 platforms, jcpuid).
  • debian/i2p-router.install

    r5c8eab9 r094cf14  
    5757
    5858
    59 # uncomment if not building with libservlet2.5-java
    60 # ubuntu: only in wily
    61 # debian: in wheezy jessie stretch sid
     59# uncomment if not building with either libtomcat6-java or libtomcat7-java
    6260pkg-temp/lib/commons-el.jar usr/share/i2p/lib
    63 
    64 
    65 # uncomment if not building with libtomcat6-java
    66 # ubuntu: only in precise trusty vivid
    67 # debian: only in wheezy
    68 # todo: see if libtomcat7-java will work
    6961# legacy name, contains only tomcat-juli, not commons-logging
    7062pkg-temp/lib/commons-logging.jar usr/share/i2p/lib
     
    7264
    7365
    74 # uncomment if not building with glassfish-javaee
     66# uncomment if not building with either glassfish-javaee or libjakarta-taglibs-standard-java
    7567# ubuntu and debian: everywhere
    7668#pkg-temp/lib/jstl.jar usr/share/i2p/lib
     69
     70
     71# uncomment if not building with either glassfish-javaee or libjstl1.1-java
     72# ubuntu and debian: everywhere
    7773#pkg-temp/lib/standard.jar usr/share/i2p/lib
  • debian/i2p-router.links

    r5c8eab9 r094cf14  
    44usr/share/common-licenses/BSD usr/share/doc/i2p-router/licenses/LICENSE-BSD.txt
    55
    6 usr/share/java/eclipse-ecj.jar /usr/share/i2p/lib/eclipse-ecj.jar
     6usr/share/java/eclipse-ecj.jar usr/share/i2p/lib/eclipse-ecj.jar
    77
    88
     
    3434
    3535
    36 # comment out if not building with libservlet2.5-java
    37 # ubuntu: only in wily
    38 # debian: in wheezy jessie stretch sid
    39 #usr/share/java/el-api-2.1.jar usr/share/i2p/lib/commons-el.jar
    40 
    41 
    4236# comment out if not building with libtomcat6-java
    4337# ubuntu: only in precise trusty vivid
    4438# debian: only in wheezy
    45 # todo: see if libtomcat7-java will work
    4639# legacy name, contains only tomcat-juli, not commons-logging
    4740#usr/share/java/tomcat-juli.jar usr/share/i2p/lib/commons-logging.jar
     
    4942# combined into jasper-runtime.jar in non-package builds
    5043#usr/share/java/tomcat-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar
     44# combined into commons-el.jar in non-package builds
     45#usr/share/java/jasper-el.jar usr/share/i2p/lib/jasper-el.jar
     46# following is from libservlet2.5-java which is a dependency of libtomcat6-java
     47# legacy name in lib/
     48#usr/share/java/el-api-2.1.jar usr/share/i2p/lib/commons-el.jar
     49
     50
     51# comment out if not building with libtomcat7-java
     52# ubuntu: only in precise trusty vivid
     53# debian: only in wheezy
     54# legacy name, contains only tomcat-juli, not commons-logging
     55#usr/share/java/tomcat-juli.jar usr/share/i2p/lib/commons-logging.jar
     56#usr/share/java/tomcat-jasper.jar usr/share/i2p/lib/jasper-runtime.jar
     57# combined into jasper-runtime.jar in non-package builds
     58#usr/share/java/tomcat-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar
     59# tomcat 7 only
     60#usr/share/java/tomcat-api.jar usr/share/i2p/lib/tomcat-api.jar
     61#usr/share/java/tomcat-util.jar usr/share/i2p/lib/tomcat-util.jar
     62# combined into commons-el.jar in non-package builds
     63#usr/share/java/tomcat-jasper-el.jar usr/share/i2p/lib/jasper-el.jar
     64# following is from libservlet3.0-java which is a dependency of libtomcat7-java
     65# legacy name in lib/
     66#usr/share/java/el-api-2.2.jar usr/share/i2p/lib/commons-el.jar
    5167
    5268
    5369# comment out if not building with glassfish-javaee
    54 # ubuntu and debian: everywhere
    5570usr/share/java/glassfish-javaee.jar usr/share/i2p/lib/jstl.jar
    5671usr/share/java/glassfish-appserv-jstl.jar usr/share/i2p/lib/standard.jar
     72
     73
     74# comment out if not building with libjakarta-taglibs-standard-java
     75# ubuntu and debian: everywhere
     76#usr/share/java/standard.jar usr/share/i2p/lib/standard.jar
     77
     78
     79# comment out if not building with libjstl1.1-java
     80# ubuntu and debian: everywhere
     81#usr/share/java/jstl1.1.jar usr/share/i2p/lib/jstl.jar
  • debian/rules

    r5c8eab9 r094cf14  
    102102        @# following two are from libservlet3.0-java which is a dependency of libjetty8-java
    103103        ln -sf /usr/share/java/servlet-api-3.0.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
    104         ln -sf /usr/share/java/jsp-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
    105 
    106         @# ubuntu: only in wily
    107         @# debian: in wheezy jessie stretch sid
    108         @#mkdir -p $(CURDIR)/apps/jetty/jettylib
    109         @#@/bin/echo -e "with-libservlet2.5-java=true" >> $(CURDIR)/override.properties
    110         @#ln -sf /usr/share/java/el-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
     104        ln -sf /usr/share/java/jsp-api-2.2.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
    111105
    112106        @# ubuntu: only in precise trusty vivid
     
    114108        @#@/bin/echo -e "with-libtomcat6-java=true" >> $(CURDIR)/override.properties
    115109        @#mkdir -p $(CURDIR)/apps/jetty/jettylib
    116         @#ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-compiler.jar
    117110        @#ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
    118111        @#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
    119112        @#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
     113        @#ln -sf /usr/share/java/jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
     114        @# following is from libservlet2.5-java which is a dependency of libtomcat6-java
     115        @#ln -sf /usr/share/java/el-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
    120116
    121117        @# debian and ubuntu: everywhere
    122         @#@/bin/echo -e "with-libtomcat7-java=true" >> $(CURDIR)/override.properties
     118        @#/bin/echo -e "with-libtomcat7-java=true" >> $(CURDIR)/override.properties
    123119        @#mkdir -p $(CURDIR)/apps/jetty/jettylib
    124         @#ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-compiler.jar
    125120        @#ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
     121        @#ln -sf /usr/share/java/tomcat-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
     122        @#ln -sf /usr/share/java/tomcat-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
    126123        @#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
    127124        @#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
     125        @#ln -sf /usr/share/java/tomcat-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
     126        @# following is from libservlet3.0-java which is a dependency of libtomcat7-java
     127        @#ln -sf /usr/share/java/el-api-2.2.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
    128128
    129129        @# debian and ubuntu: everywhere
    130130        @/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties
    131         ln -sf /usr/share/java/glassfish-javaee.jar $(CURDIR)/apps/susidns/src/WEB-INF/lib/jstl.jar
    132         ln -sf /usr/share/java/glassfish-appserv-jstl.jar $(CURDIR)/apps/susidns/src/WEB-INF/lib/standard.jar
     131        ln -sf /usr/share/java/glassfish-javaee.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar
     132        ln -sf /usr/share/java/glassfish-appserv-jstl.jar $(CURDIR)/apps/susidns/src/lib/standard.jar
     133
     134        @# debian and ubuntu: everywhere
     135        @#/bin/echo -e "with-libjakarta-taglibs-standard-java=true" >> $(CURDIR)/override.properties
     136        @#ln -sf /usr/share/java/standard.jar $(CURDIR)/apps/susidns/src/lib/standard.jar
     137
     138        @# debian and ubuntu: everywhere
     139        @#/bin/echo -e "with-libjstl1.1-java=true" >> $(CURDIR)/override.properties
     140        @#ln -sf /usr/share/java/jstl1.1.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar
    133141
    134142        TZ=UTC JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 ant preppkg-unix javadoc
  • history.txt

    r5c8eab9 r094cf14  
     12016-04-07 zzz
     2 * Debian builds:
     3   - Prep for depending on tomcat packages
     4   - Minor fixes
     5
     62016-04-04 zzz
     7 * Debian builds:
     8   - Depend on glassfish-javaee for JSTL 1.2 by default
     9
    1102016-04-03 zzz
    211 * Debian builds:
Note: See TracChangeset for help on using the changeset viewer.