From 676a9ca51dbe64135ff641865dfdd1f623cebb36 Mon Sep 17 00:00:00 2001
From: Mark Robert Miller <markrmiller@apache.org>
Date: Fri, 19 Mar 2010 13:01:40 +0000
Subject: [PATCH] clean up ant a bit - take dupe refs to Lucene classes out of
 solr contribs

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/branches/newtrunk@925206 13f79535-47bb-0310-9956-ffa450edef68
---
 solr/build.xml                           | 12 ------------
 solr/common-build.xml                    | 14 +++++++++++++-
 solr/contrib/clustering/build.xml        | 12 ------------
 solr/contrib/dataimporthandler/build.xml | 12 ------------
 solr/contrib/extraction/build.xml        | 12 ------------
 solr/contrib/velocity/build.xml          | 14 +-------------
 6 files changed, 14 insertions(+), 62 deletions(-)

diff --git a/solr/build.xml b/solr/build.xml
index 1267da8be36..4014df8c1d8 100644
--- a/solr/build.xml
+++ b/solr/build.xml
@@ -115,18 +115,6 @@
   <!-- ========================================================================= -->
   <!-- ===================== COMPILATION-RELATED TASKS ========================= -->
   <!-- ========================================================================= -->
-
-  <path id="lucene.classpath">
-    <pathelement location="../lucene/build/classes/java" />
-    <pathelement location="../lucene/build/contrib/analyzers/common/classes/java" />
-    <pathelement location="../lucene/build/contrib/fast-vector-highlighter/classes/java" />
-    <pathelement location="../lucene/build/contrib/highlighter/classes/java" />
-    <pathelement location="../lucene/build/contrib/memory/classes/java" />
-    <pathelement location="../lucene/build/contrib/misc/classes/java" />
-    <pathelement location="../lucene/build/contrib/queries/classes/java" />
-    <pathelement location="../lucene/build/contrib/spatial/classes/java" />
-    <pathelement location="../lucene/build/contrib/spellchecker/classes/java" />
-  </path>
   
   <!-- The compilation classpath -->
   <path id="compile.classpath">
diff --git a/solr/common-build.xml b/solr/common-build.xml
index 5cca8b89dc0..0e5ecf37c6a 100644
--- a/solr/common-build.xml
+++ b/solr/common-build.xml
@@ -21,7 +21,7 @@
     for standalone use.
   </description>
 
-  <dirname file="${ant.file.common}" property="common-solr.dir"/>
+  <dirname file="${ant.file.common-solr}" property="common-solr.dir"/>
   
   <!-- Initialize property values: allow easy customization via build.properties -->
   <property file="build.properties" />
@@ -142,6 +142,18 @@
        </and>
    </condition>
    
+  <path id="lucene.classpath">
+    <pathelement location="${common-solr.dir}/../lucene/build/classes/java" />
+    <pathelement location="${common-solr.dir}/../lucene/build/contrib/analyzers/common/classes/java" />
+    <pathelement location="${common-solr.dir}/../lucene/build/contrib/fast-vector-highlighter/classes/java" />
+    <pathelement location="${common-solr.dir}/../lucene/build/contrib/highlighter/classes/java" />
+    <pathelement location="${common-solr.dir}/../lucene/build/contrib/memory/classes/java" />
+    <pathelement location="${common-solr.dir}/../lucene/build/contrib/misc/classes/java" />
+    <pathelement location="${common-solr.dir}/../lucene/build/contrib/queries/classes/java" />
+    <pathelement location="${common-solr.dir}/../lucene/build/contrib/spatial/classes/java" />
+    <pathelement location="${common-solr.dir}/../lucene/build/contrib/spellchecker/classes/java" />
+  </path>   
+   
    
   <!-- Macro for compilation -->
   <macrodef name="solr-javac">
diff --git a/solr/contrib/clustering/build.xml b/solr/contrib/clustering/build.xml
index 4642103a47b..8d654c6de56 100644
--- a/solr/contrib/clustering/build.xml
+++ b/solr/contrib/clustering/build.xml
@@ -29,18 +29,6 @@
 
   <property name="download.dir" value="lib/downloads"/>
   <property name="example.local" value="example"/>
