You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/03/28 09:24:00 UTC
svn commit: r1306192 - in /lucene/dev/branches/lucene3930/solr:
common-build.xml contrib/dataimporthandler-extras/build.xml
contrib/langid/build.xml
Author: rmuir
Date: Wed Mar 28 07:24:00 2012
New Revision: 1306192
URL: http://svn.apache.org/viewvc?rev=1306192&view=rev
Log:
SOLR-3930: fix wildcarding
Modified:
lucene/dev/branches/lucene3930/solr/common-build.xml
lucene/dev/branches/lucene3930/solr/contrib/dataimporthandler-extras/build.xml
lucene/dev/branches/lucene3930/solr/contrib/langid/build.xml
Modified: lucene/dev/branches/lucene3930/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/common-build.xml?rev=1306192&r1=1306191&r2=1306192&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/common-build.xml (original)
+++ lucene/dev/branches/lucene3930/solr/common-build.xml Wed Mar 28 07:24:00 2012
@@ -60,13 +60,11 @@
</condition>
<path id="additional.dependencies">
- <fileset dir="${common-solr.dir}/lib" includes="**/*.jar"/>
- <fileset dir="${common-solr.dir}/example/lib" includes="**/*.jar"/>
- <fileset dir="lib" includes="**/*.jar" erroronmissingdir="false"/>
+ <fileset dir="${common-solr.dir}/lib" excludes="*.txt,*.template"/>
+ <fileset dir="${common-solr.dir}/example/lib" excludes="*.txt,*.template"/>
+ <fileset dir="lib" excludes="*.txt,*.template" erroronmissingdir="false"/>
</path>
- <pathconvert property="project.classpath" targetos="unix" refid="additional.dependencies"/>
-
<import file="${common-solr.dir}/../lucene/contrib/contrib-build.xml"/>
<!-- Solr Specification Version
@@ -94,6 +92,7 @@
<pathelement path="${queryparser.jar}"/>
<pathelement location="${common-solr.dir}/build/solr-solrj/classes/java"/>
<pathelement location="${common-solr.dir}/build/solr-core/classes/java"/>
+ <path refid="additional.dependencies"/>
<path refid="base.classpath"/>
</path>
Modified: lucene/dev/branches/lucene3930/solr/contrib/dataimporthandler-extras/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/contrib/dataimporthandler-extras/build.xml?rev=1306192&r1=1306191&r2=1306192&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/contrib/dataimporthandler-extras/build.xml (original)
+++ lucene/dev/branches/lucene3930/solr/contrib/dataimporthandler-extras/build.xml Wed Mar 28 07:24:00 2012
@@ -48,10 +48,8 @@
<path id="classpath">
<pathelement location="${common-solr.dir}/build/contrib/solr-dataimporthandler/classes/java"/>
<pathelement location="${common-solr.dir}/build/contrib/solr-dataimporthandler/classes/test"/>
- <pathelement location="${common-solr.dir}/contrib/dataimporthandler/lib/activation-1.1.jar"/>
- <pathelement location="${common-solr.dir}/contrib/dataimporthandler/lib/mail-1.4.1.jar"/>
- <!-- FIXME: nuke wildcarding -->
- <fileset dir="${common-solr.dir}/contrib/extraction/lib" includes="**/*.jar"/>
+ <fileset dir="${common-solr.dir}/contrib/dataimporthandler/lib" excludes="*.txt"/>
+ <fileset dir="${common-solr.dir}/contrib/extraction/lib" excludes="*.txt"/>
<path refid="solr.base.classpath"/>
</path>
Modified: lucene/dev/branches/lucene3930/solr/contrib/langid/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/solr/contrib/langid/build.xml?rev=1306192&r1=1306191&r2=1306192&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/solr/contrib/langid/build.xml (original)
+++ lucene/dev/branches/lucene3930/solr/contrib/langid/build.xml Wed Mar 28 07:24:00 2012
@@ -26,8 +26,8 @@
<import file="../contrib-build.xml"/>
<path id="classpath">
- <fileset dir="../extraction/lib" includes="*.jar"/>
- <fileset dir="lib" includes="*.jar"/>
+ <fileset dir="../extraction/lib" excludes="*.txt"/>
+ <fileset dir="lib" excludes="*.txt"/>
<path refid="solr.base.classpath"/>
</path>