Author: markrmiller
Date: Fri Mar 19 13:01:40 2010
New Revision: 925206
URL: http://svn.apache.org/viewvc?rev=925206&view=rev
Log:
clean up ant a bit - take dupe refs to Lucene classes out of solr contribs
Modified:
lucene/solr/branches/newtrunk/solr/build.xml
lucene/solr/branches/newtrunk/solr/common-build.xml
lucene/solr/branches/newtrunk/solr/contrib/clustering/build.xml
lucene/solr/branches/newtrunk/solr/contrib/dataimporthandler/build.xml
lucene/solr/branches/newtrunk/solr/contrib/extraction/build.xml
lucene/solr/branches/newtrunk/solr/contrib/velocity/build.xml
Modified: lucene/solr/branches/newtrunk/solr/build.xml
URL:
http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/build.xml?rev=925206&r1=925205&r2=925206&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/build.xml (original)
+++ lucene/solr/branches/newtrunk/solr/build.xml Fri Mar 19 13:01:40 2010
@@ -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">
Modified: lucene/solr/branches/newtrunk/solr/common-build.xml
URL:
http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/common-build.xml?rev=925206&r1=925205&r2=925206&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/common-build.xml (original)
+++ lucene/solr/branches/newtrunk/solr/common-build.xml Fri Mar 19 13:01:40 2010
@@ -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">
Modified: lucene/solr/branches/newtrunk/solr/contrib/clustering/build.xml
URL:
http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/contrib/clustering/build.xml?rev=925206&r1=925205&r2=925206&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/contrib/clustering/build.xml (original)
+++ lucene/solr/branches/newtrunk/solr/contrib/clustering/build.xml Fri Mar 19
13:01:40 2010
@@ -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"/>
Modified: lucene/solr/branches/newtrunk/solr/contrib/dataimporthandler/build.xml
URL:
http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/contrib/dataimporthandler/build.xml?rev=925206&r1=925205&r2=925206&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/contrib/dataimporthandler/build.xml
(original)
+++ lucene/solr/branches/newtrunk/solr/contrib/dataimporthandler/build.xml Fri
Mar 19 13:01:40 2010
@@ -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
Modified: lucene/solr/branches/newtrunk/solr/contrib/extraction/build.xml
URL:
http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/contrib/extraction/build.xml?rev=925206&r1=925205&r2=925206&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/contrib/extraction/build.xml (original)
+++ lucene/solr/branches/newtrunk/solr/contrib/extraction/build.xml Fri Mar 19
13:01:40 2010
@@ -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.
Modified: lucene/solr/branches/newtrunk/solr/contrib/velocity/build.xml
URL:
http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/contrib/velocity/build.xml?rev=925206&r1=925205&r2=925206&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/contrib/velocity/build.xml (original)
+++ lucene/solr/branches/newtrunk/solr/contrib/velocity/build.xml Fri Mar 19
13:01:40 2010
@@ -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