-
-  <path id="lucene.classpath">
-    <pathelement location="../../../lucene/build/classes/java" />
-    <pathelement location="../../../lucene/build/contrib/analyzers/common/classes/java" />
-    <pathelement location="../../../lucene/build/contrib/fast-vector-highlighter/classes/java" />
-    <pathelement location="../../../lucene/build/contrib/highlighter/classes/java" />
-    <pathelement location="../../../lucene/build/contrib/memory/classes/java" />
-    <pathelement location="../../../lucene/build/contrib/misc/classes/java" />
-    <pathelement location="../../../lucene/build/contrib/queries/classes/java" />
-    <pathelement location="../../../lucene/build/contrib/spatial/classes/java" />
-    <pathelement location="../../../lucene/build/contrib/spellchecker/classes/java" />
-  </path>  
   
   <path id="common.classpath">
     <fileset dir="lib"/>
diff --git a/solr/contrib/dataimporthandler/build.xml b/solr/contrib/dataimporthandler/build.xml
index d506ba81d99..3d0cb120e53 100644
--- a/solr/contrib/dataimporthandler/build.xml
+++ b/solr/contrib/dataimporthandler/build.xml
@@ -23,18 +23,6 @@
   <property name="tikalibs-path" value="../extraction/lib" />
 
   <import file="../../common-build.xml"/>
-
-  <path id="lucene.classpath">
-    <pathelement location="../../../lucene/build/classes/java" />
-    <pathelement location="../../../lucene/build/contrib/analyzers/common/classes/java" />
-    <pathelement location="../../../lucene/build/contrib/fast-vector-highlighter/classes/java" />
-    <pathelement location="../../../lucene/build/contrib/highlighter/classes/java" />
-    <pathelement location="../../../lucene/build/contrib/memory/classes/java" />
-    <pathelement location="../../../lucene/build/contrib/misc/classes/java" />
-    <pathelement location="../../../lucene/build/contrib/queries/classes/java" />
-    <pathelement location="../../../lucene/build/contrib/spatial/classes/java" />
-    <pathelement location="../../../lucene/build/contrib/spellchecker/classes/java" />
-  </path>  
   
   <description>
     Data Import Handler
diff --git a/solr/contrib/extraction/build.xml b/solr/contrib/extraction/build.xml
index 510970249ee..634e61cc24c 100644
--- a/solr/contrib/extraction/build.xml
+++ b/solr/contrib/extraction/build.xml
@@ -24,18 +24,6 @@
   <property name="tika.lib" value="lib/tika-${tika.version}-standalone.jar"/>
 
   <import file="../../common-build.xml"/>
-
-  <path id="lucene.classpath">
-    <pathelement location="../../../lucene/build/classes/java" />
-    <pathelement location="../../../lucene/build/contrib/analyzers/common/classes/java" />
-    <pathelement location="../../../lucene/build/contrib/fast-vector-highlighter/classes/java" />
-    <pathelement location="../../../lucene/build/contrib/highlighter/classes/java" />
-    <pathelement location="../../../lucene/build/contrib/memory/classes/java" />
-    <pathelement location="../../../lucene/build/contrib/misc/classes/java" />
-    <pathelement location="../../../lucene/build/contrib/queries/classes/java" />
-    <pathelement location="../../../lucene/build/contrib/spatial/classes/java" />
-    <pathelement location="../../../lucene/build/contrib/spellchecker/classes/java" />
-  </path>  
   
   <description>
     Solr Integration with Tika for extracting content from binary file formats such as Microsoft Word and Adobe PDF.
diff --git a/solr/contrib/velocity/build.xml b/solr/contrib/velocity/build.xml
index a0faaa8a8d4..58304caea83 100644
--- a/solr/contrib/velocity/build.xml
+++ b/solr/contrib/velocity/build.xml
@@ -21,19 +21,7 @@
 
   <property name="solr-path" value="../.." />
 
-  <import file="../../common-build.xml"/>
-
-  <path id="lucene.classpath">
-    <pathelement location="../../../lucene/build/classes/java" />
-    <pathelement location="../../../lucene/build/contrib/analyzers/common/classes/java" />
-    <pathelement location="../../../lucene/build/contrib/fast-vector-highlighter/classes/java" />
-    <pathelement location="../../../lucene/build/contrib/highlighter/classes/java" />
-    <pathelement location="../../../lucene/build/contrib/memory/classes/java" />
-    <pathelement location="../../../lucene/build/contrib/misc/classes/java" />
-    <pathelement location="../../../lucene/build/contrib/queries/classes/java" />
-    <pathelement location="../../../lucene/build/contrib/spatial/classes/java" />
-    <pathelement location="../../../lucene/build/contrib/spellchecker/classes/java" />
-  </path>    
+  <import file="../../common-build.xml"/>   
   
   <description>
     Solritas: Velocity Response Writer