From 4c99ab04029f7dce8c7cf26d7fd0d0469633f172 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Tue, 5 Nov 2013 23:15:34 +0000
Subject: [PATCH] Remove Jetty version from library paths

To build, i2p.i2p must be built first.
---
 src/build.xml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/build.xml b/src/build.xml
index f1d817a..c80883f 100644
--- a/src/build.xml
+++ b/src/build.xml
@@ -2,7 +2,6 @@
 <project basedir="." default="all" name="I2PControl">
     <property name="i2pbase" value="../../i2p.i2p"/>
     <property name="i2plib" value="${i2pbase}/build"/>
-    <property name="jetty" value="${i2pbase}/apps/jetty/jetty-distribution-7.6.13.v20130916/lib"/>
     <property name="jettylib" value="${i2pbase}/apps/jetty/jettylib"/>
 	<property name="wrapperlib" value="${i2pbase}/installer/lib/wrapper/all"/>
 
@@ -14,11 +13,11 @@
         <pathelement location="${i2plib}/org.mortbay.jetty.jar" />
         <pathelement location="${i2plib}/javax.servlet.jar" />
         <pathelement location="${ant.home}/lib/ant.jar"/>
-        <pathelement location="${jetty}/jetty-http-7.6.13.v20130916.jar" />
-        <pathelement location="${jetty}/jetty-server-7.6.13.v20130916.jar"/>
-        <pathelement location="${jetty}/jetty-servlet-7.6.13.v20130916.jar" />
-        <pathelement location="${jetty}/jetty-servlets-7.6.13.v20130916.jar" />
-        <pathelement location="${jetty}/jetty-util-7.6.13.v20130916.jar" />
+        <pathelement location="${jettylib}/jetty-http.jar" />
+        <pathelement location="${jettylib}/jetty-server.jar"/>
+        <pathelement location="${jettylib}/jetty-servlet.jar" />
+        <pathelement location="${jettylib}/jetty-servlets.jar" />
+        <pathelement location="${jettylib}/jetty-util.jar" />
         <pathelement location="${jettylib}/jasper-compiler.jar" />
         <pathelement location="${jettylib}/jasper-runtime.jar" />
         <pathelement location="${jettylib}/commons-logging.jar" />