forked from I2P_Developers/i2p.i2p
Debian builds:
- Remove with-libtomcat6-java and with-libtomcat7-java - Replace with-libjetty8-java with-libjetty9-java - Add libtomcat8-java dependency in debian builds - Change libservlet-3.0-java implicit dependency to libservlet-3.1-java - Initial mods for trusty build files, as it does not have jetty 9 - Initial xenial build files - Add link to jetty9-apache-jsp.jar - Add necessary util jars to jsp classpath Non-Debian builds: - Move tomcat runtime from javax.servlet.jar to jasper-runtime.jar, to be consistent with Jetty 8 - Switch from jetty (glassfish) to apache (tomcat) jsp implementation, to be consistent with Debian builds - Drop checked-in Tomcat 6 and Jetty 8 jars Code: - Force Jasper initialization in RouterConsoleRunner since we don't use the Jetty annotation scanner
This commit is contained in:
@ -6,64 +6,31 @@ 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 libjetty8-java
|
||||
# comment out if not building with libjetty9-java
|
||||
# ubuntu: in trusty vivid wily xenial
|
||||
# debian: in wheezy jessie stretch sid
|
||||
#usr/share/java/jetty8-continuation.jar usr/share/i2p/lib/jetty-continuation.jar
|
||||
#usr/share/java/jetty8-deploy.jar usr/share/i2p/lib/jetty-deploy.jar
|
||||
#usr/share/java/jetty8-http.jar usr/share/i2p/lib/jetty-http.jar
|
||||
#usr/share/java/jetty8-io.jar usr/share/i2p/lib/jetty-io.jar
|
||||
#usr/share/java/jetty9-continuation.jar usr/share/i2p/lib/jetty-continuation.jar
|
||||
#usr/share/java/jetty9-deploy.jar usr/share/i2p/lib/jetty-deploy.jar
|
||||
#usr/share/java/jetty9-http.jar usr/share/i2p/lib/jetty-http.jar
|
||||
#usr/share/java/jetty9-io.jar usr/share/i2p/lib/jetty-io.jar
|
||||
# legacy name in lib/
|
||||
#usr/share/java/jetty8-rewrite.jar usr/share/i2p/lib/jetty-rewrite-handler.jar
|
||||
#usr/share/java/jetty8-security.jar usr/share/i2p/lib/jetty-security.jar
|
||||
#usr/share/java/jetty8-servlet.jar usr/share/i2p/lib/jetty-servlet.jar
|
||||
#usr/share/java/jetty8-servlets.jar usr/share/i2p/lib/jetty-servlets.jar
|
||||
#usr/share/java/jetty8-start.jar usr/share/i2p/lib/jetty-start.jar
|
||||
#usr/share/java/jetty8-util.jar usr/share/i2p/lib/jetty-util.jar
|
||||
#usr/share/java/jetty8-webapp.jar usr/share/i2p/lib/jetty-webapp.jar
|
||||
#usr/share/java/jetty8-xml.jar usr/share/i2p/lib/jetty-xml.jar
|
||||
#usr/share/java/jetty9-rewrite.jar usr/share/i2p/lib/jetty-rewrite-handler.jar
|
||||
#usr/share/java/jetty9-security.jar usr/share/i2p/lib/jetty-security.jar
|
||||
#usr/share/java/jetty9-servlet.jar usr/share/i2p/lib/jetty-servlet.jar
|
||||
#usr/share/java/jetty9-servlets.jar usr/share/i2p/lib/jetty-servlets.jar
|
||||
#usr/share/java/jetty9-start.jar usr/share/i2p/lib/jetty-start.jar
|
||||
#usr/share/java/jetty9-util.jar usr/share/i2p/lib/jetty-util.jar
|
||||
#usr/share/java/jetty9-webapp.jar usr/share/i2p/lib/jetty-webapp.jar
|
||||
#usr/share/java/jetty9-xml.jar usr/share/i2p/lib/jetty-xml.jar
|
||||
# legacy name in lib/
|
||||
#usr/share/java/jetty8-server.jar usr/share/i2p/lib/org.mortbay.jetty.jar
|
||||
#usr/share/java/jetty9-server.jar usr/share/i2p/lib/org.mortbay.jetty.jar
|
||||
# legacy name in lib/
|
||||
#usr/share/java/jetty8-jmx.jar usr/share/i2p/lib/org.mortbay.jmx.jar
|
||||
# following two are from libservlet3.0-java which is a dependency of libjetty8-java
|
||||
#usr/share/java/jetty9-jmx.jar usr/share/i2p/lib/org.mortbay.jmx.jar
|
||||
# following two are from libservlet3.1-java which is a dependency of libjetty9-java
|
||||
# legacy name in lib/
|
||||
#usr/share/java/servlet-api-3.0.jar usr/share/i2p/lib/javax.servlet.jar
|
||||
#usr/share/java/servlet-api-3.1.jar usr/share/i2p/lib/javax.servlet.jar
|
||||
# combined into javax.servlet.jar in non-package builds
|
||||
#usr/share/java/jsp-api-2.2.jar usr/share/i2p/lib/jsp-api.jar
|
||||
|
||||
|
||||
# comment out if not building with libtomcat6-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/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
|
||||
#usr/share/java/jsp-api-2.3.jar usr/share/i2p/lib/jsp-api.jar
|
||||
|
||||
|
||||
# comment out if not building with glassfish-javaee
|
||||
|
||||
Reference in New Issue
Block a user