From 6b923c7251d92834933248642da470a090286a5f Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sun, 22 May 2011 18:33:51 +0000
Subject: [PATCH]         Fix build error that omitted local jetty patches from
 org.mortbay.jetty.jar;         affected 0.8.4 and 0.8.6 installers. Include
 jar in the updater for the next release.         Thx KYTV.

---
 apps/jetty/build.xml | 6 +-----
 build.xml            | 3 +++
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/apps/jetty/build.xml b/apps/jetty/build.xml
index a4ba71e07..73ac7a1d1 100644
--- a/apps/jetty/build.xml
+++ b/apps/jetty/build.xml
@@ -67,20 +67,16 @@
         <gunzip src="${jetty.filename}" dest="jetty.tar" />
         <untar src="jetty.tar" dest="." />
         <mkdir dir="jettylib" />
-        <copy todir="jettylib">
+        <copy todir="jettylib" preservelastmodified="true" >
             <fileset dir="${jetty.base}/lib">
                 <include name="*.jar" />
             </fileset>
-        </copy>
-        <copy todir="jettylib">
             <fileset dir="${jetty.base}/ext">
                 <include name="ant.jar" />
                 <include name="commons-el.jar" />
                 <include name="commons-logging.jar" />
                 <include name="jasper-compiler.jar" />
                 <include name="jasper-runtime.jar" />
-                <include name="javax.servlet.jar" />
-                <include name="org.mortbay.jetty.jar" />
             </fileset>
         </copy>
         <delete file="jetty.tar" />
diff --git a/build.xml b/build.xml
index 01b0388ea..66004c67f 100644
--- a/build.xml
+++ b/build.xml
@@ -878,7 +878,10 @@
 
     <!-- this is the same dependency as pkg, but with updater200 in the middle,
          since preppkg puts too much stuff in pkg-temp -->
+<!--
     <target name="release" depends="distclean, updater, updater200, preppkg, installer" >
+-->
+    <target name="release" depends="distclean, updaterWithJettyFixes, updater200WithJettyFixes, preppkg, installer" >
         <echo message="================================================================" />
         <echo message="Did you update these files?" />
         <exec executable="ls" failonerror="true">