echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Debian:

Browse Source 
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
This commit is contained in:
zzz
2016-04-07 14:38:30 +00:00
parent 5c8eab9dfb
commit 094cf14d4a
16 changed files with 154 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/i2ptunnel/java/build.xml
View File

@ -260,6 +260,10 @@
<pathelement location="../../jetty/jettylib/javax.servlet.jar" />
<!-- jsp-api.jar only present for debian builds -->
<pathelement location="../../jetty/jettylib/jsp-api.jar" />
<!-- tomcat-api.jar only present for debian builds -->
<pathelement location="../../jetty/jettylib/tomcat-api.jar" />
<!-- jasper-el.jar only present for debian builds -->
<pathelement location="../../jetty/jettylib/jasper-el.jar" />
<pathelement location="../../jetty/jettylib/commons-logging.jar" />
<pathelement location="../../jetty/jettylib/commons-el.jar" />
<pathelement location="${ant.home}/lib/ant.jar" />
@ -286,6 +290,10 @@
<pathelement location="../../jetty/jettylib/javax.servlet.jar" />
<!-- jsp-api.jar only present for debian builds -->
<pathelement location="../../jetty/jettylib/jsp-api.jar" />
<!-- tomcat-api.jar only present for debian builds -->
<pathelement location="../../jetty/jettylib/tomcat-api.jar" />
<!-- jasper-el.jar only present for debian builds -->
<pathelement location="../../jetty/jettylib/jasper-el.jar" />
<pathelement location="../../jetty/jettylib/commons-logging.jar" />
<pathelement location="../../jetty/jettylib/commons-el.jar" />
<pathelement location="build/i2ptunnel.jar" />

14
apps/jetty/build.xml
View File

@ -222,6 +222,16 @@
<target name="copyTomcatLib" depends="mkJettylibdir, copyTomcatLib1, copyTomcatLib2, copyTomcatLib3" />
<target name="copyTomcatLib1" unless="${with-libservlet2.5-java}" >
<condition property="with-libtomcat-java" >
<or>
<istrue value="${with-libtomcat6-java}" />
<istrue value="${with-libtomcat7-java}" />
</or>
</condition>
</target>
<target name="copyTomcatLib2" unless="${with-libtomcat-java}" >
<!-- EL libs.
Tomcat 6 has EL 2.1.
Tomcat 7 / libservlet3.0 has EL 2.2.
@ -232,9 +242,7 @@
<zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/jasper-el.jar" />
<zipfileset excludes="META-INF/**/*" src="${tomcat.lib}/el-api.jar" />
</jar>
</target>
<target name="copyTomcatLib2" unless="${with-libtomcat6-java}" >
<jar destfile="jettylib/jasper-runtime.jar" filesetmanifest="merge" >
<zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/jasper.jar" />
<zipfileset src="${tomcat2.lib.small}/tomcat-coyote-util.jar" />
@ -255,7 +263,7 @@
</jar>
</target>
<target name="copyTomcatLib3" unless="${with-libtomcat7-java}" >
<target name="copyTomcatLib3" unless="${with-libtomcat-java}" >
<jar destfile="jettylib/jasper-compiler.jar" >
<manifest>
<attribute name="Note" value="Intentionally empty" />

10
apps/jetty/java/src/net/i2p/jetty/I2PLogger.java
View File

@ -115,10 +115,14 @@ public class I2PLogger implements Logger
{
// some of these are serious, some aren't
// no way to get it right
if (th != null)
_log.logAlways(Log.WARN, msg + ": " + th);
else
if (th != null) {
if (_log.shouldLog(Log.WARN))
_log.warn(msg, th);
else
_log.logAlways(Log.WARN, msg + ": " + th);
} else {
_log.logAlways(Log.WARN, msg);
}
}
private void format(String msg, Object arg0, Object arg1)

6
apps/routerconsole/java/build.xml
View File

@ -347,6 +347,10 @@
<pathelement location="../../jetty/jettylib/javax.servlet.jar" />
<!-- jsp-api.jar only present for debian builds -->
<pathelement location="../../jetty/jettylib/jsp-api.jar" />
<!-- tomcat-api.jar only present for debian builds -->
<pathelement location="../../jetty/jettylib/tomcat-api.jar" />
<!-- jasper-el.jar only present for debian builds -->
<pathelement location="../../jetty/jettylib/jasper-el.jar" />
<pathelement location="../../jetty/jettylib/commons-logging.jar" />
<pathelement location="../../jetty/jettylib/commons-el.jar" />
<pathelement location="${ant.home}/lib/ant.jar" />
@ -382,6 +386,8 @@
<pathelement location="../../jetty/jettylib/javax.servlet.jar" />
<!-- jsp-api.jar only present for debian builds -->
<pathelement location="../../jetty/jettylib/jsp-api.jar" />
<!-- tomcat-api.jar only present for debian builds -->
<pathelement location="../../jetty/jettylib/tomcat-api.jar" />
<pathelement location="../../jetty/jettylib/commons-logging.jar" />
<pathelement location="../../jetty/jettylib/commons-el.jar" />
<pathelement location="../../jetty/jettylib/org.mortbay.jetty.jar" />

18
apps/susidns/src/build.xml
View File

@ -10,14 +10,24 @@
<path id="cp">
<pathelement path="${classpath}" />
<pathelement location="${bin}" />
<!-- commons-el MUST be first to ensure we get the right (2.2) version
- otherwise:
- Exception in thread "main" java.lang.NoSuchMethodError: javax.el.ExpressionFactory.newInstance()Ljavax/el/ExpressionFactory;
-->
<pathelement location="${lib}/commons-el.jar" />
<pathelement location="${lib}/javax.servlet.jar"/>
<!-- jsp-api.jar only present for debian builds -->
<pathelement location="${lib}/jsp-api.jar" />
<pathelement location="WEB-INF/lib/jstl.jar" />
<pathelement location="WEB-INF/lib/standard.jar" />
<!-- tomcat-api.jar only present for debian builds -->
<pathelement location="${lib}/tomcat-api.jar" />
<!-- tomcat-util.jar only present for debian builds -->
<pathelement location="${lib}/tomcat-util.jar" />
<pathelement location="lib/jstl.jar" />
<pathelement location="lib/standard.jar" />
<pathelement location="${lib}/jasper-runtime.jar" />
<pathelement location="${lib}/commons-logging.jar" />
<pathelement location="${lib}/commons-el.jar" />
<!-- jasper-el.jar only present for debian builds -->
<pathelement location="${lib}/jasper-el.jar" />
<pathelement location="${ant.home}/lib/ant.jar" />
<pathelement location="../../../core/java/build/i2p.jar" />
</path>
@ -62,7 +72,7 @@
</javac>
<copy file="WEB-INF/web-template.xml" tofile="WEB-INF/web-out.xml" />
<loadfile property="jspc.web.fragment" srcfile="WEB-INF/web-fragment.xml" />
<replace file="WEB-INF//web-out.xml">
<replace file="WEB-INF/web-out.xml">
<replacefilter token="&lt;!-- precompiled servlets --&gt;" value="${jspc.web.fragment}" />
</replace>
</target>

0
apps/susidns/src/WEB-INF/lib/README.txt → apps/susidns/src/lib/README.txt
View File

0
apps/susidns/src/WEB-INF/lib/jstl.jar → apps/susidns/src/lib/jstl.jar
View File

0
apps/susidns/src/WEB-INF/lib/standard.jar → apps/susidns/src/lib/standard.jar
View File

10
apps/susimail/build.xml
View File

@ -26,7 +26,9 @@
<pathelement location="../../core/java/build/obj" />
<pathelement location="../jetty/jettylib/javax.servlet.jar" />
<!-- jsp-api.jar only present for debian builds -->
<pathelement location="../../jetty/jettylib/jsp-api.jar" />
<pathelement location="../jetty/jettylib/jsp-api.jar" />
<!-- tomcat-api.jar only present for debian builds -->
<pathelement location="../jetty/jettylib/tomcat-api.jar" />
<pathelement location="../jetty/jettylib/jetty-i2p.jar" />
</classpath>
</depend>
@ -41,11 +43,13 @@
destdir="./src/WEB-INF/classes">
<compilerarg line="${javac.compilerargs}" />
<classpath>
<pathelement location="../../core/java/build/i2p.jar" />
<pathelement location="../jetty/jettylib/javax.servlet.jar" />
<!-- jsp-api.jar only present for debian builds -->
<pathelement location="../../jetty/jettylib/jsp-api.jar" />
<pathelement location="../jetty/jettylib/jsp-api.jar" />
<!-- tomcat-api.jar only present for debian builds -->
<pathelement location="../jetty/jettylib/tomcat-api.jar" />
<pathelement location="../jetty/jettylib/jetty-i2p.jar" />
<pathelement location="../../core/java/build/i2p.jar" />
</classpath>
</javac>
</target>

10
build.properties
View File

@ -119,11 +119,13 @@ javac.version=1.6
#with-geoip-database=true
# Don't include jetty files, we will use libjetty8-java package
#with-libjetty8-java=true
# Don't include tomcat files, we will use libservlet2.5-java package
#with-libservlet2.5-java=true
# Don't include tomcat juli files, we will use libtomcat6-java package
# Don't include tomcat files, we will use libtomcat6-java package
#with-libtomcat6-java=true
# Don't build with bundled tomcat 6, we will use libtomcat7-java package
# Don't include tomcat files, we will use libtomcat7-java package
#with-libtomcat7-java=true
# Don't include jstl.jar and standard.jar, we will use glassfish-javaee package
#with-glassfish-javaee=true
# Don't include standard.jar, we will use libjakarta-taglibs-standard-java package
#with-libjakarta-taglibs-standard-java=true
# Don't include jstl.jar, we will use libjstl1.1-java package
#with-libjstl1.1-java=true

40
build.xml
View File

