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 2010/12/01 13:37:03 UTC
svn commit: r1040982 - in /lucene/dev/trunk/solr:
contrib/clustering/src/test/resources/solr/conf/
contrib/dataimporthandler/src/extras/test/resources/solr/conf/
contrib/dataimporthandler/src/test/resources/solr/conf/
contrib/extraction/src/test/resour...
Author: rmuir
Date: Wed Dec 1 12:37:01 2010
New Revision: 1040982
URL: http://svn.apache.org/viewvc?rev=1040982&view=rev
Log:
SOLR-2259: use $tests.luceneMatchVersion in all test files, make this parameter mandatory in trunk
Modified:
lucene/dev/trunk/solr/contrib/clustering/src/test/resources/solr/conf/solrconfig.xml
lucene/dev/trunk/solr/contrib/dataimporthandler/src/extras/test/resources/solr/conf/dataimport-solrconfig.xml
lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/resources/solr/conf/contentstream-solrconfig.xml
lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/resources/solr/conf/dataimport-nodatasource-solrconfig.xml
lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/resources/solr/conf/dataimport-solrconfig.xml
lucene/dev/trunk/solr/contrib/extraction/src/test/resources/solr/conf/schema.xml
lucene/dev/trunk/solr/contrib/extraction/src/test/resources/solr/conf/solrconfig.xml
lucene/dev/trunk/solr/example/multicore/core0/conf/solrconfig.xml
lucene/dev/trunk/solr/example/multicore/core1/conf/solrconfig.xml
lucene/dev/trunk/solr/src/java/org/apache/solr/core/SolrConfig.java
lucene/dev/trunk/solr/src/test/test-files/solr/conf/bad_solrconfig.xml
lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-SOLR-749.xml
lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-altdirectory.xml
lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-delpolicy1.xml
lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-delpolicy2.xml
lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-duh-optimize.xml
lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-elevate.xml
lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-enableplugin.xml
lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-functionquery.xml
lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-highlight.xml
lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-legacy.xml
lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-master.xml
lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-master1.xml
lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-master2.xml
lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-nocache.xml
lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-propinject-indexdefault.xml
lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-propinject.xml
lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-querysender.xml
lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-slave.xml
lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-slave1.xml
lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-solcoreproperties.xml
lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-spellcheckcomponent.xml
lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-spellchecker.xml
lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-termindex.xml
lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-transformers.xml
lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-xinclude.xml
lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig.xml
lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig_perf.xml
lucene/dev/trunk/solr/src/test/test-files/solr/crazy-path-to-config.xml
lucene/dev/trunk/solr/src/test/test-files/solr/shared/conf/solrconfig.xml
Modified: lucene/dev/trunk/solr/contrib/clustering/src/test/resources/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/clustering/src/test/resources/solr/conf/solrconfig.xml?rev=1040982&r1=1040981&r2=1040982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/clustering/src/test/resources/solr/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/contrib/clustering/src/test/resources/solr/conf/solrconfig.xml Wed Dec 1 12:37:01 2010
@@ -17,6 +17,7 @@
-->
<config>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<!-- Set this to 'false' if you want solr to continue working after it has
encountered an severe configuration error. In a production environment,
you may want solr to keep working even if one handler is mis-configured.
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/extras/test/resources/solr/conf/dataimport-solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/extras/test/resources/solr/conf/dataimport-solrconfig.xml?rev=1040982&r1=1040981&r2=1040982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/extras/test/resources/solr/conf/dataimport-solrconfig.xml (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/extras/test/resources/solr/conf/dataimport-solrconfig.xml Wed Dec 1 12:37:01 2010
@@ -17,6 +17,7 @@
-->
<config>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<!-- Set this to 'false' if you want solr to continue working after it has
encountered an severe configuration error. In a production environment,
you may want solr to keep working even if one handler is mis-configured.
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/resources/solr/conf/contentstream-solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/resources/solr/conf/contentstream-solrconfig.xml?rev=1040982&r1=1040981&r2=1040982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/resources/solr/conf/contentstream-solrconfig.xml (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/resources/solr/conf/contentstream-solrconfig.xml Wed Dec 1 12:37:01 2010
@@ -17,6 +17,7 @@
-->
<config>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<!-- Set this to 'false' if you want solr to continue working after it has
encountered an severe configuration error. In a production environment,
you may want solr to keep working even if one handler is mis-configured.
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/resources/solr/conf/dataimport-nodatasource-solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/resources/solr/conf/dataimport-nodatasource-solrconfig.xml?rev=1040982&r1=1040981&r2=1040982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/resources/solr/conf/dataimport-nodatasource-solrconfig.xml (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/resources/solr/conf/dataimport-nodatasource-solrconfig.xml Wed Dec 1 12:37:01 2010
@@ -17,6 +17,7 @@
-->
<config>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<!-- Set this to 'false' if you want solr to continue working after it has
encountered an severe configuration error. In a production environment,
you may want solr to keep working even if one handler is mis-configured.
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/resources/solr/conf/dataimport-solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/resources/solr/conf/dataimport-solrconfig.xml?rev=1040982&r1=1040981&r2=1040982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/resources/solr/conf/dataimport-solrconfig.xml (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/resources/solr/conf/dataimport-solrconfig.xml Wed Dec 1 12:37:01 2010
@@ -17,6 +17,7 @@
-->
<config>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<!-- Set this to 'false' if you want solr to continue working after it has
encountered an severe configuration error. In a production environment,
you may want solr to keep working even if one handler is mis-configured.
Modified: lucene/dev/trunk/solr/contrib/extraction/src/test/resources/solr/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/extraction/src/test/resources/solr/conf/schema.xml?rev=1040982&r1=1040981&r2=1040982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/extraction/src/test/resources/solr/conf/schema.xml (original)
+++ lucene/dev/trunk/solr/contrib/extraction/src/test/resources/solr/conf/schema.xml Wed Dec 1 12:37:01 2010
@@ -117,8 +117,8 @@
-->
<fieldtype name="text" class="solr.TextField">
<analyzer>
- <tokenizer class="solr.StandardTokenizerFactory"/>
- <filter class="solr.StandardFilterFactory"/>
+ <tokenizer class="solr.ClassicTokenizerFactory"/>
+ <filter class="solr.ClassicFilterFactory"/>
<filter class="solr.LowerCaseFilterFactory"/>
<filter class="solr.StopFilterFactory"/>
<filter class="solr.PorterStemFilterFactory"/>
@@ -133,7 +133,7 @@
<fieldtype name="teststop" class="solr.TextField">
<analyzer>
<tokenizer class="solr.LowerCaseTokenizerFactory"/>
- <filter class="solr.StandardFilterFactory"/>
+ <filter class="solr.ClassicFilterFactory"/>
<filter class="solr.StopFilterFactory" words="stopwords.txt"/>
</analyzer>
</fieldtype>
@@ -168,14 +168,14 @@
</fieldtype>
<fieldtype name="standardtokfilt" class="solr.TextField">
<analyzer>
- <tokenizer class="solr.StandardTokenizerFactory"/>
- <filter class="solr.StandardFilterFactory"/>
+ <tokenizer class="solr.ClassicTokenizerFactory"/>
+ <filter class="solr.ClassicFilterFactory"/>
</analyzer>
</fieldtype>
<fieldtype name="standardfilt" class="solr.TextField">
<analyzer>
<tokenizer class="solr.WhitespaceTokenizerFactory"/>
- <filter class="solr.StandardFilterFactory"/>
+ <filter class="solr.ClassicFilterFactory"/>
</analyzer>
</fieldtype>
<fieldtype name="lowerfilt" class="solr.TextField">
Modified: lucene/dev/trunk/solr/contrib/extraction/src/test/resources/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/extraction/src/test/resources/solr/conf/solrconfig.xml?rev=1040982&r1=1040981&r2=1040982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/extraction/src/test/resources/solr/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/contrib/extraction/src/test/resources/solr/conf/solrconfig.xml Wed Dec 1 12:37:01 2010
@@ -23,7 +23,7 @@
-->
<config>
-
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<jmx />
<!-- Used to specify an alternate directory to hold all index data.
Modified: lucene/dev/trunk/solr/example/multicore/core0/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/multicore/core0/conf/solrconfig.xml?rev=1040982&r1=1040981&r2=1040982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/multicore/core0/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/example/multicore/core0/conf/solrconfig.xml Wed Dec 1 12:37:01 2010
@@ -21,7 +21,7 @@
It is *not* a good example to work from.
-->
<config>
-
+ <luceneMatchVersion>LUCENE_40</luceneMatchVersion>
<!-- The DirectoryFactory to use for indexes.
solr.StandardDirectoryFactory, the default, is filesystem based.
solr.RAMDirectoryFactory is memory based, not persistent, and doesn't work with replication. -->
Modified: lucene/dev/trunk/solr/example/multicore/core1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/multicore/core1/conf/solrconfig.xml?rev=1040982&r1=1040981&r2=1040982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/multicore/core1/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/example/multicore/core1/conf/solrconfig.xml Wed Dec 1 12:37:01 2010
@@ -21,6 +21,7 @@
It is *not* a good example to work from.
-->
<config>
+ <luceneMatchVersion>LUCENE_40</luceneMatchVersion>
<!-- The DirectoryFactory to use for indexes.
solr.StandardDirectoryFactory, the default, is filesystem based.
solr.RAMDirectoryFactory is memory based, not persistent, and doesn't work with replication. -->
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/core/SolrConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/core/SolrConfig.java?rev=1040982&r1=1040981&r2=1040982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/core/SolrConfig.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/core/SolrConfig.java Wed Dec 1 12:37:01 2010
@@ -138,7 +138,7 @@ public class SolrConfig extends Config {
reopenReaders = getBool("mainIndex/reopenReaders", true);
booleanQueryMaxClauseCount = getInt("query/maxBooleanClauses", BooleanQuery.getMaxClauseCount());
- luceneMatchVersion = getLuceneVersion("luceneMatchVersion", Version.LUCENE_30);
+ luceneMatchVersion = getLuceneVersion("luceneMatchVersion");
log.info("Using Lucene MatchVersion: " + luceneMatchVersion);
filtOptEnabled = getBool("query/boolTofilterOptimizer/@enabled", false);
Modified: lucene/dev/trunk/solr/src/test/test-files/solr/conf/bad_solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/test-files/solr/conf/bad_solrconfig.xml?rev=1040982&r1=1040981&r2=1040982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/test-files/solr/conf/bad_solrconfig.xml (original)
+++ lucene/dev/trunk/solr/src/test/test-files/solr/conf/bad_solrconfig.xml Wed Dec 1 12:37:01 2010
@@ -23,6 +23,7 @@
-->
<config>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<indexDefaults>
<useCompoundFile>${unset.sys.property}</useCompoundFile>
</indexDefaults>
Modified: lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-SOLR-749.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-SOLR-749.xml?rev=1040982&r1=1040981&r2=1040982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-SOLR-749.xml (original)
+++ lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-SOLR-749.xml Wed Dec 1 12:37:01 2010
@@ -23,7 +23,7 @@
-->
<config>
-
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<jmx />
<!-- Used to specify an alternate directory to hold all index data.
Modified: lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-altdirectory.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-altdirectory.xml?rev=1040982&r1=1040981&r2=1040982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-altdirectory.xml (original)
+++ lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-altdirectory.xml Wed Dec 1 12:37:01 2010
@@ -18,6 +18,7 @@
-->
<config>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
<directoryFactory name="DirectoryFactory" class="org.apache.solr.core.AlternateDirectoryTest$TestFSDirectoryFactory"></directoryFactory>
<indexReaderFactory name="IndexReaderFactory" class="org.apache.solr.core.AlternateDirectoryTest$TestIndexReaderFactory"></indexReaderFactory >
Modified: lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-delpolicy1.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-delpolicy1.xml?rev=1040982&r1=1040981&r2=1040982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-delpolicy1.xml (original)
+++ lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-delpolicy1.xml Wed Dec 1 12:37:01 2010
@@ -23,7 +23,7 @@
-->
<config>
-
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<jmx />
<!-- Used to specify an alternate directory to hold all index data.
Modified: lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-delpolicy2.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-delpolicy2.xml?rev=1040982&r1=1040981&r2=1040982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-delpolicy2.xml (original)
+++ lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-delpolicy2.xml Wed Dec 1 12:37:01 2010
@@ -18,6 +18,7 @@
-->
<config>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<mainIndex>
<deletionPolicy class="org.apache.solr.core.FakeDeletionPolicy">
<str name="var1">value1</str>
Modified: lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-duh-optimize.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-duh-optimize.xml?rev=1040982&r1=1040981&r2=1040982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-duh-optimize.xml (original)
+++ lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-duh-optimize.xml Wed Dec 1 12:37:01 2010
@@ -23,7 +23,7 @@
-->
<config>
-
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<!-- Used to specify an alternate directory to hold all index data.
It defaults to "index" if not present, and should probably
not be changed if replication is in use. -->
Modified: lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-elevate.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-elevate.xml?rev=1040982&r1=1040981&r2=1040982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-elevate.xml (original)
+++ lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-elevate.xml Wed Dec 1 12:37:01 2010
@@ -23,7 +23,7 @@
-->
<config>
-
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<jmx />
<!-- Used to specify an alternate directory to hold all index data.
Modified: lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-enableplugin.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-enableplugin.xml?rev=1040982&r1=1040981&r2=1040982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-enableplugin.xml (original)
+++ lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-enableplugin.xml Wed Dec 1 12:37:01 2010
@@ -23,7 +23,7 @@
-->
<config>
-
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<dataDir>${solr.data.dir:./solr/data}</dataDir>
<!-- The DirectoryFactory to use for indexes.
Modified: lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-functionquery.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-functionquery.xml?rev=1040982&r1=1040981&r2=1040982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-functionquery.xml (original)
+++ lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-functionquery.xml Wed Dec 1 12:37:01 2010
@@ -23,7 +23,7 @@
-->
<config>
-
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<!-- Used to specify an alternate directory to hold all index data.
It defaults to "index" if not present, and should probably
not be changed if replication is in use. -->
Modified: lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-highlight.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-highlight.xml?rev=1040982&r1=1040981&r2=1040982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-highlight.xml (original)
+++ lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-highlight.xml Wed Dec 1 12:37:01 2010
@@ -23,7 +23,7 @@
-->
<config>
-
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<!-- Used to specify an alternate directory to hold all index data.
It defaults to "index" if not present, and should probably
not be changed if replication is in use. -->
Modified: lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-legacy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-legacy.xml?rev=1040982&r1=1040981&r2=1040982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-legacy.xml (original)
+++ lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-legacy.xml Wed Dec 1 12:37:01 2010
@@ -37,7 +37,7 @@
-->
<config>
-
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<jmx />
<!-- Used to specify an alternate directory to hold all index data.
Modified: lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-master.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-master.xml?rev=1040982&r1=1040981&r2=1040982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-master.xml (original)
+++ lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-master.xml Wed Dec 1 12:37:01 2010
@@ -23,7 +23,7 @@
-->
<config>
- <luceneMatchVersion>4.0</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<dataDir>${solr.data.dir:./solr/data}</dataDir>
Modified: lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-master1.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-master1.xml?rev=1040982&r1=1040981&r2=1040982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-master1.xml (original)
+++ lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-master1.xml Wed Dec 1 12:37:01 2010
@@ -23,7 +23,7 @@
-->
<config>
-
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<dataDir>${solr.data.dir:./solr/data}</dataDir>
<indexDefaults>
Modified: lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-master2.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-master2.xml?rev=1040982&r1=1040981&r2=1040982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-master2.xml (original)
+++ lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-master2.xml Wed Dec 1 12:37:01 2010
@@ -23,7 +23,7 @@
-->
<config>
-
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<dataDir>${solr.data.dir:./solr/data}</dataDir>
<indexDefaults>
Modified: lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-nocache.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-nocache.xml?rev=1040982&r1=1040981&r2=1040982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-nocache.xml (original)
+++ lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-nocache.xml Wed Dec 1 12:37:01 2010
@@ -23,7 +23,7 @@
-->
<config>
-
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<!-- Used to specify an alternate directory to hold all index data.
It defaults to "index" if not present, and should probably
not be changed if replication is in use. -->
Modified: lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-propinject-indexdefault.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-propinject-indexdefault.xml?rev=1040982&r1=1040981&r2=1040982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-propinject-indexdefault.xml (original)
+++ lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-propinject-indexdefault.xml Wed Dec 1 12:37:01 2010
@@ -37,7 +37,7 @@
-->
<config>
-
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<jmx />
<!-- Used to specify an alternate directory to hold all index data.
Modified: lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-propinject.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-propinject.xml?rev=1040982&r1=1040981&r2=1040982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-propinject.xml (original)
+++ lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-propinject.xml Wed Dec 1 12:37:01 2010
@@ -37,7 +37,7 @@
-->
<config>
-
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<jmx />
<!-- Used to specify an alternate directory to hold all index data.
Modified: lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-querysender.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-querysender.xml?rev=1040982&r1=1040981&r2=1040982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-querysender.xml (original)
+++ lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-querysender.xml Wed Dec 1 12:37:01 2010
@@ -23,6 +23,7 @@
-->
<config>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<!-- The DirectoryFactory to use for indexes.
solr.StandardDirectoryFactory, the default, is filesystem based.
solr.RAMDirectoryFactory is memory based and not persistent. -->
Modified: lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-slave.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-slave.xml?rev=1040982&r1=1040981&r2=1040982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-slave.xml (original)
+++ lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-slave.xml Wed Dec 1 12:37:01 2010
@@ -23,7 +23,7 @@
-->
<config>
- <luceneMatchVersion>4.0</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<dataDir>${solr.data.dir:./solr/data}</dataDir>
Modified: lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-slave1.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-slave1.xml?rev=1040982&r1=1040981&r2=1040982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-slave1.xml (original)
+++ lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-slave1.xml Wed Dec 1 12:37:01 2010
@@ -23,7 +23,7 @@
-->
<config>
-
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<dataDir>${solr.data.dir:./solr/data}</dataDir>
<indexDefaults>
Modified: lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-solcoreproperties.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-solcoreproperties.xml?rev=1040982&r1=1040981&r2=1040982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-solcoreproperties.xml (original)
+++ lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-solcoreproperties.xml Wed Dec 1 12:37:01 2010
@@ -23,7 +23,7 @@
-->
<config>
-
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<dataDir>${solr.data.dir:./solr/data}</dataDir>
<!-- The DirectoryFactory to use for indexes.
Modified: lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-spellcheckcomponent.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-spellcheckcomponent.xml?rev=1040982&r1=1040981&r2=1040982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-spellcheckcomponent.xml (original)
+++ lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-spellcheckcomponent.xml Wed Dec 1 12:37:01 2010
@@ -25,7 +25,7 @@ Config for testing spellcheck component
-->
<config>
-
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<requestHandler name="standard"
class="solr.StandardRequestHandler"></requestHandler>
Modified: lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-spellchecker.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-spellchecker.xml?rev=1040982&r1=1040981&r2=1040982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-spellchecker.xml (original)
+++ lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-spellchecker.xml Wed Dec 1 12:37:01 2010
@@ -22,7 +22,7 @@
solr.RAMDirectoryFactory is memory based and not persistent. -->
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
- <luceneMatchVersion>4.0</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<indexDefaults>
<useCompoundFile>false</useCompoundFile>
Modified: lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-termindex.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-termindex.xml?rev=1040982&r1=1040981&r2=1040982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-termindex.xml (original)
+++ lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-termindex.xml Wed Dec 1 12:37:01 2010
@@ -23,7 +23,7 @@
-->
<config>
-
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<!-- see TestConfig.testLib() -->
<lib dir="../lib-dirs/a" />
<lib dir="../lib-dirs/b" regex="b." />
Modified: lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-transformers.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-transformers.xml?rev=1040982&r1=1040981&r2=1040982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-transformers.xml (original)
+++ lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-transformers.xml Wed Dec 1 12:37:01 2010
@@ -18,7 +18,7 @@
-->
<config>
-
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<!-- The DirectoryFactory to use for indexes.
solr.StandardDirectoryFactory, the default, is filesystem based.
solr.RAMDirectoryFactory is memory based and not persistent. -->
Modified: lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-xinclude.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-xinclude.xml?rev=1040982&r1=1040981&r2=1040982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-xinclude.xml (original)
+++ lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig-xinclude.xml Wed Dec 1 12:37:01 2010
@@ -23,7 +23,7 @@
-->
<config>
-
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<jmx />
<!-- Used to specify an alternate directory to hold all index data.
Modified: lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig.xml?rev=1040982&r1=1040981&r2=1040982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig.xml Wed Dec 1 12:37:01 2010
@@ -50,7 +50,7 @@
solr.RAMDirectoryFactory is memory based and not persistent. -->
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
- <luceneMatchVersion>4.0</luceneMatchVersion>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<indexDefaults>
<!-- Values here affect all index writers and act as a default
Modified: lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig_perf.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig_perf.xml?rev=1040982&r1=1040981&r2=1040982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig_perf.xml (original)
+++ lucene/dev/trunk/solr/src/test/test-files/solr/conf/solrconfig_perf.xml Wed Dec 1 12:37:01 2010
@@ -17,6 +17,7 @@
-->
<config>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<!-- Used to specify an alternate directory to hold all index data
other than the default ./data under the Solr home.
If replication is in use, this should match the replication configuration. -->
Modified: lucene/dev/trunk/solr/src/test/test-files/solr/crazy-path-to-config.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/test-files/solr/crazy-path-to-config.xml?rev=1040982&r1=1040981&r2=1040982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/test-files/solr/crazy-path-to-config.xml (original)
+++ lucene/dev/trunk/solr/src/test/test-files/solr/crazy-path-to-config.xml Wed Dec 1 12:37:01 2010
@@ -24,6 +24,7 @@
-->
<config>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<indexDefaults>
<useCompoundFile>false</useCompoundFile>
<mergeFactor>10</mergeFactor>
Modified: lucene/dev/trunk/solr/src/test/test-files/solr/shared/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/test-files/solr/shared/conf/solrconfig.xml?rev=1040982&r1=1040981&r2=1040982&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/test-files/solr/shared/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/src/test/test-files/solr/shared/conf/solrconfig.xml Wed Dec 1 12:37:01 2010
@@ -21,6 +21,7 @@
It is *not* a good example to work from.
-->
<config>
+ <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<dataDir>${solr.solr.home}/data/${l10n}-${version}</dataDir>