I2P Address: [http://git.idk.i2p]

Skip to content
Snippets Groups Projects
Commit b72085bc authored by zzz's avatar zzz
Browse files

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
parent d3abbe86
No related branches found
No related tags found
No related merge requests found
Showing
with 61 additions and 80 deletions
......@@ -277,14 +277,17 @@
<classpath>
<pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
<pathelement location="../../jetty/jettylib/javax.servlet.jar" />
<!-- jsp-api.jar only present for debian builds -->
<!-- following jars only present for debian builds -->
<pathelement location="../../jetty/jettylib/jsp-api.jar" />
<!-- tomcat-api.jar only present for debian builds -->
<pathelement location="../../jetty/jettylib/tomcat-api.jar" />
<!-- jasper-el.jar only present for debian builds -->
<pathelement location="../../jetty/jettylib/tomcat-util.jar" />
<pathelement location="../../jetty/jettylib/tomcat-util-scan.jar" />
<pathelement location="../../jetty/jettylib/jasper-el.jar" />
<pathelement location="../../jetty/jettylib/commons-logging.jar" />
<pathelement location="../../jetty/jettylib/commons-el.jar" />
<pathelement location="../../jetty/jettylib/jetty-util.jar" />
<pathelement location="${ant.home}/lib/ant.jar" />
<pathelement location="build/i2ptunnel.jar" />
<pathelement location="build/temp-beans.jar" />
......@@ -309,12 +312,14 @@
<classpath>
<pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
<pathelement location="../../jetty/jettylib/javax.servlet.jar" />
<!-- jsp-api.jar only present for debian builds -->
<!-- following jars only present for debian builds -->
<pathelement location="../../jetty/jettylib/jsp-api.jar" />
<!-- tomcat-api.jar only present for debian builds -->
<pathelement location="../../jetty/jettylib/tomcat-api.jar" />
<!-- jasper-el.jar only present for debian builds -->
<pathelement location="../../jetty/jettylib/jasper-el.jar" />
<pathelement location="../../jetty/jettylib/tomcat-util.jar" />
<pathelement location="../../jetty/jettylib/tomcat-util-scan.jar" />
<pathelement location="../../jetty/jettylib/commons-logging.jar" />
<pathelement location="../../jetty/jettylib/commons-el.jar" />
<pathelement location="build/i2ptunnel.jar" />
......
Apache Tomcat
Copyright 1999-2016 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
The Windows Installer is built with the Nullsoft
Scriptable Install System (NSIS), which is
open source software. The original software and
related information is available at
http://nsis.sourceforge.net.
Java compilation software for JSP pages is provided by the Eclipse
JDT Core Batch Compiler component, which is open source software.
The original software and related information is available at
http://www.eclipse.org/jdt/core/.
The original XML Schemas for Java EE Deployment Descriptors:
- javaee_5.xsd
- javaee_web_services_1_2.xsd
- javaee_web_services_client_1_2.xsd
may be obtained from http://java.sun.com/xml/ns/javaee/
This is Apache Tomcat 6.x, supporting Servlet 2.5 and JSP 2.1.
The Glassfish JSP 2.1 bundled in Jetty 6 is way too old.
Retrieved from the file
apache-tomcat-6.0.48-deployer.tar.gz
minus the following files and directores:
build.xml
deployer-howto.html
images/*
lib/catalina*
lib/jsp-api.jar (see below)
lib/servlet-api.jar (see below)
LICENSE (see ../../../licenses/LICENSE-Apache2.0.txt, it's also inside every jar)
RELEASE-NOTES
We could use the following API jars from Apache Tomcat 7.x, supporting Servlet 3.0 and JSP 2.2,
that are required for Jetty 8, but we just bundle the ones from Jetty 8 instead:
lib/jsp-api.jar
lib/servlet-api.jar
For more info:
http://tomcat.apache.org/whichversion.html
File deleted
File deleted
File deleted
File deleted
This is Apache Tomcat 6.x, supporting Servlet 2.5 and JSP 2.1.
Retrieved from the file
apache-tomcat-6.0.48.tar.gz
containing only a small subset of lib/tomcat-coyote.jar.
See the buildTomcatUtilJar target in ../build.xml for the classes extracted and more information.
LICENSE: see ../../../licenses/LICENSE-Apache2.0.txt
File deleted
......@@ -3,7 +3,7 @@
<!-- This copies jars, with some modifications and renaming,
from the jetty-distribution directory to the jettylib directory.
This is disabled if the property with-libjetty8-java=true.
This is disabled if the property with-libjetty9-java=true.
This copies jars, with some modifications and renaming,
from the apache-tomcat-deployer and apache-tomcat directories to the jettylib directory.
......@@ -25,10 +25,12 @@
<property name="verified.filename" value="verified.txt" />
<property name="javac.compilerargs" value="" />
<property name="javac.version" value="1.7" />
<!--
<property name="tomcat.lib" value="apache-tomcat-deployer/lib" />
<property name="tomcat.ver" value="6.0.48" />
<property name="tomcat2.lib" value="apache-tomcat-${tomcat.ver}/lib" />
<property name="tomcat2.lib.small" value="apache-tomcat/lib" />
-->
<target name="all" depends="build" />
......@@ -44,7 +46,7 @@
<target name="ensureJettylib1" >
<condition property="jetty.zip.extracted" >
<or>
<istrue value="${with-libjetty8-java}" />
<istrue value="${with-libjetty9-java}" />
<available file="${jetty.base}" type="dir" />
</or>
</condition>
......@@ -56,7 +58,7 @@
</condition>
<condition property="verified.already" >
<or>
<istrue value="${with-libjetty8-java}" />
<istrue value="${with-libjetty9-java}" />
<istrue value="${jetty.zip.extracted}" />
<and>
<available file="${jetty.filename}" />
......@@ -126,7 +128,7 @@
<target name="copyJettylib" depends="mkJettylibdir, copyJettylib1, copyTomcatLib" />
<!-- Jetty files only -->
<target name="copyJettylib1" depends="extractJettylib" unless="${with-libjetty8-java}" >
<target name="copyJettylib1" depends="extractJettylib" unless="${with-libjetty9-java}" >
<!-- We copy everything to names without the version numbers so we
can update them later. Where there was something similar in Jetty 5/6,
we use the same names so they will overwrite the Jetty 5/6 jar on upgrade.
......@@ -169,14 +171,15 @@
<attribute name="Note" value="Intentionally empty" />
</manifest>
</jar>
<!-- TODO we may wish to put the compiler in jasper-runtime.jar instead -->
<jar destfile="jettylib/javax.servlet.jar" duplicate="preserve" filesetmanifest="mergewithoutmain" >
<zipfileset excludes="about.html about_files about_files/* META-INF/ECLIPSEF.* META-INF/eclipse.inf plugin.properties" src="${jetty.base}/lib/servlet-api-3.1.jar" />
<!--
Jetty version - see below for why we don't use this one
<zipfileset excludes="about.html about_files about_files/* META-INF/ECLIPSEF.* META-INF/eclipse.inf plugin.properties" src="${jetty.base}/lib/jsp/javax.servlet.jsp-api-2.3.1.jar" />
<zipfileset excludes="about.html about_files about_files/* META-INF/ECLIPSEF.* META-INF/eclipse.inf plugin.properties" src="${jetty.base}/lib/jsp/javax.servlet.jsp-2.3.2.jar" />
<!--
<zipfileset excludes="about.html about_files about_files/* META-INF/ECLIPSEF.* META-INF/eclipse.inf plugin.properties" src="${jetty.base}/lib/jsp/jetty-jsp-${jetty.ver}.jar" />
-->
-->
<!-- Apache version -->
<!-- Also includes org.apache.*, this is copied into jasper-runtime.jar below -->
<zipfileset includes="javax/**/*" src="${jetty.base}/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.0.33.jar"/>
<!-- In Debian packages they are found in /usr/share/java/tomcat8-servlet-api.jar in the libtomcat8-java package -->
<zipfileset excludes="about.html about_files about_files/* META-INF/ECLIPSEF.* META-INF/eclipse.inf plugin.properties" src="${jetty.base}/lib/jetty-schemas-3.1.jar" />
</jar>
......@@ -206,13 +209,16 @@
Apparently this is only required for precompilation of jsps, so this is put in
with the JspC compiler jasper-runtime.jar below.
-->
<target name="buildTomcatUtilJar" unless="${with-libservlet2.5-java}" >
<!-- take only what we need from the tomcat-coyote jar -->
<!-- take only what we need from the tomcat-coyote jar -->
<!--
<target name="buildTomcatUtilJar" unless="${with-libjetty9-java}" >
<jar destfile="${tomcat2.lib.small}/tomcat-coyote-util.jar" >
<zipfileset src="${tomcat2.lib}/tomcat-coyote.jar"
includes="org/apache/tomcat/util/descriptor/* org/apache/tomcat/util/res/*" />
</jar>
</target>
-->
<!-- Tomcat.
The glassfish jars bundled in Jetty 6 are way too old.
......@@ -231,7 +237,7 @@
-->
<target name="copyTomcatLib" depends="mkJettylibdir, copyTomcatLib1, copyTomcatLib2, copyTomcatLib3" />
<target name="copyTomcatLib1" unless="${with-libservlet2.5-java}" >
<target name="copyTomcatLib1" unless="${with-libjetty9-java}" >
<condition property="with-libtomcat-java" >
<or>
<istrue value="${with-libtomcat6-java}" />
......@@ -250,13 +256,36 @@
According to http://stackoverflow.com/questions/7202686/differences-between-el-2-1-and-2-2
2.2 is backwards-compatible with 2.1.
-->
<copy preservelastmodified="true" file="${jetty.base}/lib/jsp/javax.el-3.0.0.jar" tofile="jettylib/commons-el.jar" />
<!-- the javax.el API, AND the com.sun.el parser -->
<!-- actually from jetty9, not tomcat8... this will fail unless neither or both -->
<jar destfile="jettylib/commons-el.jar" >
<!--
Jetty version
<zipfileset src="${jetty.base}/lib/jsp/javax.el-3.0.0.jar"/>
-->
<!-- Apache version -->
<zipfileset src="${jetty.base}/lib/apache-jsp/org.mortbay.jasper.apache-el-8.0.33.jar"/>
</jar>
<!-- actually from jetty9, not tomcat8... this will fail unless neither or both -->
<jar destfile="jettylib/jasper-runtime.jar" >
<manifest>
<attribute name="Note" value="Intentionally empty" />
</manifest>
<!--
Jetty version
<zipfileset src="${jetty.base}/lib/jsp/javax.servlet.jsp-2.3.2.jar"/>
To be included in jasper-runtime.jar?
Server complains "NO JSP Support for /, did not find org.eclipse.jetty.jsp.JettyJspServlet" even with this included (but it still works).
The following file has the class, but /usr/share/java/jetty8-jsp.jar is empty
We don't use this one, because we want to be consistent with Debian builds that
must use Apache (aka libtomcat8).
<zipfileset excludes="about.html about_files about_files/* META-INF/ECLIPSEF.* META-INF/eclipse.inf plugin.properties" src="${jetty.base}/lib/jsp/jetty-jsp-${jetty.ver}.jar" />
-->
<!-- Apache version -->
<!-- Also includes javax.servlet.jsp.*, this is copied into javax.servlet.jar above -->
<zipfileset includes="org/**/*" src="${jetty.base}/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.0.33.jar"/>
<!-- required Jetty initializer (see RouterConsoleRunner) -->
<zipfileset src="${jetty.base}/lib/apache-jsp/org.eclipse.jetty.apache-jsp-${jetty.ver}.jar"/>
</jar>
<!--
<jar destfile="jettylib/javax.servlet.jar" duplicate="preserve" filesetmanifest="mergewithoutmain" >
<zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/servlet-api.jar" />
......@@ -269,7 +298,12 @@
Their bug tracker claims fixed in 1.8.0 but broken for me in 1.8.1
-->
<jar destfile="jettylib/commons-logging.jar" update="true" >
<!--
<zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/tomcat-juli.jar" />
-->
<manifest>
<attribute name="Note" value="Intentionally empty" />
</manifest>
</jar>
</target>
......
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment