From d6b1f813a853229e94fce8feda4b2abf448b163d Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sun, 3 Apr 2016 13:04:23 +0000
Subject: [PATCH] Debian: Fixes for with-libjetty8-java builds

---
 apps/jetty/build.xml |  6 ++++++
 build.xml            | 28 ++++++++++++++++++----------
 debian/rules         |  9 +++++++--
 3 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/apps/jetty/build.xml b/apps/jetty/build.xml
index c08fdd88a7..6c5c48ada0 100644
--- a/apps/jetty/build.xml
+++ b/apps/jetty/build.xml
@@ -222,6 +222,12 @@
     <target name="copyTomcatLib" depends="mkJettylibdir, copyTomcatLib1, copyTomcatLib2, copyTomcatLib3" />
 
     <target name="copyTomcatLib1" unless="${with-libservlet2.5-java}" >
+        <!-- EL libs.
+             Tomcat 6 has EL 2.1.
+             Tomcat 7 / libservlet3.0 has EL 2.2.
+             According to http://stackoverflow.com/questions/7202686/differences-between-el-2-1-and-2-2
+             2.2 is backwards-compatible with 2.1.
+         -->
         <jar destfile="jettylib/commons-el.jar" duplicate="preserve" filesetmanifest="merge" >
             <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/jasper-el.jar" />
             <zipfileset excludes="META-INF/**/*" src="${tomcat.lib}/el-api.jar" />
diff --git a/build.xml b/build.xml
index 81de0c789e..94f6e939c4 100644
--- a/build.xml
+++ b/build.xml
@@ -1143,7 +1143,7 @@
     </target>
 
     <!-- see targets below for conditional copying -->
-    <target name="preppkg-base" depends="build, preplicenses, prepConsoleDocs, prepthemeupdates, prepCertificates, prepRouterInfos, copyjetty-unlesspkg, copytomcat-unlesspkg, copyjstl-unlesspkg, copystandard-unlesspkg">
+    <target name="preppkg-base" depends="build, preplicenses, prepConsoleDocs, prepthemeupdates, prepCertificates, prepRouterInfos, copyjetty, copytomcat-unlesspkg, copyjstl-unlesspkg, copystandard-unlesspkg">
         <!-- if updater200 was run previously, it left *.pack files in pkg-temp -->
         <!-- Also remove deletelist.txt used for updater only -->
         <delete>
@@ -1201,9 +1201,13 @@
         </copy>
     </target>
 
+    <target name="copyjetty" depends="copyjetty-unlesspkg" >
+        <copy file="build/jetty-i2p.jar" todir="pkg-temp/libs/" />
+    </target>
+
     <target name="copyjetty-unlesspkg" unless="${with-libjetty8-java}" >
         <copy todir="pkg-temp/lib" >
-            <fileset dir="build" includes="javax.servlet.jar jetty*.jar org.mortbay.*.jar" />
+            <fileset dir="build" includes="javax.servlet.jar jetty*.jar org.mortbay.*.jar" excludes="jetty-i2p.jar" />
         </copy>
     </target>
 
@@ -1996,8 +2000,6 @@
         <delete dir="../i2p-${Extended.Version}" />
         <exec executable="mtn" failonerror="true">
             <arg value="co" />
-            <arg value="-b" />
-            <arg value="i2p.i2p" />
             <!-- w: is the revision of the current workspace -->
             <arg value="-r" />
             <arg value="w:" />
@@ -2010,11 +2012,13 @@
             <fileset dir="../i2p-${Extended.Version}/_MTN" />
             <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
             <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
+            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.17.v20150415" />
+          <!--
             <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat" />
             <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-deployer/" />
-            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.17.v20150415" />
             <file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/jstl.jar" />
             <file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/standard.jar" />
+           -->
             <!-- anything added above, add in debian-release-tarball also -->
         </delete>
         <tar longfile="gnu" destfile="../${debian.tarball.name}" compression="bzip2">
@@ -2025,11 +2029,13 @@
                 <exclude name="**/*.sh"/>
                 <exclude name="installer/resources/geoip.txt"/>
                 <exclude name="installer/resources/geoipv6.dat.gz"/>
+                <exclude name="apps/jetty/jetty-distribution-*/**"/>
+          <!--
                 <exclude name="apps/jetty/apache-tomcat/**"/>
                 <exclude name="apps/jetty/apache-tomcat-deployer/**"/>
-                <exclude name="apps/jetty/jetty-distribution-*/**"/>
                 <exclude name="apps/susidns/src/WEB-INF/lib/jstl.jar" />
                 <exclude name="apps/susidns/src/WEB-INF/lib/standard.jar" />
