forked from I2P_Developers/i2p.i2p
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
This commit is contained in:
@@ -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>
|
||||
|
Reference in New Issue
Block a user