From f38ee48ca31e9c58bdece33fadc6431046260d37 Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 4 Mar 2017 14:24:48 +0000 Subject: [PATCH] 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 --- LICENSE.txt | 5 +- apps/jetty/build.xml | 64 ++++--------------- .../i2p/router/web/RouterConsoleRunner.java | 9 +-- .../i2p/router/web/WebAppConfiguration.java | 5 ++ .../src/net/i2p/router/web/WebAppStarter.java | 18 +++--- build.properties | 2 +- debian-alt/README.txt | 12 +++- debian-alt/jessie/README.txt | 3 + debian-alt/precise/control | 4 +- debian-alt/precise/i2p-router.install | 11 ++-- debian-alt/precise/i2p-router.links | 21 +++++- debian-alt/precise/rules | 18 +++++- debian-alt/trusty/control | 4 +- debian-alt/trusty/i2p-router.install | 9 ++- debian-alt/trusty/i2p-router.links | 21 +++++- debian-alt/trusty/rules | 18 +++++- debian-alt/wheezy/README.txt | 1 + debian-alt/wheezy/control | 14 ++-- debian-alt/xenial/control | 1 - debian-alt/xenial/rules | 16 ++--- debian/control | 1 - debian/rules | 14 ++-- 22 files changed, 155 insertions(+), 116 deletions(-) create mode 100644 debian-alt/jessie/README.txt create mode 100644 debian-alt/wheezy/README.txt diff --git a/LICENSE.txt b/LICENSE.txt index d177d7983c..206d51f104 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -212,12 +212,11 @@ Applications: Zxing 3.3.0: See licenses/LICENSE-Apache2.0.txt - Jetty 8.1.21.v20160908: + Jetty 9.2.21.v20170120: See licenses/ABOUT-Jetty.html See licenses/NOTICE-Jetty.html See licenses/LICENSE-Apache2.0.txt See licenses/LICENSE-ECLIPSE-1.0.html - See licenses/NOTICE-Commons-Logging.txt JRobin 1.6.0-1: Copyright (c) 2001-2005 Sasa Markovic and Ciaran Treanor. @@ -283,7 +282,7 @@ Applications: Bundles systray4j-2.4.1: See licenses/LICENSE-LGPLv2.1.txt - Tomcat 6.0.48: + Tomcat 8.0.33: Copyright 1999-2016 The Apache Software Foundation See licenses/LICENSE-Apache2.0.txt See licenses/NOTICE-Tomcat.txt diff --git a/apps/jetty/build.xml b/apps/jetty/build.xml index b9bf0401b2..0377e74b89 100644 --- a/apps/jetty/build.xml +++ b/apps/jetty/build.xml @@ -25,12 +25,6 @@ - @@ -125,7 +119,14 @@ - + + @@ -171,6 +172,10 @@ + + + + - - - - - - - + + - diff --git a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java index eeb855c5ca..e6a5e8ee08 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java @@ -40,7 +40,6 @@ import net.i2p.util.SecureDirectory; import net.i2p.util.I2PSSLSocketFactory; import net.i2p.util.SystemVersion; -import org.apache.tomcat.SimpleInstanceManager; import org.eclipse.jetty.security.HashLoginService; import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; @@ -648,7 +647,9 @@ public class RouterConsoleRunner implements RouterApp { } catch (ClassNotFoundException cnfe) { System.err.println("Warning: JettyJasperInitializer not found"); } - initialize(_context, (WebAppContext)(rootWebApp.getHandler())); + WebAppContext wac = (WebAppContext)(rootWebApp.getHandler()); + initialize(_context, wac); + WebAppStarter.setWebAppConfiguration(wac); chColl.addHandler(rootWebApp); } catch (Exception ioe) { @@ -662,10 +663,6 @@ public class RouterConsoleRunner implements RouterApp { try { // start does a mapContexts() _server.start(); - // can't do this before start - // http://stackoverflow.com/questions/17529936/issues-while-using-jetty-embedded-to-handle-jsp-jasperexception-unable-to-com - // https://github.com/jetty-project/embedded-jetty-jsp/blob/master/src/main/java/org/eclipse/jetty/demo/Main.java - rootServletHandler.getServletContext().setAttribute("org.apache.tomcat.InstanceManager", new SimpleInstanceManager()); } catch (Throwable me) { // NoClassFoundDefError from a webapp is a throwable, not an exception System.err.println("Error starting the Router Console server: " + me); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/WebAppConfiguration.java b/apps/routerconsole/java/src/net/i2p/router/web/WebAppConfiguration.java index c88ec64d90..20b97834ed 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/WebAppConfiguration.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/WebAppConfiguration.java @@ -15,6 +15,7 @@ import java.util.StringTokenizer; import net.i2p.I2PAppContext; +import org.apache.tomcat.SimpleInstanceManager; import org.eclipse.jetty.webapp.Configuration; import org.eclipse.jetty.webapp.WebAppClassLoader; import org.eclipse.jetty.webapp.WebAppContext; @@ -191,6 +192,10 @@ public class WebAppConfiguration implements Configuration { /** @since Jetty 7 */ public void configure(WebAppContext context) throws Exception { configureClassPath(context); + // do we just need one, in the ContextHandlerCollection, or one for each? + // http://stackoverflow.com/questions/17529936/issues-while-using-jetty-embedded-to-handle-jsp-jasperexception-unable-to-com + // https://github.com/jetty-project/embedded-jetty-jsp/blob/master/src/main/java/org/eclipse/jetty/demo/Main.java + context.getServletContext().setAttribute("org.apache.tomcat.InstanceManager", new SimpleInstanceManager()); } /** @since Jetty 7 */ diff --git a/apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java b/apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java index 4d659c200d..876f99fcb7 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java @@ -10,7 +10,6 @@ import net.i2p.router.RouterContext; import net.i2p.util.FileUtil; import net.i2p.util.SecureDirectory; -import org.apache.tomcat.SimpleInstanceManager; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.handler.ContextHandler; @@ -64,11 +63,6 @@ public class WebAppStarter { // and the caller will know it failed wac.setThrowUnavailableOnStartupException(true); wac.start(); - // can't do this before start - // do we just need one, in the ContextHandlerCollection, or one for each? - // http://stackoverflow.com/questions/17529936/issues-while-using-jetty-embedded-to-handle-jsp-jasperexception-unable-to-com - // https://github.com/jetty-project/embedded-jetty-jsp/blob/master/src/main/java/org/eclipse/jetty/demo/Main.java - wac.getServletContext().setAttribute("org.apache.tomcat.InstanceManager", new SimpleInstanceManager()); } /** @@ -115,7 +109,16 @@ public class WebAppStarter { // this does the passwords... RouterConsoleRunner.initialize(ctx, wac); + setWebAppConfiguration(wac); + server.addHandler(wac); + server.mapContexts(); + return wac; + } + /** + * @since Jetty 9 + */ + static void setWebAppConfiguration(WebAppContext wac) { // see WebAppConfiguration for info String[] classNames = wac.getConfigurationClasses(); // In Jetty 9, it doesn't set the defaults if we've already added one, but the @@ -130,9 +133,6 @@ public class WebAppStarter { newClassNames[j] = classNames[j]; newClassNames[classNames.length] = WebAppConfiguration.class.getName(); wac.setConfigurationClasses(newClassNames); - server.addHandler(wac); - server.mapContexts(); - return wac; } /** diff --git a/build.properties b/build.properties index 9577a65b90..9545420895 100644 --- a/build.properties +++ b/build.properties @@ -131,7 +131,7 @@ javac.version=1.7 ### Debian/Ubuntu packages ### # Don't include geoip files, we will use geoip-database package #with-geoip-database=true -# Don't include jetty files, we will use libjetty9-java package +# Don't include jetty files, we will use libjetty9-java package. Requires with-libtomcat8-java=true. #with-libjetty9-java=true # Don't include tomcat files, we will use libtomcat8-java package #with-libtomcat8-java=true diff --git a/debian-alt/README.txt b/debian-alt/README.txt index 9bc53dd6d6..4a2c538827 100644 --- a/debian-alt/README.txt +++ b/debian-alt/README.txt @@ -1,7 +1,13 @@ -The files in ../debian/ are for jessie/stable. -Alternates are in the subdirectories here. +The files in ../debian/ are for stretch. +You may also use them for jessie if you have libjetty9-java from jessie-backports. -trusty may be copied to utopic, vivid, wily, xenial. +Alternates are in the subdirectories here. +To use them, copy them over the files in ../debian/ . + +Built file compatibility: +trusty may be copied to vivid. +trusty may be used for jessie without libjetty9-java from backports. +xenial may be copied to yakkety, zesty. tails-jessie and tails-wheezy are currently the same as jessie and wheezy, respectively. If they diverge, put the changes here. diff --git a/debian-alt/jessie/README.txt b/debian-alt/jessie/README.txt new file mode 100644 index 0000000000..6148f10fe2 --- /dev/null +++ b/debian-alt/jessie/README.txt @@ -0,0 +1,3 @@ +If you have libjetty9-java from jessie-backports: use the stretch files in ../../debian. + +If you do not have libjetty9-java from jessie-backports: use the trusty files in ../trusty. diff --git a/debian-alt/precise/control b/debian-alt/precise/control index ee3f8a3d75..7bb4827267 100644 --- a/debian-alt/precise/control +++ b/debian-alt/precise/control @@ -7,12 +7,12 @@ Bugs: mailto:zzz@i2pmail.org Homepage: https://geti2p.net/ Build-Depends: debhelper (>= 7.0.50~) ,ant (>= 1.8) - ,ant-optional ,debconf ,openjdk-7-jdk # Ant requires java 6 tools.jar: # Unable to locate tools.jar. Expected to find it in /usr/lib/jvm/java-6-openjdk-amd64/lib/tools.jar ,openjdk-6-jdk + ,libtomcat8-java ,glassfish-javaee ,dh-apparmor ,gettext @@ -76,7 +76,7 @@ Section: net Priority: optional Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends}, openjdk-8-jre-headless | openjdk-7-jre-headless | java8-runtime-headless | java7-runtime-headless, - libecj-java, + libtomcat8-java, geoip-database, gettext-base, libgetopt-java, diff --git a/debian-alt/precise/i2p-router.install b/debian-alt/precise/i2p-router.install index 99683be0f5..b67858d043 100644 --- a/debian-alt/precise/i2p-router.install +++ b/debian-alt/precise/i2p-router.install @@ -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 diff --git a/debian-alt/precise/i2p-router.links b/debian-alt/precise/i2p-router.links index 0ac85f6f58..d85cf86ee3 100644 --- a/debian-alt/precise/i2p-router.links +++ b/debian-alt/precise/i2p-router.links @@ -3,8 +3,6 @@ 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 - # comment out if not building with libjetty9-java # ubuntu: in trusty vivid wily xenial @@ -33,6 +31,25 @@ usr/share/java/eclipse-ecj.jar usr/share/i2p/lib/eclipse-ecj.jar #usr/share/java/jsp-api-2.3.jar usr/share/i2p/lib/jsp-api.jar +# comment out if not building with libtomcat8-java +# ubuntu: only in xenial+ +# debian: wheezy-backports, jessie+ +# legacy name, contains only tomcat-juli, not commons-logging +usr/share/java/tomcat8-juli.jar usr/share/i2p/lib/commons-logging.jar +usr/share/java/tomcat8-jasper.jar usr/share/i2p/lib/jasper-runtime.jar +# combined into jasper-runtime.jar in non-package builds +usr/share/java/tomcat8-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar +usr/share/java/tomcat8-api.jar usr/share/i2p/lib/tomcat-api.jar +usr/share/java/tomcat8-util.jar usr/share/i2p/lib/tomcat-util.jar +usr/share/java/tomcat8-util-scan.jar usr/share/i2p/lib/tomcat-util-scan.jar +# combined into commons-el.jar in non-package builds +usr/share/java/tomcat8-jasper-el.jar usr/share/i2p/lib/jasper-el.jar +# legacy name in lib/ +usr/share/java/tomcat8-el-api.jar usr/share/i2p/lib/commons-el.jar +usr/share/java/tomcat8-servlet-api.jar usr/share/i2p/lib/javax.servlet.jar +usr/share/java/tomcat8-jsp-api.jar usr/share/i2p/lib/jsp-api.jar + + # comment out if not building with glassfish-javaee # glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail #usr/share/java/glassfish-javaee.jar usr/share/i2p/lib/jstl.jar diff --git a/debian-alt/precise/rules b/debian-alt/precise/rules index 2cb94b3931..c3466db46d 100755 --- a/debian-alt/precise/rules +++ b/debian-alt/precise/rules @@ -84,8 +84,8 @@ endif @# debian and ubuntu: everywhere @/bin/echo -e "with-geoip-database=true" >> $(CURDIR)/override.properties - @# ubuntu: not in precise - @# debian: in wheezy jessie stretch sid + @# ubuntu: in xenial + @# debian: in jessie-backports stretch sid @#/bin/echo -e "with-libjetty9-java=true" >> $(CURDIR)/override.properties @#mkdir -p $(CURDIR)/apps/jetty/jettylib @#ln -sf /usr/share/java/jetty9-continuation.jar $(CURDIR)/apps/jetty/jettylib/jetty-continuation.jar @@ -106,6 +106,20 @@ endif @#ln -sf /usr/share/java/servlet-api-3.1.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar @#ln -sf /usr/share/java/jsp-api-2.3.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar + @# debian and ubuntu: wheezy-backports, jessie+, xenial+ + @/bin/echo -e "with-libtomcat8-java=true" >> $(CURDIR)/override.properties + mkdir -p $(CURDIR)/apps/jetty/jettylib + ln -sf /usr/share/java/tomcat8-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar + ln -sf /usr/share/java/tomcat8-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar + ln -sf /usr/share/java/tomcat8-el-api.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar + ln -sf /usr/share/java/tomcat8-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar + ln -sf /usr/share/java/tomcat8-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar + ln -sf /usr/share/java/tomcat8-jsp-api.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar + ln -sf /usr/share/java/tomcat8-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar + ln -sf /usr/share/java/tomcat8-servlet-api.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar + ln -sf /usr/share/java/tomcat8-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar + ln -sf /usr/share/java/tomcat8-util-scan.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util-scan.jar + @# debian and ubuntu: everywhere @/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties @# glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail diff --git a/debian-alt/trusty/control b/debian-alt/trusty/control index 309b91de19..e5c9401ec0 100644 --- a/debian-alt/trusty/control +++ b/debian-alt/trusty/control @@ -7,12 +7,12 @@ Bugs: mailto:zzz@i2pmail.org Homepage: https://geti2p.net/ Build-Depends: debhelper (>= 7.0.50~) ,ant (>= 1.8) - ,ant-optional ,debconf ,openjdk-7-jdk # Ant requires java 6 tools.jar: # Unable to locate tools.jar. Expected to find it in /usr/lib/jvm/java-6-openjdk-amd64/lib/tools.jar ,openjdk-6-jdk + ,libtomcat8-java ,dh-apparmor ,gettext ,libgetopt-java @@ -75,7 +75,7 @@ Section: net Priority: optional Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends}, openjdk-8-jre-headless | openjdk-7-jre-headless | java8-runtime-headless | java7-runtime-headless, - libecj-java, + libtomcat8-java, geoip-database, gettext-base, libgetopt-java, diff --git a/debian-alt/trusty/i2p-router.install b/debian-alt/trusty/i2p-router.install index 431e32c87b..b67858d043 100644 --- a/debian-alt/trusty/i2p-router.install +++ b/debian-alt/trusty/i2p-router.install @@ -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.0-java which is a dependency of libjetty9-java -pkg-temp/lib/javax.servlet.jar usr/share/i2p/lib # uncomment if not building with libtomcat8-java -pkg-temp/lib/commons-el.jar usr/share/i2p/lib +#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 diff --git a/debian-alt/trusty/i2p-router.links b/debian-alt/trusty/i2p-router.links index 0ac85f6f58..d85cf86ee3 100644 --- a/debian-alt/trusty/i2p-router.links +++ b/debian-alt/trusty/i2p-router.links @@ -3,8 +3,6 @@ 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 - # comment out if not building with libjetty9-java # ubuntu: in trusty vivid wily xenial @@ -33,6 +31,25 @@ usr/share/java/eclipse-ecj.jar usr/share/i2p/lib/eclipse-ecj.jar #usr/share/java/jsp-api-2.3.jar usr/share/i2p/lib/jsp-api.jar +# comment out if not building with libtomcat8-java +# ubuntu: only in xenial+ +# debian: wheezy-backports, jessie+ +# legacy name, contains only tomcat-juli, not commons-logging +usr/share/java/tomcat8-juli.jar usr/share/i2p/lib/commons-logging.jar +usr/share/java/tomcat8-jasper.jar usr/share/i2p/lib/jasper-runtime.jar +# combined into jasper-runtime.jar in non-package builds +usr/share/java/tomcat8-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar +usr/share/java/tomcat8-api.jar usr/share/i2p/lib/tomcat-api.jar +usr/share/java/tomcat8-util.jar usr/share/i2p/lib/tomcat-util.jar +usr/share/java/tomcat8-util-scan.jar usr/share/i2p/lib/tomcat-util-scan.jar +# combined into commons-el.jar in non-package builds +usr/share/java/tomcat8-jasper-el.jar usr/share/i2p/lib/jasper-el.jar +# legacy name in lib/ +usr/share/java/tomcat8-el-api.jar usr/share/i2p/lib/commons-el.jar +usr/share/java/tomcat8-servlet-api.jar usr/share/i2p/lib/javax.servlet.jar +usr/share/java/tomcat8-jsp-api.jar usr/share/i2p/lib/jsp-api.jar + + # comment out if not building with glassfish-javaee # glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail #usr/share/java/glassfish-javaee.jar usr/share/i2p/lib/jstl.jar diff --git a/debian-alt/trusty/rules b/debian-alt/trusty/rules index 19dc1fa0a8..2de0f9840a 100755 --- a/debian-alt/trusty/rules +++ b/debian-alt/trusty/rules @@ -83,8 +83,8 @@ endif @# debian and ubuntu: everywhere @/bin/echo -e "with-geoip-database=true" >> $(CURDIR)/override.properties - @# ubuntu: not in precise - @# debian: in wheezy jessie stretch sid + @# ubuntu: in xenial + @# debian: in jessie-backports stretch sid @#/bin/echo -e "with-libjetty9-java=true" >> $(CURDIR)/override.properties @#mkdir -p $(CURDIR)/apps/jetty/jettylib @#ln -sf /usr/share/java/jetty9-continuation.jar $(CURDIR)/apps/jetty/jettylib/jetty-continuation.jar @@ -105,6 +105,20 @@ endif @#ln -sf /usr/share/java/servlet-api-3.1.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar @#ln -sf /usr/share/java/jsp-api-2.3.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar + @# debian and ubuntu: wheezy-backports, jessie+, xenial+ + @/bin/echo -e "with-libtomcat8-java=true" >> $(CURDIR)/override.properties + mkdir -p $(CURDIR)/apps/jetty/jettylib + ln -sf /usr/share/java/tomcat8-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar + ln -sf /usr/share/java/tomcat8-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar + ln -sf /usr/share/java/tomcat8-el-api.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar + ln -sf /usr/share/java/tomcat8-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar + ln -sf /usr/share/java/tomcat8-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar + ln -sf /usr/share/java/tomcat8-jsp-api.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar + ln -sf /usr/share/java/tomcat8-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar + ln -sf /usr/share/java/tomcat8-servlet-api.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar + ln -sf /usr/share/java/tomcat8-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar + ln -sf /usr/share/java/tomcat8-util-scan.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util-scan.jar + @# debian and ubuntu: everywhere @/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties @# glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail diff --git a/debian-alt/wheezy/README.txt b/debian-alt/wheezy/README.txt new file mode 100644 index 0000000000..4a25580509 --- /dev/null +++ b/debian-alt/wheezy/README.txt @@ -0,0 +1 @@ +Not maintained. Use the precise files instead. diff --git a/debian-alt/wheezy/control b/debian-alt/wheezy/control index c9f476c6c1..0c0695d53d 100644 --- a/debian-alt/wheezy/control +++ b/debian-alt/wheezy/control @@ -1,5 +1,5 @@ Source: i2p -Maintainer: Kill Your TV +Maintainer: zzz Section: net Standards-Version: 3.9.6 Priority: optional @@ -7,9 +7,10 @@ Bugs: mailto:killyourtv@i2pmail.org Homepage: https://geti2p.net Build-Depends: debhelper (>= 7.0.50~) ,ant (>= 1.8) - ,ant-optional ,debconf - ,default-jdk | openjdk-7-jdk | openjdk-6-jdk + ,default-jdk | openjdk-7-jdk + ,libtomcat8-java + ,glassfish-javaee ,gettext ,dh-apparmor ,libgmp3-dev @@ -71,7 +72,12 @@ Architecture: all Section: net Priority: optional Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends}, - openjdk-8-jre-headless | openjdk-7-jre-headless | openjdk-6-jre-headless | default-jre-headless | java8-runtime-headless | java7-runtime-headless | java6-runtime-headless, libecj-java + openjdk-8-jre-headless | openjdk-7-jre-headless | java8-runtime-headless | java7-runtime-headless, + libtomcat8-java, + geoip-database, + gettext-base, + libgetopt-java, + glassfish-javaee Replaces: i2p ( << 0.8.6-5) Breaks: i2p (<< 0.8.6-5) Recommends: libjbigi-jni, ttf-dejavu diff --git a/debian-alt/xenial/control b/debian-alt/xenial/control index 7798c677b8..3fe552d463 100644 --- a/debian-alt/xenial/control +++ b/debian-alt/xenial/control @@ -7,7 +7,6 @@ Bugs: mailto:zzz@i2pmail.org Homepage: https://geti2p.net/ Build-Depends: debhelper (>= 7.0.50~) ,ant (>= 1.8) - ,ant-optional ,debconf ,openjdk-8-jdk ,libjetty9-java diff --git a/debian-alt/xenial/rules b/debian-alt/xenial/rules index 496c946d56..c70f194383 100755 --- a/debian-alt/xenial/rules +++ b/debian-alt/xenial/rules @@ -83,8 +83,8 @@ endif @# debian and ubuntu: everywhere @/bin/echo -e "with-geoip-database=true" >> $(CURDIR)/override.properties - @# ubuntu: not in precise - @# debian: in wheezy jessie stretch sid + @# ubuntu: in xenial + @# debian: in jessie-backports stretch sid @/bin/echo -e "with-libjetty9-java=true" >> $(CURDIR)/override.properties mkdir -p $(CURDIR)/apps/jetty/jettylib ln -sf /usr/share/java/jetty9-continuation.jar $(CURDIR)/apps/jetty/jettylib/jetty-continuation.jar @@ -107,16 +107,16 @@ endif ln -sf /usr/share/java/jsp-api-2.3.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar @# debian and ubuntu: wheezy-backports, jessie+, xenial+ - /bin/echo -e "with-libtomcat8-java=true" >> $(CURDIR)/override.properties + @/bin/echo -e "with-libtomcat8-java=true" >> $(CURDIR)/override.properties mkdir -p $(CURDIR)/apps/jetty/jettylib - ln -sf /usr/share/java/tomcat8-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar ln -sf /usr/share/java/tomcat8-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar + ln -sf /usr/share/java/tomcat8-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar + ln -sf /usr/share/java/tomcat8-el-api.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar + ln -sf /usr/share/java/tomcat8-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar + ln -sf /usr/share/java/tomcat8-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar + ln -sf /usr/share/java/tomcat8-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar ln -sf /usr/share/java/tomcat8-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar ln -sf /usr/share/java/tomcat8-util-scan.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util-scan.jar - ln -sf /usr/share/java/tomcat8-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar - ln -sf /usr/share/java/tomcat8-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar - ln -sf /usr/share/java/tomcat8-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar - ln -sf /usr/share/java/tomcat8-el-api.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar @# debian and ubuntu: everywhere @/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties diff --git a/debian/control b/debian/control index 03da0745bd..d665948653 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,6 @@ Bugs: mailto:zzz@i2pmail.org Homepage: https://geti2p.net/ Build-Depends: debhelper (>= 7.0.50~) ,ant (>= 1.8) - ,ant-optional ,debconf ,openjdk-7-jdk ,libjetty9-java diff --git a/debian/rules b/debian/rules index d6bf372d0f..00f0f6b93b 100755 --- a/debian/rules +++ b/debian/rules @@ -83,8 +83,8 @@ endif @# debian and ubuntu: everywhere @/bin/echo -e "with-geoip-database=true" >> $(CURDIR)/override.properties - @# ubuntu: not in precise - @# debian: in wheezy jessie stretch sid + @# ubuntu: in xenial + @# debian: in jessie-backports stretch sid @/bin/echo -e "with-libjetty9-java=true" >> $(CURDIR)/override.properties mkdir -p $(CURDIR)/apps/jetty/jettylib ln -sf /usr/share/java/jetty9-continuation.jar $(CURDIR)/apps/jetty/jettylib/jetty-continuation.jar @@ -109,14 +109,14 @@ endif @# debian and ubuntu: wheezy-backports, jessie+, xenial+ /bin/echo -e "with-libtomcat8-java=true" >> $(CURDIR)/override.properties mkdir -p $(CURDIR)/apps/jetty/jettylib - ln -sf /usr/share/java/tomcat8-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar ln -sf /usr/share/java/tomcat8-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar + ln -sf /usr/share/java/tomcat8-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar + ln -sf /usr/share/java/tomcat8-el-api.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar + ln -sf /usr/share/java/tomcat8-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar + ln -sf /usr/share/java/tomcat8-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar + ln -sf /usr/share/java/tomcat8-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar ln -sf /usr/share/java/tomcat8-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar ln -sf /usr/share/java/tomcat8-util-scan.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util-scan.jar - ln -sf /usr/share/java/tomcat8-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar - ln -sf /usr/share/java/tomcat8-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar - ln -sf /usr/share/java/tomcat8-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar - ln -sf /usr/share/java/tomcat8-el-api.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar @# debian and ubuntu: everywhere @/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties