From 874e7b95f7551ee23d11d71f196d4847f9dc931c Mon Sep 17 00:00:00 2001
From: Grant Ingersoll <gsingers@apache.org>
Date: Mon, 29 Mar 2010 15:52:39 +0000
Subject: [PATCH] Fix the Luke target to work with the new layout, classpaths,
 etc.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@928809 13f79535-47bb-0310-9956-ffa450edef68
---
 solr/build.xml | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/solr/build.xml b/solr/build.xml
index 719e4e66b8b..cffbf97b7b4 100644
--- a/solr/build.xml
+++ b/solr/build.xml
@@ -960,14 +960,12 @@
   <!-- ========================================================================= -->
   <!-- ===================== Runtime: luke         ============================= -->
   <!-- ========================================================================= -->
-
-  <available file="luke/luke-0.9.9.jar" property="luke.jar.exists" />
+  <property  name="luke.version" value="1.0.0"/>
+  <available file="luke/luke-${luke.version}.jar" property="luke.jar.exists" />
   <target name="luke-download" unless="luke.jar.exists" depends="proxy.setup">
     <mkdir dir="luke"/>
-    <get src="http://www.getopt.org/luke/luke-0.9.9/luke-0.9.9.jar" 
-        dest="luke/luke-0.9.9.jar"/>
-    <get src="http://people.apache.org/repo/m2-ibiblio-rsync-repository/org/apache/lucene/lucene-misc/2.9.1/lucene-misc-2.9.1.jar" 
-        dest="luke/lucene-misc-2.9.0.jar" />
+    <get src="http://luke.googlecode.com/files/luke-${luke.version}.jar"
+        dest="luke/luke-${luke.version}.jar"/>
   </target>
   
   <target name="luke" depends="luke-download">
@@ -976,13 +974,11 @@
           logError="true"
           failonerror="true">
       <classpath>
-        <fileset dir="${lib}">
-          <include name="*.jar" />
-        </fileset>
         <fileset dir="luke">
-          <include name="luke-0.9.9.jar"/>
-          <include name="lucene-misc-2.9.0.jar"/>
+          <include name="luke-${luke.version}.jar"/>
         </fileset>
+        <path refid="lucene.classpath"/>
+        <path refid="test.run.classpath"/>
        </classpath>
     </java>
   </target>