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

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)