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
This commit is contained in:
Mark Robert Miller 2010-03-19 13:01:40 +00:00
parent 0d10770063
commit 676a9ca51d
6 changed files with 14 additions and 62 deletions

View File

@ -116,18 +116,6 @@
<!-- ===================== COMPILATION-RELATED TASKS ========================= --> <!-- ===================== 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 --> <!-- The compilation classpath -->
<path id="compile.classpath"> <path id="compile.classpath">
<fileset dir="${lib}"> <fileset dir="${lib}">

View File

@ -21,7 +21,7 @@
for standalone use. for standalone use.
</description> </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 --> <!-- Initialize property values: allow easy customization via build.properties -->
<property file="build.properties" /> <property file="build.properties" />
@ -142,6 +142,18 @@
</and> </and>
</condition> </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 --> <!-- Macro for compilation -->
<macrodef name="solr-javac"> <macrodef name="solr-javac">

View File

@ -30,18 +30,6 @@
<property name="download.dir" value="lib/downloads"/> <property name="download.dir" value="lib/downloads"/>
<property name="example.local" value="example"/> <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"> <path id="common.classpath">
<fileset dir="lib"/> <fileset dir="lib"/>
<fileset dir="${download.dir}"/> <fileset dir="${download.dir}"/>

View File

@ -24,18 +24,6 @@
<import file="../../common-build.xml"/> <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> <description>
Data Import Handler Data Import Handler
</description> </description>

View File

@ -25,18 +25,6 @@
<import file="../../common-build.xml"/> <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> <description>
Solr Integration with Tika for extracting content from binary file formats such as Microsoft Word and Adobe PDF. Solr Integration with Tika for extracting content from binary file formats such as Microsoft Word and Adobe PDF.
</description> </description>

View File

@ -23,18 +23,6 @@
<import file="../../common-build.xml"/> <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> <description>
Solritas: Velocity Response Writer Solritas: Velocity Response Writer
</description> </description>