From 061f96ad89c02e42fcc63308613ae3558895172f Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Mon, 23 Jan 2012 16:44:08 +0000
Subject: [PATCH] Use ${ant.home}/lib/ant.jar instead of pulling ant.jar from
 Jetty

---
 apps/i2ptunnel/java/build.xml     | 2 +-
 apps/jetty/build.xml              | 1 -
 apps/routerconsole/java/build.xml | 2 +-
 apps/susidns/src/build.xml        | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/apps/i2ptunnel/java/build.xml b/apps/i2ptunnel/java/build.xml
index a9b3128f0..63885b85e 100644
--- a/apps/i2ptunnel/java/build.xml
+++ b/apps/i2ptunnel/java/build.xml
@@ -174,7 +174,7 @@
                 <pathelement location="../../jetty/jettylib/commons-logging.jar" />
                 <pathelement location="../../jetty/jettylib/commons-el.jar" />
                 <pathelement location="../../jetty/jettylib/jsp-api.jar" />
-                <pathelement location="../../jetty/jettylib/ant.jar" />
+                <pathelement location="${ant.home}/lib/ant.jar" />
                 <pathelement location="build/i2ptunnel.jar" />
                 <pathelement location="build/temp-beans.jar" />
             </classpath>
diff --git a/apps/jetty/build.xml b/apps/jetty/build.xml
index ec85c3bb4..7d4c824cf 100644
--- a/apps/jetty/build.xml
+++ b/apps/jetty/build.xml
@@ -95,7 +95,6 @@
         <copy preservelastmodified="true" file="${jetty.base}/lib/ext/jetty-rewrite-handler-${jetty.ver}.jar" tofile="jettylib/jetty-rewrite-handler.jar" />
         <copy preservelastmodified="true" file="${jetty.base}/lib/ext/jetty-sslengine-${jetty.ver}.jar" tofile="jettylib/jetty-sslengine.jar" />
         <copy preservelastmodified="true" file="${jetty.base}/lib/management/jetty-management-${jetty.ver}.jar" tofile="jettylib/org.mortbay.jmx.jar" />
-        <copy file="${jetty.base}/lib/jsp-2.1/ant-1.6.5.jar" tofile="jettylib/ant.jar" />
         <delete file="jetty.tar" />
         <delete dir="${jetty.base}" />
         <!-- commons-logging.jar not in Jetty 6 but we have it in launch4j so copy it over, we need it
diff --git a/apps/routerconsole/java/build.xml b/apps/routerconsole/java/build.xml
index e5ea215aa..ab5e8d775 100644
--- a/apps/routerconsole/java/build.xml
+++ b/apps/routerconsole/java/build.xml
@@ -247,7 +247,7 @@
                 <pathelement location="../../jetty/jettylib/commons-logging.jar" />
                 <pathelement location="../../jetty/jettylib/commons-el.jar" />
                 <pathelement location="../../jetty/jettylib/jsp-api.jar" />
-                <pathelement location="../../jetty/jettylib/ant.jar" />
+                <pathelement location="${ant.home}/lib/ant.jar" />
                 <pathelement location="../../jetty/jettylib/jetty-i2p.jar" />
                 <pathelement location="../../systray/java/build/obj" />
                 <pathelement location="../../systray/java/lib/systray4j.jar" />
diff --git a/apps/susidns/src/build.xml b/apps/susidns/src/build.xml
index 76831b2d1..78975eaf5 100644
--- a/apps/susidns/src/build.xml
+++ b/apps/susidns/src/build.xml
@@ -20,7 +20,7 @@
         <pathelement location="${lib}/jsp-api.jar" />
         <pathelement location="${lib}/commons-logging.jar" />
         <pathelement location="${lib}/commons-el.jar" />
-        <pathelement location="${lib}/ant.jar" />
+        <pathelement location="${ant.home}/lib/ant.jar" />
         <pathelement location="../../../core/java/build/i2p.jar" />
  	</path>
 	<property name="javac.compilerargs" value="" />