SOLR-2259: use $tests.luceneMatchVersion in all test files, make this parameter mandatory in trunk

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1040982 13f79535-47bb-0310-9956-ffa450edef68
2010-12-01 12:37:01 +00:00 · 2010-12-01 12:37:01 +00:00 · 836873d779
parent e7214a0f6f
commit 836873d779
40 changed files with 45 additions and 32 deletions
--- a/solr/contrib/clustering/src/test/resources/solr/conf/solrconfig.xml
+++ b/solr/contrib/clustering/src/test/resources/solr/conf/solrconfig.xml
@ -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.
--- a/solr/contrib/dataimporthandler/src/extras/test/resources/solr/conf/dataimport-solrconfig.xml
+++ b/solr/contrib/dataimporthandler/src/extras/test/resources/solr/conf/dataimport-solrconfig.xml
@ -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.
--- a/solr/contrib/dataimporthandler/src/test/resources/solr/conf/contentstream-solrconfig.xml
+++ b/solr/contrib/dataimporthandler/src/test/resources/solr/conf/contentstream-solrconfig.xml
@ -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.
--- a/solr/contrib/dataimporthandler/src/test/resources/solr/conf/dataimport-nodatasource-solrconfig.xml
+++ b/solr/contrib/dataimporthandler/src/test/resources/solr/conf/dataimport-nodatasource-solrconfig.xml
@ -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.
--- a/solr/contrib/dataimporthandler/src/test/resources/solr/conf/dataimport-solrconfig.xml
+++ b/solr/contrib/dataimporthandler/src/test/resources/solr/conf/dataimport-solrconfig.xml
@ -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.
--- a/solr/contrib/extraction/src/test/resources/solr/conf/schema.xml
+++ b/solr/contrib/extraction/src/test/resources/solr/conf/schema.xml
@ -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">
--- a/solr/contrib/extraction/src/test/resources/solr/conf/solrconfig.xml
+++ b/solr/contrib/extraction/src/test/resources/solr/conf/solrconfig.xml
@ -23,7 +23,7 @@
  -->

 <config>
-
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
  <jmx />

  <!-- Used to specify an alternate directory to hold all index data.
--- a/solr/example/multicore/core0/conf/solrconfig.xml
+++ b/solr/example/multicore/core0/conf/solrconfig.xml
@ -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. -->
--- a/solr/example/multicore/core1/conf/solrconfig.xml
+++ b/solr/example/multicore/core1/conf/solrconfig.xml
@ -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. -->
--- a/solr/src/java/org/apache/solr/core/SolrConfig.java
+++ b/solr/src/java/org/apache/solr/core/SolrConfig.java
@ -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);
--- a/solr/src/test/test-files/solr/conf/bad_solrconfig.xml
+++ b/solr/src/test/test-files/solr/conf/bad_solrconfig.xml
@ -23,6 +23,7 @@
  -->

 <config>
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
  <indexDefaults>
    <useCompoundFile>${unset.sys.property}</useCompoundFile>
  </indexDefaults>
--- a/solr/src/test/test-files/solr/conf/solrconfig-SOLR-749.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-SOLR-749.xml
@ -23,7 +23,7 @@
  -->

 <config>
-
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
  <jmx />

  <!-- Used to specify an alternate directory to hold all index data.
--- a/solr/src/test/test-files/solr/conf/solrconfig-altdirectory.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-altdirectory.xml
@ -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 >
--- a/solr/src/test/test-files/solr/conf/solrconfig-delpolicy1.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-delpolicy1.xml
@ -23,7 +23,7 @@
  -->

 <config>
-
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
  <jmx />

  <!-- Used to specify an alternate directory to hold all index data.
--- a/solr/src/test/test-files/solr/conf/solrconfig-delpolicy2.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-delpolicy2.xml
@ -18,6 +18,7 @@
 -->

 <config>
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
  <mainIndex>
    <deletionPolicy class="org.apache.solr.core.FakeDeletionPolicy">
      <str name="var1">value1</str>
--- a/solr/src/test/test-files/solr/conf/solrconfig-duh-optimize.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-duh-optimize.xml
@ -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. -->
--- a/solr/src/test/test-files/solr/conf/solrconfig-elevate.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-elevate.xml
@ -23,7 +23,7 @@
  -->

 <config>
-
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
  <jmx />

  <!-- Used to specify an alternate directory to hold all index data.
--- a/solr/src/test/test-files/solr/conf/solrconfig-enableplugin.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-enableplugin.xml
@ -23,7 +23,7 @@
  -->

 <config>
-
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
  <dataDir>${solr.data.dir:./solr/data}</dataDir>

  <!--  The DirectoryFactory to use for indexes.
