Author: hossman
Date: Tue Oct 13 18:58:59 2009
New Revision: 824882
URL: http://svn.apache.org/viewvc?rev=824882&view=rev
Log:
make all examples of refrencing solr jars consistent across the various
solrconfig.xml files - new regex will match official version numbers, dev
version numbers, and 'nightly' version numbers, but will prevent the JVM from
loading the 'src' and 'doc' jars
Modified:
lucene/solr/trunk/contrib/clustering/example/conf/solrconfig.xml
lucene/solr/trunk/example/example-DIH/solr/mail/conf/solrconfig.xml
lucene/solr/trunk/example/solr/conf/solrconfig.xml
Modified: lucene/solr/trunk/contrib/clustering/example/conf/solrconfig.xml
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/clustering/example/conf/solrconfig.xml?rev=824882&r1=824881&r2=824882&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/clustering/example/conf/solrconfig.xml (original)
+++ lucene/solr/trunk/contrib/clustering/example/conf/solrconfig.xml Tue Oct 13
18:58:59 2009
@@ -26,7 +26,7 @@
-->
<abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError>
- <lib dir="../../../dist/" regex="apache-solr-clustering-(\d|\.)+-.*\.jar" />
+ <lib dir="../../../dist/" regex="apache-solr-clustering-(nightly|\d).*\.jar"
/>
<lib dir="../lib" />
<!-- these jars are not inlcuded in the release because of their licenses,
they will be downlodded when 'ant example' is run
Modified: lucene/solr/trunk/example/example-DIH/solr/mail/conf/solrconfig.xml
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/example/example-DIH/solr/mail/conf/solrconfig.xml?rev=824882&r1=824881&r2=824882&view=diff
==============================================================================
--- lucene/solr/trunk/example/example-DIH/solr/mail/conf/solrconfig.xml
(original)
+++ lucene/solr/trunk/example/example-DIH/solr/mail/conf/solrconfig.xml Tue Oct
13 18:58:59 2009
@@ -27,7 +27,7 @@
<abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError>
<lib dir="../../../../contrib/dataimporthandler/lib/" regex=".*jar$" />
- <lib dir="../../../../dist/"
regex="apache-solr-dataimporthandler-extras.*jar" />
+ <lib dir="../../../../dist/"
regex="apache-solr-dataimporthandler-extras-(nightly|\d).*jar" />
<indexDefaults>
<!-- Values here affect all index writers and act as a default unless
overridden. -->
Modified: lucene/solr/trunk/example/solr/conf/solrconfig.xml
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/example/solr/conf/solrconfig.xml?rev=824882&r1=824881&r2=824882&view=diff
==============================================================================
--- lucene/solr/trunk/example/solr/conf/solrconfig.xml (original)
+++ lucene/solr/trunk/example/solr/conf/solrconfig.xml Tue Oct 13 18:58:59 2009
@@ -51,7 +51,7 @@
directory which completely match the regex (anchored on both ends)
will be included.
-->
- <lib dir="../../dist/" regex="apache-solr-cell-.*\.jar" />
+ <lib dir="../../dist/" regex="apache-solr-cell-(nightly|\d).*\.jar" />
<!-- If a dir option (with or without a regex) is used and nothing is found
that matches, it will be ignored
-->