@ -523,8 +523,8 @@
<!-- Custom target to collect the jars that I2P-Bote needs to compile, so it can compile from source. -->
<target name="jarBote" depends="buildRouter, buildStreaming, buildJetty" >
<copy file="apps/susidns/src/WEB-INF/lib/jstl.jar" todir="build/" />
<copy file="apps/susidns/src/WEB-INF/lib/standard.jar" todir="build/" />
<copy file="apps/susidns/src/lib/jstl.jar" todir="build/" />
<copy file="apps/susidns/src/lib/standard.jar" todir="build/" />
</target>
<target name="jbigi-list-changes" depends="checkForMtn" if="mtn.available">
@ -1215,18 +1215,21 @@
</copy>
</target>
<target name="copytomcat-unlesspkg" unless="${with-libservlet2.5-java}" >
<!-- todo handle alt package too -->
<target name="copytomcat-unlesspkg" unless="${with-libtomcat7-java}" >
<copy todir="pkg-temp/lib" >
<fileset dir="build" includes="commons*.jar jasper*.jar javax*.jar" />
</copy>
</target>
<!-- todo handle alt package too -->
<target name="copyjstl-unlesspkg" unless="${with-glassfish-javaee}" >
<copy file="apps/susidns/src/WEB-INF/lib/jstl.jar" todir="pkg-temp/lib/" />
<copy file="apps/susidns/src/lib/jstl.jar" todir="pkg-temp/lib/" />
</target>
<!-- todo handle alt package too -->
<target name="copystandard-unlesspkg" unless="${with-glassfish-javaee}" >
<copy file="apps/susidns/src/WEB-INF/lib/standard.jar" todir="pkg-temp/lib/" />
<copy file="apps/susidns/src/lib/standard.jar" todir="pkg-temp/lib/" />
</target>
<!-- does NOT include launch4j licenses for Windows builds -->
@ -1459,8 +1462,8 @@
<copy file="build/susidns.war" todir="pkg-temp/webapps/" />
<copy file="build/imagegen.war" todir="pkg-temp/webapps/" />
<!-- as of 0.7.12; someday, we can remove these from the updater -->
<copy file="apps/susidns/src/WEB-INF/lib/jstl.jar" todir="pkg-temp/lib/" />
<copy file="apps/susidns/src/WEB-INF/lib/standard.jar" todir="pkg-temp/lib/" />
<copy file="apps/susidns/src/lib/jstl.jar" todir="pkg-temp/lib/" />
<copy file="apps/susidns/src/lib/standard.jar" todir="pkg-temp/lib/" />
<copy file="build/i2psnark.war" todir="pkg-temp/webapps/" />
<copy file="history.txt" todir="pkg-temp/" />
<!-- the following overwrites history.txt on unix to shrink the update file -->
@ -1825,7 +1828,7 @@
<arg value="-output"/>
<arg value="i2p.fba"/>
<arg value="-auxclasspath"/>
<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"/>
<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"/>
<arg value="-sourcepath"/>
<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"/>
<!-- start of the files to be analyzed -->
@ -2014,11 +2017,16 @@
<fileset dir="../i2p-${Extended.Version}/installer/lib/" />
<fileset dir="../i2p-${Extended.Version}/Slackware" />
<fileset dir="../i2p-${Extended.Version}/_MTN" />
<!-- geoip-database -->
<file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
<file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
<!-- libjetty8-java -->
<fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.17.v20150415" />
<file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/jstl.jar" />
<file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/standard.jar" />
<!-- libjstl1.1-java or glassfish-javaee -->
<file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
<!-- libjakarta-taglibs-standard-java or glassfish-javaee -->
<file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
<!-- libtomcat6-java or libtomcat7-java -->
<!--
<fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat" />
<fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-deployer/" />
@ -2034,8 +2042,8 @@
<exclude name="installer/resources/geoip.txt"/>
<exclude name="installer/resources/geoipv6.dat.gz"/>
<exclude name="apps/jetty/jetty-distribution-*/**"/>
<exclude name="apps/susidns/src/WEB-INF/lib/jstl.jar" />
<exclude name="apps/susidns/src/WEB-INF/lib/standard.jar" />
<exclude name="apps/susidns/src/lib/jstl.jar" />
<exclude name="apps/susidns/src/lib/standard.jar" />
<!--
<exclude name="apps/jetty/apache-tomcat/**"/>
<exclude name="apps/jetty/apache-tomcat-deployer/**"/>
@ -2077,8 +2085,8 @@
<file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
<file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
<fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.17.v20150415" />
<file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/jstl.jar" />
<file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/standard.jar" />
<file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
<file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
<!--
<fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat" />
<fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-deployer/" />
@ -2094,8 +2102,8 @@
<exclude name="installer/resources/geoip.txt"/>
<exclude name="installer/resources/geoipv6.dat.gz"/>
<exclude name="apps/jetty/jetty-distribution-*/**"/>
<exclude name="apps/susidns/src/WEB-INF/lib/jstl.jar" />
<exclude name="apps/susidns/src/WEB-INF/lib/standard.jar" />
<exclude name="apps/susidns/src/lib/jstl.jar" />
<exclude name="apps/susidns/src/lib/standard.jar" />
<!--
<exclude name="apps/jetty/apache-tomcat/**"/>
<exclude name="apps/jetty/apache-tomcat-deployer/**"/>

4
debian/control vendored
View File

@ -4,7 +4,7 @@ Section: net
Standards-Version: 3.9.6
Priority: optional
Bugs: mailto:zzz@i2pmail.org
Homepage: https://geti2p.net
Homepage: https://geti2p.net/
Build-Depends: debhelper (>= 7.0.50~)
,ant (>= 1.8)
,ant-optional
@ -45,7 +45,7 @@ Architecture: any
Section: java
Priority: optional
Depends: ${shlibs:Depends}, i2p-router
Homepage: http://www.i2p2.de/jbigi
Homepage: https://geti2p.net/
Description: Java Big Integer library
This Package contains the libjbigi JNI library (and on x86 platforms, jcpuid).
.

16
debian/i2p-router.install vendored
View File

