You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2011/02/19 18:09:47 UTC
svn commit: r1072397 - in /lucene/dev/trunk/solr:
client/ruby/solr-ruby/solr/conf/ client/ruby/solr-ruby/test/conf/
contrib/clustering/src/test/resources/solr-clustering/conf/
contrib/dataimporthandler/src/extras/test/resources/solr-dihextras/conf/
con...
Author: hossman
Date: Sat Feb 19 17:09:45 2011
New Revision: 1072397
URL: http://svn.apache.org/viewvc?rev=1072397&view=rev
Log:
SOLR-2377: fix test/example configs that use a bad meme in dataDir
Modified:
lucene/dev/trunk/solr/client/ruby/solr-ruby/solr/conf/solrconfig.xml
lucene/dev/trunk/solr/client/ruby/solr-ruby/test/conf/solrconfig.xml
lucene/dev/trunk/solr/contrib/clustering/src/test/resources/solr-clustering/conf/solrconfig.xml
lucene/dev/trunk/solr/contrib/dataimporthandler/src/extras/test/resources/solr-dihextras/conf/dataimport-solrconfig.xml
lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/resources/solr-dih/conf/contentstream-solrconfig.xml
lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/resources/solr-dih/conf/dataimport-nodatasource-solrconfig.xml
lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/resources/solr-dih/conf/dataimport-solrconfig.xml
lucene/dev/trunk/solr/contrib/extraction/src/test/resources/solr-extraction/conf/solrconfig.xml
lucene/dev/trunk/solr/contrib/uima/src/test/resources/solr-uima/conf/solrconfig.xml
lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-elevate.xml
lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-enableplugin.xml
lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-master.xml
lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-master1.xml
lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-master2.xml
lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-repeater.xml
lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-slave.xml
lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-slave1.xml
lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-solcoreproperties.xml
lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-spellcheckcomponent.xml
lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig.xml
lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig_perf.xml
Modified: lucene/dev/trunk/solr/client/ruby/solr-ruby/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/client/ruby/solr-ruby/solr/conf/solrconfig.xml?rev=1072397&r1=1072396&r2=1072397&view=diff
==============================================================================
--- lucene/dev/trunk/solr/client/ruby/solr-ruby/solr/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/client/ruby/solr-ruby/solr/conf/solrconfig.xml Sat Feb 19 17:09:45 2011
@@ -21,7 +21,7 @@
<!-- 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. -->
- <dataDir>${solr.data.dir:./solr/data}</dataDir>
+ <dataDir>${solr.data.dir:}</dataDir>
<indexDefaults>
<!-- Values here affect all index writers and act as a default unless overridden. -->
Modified: lucene/dev/trunk/solr/client/ruby/solr-ruby/test/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/client/ruby/solr-ruby/test/conf/solrconfig.xml?rev=1072397&r1=1072396&r2=1072397&view=diff
==============================================================================
--- lucene/dev/trunk/solr/client/ruby/solr-ruby/test/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/client/ruby/solr-ruby/test/conf/solrconfig.xml Sat Feb 19 17:09:45 2011
@@ -22,7 +22,7 @@
other than the default ./data under the Solr home.
If replication is in use, this should match the replication configuration. -->
<!--
- <dataDir>./solr/data</dataDir>
+ <dataDir>${solr.data.dir:}</dataDir>
-->
<indexDefaults>
Modified: lucene/dev/trunk/solr/contrib/clustering/src/test/resources/solr-clustering/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/clustering/src/test/resources/solr-clustering/conf/solrconfig.xml?rev=1072397&r1=1072396&r2=1072397&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/clustering/src/test/resources/solr-clustering/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/contrib/clustering/src/test/resources/solr-clustering/conf/solrconfig.xml Sat Feb 19 17:09:45 2011
@@ -22,7 +22,7 @@
<!-- 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. -->
- <dataDir>${solr.data.dir:./solr/data}</dataDir>
+ <dataDir>${solr.data.dir:}</dataDir>
<indexDefaults>
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/extras/test/resources/solr-dihextras/conf/dataimport-solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/extras/test/resources/solr-dihextras/conf/dataimport-solrconfig.xml?rev=1072397&r1=1072396&r2=1072397&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/extras/test/resources/solr-dihextras/conf/dataimport-solrconfig.xml (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/extras/test/resources/solr-dihextras/conf/dataimport-solrconfig.xml Sat Feb 19 17:09:45 2011
@@ -22,7 +22,7 @@
<!-- 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. -->
- <dataDir>${solr.data.dir:./solr/data}</dataDir>
+ <dataDir>${solr.data.dir:}</dataDir>
<indexDefaults>
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/resources/solr-dih/conf/contentstream-solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/resources/solr-dih/conf/contentstream-solrconfig.xml?rev=1072397&r1=1072396&r2=1072397&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/resources/solr-dih/conf/contentstream-solrconfig.xml (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/resources/solr-dih/conf/contentstream-solrconfig.xml Sat Feb 19 17:09:45 2011
@@ -22,7 +22,7 @@
<!-- 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. -->
- <dataDir>${solr.data.dir:./solr/data}</dataDir>
+ <dataDir>${solr.data.dir:}</dataDir>
<indexDefaults>
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/resources/solr-dih/conf/dataimport-nodatasource-solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/resources/solr-dih/conf/dataimport-nodatasource-solrconfig.xml?rev=1072397&r1=1072396&r2=1072397&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/resources/solr-dih/conf/dataimport-nodatasource-solrconfig.xml (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/resources/solr-dih/conf/dataimport-nodatasource-solrconfig.xml Sat Feb 19 17:09:45 2011
@@ -22,7 +22,7 @@
<!-- 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. -->
- <dataDir>${solr.data.dir:./solr/data}</dataDir>
+ <dataDir>${solr.data.dir:}</dataDir>
<indexDefaults>
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/resources/solr-dih/conf/dataimport-solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/resources/solr-dih/conf/dataimport-solrconfig.xml?rev=1072397&r1=1072396&r2=1072397&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/resources/solr-dih/conf/dataimport-solrconfig.xml (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/resources/solr-dih/conf/dataimport-solrconfig.xml Sat Feb 19 17:09:45 2011
@@ -22,7 +22,7 @@
<!-- 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. -->
- <dataDir>${solr.data.dir:./solr/data}</dataDir>
+ <dataDir>${solr.data.dir:}</dataDir>
<indexDefaults>
Modified: lucene/dev/trunk/solr/contrib/extraction/src/test/resources/solr-extraction/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/extraction/src/test/resources/solr-extraction/conf/solrconfig.xml?rev=1072397&r1=1072396&r2=1072397&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/extraction/src/test/resources/solr-extraction/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/contrib/extraction/src/test/resources/solr-extraction/conf/solrconfig.xml Sat Feb 19 17:09:45 2011
@@ -29,7 +29,7 @@
<!-- 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. -->
- <dataDir>${solr.data.dir:./solr/data}</dataDir>
+ <dataDir>${solr.data.dir:}</dataDir>
<indexDefaults>
<!-- Values here affect all index writers and act as a default
Modified: lucene/dev/trunk/solr/contrib/uima/src/test/resources/solr-uima/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/uima/src/test/resources/solr-uima/conf/solrconfig.xml?rev=1072397&r1=1072396&r2=1072397&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/uima/src/test/resources/solr-uima/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/contrib/uima/src/test/resources/solr-uima/conf/solrconfig.xml Sat Feb 19 17:09:45 2011
@@ -67,7 +67,7 @@
than the default ./data under the Solr home. If replication is in
use, this should match the replication configuration.
-->
- <dataDir>${solr.data.dir:./solr/data}</dataDir>
+ <dataDir>${solr.data.dir:}</dataDir>
<!--
Modified: lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-elevate.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-elevate.xml?rev=1072397&r1=1072396&r2=1072397&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-elevate.xml (original)
+++ lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-elevate.xml Sat Feb 19 17:09:45 2011
@@ -29,7 +29,7 @@
<!-- 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. -->
- <dataDir>${solr.data.dir:./solr/data}</dataDir>
+ <dataDir>${solr.data.dir:}</dataDir>
<!-- The DirectoryFactory to use for indexes.
solr.StandardDirectoryFactory, the default, is filesystem based.
Modified: lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-enableplugin.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-enableplugin.xml?rev=1072397&r1=1072396&r2=1072397&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-enableplugin.xml (original)
+++ lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-enableplugin.xml Sat Feb 19 17:09:45 2011
@@ -24,7 +24,7 @@
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
- <dataDir>${solr.data.dir:./solr/data}</dataDir>
+ <dataDir>${solr.data.dir:}</dataDir>
<!-- The DirectoryFactory to use for indexes.
solr.StandardDirectoryFactory, the default, is filesystem based.
Modified: lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-master.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-master.xml?rev=1072397&r1=1072396&r2=1072397&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-master.xml (original)
+++ lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-master.xml Sat Feb 19 17:09:45 2011
@@ -25,7 +25,7 @@
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
- <dataDir>${solr.data.dir:./solr/data}</dataDir>
+ <dataDir>${solr.data.dir:}</dataDir>
<indexDefaults>
<useCompoundFile>false</useCompoundFile>
Modified: lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-master1.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-master1.xml?rev=1072397&r1=1072396&r2=1072397&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-master1.xml (original)
+++ lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-master1.xml Sat Feb 19 17:09:45 2011
@@ -24,7 +24,7 @@
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
- <dataDir>${solr.data.dir:./solr/data}</dataDir>
+ <dataDir>${solr.data.dir:}</dataDir>
<indexDefaults>
<useCompoundFile>false</useCompoundFile>
Modified: lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-master2.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-master2.xml?rev=1072397&r1=1072396&r2=1072397&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-master2.xml (original)
+++ lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-master2.xml Sat Feb 19 17:09:45 2011
@@ -24,7 +24,7 @@
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
- <dataDir>${solr.data.dir:./solr/data}</dataDir>
+ <dataDir>${solr.data.dir:}</dataDir>
<indexDefaults>
<useCompoundFile>false</useCompoundFile>
Modified: lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-repeater.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-repeater.xml?rev=1072397&r1=1072396&r2=1072397&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-repeater.xml (original)
+++ lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-repeater.xml Sat Feb 19 17:09:45 2011
@@ -25,7 +25,7 @@
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
- <dataDir>${solr.data.dir:./solr/data}</dataDir>
+ <dataDir>${solr.data.dir:}</dataDir>
<indexDefaults>
<useCompoundFile>false</useCompoundFile>
Modified: lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-slave.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-slave.xml?rev=1072397&r1=1072396&r2=1072397&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-slave.xml (original)
+++ lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-slave.xml Sat Feb 19 17:09:45 2011
@@ -25,7 +25,7 @@
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
- <dataDir>${solr.data.dir:./solr/data}</dataDir>
+ <dataDir>${solr.data.dir:}</dataDir>
<indexDefaults>
<useCompoundFile>false</useCompoundFile>
Modified: lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-slave1.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-slave1.xml?rev=1072397&r1=1072396&r2=1072397&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-slave1.xml (original)
+++ lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-slave1.xml Sat Feb 19 17:09:45 2011
@@ -24,7 +24,7 @@
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
- <dataDir>${solr.data.dir:./solr/data}</dataDir>
+ <dataDir>${solr.data.dir:}</dataDir>
<indexDefaults>
<useCompoundFile>false</useCompoundFile>
Modified: lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-solcoreproperties.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-solcoreproperties.xml?rev=1072397&r1=1072396&r2=1072397&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-solcoreproperties.xml (original)
+++ lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-solcoreproperties.xml Sat Feb 19 17:09:45 2011
@@ -24,7 +24,7 @@
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
- <dataDir>${solr.data.dir:./solr/data}</dataDir>
+ <dataDir>${solr.data.dir:}</dataDir>
<!-- The DirectoryFactory to use for indexes.
solr.StandardDirectoryFactory, the default, is filesystem based.
Modified: lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-spellcheckcomponent.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-spellcheckcomponent.xml?rev=1072397&r1=1072396&r2=1072397&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-spellcheckcomponent.xml (original)
+++ lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig-spellcheckcomponent.xml Sat Feb 19 17:09:45 2011
@@ -32,7 +32,7 @@ Config for testing spellcheck component
<!-- 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. -->
- <dataDir>${solr.data.dir:./solr/data}</dataDir>
+ <dataDir>${solr.data.dir:}</dataDir>
<!-- The DirectoryFactory to use for indexes.
solr.StandardDirectoryFactory, the default, is filesystem based.
Modified: lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig.xml?rev=1072397&r1=1072396&r2=1072397&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig.xml Sat Feb 19 17:09:45 2011
@@ -43,7 +43,7 @@
<!-- 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. -->
- <dataDir>${solr.data.dir:./solr/data}</dataDir>
+ <dataDir>${solr.data.dir:}</dataDir>
<!-- The DirectoryFactory to use for indexes.
solr.StandardDirectoryFactory, the default, is filesystem based.
Modified: lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig_perf.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig_perf.xml?rev=1072397&r1=1072396&r2=1072397&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig_perf.xml (original)
+++ lucene/dev/trunk/solr/src/test-files/solr/conf/solrconfig_perf.xml Sat Feb 19 17:09:45 2011
@@ -21,7 +21,7 @@
<!-- 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. -->
- <dataDir>${solr.data.dir:./solr/data}</dataDir>
+ <dataDir>${solr.data.dir:}</dataDir>
<!-- The DirectoryFactory to use for indexes.
solr.StandardDirectoryFactory, the default, is filesystem based.