Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Robert Muir 2010-12-01 12:37:01 +00:00
parent e7214a0f6f
commit 836873d779
40 changed files with 45 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
solr/contrib/clustering/src/test/resources/solr/conf/solrconfig.xml
View File

@ -17,6 +17,7 @@
--> -->
<config> <config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<!-- Set this to 'false' if you want solr to continue working after it has <!-- Set this to 'false' if you want solr to continue working after it has
encountered an severe configuration error. In a production environment, encountered an severe configuration error. In a production environment,
you may want solr to keep working even if one handler is mis-configured. you may want solr to keep working even if one handler is mis-configured.

1
solr/contrib/dataimporthandler/src/extras/test/resources/solr/conf/dataimport-solrconfig.xml
View File

@ -17,6 +17,7 @@
--> -->
<config> <config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<!-- Set this to 'false' if you want solr to continue working after it has <!-- Set this to 'false' if you want solr to continue working after it has
encountered an severe configuration error. In a production environment, encountered an severe configuration error. In a production environment,
you may want solr to keep working even if one handler is mis-configured. you may want solr to keep working even if one handler is mis-configured.

1
solr/contrib/dataimporthandler/src/test/resources/solr/conf/contentstream-solrconfig.xml
View File

@ -17,6 +17,7 @@
--> -->
<config> <config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<!-- Set this to 'false' if you want solr to continue working after it has <!-- Set this to 'false' if you want solr to continue working after it has
encountered an severe configuration error. In a production environment, encountered an severe configuration error. In a production environment,
you may want solr to keep working even if one handler is mis-configured. you may want solr to keep working even if one handler is mis-configured.

1
solr/contrib/dataimporthandler/src/test/resources/solr/conf/dataimport-nodatasource-solrconfig.xml
View File

@ -17,6 +17,7 @@
--> -->
<config> <config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<!-- Set this to 'false' if you want solr to continue working after it has <!-- Set this to 'false' if you want solr to continue working after it has
encountered an severe configuration error. In a production environment, encountered an severe configuration error. In a production environment,
you may want solr to keep working even if one handler is mis-configured. you may want solr to keep working even if one handler is mis-configured.

1
solr/contrib/dataimporthandler/src/test/resources/solr/conf/dataimport-solrconfig.xml
View File

@ -17,6 +17,7 @@
--> -->
<config> <config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<!-- Set this to 'false' if you want solr to continue working after it has <!-- Set this to 'false' if you want solr to continue working after it has
encountered an severe configuration error. In a production environment, encountered an severe configuration error. In a production environment,
you may want solr to keep working even if one handler is mis-configured. you may want solr to keep working even if one handler is mis-configured.

12
solr/contrib/extraction/src/test/resources/solr/conf/schema.xml
View File

@ -117,8 +117,8 @@
--> -->
<fieldtype name="text" class="solr.TextField"> <fieldtype name="text" class="solr.TextField">
<analyzer> <analyzer>
<tokenizer class="solr.StandardTokenizerFactory"/> <tokenizer class="solr.ClassicTokenizerFactory"/>
<filter class="solr.StandardFilterFactory"/> <filter class="solr.ClassicFilterFactory"/>
<filter class="solr.LowerCaseFilterFactory"/> <filter class="solr.LowerCaseFilterFactory"/>
<filter class="solr.StopFilterFactory"/> <filter class="solr.StopFilterFactory"/>
<filter class="solr.PorterStemFilterFactory"/> <filter class="solr.PorterStemFilterFactory"/>
@ -133,7 +133,7 @@
<fieldtype name="teststop" class="solr.TextField"> <fieldtype name="teststop" class="solr.TextField">
<analyzer> <analyzer>
<tokenizer class="solr.LowerCaseTokenizerFactory"/> <tokenizer class="solr.LowerCaseTokenizerFactory"/>
<filter class="solr.StandardFilterFactory"/> <filter class="solr.ClassicFilterFactory"/>
<filter class="solr.StopFilterFactory" words="stopwords.txt"/> <filter class="solr.StopFilterFactory" words="stopwords.txt"/>
</analyzer> </analyzer>
</fieldtype> </fieldtype>
@ -168,14 +168,14 @@
</fieldtype> </fieldtype>
<fieldtype name="standardtokfilt" class="solr.TextField"> <fieldtype name="standardtokfilt" class="solr.TextField">
<analyzer> <analyzer>
<tokenizer class="solr.StandardTokenizerFactory"/> <tokenizer class="solr.ClassicTokenizerFactory"/>
<filter class="solr.StandardFilterFactory"/> <filter class="solr.ClassicFilterFactory"/>
</analyzer> </analyzer>
</fieldtype> </fieldtype>
<fieldtype name="standardfilt" class="solr.TextField"> <fieldtype name="standardfilt" class="solr.TextField">
<analyzer> <analyzer>
<tokenizer class="solr.WhitespaceTokenizerFactory"/> <tokenizer class="solr.WhitespaceTokenizerFactory"/>
<filter class="solr.StandardFilterFactory"/> <filter class="solr.ClassicFilterFactory"/>
</analyzer> </analyzer>
</fieldtype> </fieldtype>
<fieldtype name="lowerfilt" class="solr.TextField"> <fieldtype name="lowerfilt" class="solr.TextField">

2
solr/contrib/extraction/src/test/resources/solr/conf/solrconfig.xml
View File

@ -23,7 +23,7 @@
--> -->
<config> <config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<jmx /> <jmx />
<!-- Used to specify an alternate directory to hold all index data. <!-- Used to specify an alternate directory to hold all index data.

2
solr/example/multicore/core0/conf/solrconfig.xml
View File

@ -21,7 +21,7 @@
It is *not* a good example to work from. It is *not* a good example to work from.
--> -->
<config> <config>
<luceneMatchVersion>LUCENE_40</luceneMatchVersion>
<!-- The DirectoryFactory to use for indexes. <!-- The DirectoryFactory to use for indexes.
solr.StandardDirectoryFactory, the default, is filesystem based. solr.StandardDirectoryFactory, the default, is filesystem based.
solr.RAMDirectoryFactory is memory based, not persistent, and doesn't work with replication. --> solr.RAMDirectoryFactory is memory based, not persistent, and doesn't work with replication. -->

1
solr/example/multicore/core1/conf/solrconfig.xml
View File

@ -21,6 +21,7 @@
It is *not* a good example to work from. It is *not* a good example to work from.
--> -->
<config> <config>
<luceneMatchVersion>LUCENE_40</luceneMatchVersion>
<!-- The DirectoryFactory to use for indexes. <!-- The DirectoryFactory to use for indexes.
solr.StandardDirectoryFactory, the default, is filesystem based. solr.StandardDirectoryFactory, the default, is filesystem based.
solr.RAMDirectoryFactory is memory based, not persistent, and doesn't work with replication. --> solr.RAMDirectoryFactory is memory based, not persistent, and doesn't work with replication. -->

2
solr/src/java/org/apache/solr/core/SolrConfig.java
View File

@ -138,7 +138,7 @@ public class SolrConfig extends Config {
reopenReaders = getBool("mainIndex/reopenReaders", true); reopenReaders = getBool("mainIndex/reopenReaders", true);
booleanQueryMaxClauseCount = getInt("query/maxBooleanClauses", BooleanQuery.getMaxClauseCount()); booleanQueryMaxClauseCount = getInt("query/maxBooleanClauses", BooleanQuery.getMaxClauseCount());
luceneMatchVersion = getLuceneVersion("luceneMatchVersion", Version.LUCENE_30); luceneMatchVersion = getLuceneVersion("luceneMatchVersion");
log.info("Using Lucene MatchVersion: " + luceneMatchVersion); log.info("Using Lucene MatchVersion: " + luceneMatchVersion);
filtOptEnabled = getBool("query/boolTofilterOptimizer/@enabled", false); filtOptEnabled = getBool("query/boolTofilterOptimizer/@enabled", false);

1
solr/src/test/test-files/solr/conf/bad_solrconfig.xml
View File

@ -23,6 +23,7 @@
--> -->
<config> <config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<indexDefaults> <indexDefaults>
<useCompoundFile>${unset.sys.property}</useCompoundFile> <useCompoundFile>${unset.sys.property}</useCompoundFile>
</indexDefaults> </indexDefaults>

2
solr/src/test/test-files/solr/conf/solrconfig-SOLR-749.xml
View File

@ -23,7 +23,7 @@
--> -->
<config> <config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<jmx /> <jmx />
<!-- Used to specify an alternate directory to hold all index data. <!-- Used to specify an alternate directory to hold all index data.

1
solr/src/test/test-files/solr/conf/solrconfig-altdirectory.xml
View File

@ -18,6 +18,7 @@
--> -->
<config> <config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler> <requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
<directoryFactory name="DirectoryFactory" class="org.apache.solr.core.AlternateDirectoryTest$TestFSDirectoryFactory"></directoryFactory> <directoryFactory name="DirectoryFactory" class="org.apache.solr.core.AlternateDirectoryTest$TestFSDirectoryFactory"></directoryFactory>
<indexReaderFactory name="IndexReaderFactory" class="org.apache.solr.core.AlternateDirectoryTest$TestIndexReaderFactory"></indexReaderFactory > <indexReaderFactory name="IndexReaderFactory" class="org.apache.solr.core.AlternateDirectoryTest$TestIndexReaderFactory"></indexReaderFactory >

2
solr/src/test/test-files/solr/conf/solrconfig-delpolicy1.xml
View File

@ -23,7 +23,7 @@
--> -->
<config> <config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<jmx /> <jmx />
<!-- Used to specify an alternate directory to hold all index data. <!-- Used to specify an alternate directory to hold all index data.

1
solr/src/test/test-files/solr/conf/solrconfig-delpolicy2.xml
View File

@ -18,6 +18,7 @@
--> -->
<config> <config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<mainIndex> <mainIndex>
<deletionPolicy class="org.apache.solr.core.FakeDeletionPolicy"> <deletionPolicy class="org.apache.solr.core.FakeDeletionPolicy">
<str name="var1">value1</str> <str name="var1">value1</str>

2
solr/src/test/test-files/solr/conf/solrconfig-duh-optimize.xml
View File

@ -23,7 +23,7 @@
--> -->
<config> <config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<!-- Used to specify an alternate directory to hold all index data. <!-- Used to specify an alternate directory to hold all index data.
It defaults to "index" if not present, and should probably It defaults to "index" if not present, and should probably
not be changed if replication is in use. --> not be changed if replication is in use. -->

2
solr/src/test/test-files/solr/conf/solrconfig-elevate.xml
View File

@ -23,7 +23,7 @@
--> -->
<config> <config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<jmx /> <jmx />
<!-- Used to specify an alternate directory to hold all index data. <!-- Used to specify an alternate directory to hold all index data.

2
solr/src/test/test-files/solr/conf/solrconfig-enableplugin.xml
View File

@ -23,7 +23,7 @@
--> -->
<config> <config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<dataDir>${solr.data.dir:./solr/data}</dataDir> <dataDir>${solr.data.dir:./solr/data}</dataDir>
<!-- The DirectoryFactory to use for indexes. <!-- The DirectoryFactory to use for indexes.

2
solr/src/test/test-files/solr/conf/solrconfig-functionquery.xml
View File

@ -23,7 +23,7 @@
--> -->
<config> <config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<!-- Used to specify an alternate directory to hold all index data. <!-- Used to specify an alternate directory to hold all index data.
It defaults to "index" if not present, and should probably It defaults to "index" if not present, and should probably
not be changed if replication is in use. --> not be changed if replication is in use. -->

2
solr/src/test/test-files/solr/conf/solrconfig-highlight.xml
View File

@ -23,7 +23,7 @@
--> -->
<config> <config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<!-- Used to specify an alternate directory to hold all index data. <!-- Used to specify an alternate directory to hold all index data.
It defaults to "index" if not present, and should probably It defaults to "index" if not present, and should probably
not be changed if replication is in use. --> not be changed if replication is in use. -->

2
solr/src/test/test-files/solr/conf/solrconfig-legacy.xml
View File

@ -37,7 +37,7 @@
--> -->
<config> <config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<jmx /> <jmx />
<!-- Used to specify an alternate directory to hold all index data. <!-- Used to specify an alternate directory to hold all index data.

2
solr/src/test/test-files/solr/conf/solrconfig-master.xml
View File

@ -23,7 +23,7 @@
--> -->
<config> <config>
<luceneMatchVersion>4.0</luceneMatchVersion> <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<dataDir>${solr.data.dir:./solr/data}</dataDir> <dataDir>${solr.data.dir:./solr/data}</dataDir>

2
solr/src/test/test-files/solr/conf/solrconfig-master1.xml
View File

@ -23,7 +23,7 @@
--> -->
<config> <config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<dataDir>${solr.data.dir:./solr/data}</dataDir> <dataDir>${solr.data.dir:./solr/data}</dataDir>
<indexDefaults> <indexDefaults>

2
solr/src/test/test-files/solr/conf/solrconfig-master2.xml
View File

@ -23,7 +23,7 @@
--> -->
<config> <config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<dataDir>${solr.data.dir:./solr/data}</dataDir> <dataDir>${solr.data.dir:./solr/data}</dataDir>
<indexDefaults> <indexDefaults>

2
solr/src/test/test-files/solr/conf/solrconfig-nocache.xml
View File

@ -23,7 +23,7 @@
--> -->
<config> <config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<!-- Used to specify an alternate directory to hold all index data. <!-- Used to specify an alternate directory to hold all index data.
It defaults to "index" if not present, and should probably It defaults to "index" if not present, and should probably
not be changed if replication is in use. --> not be changed if replication is in use. -->

2
solr/src/test/test-files/solr/conf/solrconfig-propinject-indexdefault.xml
View File

@ -37,7 +37,7 @@
--> -->
<config> <config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<jmx /> <jmx />
<!-- Used to specify an alternate directory to hold all index data. <!-- Used to specify an alternate directory to hold all index data.

2
solr/src/test/test-files/solr/conf/solrconfig-propinject.xml
View File

@ -37,7 +37,7 @@
--> -->
<config> <config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<jmx /> <jmx />
<!-- Used to specify an alternate directory to hold all index data. <!-- Used to specify an alternate directory to hold all index data.

1
solr/src/test/test-files/solr/conf/solrconfig-querysender.xml
View File

@ -23,6 +23,7 @@
--> -->
<config> <config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<!-- The DirectoryFactory to use for indexes. <!-- The DirectoryFactory to use for indexes.
solr.StandardDirectoryFactory, the default, is filesystem based. solr.StandardDirectoryFactory, the default, is filesystem based.
solr.RAMDirectoryFactory is memory based and not persistent. --> solr.RAMDirectoryFactory is memory based and not persistent. -->

2
solr/src/test/test-files/solr/conf/solrconfig-slave.xml
View File

@ -23,7 +23,7 @@
--> -->
<config> <config>
<luceneMatchVersion>4.0</luceneMatchVersion> <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<dataDir>${solr.data.dir:./solr/data}</dataDir> <dataDir>${solr.data.dir:./solr/data}</dataDir>

2
solr/src/test/test-files/solr/conf/solrconfig-slave1.xml
View File

@ -23,7 +23,7 @@
--> -->
<config> <config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<dataDir>${solr.data.dir:./solr/data}</dataDir> <dataDir>${solr.data.dir:./solr/data}</dataDir>
<indexDefaults> <indexDefaults>

2
solr/src/test/test-files/solr/conf/solrconfig-solcoreproperties.xml
View File

@ -23,7 +23,7 @@
--> -->
<config> <config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<dataDir>${solr.data.dir:./solr/data}</dataDir> <dataDir>${solr.data.dir:./solr/data}</dataDir>
<!-- The DirectoryFactory to use for indexes. <!-- The DirectoryFactory to use for indexes.

2
solr/src/test/test-files/solr/conf/solrconfig-spellcheckcomponent.xml
View File

@ -25,7 +25,7 @@ Config for testing spellcheck component
--> -->
<config> <config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<requestHandler name="standard" <requestHandler name="standard"
class="solr.StandardRequestHandler"></requestHandler> class="solr.StandardRequestHandler"></requestHandler>

2
solr/src/test/test-files/solr/conf/solrconfig-spellchecker.xml
View File

@ -22,7 +22,7 @@
solr.RAMDirectoryFactory is memory based and not persistent. --> solr.RAMDirectoryFactory is memory based and not persistent. -->
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/> <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<luceneMatchVersion>4.0</luceneMatchVersion> <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<indexDefaults> <indexDefaults>
<useCompoundFile>false</useCompoundFile> <useCompoundFile>false</useCompoundFile>

2
solr/src/test/test-files/solr/conf/solrconfig-termindex.xml
View File

@ -23,7 +23,7 @@
--> -->
<config> <config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<!-- see TestConfig.testLib() --> <!-- see TestConfig.testLib() -->
<lib dir="../lib-dirs/a" /> <lib dir="../lib-dirs/a" />
<lib dir="../lib-dirs/b" regex="b." /> <lib dir="../lib-dirs/b" regex="b." />

2
solr/src/test/test-files/solr/conf/solrconfig-transformers.xml
View File

@ -18,7 +18,7 @@
--> -->
<config> <config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<!-- The DirectoryFactory to use for indexes. <!-- The DirectoryFactory to use for indexes.
solr.StandardDirectoryFactory, the default, is filesystem based. solr.StandardDirectoryFactory, the default, is filesystem based.
solr.RAMDirectoryFactory is memory based and not persistent. --> solr.RAMDirectoryFactory is memory based and not persistent. -->

2
solr/src/test/test-files/solr/conf/solrconfig-xinclude.xml
View File

@ -23,7 +23,7 @@
--> -->
<config> <config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<jmx /> <jmx />
<!-- Used to specify an alternate directory to hold all index data. <!-- Used to specify an alternate directory to hold all index data.

2
solr/src/test/test-files/solr/conf/solrconfig.xml
View File

@ -50,7 +50,7 @@
solr.RAMDirectoryFactory is memory based and not persistent. --> solr.RAMDirectoryFactory is memory based and not persistent. -->
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/> <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<luceneMatchVersion>4.0</luceneMatchVersion> <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<indexDefaults> <indexDefaults>
<!-- Values here affect all index writers and act as a default <!-- Values here affect all index writers and act as a default

1
solr/src/test/test-files/solr/conf/solrconfig_perf.xml
View File

@ -17,6 +17,7 @@
--> -->
<config> <config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<!-- Used to specify an alternate directory to hold all index data <!-- Used to specify an alternate directory to hold all index data
other than the default ./data under the Solr home. other than the default ./data under the Solr home.
If replication is in use, this should match the replication configuration. --> If replication is in use, this should match the replication configuration. -->

1
solr/src/test/test-files/solr/crazy-path-to-config.xml
View File

@ -24,6 +24,7 @@
--> -->
<config> <config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<indexDefaults> <indexDefaults>
<useCompoundFile>false</useCompoundFile> <useCompoundFile>false</useCompoundFile>
<mergeFactor>10</mergeFactor> <mergeFactor>10</mergeFactor>

1
solr/src/test/test-files/solr/shared/conf/solrconfig.xml
View File

@ -21,6 +21,7 @@
It is *not* a good example to work from. It is *not* a good example to work from.
--> -->
<config> <config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
<dataDir>${solr.solr.home}/data/${l10n}-${version}</dataDir> <dataDir>${solr.solr.home}/data/${l10n}-${version}</dataDir>