@ -56,22 +56,18 @@ pkg-temp/lib/systray.jar usr/share/i2p/lib
#pkg-temp/lib/javax.servlet.jar usr/share/i2p/lib
# uncomment if not building with libservlet2.5-java
# ubuntu: only in wily
# debian: in wheezy jessie stretch sid
# uncomment if not building with either libtomcat6-java or libtomcat7-java
pkg-temp/lib/commons-el.jar usr/share/i2p/lib
# uncomment if not building with libtomcat6-java
# ubuntu: only in precise trusty vivid
# debian: only in wheezy
# todo: see if libtomcat7-java will work
# legacy name, contains only tomcat-juli, not commons-logging
pkg-temp/lib/commons-logging.jar usr/share/i2p/lib
pkg-temp/lib/jasper-runtime.jar usr/share/i2p/lib
# uncomment if not building with glassfish-javaee
# uncomment if not building with either glassfish-javaee or libjakarta-taglibs-standard-java
# ubuntu and debian: everywhere
#pkg-temp/lib/jstl.jar usr/share/i2p/lib
# uncomment if not building with either glassfish-javaee or libjstl1.1-java
# ubuntu and debian: everywhere
#pkg-temp/lib/standard.jar usr/share/i2p/lib

43
debian/i2p-router.links vendored
View File

@ -3,7 +3,7 @@ usr/share/common-licenses/LGPL-2.1 usr/share/doc/i2p-router/licenses/LICENSE-LGP
usr/share/common-licenses/Apache-2.0 usr/share/doc/i2p-router/licenses/LICENSE-Apache2.0.txt
usr/share/common-licenses/BSD usr/share/doc/i2p-router/licenses/LICENSE-BSD.txt
usr/share/java/eclipse-ecj.jar /usr/share/i2p/lib/eclipse-ecj.jar
usr/share/java/eclipse-ecj.jar usr/share/i2p/lib/eclipse-ecj.jar
# comment out if not building with libjetty8-java
@ -33,24 +33,49 @@ usr/share/java/servlet-api-3.0.jar usr/share/i2p/lib/javax.servlet.jar
usr/share/java/jsp-api-2.2.jar usr/share/i2p/lib/jsp-api.jar
# comment out if not building with libservlet2.5-java
# ubuntu: only in wily
# debian: in wheezy jessie stretch sid
#usr/share/java/el-api-2.1.jar usr/share/i2p/lib/commons-el.jar
# comment out if not building with libtomcat6-java
# ubuntu: only in precise trusty vivid
# debian: only in wheezy
# todo: see if libtomcat7-java will work
# legacy name, contains only tomcat-juli, not commons-logging
#usr/share/java/tomcat-juli.jar usr/share/i2p/lib/commons-logging.jar
#usr/share/java/jasper.jar usr/share/i2p/lib/jasper-runtime.jar
# combined into jasper-runtime.jar in non-package builds
#usr/share/java/tomcat-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar
# combined into commons-el.jar in non-package builds
#usr/share/java/jasper-el.jar usr/share/i2p/lib/jasper-el.jar
# following is from libservlet2.5-java which is a dependency of libtomcat6-java
# legacy name in lib/
#usr/share/java/el-api-2.1.jar usr/share/i2p/lib/commons-el.jar
# comment out if not building with libtomcat7-java
# ubuntu: only in precise trusty vivid
# debian: only in wheezy
# legacy name, contains only tomcat-juli, not commons-logging
#usr/share/java/tomcat-juli.jar usr/share/i2p/lib/commons-logging.jar
#usr/share/java/tomcat-jasper.jar usr/share/i2p/lib/jasper-runtime.jar
# combined into jasper-runtime.jar in non-package builds
#usr/share/java/tomcat-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar
# tomcat 7 only
#usr/share/java/tomcat-api.jar usr/share/i2p/lib/tomcat-api.jar
#usr/share/java/tomcat-util.jar usr/share/i2p/lib/tomcat-util.jar
# combined into commons-el.jar in non-package builds
#usr/share/java/tomcat-jasper-el.jar usr/share/i2p/lib/jasper-el.jar
# following is from libservlet3.0-java which is a dependency of libtomcat7-java
# legacy name in lib/
#usr/share/java/el-api-2.2.jar usr/share/i2p/lib/commons-el.jar
# comment out if not building with glassfish-javaee
# ubuntu and debian: everywhere
usr/share/java/glassfish-javaee.jar usr/share/i2p/lib/jstl.jar
usr/share/java/glassfish-appserv-jstl.jar usr/share/i2p/lib/standard.jar
# comment out if not building with libjakarta-taglibs-standard-java
# ubuntu and debian: everywhere
#usr/share/java/standard.jar usr/share/i2p/lib/standard.jar
# comment out if not building with libjstl1.1-java
# ubuntu and debian: everywhere
#usr/share/java/jstl1.1.jar usr/share/i2p/lib/jstl.jar

32
debian/rules vendored
View File

@ -101,35 +101,43 @@ endif
ln -sf /usr/share/java/jetty8-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar
@# following two are from libservlet3.0-java which is a dependency of libjetty8-java
ln -sf /usr/share/java/servlet-api-3.0.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
ln -sf /usr/share/java/jsp-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
@# ubuntu: only in wily
@# debian: in wheezy jessie stretch sid
@#mkdir -p $(CURDIR)/apps/jetty/jettylib
@#@/bin/echo -e "with-libservlet2.5-java=true" >> $(CURDIR)/override.properties
@#ln -sf /usr/share/java/el-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
ln -sf /usr/share/java/jsp-api-2.2.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
@# ubuntu: only in precise trusty vivid
@# debian: only in wheezy
@#@/bin/echo -e "with-libtomcat6-java=true" >> $(CURDIR)/override.properties
@#mkdir -p $(CURDIR)/apps/jetty/jettylib
@#ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-compiler.jar
@#ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
@#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
@#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
@#ln -sf /usr/share/java/jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
@# following is from libservlet2.5-java which is a dependency of libtomcat6-java
@#ln -sf /usr/share/java/el-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
@# debian and ubuntu: everywhere
@#@/bin/echo -e "with-libtomcat7-java=true" >> $(CURDIR)/override.properties
@#/bin/echo -e "with-libtomcat7-java=true" >> $(CURDIR)/override.properties
@#mkdir -p $(CURDIR)/apps/jetty/jettylib
@#ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-compiler.jar
@#ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
@#ln -sf /usr/share/java/tomcat-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
@#ln -sf /usr/share/java/tomcat-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
@#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
@#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
@#ln -sf /usr/share/java/tomcat-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
@# following is from libservlet3.0-java which is a dependency of libtomcat7-java
@#ln -sf /usr/share/java/el-api-2.2.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
@# debian and ubuntu: everywhere
@/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties
ln -sf /usr/share/java/glassfish-javaee.jar $(CURDIR)/apps/susidns/src/WEB-INF/lib/jstl.jar
ln -sf /usr/share/java/glassfish-appserv-jstl.jar $(CURDIR)/apps/susidns/src/WEB-INF/lib/standard.jar
ln -sf /usr/share/java/glassfish-javaee.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar
ln -sf /usr/share/java/glassfish-appserv-jstl.jar $(CURDIR)/apps/susidns/src/lib/standard.jar
@# debian and ubuntu: everywhere
@#/bin/echo -e "with-libjakarta-taglibs-standard-java=true" >> $(CURDIR)/override.properties
@#ln -sf /usr/share/java/standard.jar $(CURDIR)/apps/susidns/src/lib/standard.jar
@# debian and ubuntu: everywhere
@#/bin/echo -e "with-libjstl1.1-java=true" >> $(CURDIR)/override.properties
@#ln -sf /usr/share/java/jstl1.1.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar
TZ=UTC JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 ant preppkg-unix javadoc
echo router.updateDisabled=true > $(I2P)/router.config

9
history.txt
View File

@ -1,3 +1,12 @@
2016-04-07 zzz
* Debian builds:
- Prep for depending on tomcat packages
- Minor fixes
2016-04-04 zzz
* Debian builds:
- Depend on glassfish-javaee for JSTL 1.2 by default
2016-04-03 zzz
* Debian builds:
- Add build options to depend on various packages