Move setting of InstanceManager to WebAppConfiguration to avoid race

Fix up LICENSES.txt
Build.xml cleanup
Debian:
- Add support for with-libtomcat8-java but not with-libjetty9-java for wheezy/jessie
- Fix wheezy/precise/trusty build files to use tomcat8 but not jetty9 packages
- Remove build dependency on ant-optional, not required
- Remove some remaining eclipse-ecj dependencies
- Add short README files for wheezy and jessie
This commit is contained in:
zzz
2017-03-04 14:24:48 +00:00
parent ec6c24429a
commit f38ee48ca3
22 changed files with 155 additions and 116 deletions

View File

@ -51,15 +51,14 @@ pkg-temp/lib/jetty-webapp.jar usr/share/i2p/lib
pkg-temp/lib/jetty-xml.jar usr/share/i2p/lib
pkg-temp/lib/org.mortbay.jetty.jar usr/share/i2p/lib
pkg-temp/lib/org.mortbay.jmx.jar usr/share/i2p/lib
# following two are from libservlet3.1-java which is a dependency of libjetty9-java
pkg-temp/lib/javax.servlet.jar usr/share/i2p/lib
# 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 libtomcat8-java
#pkg-temp/lib/commons-el.jar usr/share/i2p/lib
# 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
#pkg-temp/lib/commons-logging.jar usr/share/i2p/lib
#pkg-temp/lib/jasper-runtime.jar usr/share/i2p/lib
#pkg-temp/lib/javax.servlet.jar usr/share/i2p/lib
# uncomment if not building with either glassfish-javaee or libjakarta-taglibs-standard-java