From a5c4ba3bff5082fc3c4376bfe510bec2b10f8403 Mon Sep 17 00:00:00 2001
From: zzz <zzz>
Date: Sat, 3 Mar 2007 20:30:52 +0000
Subject: [PATCH] 2007-03-03  zzz     * Upgrade from Jetty 5.1.6 to 5.1.12
 which fixes spaces in URL     * Add a updaterWithJetty build target

---
 apps/jetty/build.xml                            | 17 ++++++++---------
 build.xml                                       | 14 ++++++++++++++
 history.txt                                     |  6 +++++-
 .../java/src/net/i2p/router/RouterVersion.java  |  4 ++--
 4 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/apps/jetty/build.xml b/apps/jetty/build.xml
index d7d6a68df..6688f0059 100644
--- a/apps/jetty/build.xml
+++ b/apps/jetty/build.xml
@@ -3,29 +3,30 @@
         
     <target name="all" depends="build" />
     <target name="fetchJettylib" >
-        <available property="jetty.available" file="jetty-5.1.6.zip" />
+        <available property="jetty.available" file="jetty-5.1.12.zip" />
         <ant target="doFetchJettylib" />
     </target>
     <target name="doFetchJettylib" unless="jetty.available" >
-        <echo message="The libraries contained within the fetched file are from Jetty's 5.1.6" />
+        <echo message="The libraries contained within the fetched file are from Jetty's 5.1.12" />
         <echo message="distribution (http://jetty.mortbay.org/).  These are not " />
         <echo message="necessary for using I2P, but are used by some applications on top of I2P," />
         <echo message="such as the routerconsole." />
-        <get src="http://mesh.dl.sourceforge.net/sourceforge/jetty/jetty-5.1.6.zip" verbose="true" dest="jetty-5.1.6.zip" />
+        <get src="http://mesh.dl.sourceforge.net/sourceforge/jetty/jetty-5.1.12.zip" verbose="true" dest="jetty-5.1.12.zip" />
         <ant target="doExtract" />
     </target>
     <target name="doExtract">
-        <unzip src="jetty-5.1.6.zip" dest="." />
+        <unzip src="jetty-5.1.12.zip" dest="." />
         <mkdir dir="jettylib" />
         <copy todir="jettylib">
-            <fileset dir="jetty-5.1.6/lib">
+            <fileset dir="jetty-5.1.12/lib">
                 <include name="*.jar" />
             </fileset>
         </copy>
         <copy todir="jettylib">
-            <fileset dir="jetty-5.1.6/ext">
+            <fileset dir="jetty-5.1.12/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" />
@@ -33,9 +34,7 @@
                 <include name="xercesImpl.jar" />
             </fileset>
         </copy>
-	<!-- note the rename, to keep compat with old rev, since we only used the API anyway -->
-	<copy file="jetty-5.1.6/ext/commons-logging-api.jar" tofile="jettylib/commons-logging.jar" />
-        <delete dir="jetty-5.1.6" />
+        <delete dir="jetty-5.1.12" />
     </target>
     <target name="build" depends="fetchJettylib" />
     <target name="builddep" />
diff --git a/build.xml b/build.xml
index a2fabc3d5..a3a737d9b 100644
--- a/build.xml
+++ b/build.xml
@@ -7,6 +7,7 @@
         <echo message="  installer: build the GUI installer" />
         <echo message="  tarball:   tar the full install into i2p.tar.bz2 (extracts to build a new clean install)" />
         <echo message="  updater:   tar the built i2p specific files into an i2pupdate.zip (extracts safely over existing installs)" />
+        <echo message="  updaterWithJetty:   tar the built i2p specific files and jetty into an i2pupdate.zip (extracts safely over existing installs)" />
         <echo message="  distclean: clean up all derived files" />
         <echo message="  syndie:    generate a standalone syndie install" />
         <echo message="  i2psnark:  generate a standalone i2psnark install" />
@@ -292,6 +293,9 @@
     <target name="updater" depends="prepupdate">
         <zip destfile="i2pupdate.zip" basedir="pkg-temp" />
     </target>
+    <target name="updaterWithJetty" depends="prepjupdate">
+        <zip destfile="i2pupdate.zip" basedir="pkg-temp" />
+    </target>
     <target name="updateTest" depends="prepupdate">
         <ant dir="core/java/" target="jarTest" />    
         <copy file="core/java/build/i2ptest.jar" todir="pkg-temp/lib" />
@@ -353,6 +357,16 @@
 	<copy file="installer/resources/blogMeta.snm" tofile="pkg-temp/syndie/archive/ovpBy2mpO1CQ7deYhQ1cDGAwI6pQzLbWOm1Sdd0W06c=/meta.snm" />
 	<copy file="installer/resources/blogPost.snd" tofile="pkg-temp/syndie/archive/ovpBy2mpO1CQ7deYhQ1cDGAwI6pQzLbWOm1Sdd0W06c=/1132012800001.snd" />
     </target>
+    <target name="prepjupdate" depends="prepupdate, buildWEB">
+        <copy file="build/ant.jar" todir="pkg-temp/lib/" />
+        <copy file="build/jasper-compiler.jar" todir="pkg-temp/lib/" />
+        <copy file="build/jasper-runtime.jar" todir="pkg-temp/lib/" />
+        <copy file="build/commons-logging.jar" todir="pkg-temp/lib/" />
+        <copy file="build/commons-el.jar" todir="pkg-temp/lib/" />
+        <copy file="build/javax.servlet.jar" todir="pkg-temp/lib/" />
+        <copy file="build/org.mortbay.jetty.jar" todir="pkg-temp/lib/" />
+        <copy file="build/xercesImpl.jar" todir="pkg-temp/lib/" />
+    </target>
     <target name="installer" depends="preppkg">
         <taskdef name="izpack" classpath="${basedir}/installer/lib/izpack/standalone-compiler.jar" classname="com.izforge.izpack.ant.IzPackTask" />
         <jar destfile="./pkg-temp/lib/copy.jar" basedir="./core/java/build/obj" includes="net/i2p/util/*.class">
diff --git a/history.txt b/history.txt
index a78401617..d8a97c9e6 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,8 @@
-$Id: history.txt,v 1.553 2007-02-28 21:29:12 zzz Exp $
+$Id: history.txt,v 1.554 2007-03-03 15:11:07 zzz Exp $
+
+2007-03-03  zzz
+    * Upgrade from Jetty 5.1.6 to 5.1.12 which fixes spaces in URL
+    * Add a updaterWithJetty build target
 
 2007-03-03  zzz
     * Implement priority sending for NTCP
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 25181e746..156898edf 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
  *
  */
 public class RouterVersion {
-    public final static String ID = "$Revision: 1.489 $ $Date: 2007-02-28 21:29:11 $";
+    public final static String ID = "$Revision: 1.490 $ $Date: 2007-03-03 15:11:05 $";
     public final static String VERSION = "0.6.1.27";
-    public final static long BUILD = 3;
+    public final static long BUILD = 4;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
         System.out.println("Router ID: " + RouterVersion.ID);