--- a/solr/src/test/test-files/solr/conf/solrconfig-functionquery.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-functionquery.xml
@ -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. -->
--- a/solr/src/test/test-files/solr/conf/solrconfig-highlight.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-highlight.xml
@ -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. -->
--- a/solr/src/test/test-files/solr/conf/solrconfig-legacy.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-legacy.xml
@ -37,7 +37,7 @@
  -->

 <config>
-
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
  <jmx />

  <!-- Used to specify an alternate directory to hold all index data.
--- a/solr/src/test/test-files/solr/conf/solrconfig-master.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-master.xml
@ -23,7 +23,7 @@
  -->

 <config>
-  <luceneMatchVersion>4.0</luceneMatchVersion>  
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>  

  <dataDir>${solr.data.dir:./solr/data}</dataDir>

--- a/solr/src/test/test-files/solr/conf/solrconfig-master1.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-master1.xml
@ -23,7 +23,7 @@
  -->

 <config>
-
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
  <dataDir>${solr.data.dir:./solr/data}</dataDir>

  <indexDefaults>
--- a/solr/src/test/test-files/solr/conf/solrconfig-master2.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-master2.xml
@ -23,7 +23,7 @@
  -->

 <config>
-
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
  <dataDir>${solr.data.dir:./solr/data}</dataDir>

  <indexDefaults>
--- a/solr/src/test/test-files/solr/conf/solrconfig-nocache.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-nocache.xml
@ -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. -->
--- a/solr/src/test/test-files/solr/conf/solrconfig-propinject-indexdefault.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-propinject-indexdefault.xml
@ -37,7 +37,7 @@
  -->

 <config>
-
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
  <jmx />

  <!-- Used to specify an alternate directory to hold all index data.
--- a/solr/src/test/test-files/solr/conf/solrconfig-propinject.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-propinject.xml
@ -37,7 +37,7 @@
  -->

 <config>
-
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
  <jmx />

  <!-- Used to specify an alternate directory to hold all index data.
--- a/solr/src/test/test-files/solr/conf/solrconfig-querysender.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-querysender.xml
@ -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. -->
--- a/solr/src/test/test-files/solr/conf/solrconfig-slave.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-slave.xml
@ -23,7 +23,7 @@
  -->

 <config>
-  <luceneMatchVersion>4.0</luceneMatchVersion>
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>

  <dataDir>${solr.data.dir:./solr/data}</dataDir>

--- a/solr/src/test/test-files/solr/conf/solrconfig-slave1.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-slave1.xml
@ -23,7 +23,7 @@
  -->

 <config>
-
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
  <dataDir>${solr.data.dir:./solr/data}</dataDir>

  <indexDefaults>
--- a/solr/src/test/test-files/solr/conf/solrconfig-solcoreproperties.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-solcoreproperties.xml
@ -23,7 +23,7 @@
  -->

 <config>
-
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
  <dataDir>${solr.data.dir:./solr/data}</dataDir>

  <!--  The DirectoryFactory to use for indexes.
--- a/solr/src/test/test-files/solr/conf/solrconfig-spellcheckcomponent.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-spellcheckcomponent.xml
@ -25,7 +25,7 @@ Config for testing spellcheck component
  -->

 <config>
-
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
  <requestHandler name="standard"
     class="solr.StandardRequestHandler"></requestHandler>

--- a/solr/src/test/test-files/solr/conf/solrconfig-spellchecker.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-spellchecker.xml
@ -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>
--- a/solr/src/test/test-files/solr/conf/solrconfig-termindex.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-termindex.xml
@ -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." />
--- a/solr/src/test/test-files/solr/conf/solrconfig-transformers.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-transformers.xml
@ -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. -->
--- a/solr/src/test/test-files/solr/conf/solrconfig-xinclude.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig-xinclude.xml
@ -23,7 +23,7 @@
  -->

 <config>
-
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
  <jmx />

  <!-- Used to specify an alternate directory to hold all index data.
--- a/solr/src/test/test-files/solr/conf/solrconfig.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig.xml
@ -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
--- a/solr/src/test/test-files/solr/conf/solrconfig_perf.xml
+++ b/solr/src/test/test-files/solr/conf/solrconfig_perf.xml
@ -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. -->
--- a/solr/src/test/test-files/solr/crazy-path-to-config.xml
+++ b/solr/src/test/test-files/solr/crazy-path-to-config.xml
@ -24,6 +24,7 @@
  -->

 <config>
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
  <indexDefaults>
    <useCompoundFile>false</useCompoundFile>
    <mergeFactor>10</mergeFactor>
--- a/solr/src/test/test-files/solr/shared/conf/solrconfig.xml
+++ b/solr/src/test/test-files/solr/shared/conf/solrconfig.xml
@ -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>