+           -->
                 <!-- anything added above, add in debian-release-tarball also -->
             </tarfileset>
             <tarfileset dir="../i2p-${Extended.Version}" prefix="/i2p-${Extended.Version}" filemode="755">
@@ -2054,8 +2060,6 @@
         <delete dir="../i2p-${Extended.Version}" />
         <exec executable="mtn" failonerror="true">
             <arg value="co" />
-            <arg value="-b" />
-            <arg value="i2p.i2p" />
             <!-- w: is the revision of the current workspace -->
             <arg value="-r" />
             <arg value="w:" />
@@ -2068,11 +2072,13 @@
             <fileset dir="../i2p-${Extended.Version}/_MTN" />
             <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
             <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
+            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.17.v20150415" />
+          <!--
             <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat" />
             <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-deployer/" />
-            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.17.v20150415" />
             <file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/jstl.jar" />
             <file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/standard.jar" />
+           -->
             <!-- anything added above, add in debian-tarball also -->
         </delete>
         <tar longfile="gnu" destfile="../${debian.tarball.name}" compression="bzip2">
@@ -2083,11 +2089,13 @@
                 <exclude name="**/*.sh"/>
                 <exclude name="installer/resources/geoip.txt"/>
                 <exclude name="installer/resources/geoipv6.dat.gz"/>
+                <exclude name="apps/jetty/jetty-distribution-*/**"/>
+          <!--
                 <exclude name="apps/jetty/apache-tomcat/**"/>
                 <exclude name="apps/jetty/apache-tomcat-deployer/**"/>
-                <exclude name="apps/jetty/jetty-distribution-*/**"/>
                 <exclude name="apps/susidns/src/WEB-INF/lib/jstl.jar" />
                 <exclude name="apps/susidns/src/WEB-INF/lib/standard.jar" />
+           -->
                 <!-- anything added above, add in debian-tarball also -->
             </tarfileset>
             <tarfileset dir="../i2p-${Extended.Version}" prefix="/i2p-${release.number}" filemode="755">
diff --git a/debian/rules b/debian/rules
index 96acb54fa5..db4538f6cd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -84,6 +84,7 @@ endif
 	# ubuntu: only in wily
 	# debian: in wheezy jessie stretch sid
 	@/bin/echo -e "with-libjetty8-java=true" >> $(CURDIR)/override.properties
+	mkdir -p $(CURDIR)/apps/jetty/jettylib
 	ln -sf /usr/share/java/jetty8-continuation.jar $(CURDIR)/apps/jetty/jettylib/jetty-continuation.jar
 	ln -sf /usr/share/java/jetty8-deploy.jar $(CURDIR)/apps/jetty/jettylib/jetty-deploy.jar
 	ln -sf /usr/share/java/jetty8-http.jar $(CURDIR)/apps/jetty/jettylib/jetty-http.jar
@@ -98,17 +99,20 @@ endif
 	ln -sf /usr/share/java/jetty8-xml.jar $(CURDIR)/apps/jetty/jettylib/jetty-xml.jar
 	ln -sf /usr/share/java/jetty8-server.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jetty.jar
 	ln -sf /usr/share/java/jetty8-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar
+	# following two are from libservlet3.0-java which is a dependency of libjetty8-java
+	ln -sf /usr/share/java/servlet-api-3.0.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
+	ln -sf /usr/share/java/jsp-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
 
 	# ubuntu: only in wily
 	# debian: in wheezy jessie stretch sid
+	#mkdir -p $(CURDIR)/apps/jetty/jettylib
 	#@/bin/echo -e "with-libservlet2.5-java=true" >> $(CURDIR)/override.properties
 	#ln -sf /usr/share/java/el-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
-	#ln -sf /usr/share/java/jsp-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
-	#ln -sf /usr/share/java/servlet-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
 
 	# ubuntu: only in precise trusty vivid
 	# debian: only in wheezy
 	#@/bin/echo -e "with-libtomcat6-java=true" >> $(CURDIR)/override.properties
+	#mkdir -p $(CURDIR)/apps/jetty/jettylib
 	#ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-compiler.jar
 	#ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
 	#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
@@ -116,6 +120,7 @@ endif
 
 	# debian and ubuntu: everywhere
 	#@/bin/echo -e "with-libtomcat7-java=true" >> $(CURDIR)/override.properties
+	#mkdir -p $(CURDIR)/apps/jetty/jettylib
 	#ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-compiler.jar
 	#ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
 	#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar