lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hoss...@apache.org
Subject svn commit: r1072400 - in /lucene/dev/branches/branch_3x/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-dih...
Date Sat, 19 Feb 2011 17:20:22 GMT
Author: hossman
Date: Sat Feb 19 17:20:21 2011
New Revision: 1072400

URL: http://svn.apache.org/viewvc?rev=1072400&view=rev
Log:
SOLR-2377: clean up bad dataDir meme... merge 1072397 from trunk, plus fix some more files
that have already been removed from trunk

Modified:
    lucene/dev/branches/branch_3x/solr/   (props changed)
    lucene/dev/branches/branch_3x/solr/client/ruby/solr-ruby/solr/conf/solrconfig.xml
    lucene/dev/branches/branch_3x/solr/client/ruby/solr-ruby/test/conf/solrconfig.xml
    lucene/dev/branches/branch_3x/solr/contrib/clustering/src/test/resources/solr-clustering/conf/solrconfig.xml
    lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/extras/test/resources/solr-dihextras/conf/dataimport-solrconfig.xml
    lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/resources/solr-dih/conf/contentstream-solrconfig.xml
    lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/resources/solr-dih/conf/dataimport-nodatasource-solrconfig.xml
    lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/resources/solr-dih/conf/dataimport-solrconfig.xml
    lucene/dev/branches/branch_3x/solr/contrib/extraction/src/test/resources/solr-extraction/conf/solrconfig.xml
    lucene/dev/branches/branch_3x/solr/contrib/uima/src/test/resources/solr-uima/conf/solrconfig.xml
    lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-SOLR-749.xml
    lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-delpolicy1.xml
    lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-delpolicy2.xml
    lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-duh-optimize.xml
    lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-elevate.xml
    lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-enableplugin.xml
    lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-highlight.xml
    lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-legacy.xml
    lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-master.xml
    lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-master1.xml
    lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-master2.xml
    lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-propinject-indexdefault.xml
    lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-propinject.xml
    lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-repeater.xml
    lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-slave.xml
    lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-slave1.xml
    lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-solcoreproperties.xml
    lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-spellcheckcomponent.xml
    lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-termindex.xml
    lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-xinclude.xml
    lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig.xml
    lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig_perf.xml

Modified: lucene/dev/branches/branch_3x/solr/client/ruby/solr-ruby/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/client/ruby/solr-ruby/solr/conf/solrconfig.xml?rev=1072400&r1=1072399&r2=1072400&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/client/ruby/solr-ruby/solr/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_3x/solr/client/ruby/solr-ruby/solr/conf/solrconfig.xml Sat
Feb 19 17:20:21 2011
@@ -29,7 +29,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/branches/branch_3x/solr/client/ruby/solr-ruby/test/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/client/ruby/solr-ruby/test/conf/solrconfig.xml?rev=1072400&r1=1072399&r2=1072400&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/client/ruby/solr-ruby/test/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_3x/solr/client/ruby/solr-ruby/test/conf/solrconfig.xml Sat
Feb 19 17:20:21 2011
@@ -30,7 +30,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/branches/branch_3x/solr/contrib/clustering/src/test/resources/solr-clustering/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/clustering/src/test/resources/solr-clustering/conf/solrconfig.xml?rev=1072400&r1=1072399&r2=1072400&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/clustering/src/test/resources/solr-clustering/conf/solrconfig.xml
(original)
+++ lucene/dev/branches/branch_3x/solr/contrib/clustering/src/test/resources/solr-clustering/conf/solrconfig.xml
Sat Feb 19 17:20:21 2011
@@ -30,7 +30,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/branches/branch_3x/solr/contrib/dataimporthandler/src/extras/test/resources/solr-dihextras/conf/dataimport-solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/extras/test/resources/solr-dihextras/conf/dataimport-solrconfig.xml?rev=1072400&r1=1072399&r2=1072400&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/extras/test/resources/solr-dihextras/conf/dataimport-solrconfig.xml
(original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/extras/test/resources/solr-dihextras/conf/dataimport-solrconfig.xml
Sat Feb 19 17:20:21 2011
@@ -30,7 +30,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/branches/branch_3x/solr/contrib/dataimporthandler/src/test/resources/solr-dih/conf/contentstream-solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/resources/solr-dih/conf/contentstream-solrconfig.xml?rev=1072400&r1=1072399&r2=1072400&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/resources/solr-dih/conf/contentstream-solrconfig.xml
(original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/resources/solr-dih/conf/contentstream-solrconfig.xml
Sat Feb 19 17:20:21 2011
@@ -30,7 +30,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/branches/branch_3x/solr/contrib/dataimporthandler/src/test/resources/solr-dih/conf/dataimport-nodatasource-solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/resources/solr-dih/conf/dataimport-nodatasource-solrconfig.xml?rev=1072400&r1=1072399&r2=1072400&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/resources/solr-dih/conf/dataimport-nodatasource-solrconfig.xml
(original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/resources/solr-dih/conf/dataimport-nodatasource-solrconfig.xml
Sat Feb 19 17:20:21 2011
@@ -30,7 +30,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/branches/branch_3x/solr/contrib/dataimporthandler/src/test/resources/solr-dih/conf/dataimport-solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/resources/solr-dih/conf/dataimport-solrconfig.xml?rev=1072400&r1=1072399&r2=1072400&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/resources/solr-dih/conf/dataimport-solrconfig.xml
(original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/resources/solr-dih/conf/dataimport-solrconfig.xml
Sat Feb 19 17:20:21 2011
@@ -30,7 +30,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/branches/branch_3x/solr/contrib/extraction/src/test/resources/solr-extraction/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/extraction/src/test/resources/solr-extraction/conf/solrconfig.xml?rev=1072400&r1=1072399&r2=1072400&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/extraction/src/test/resources/solr-extraction/conf/solrconfig.xml
(original)
+++ lucene/dev/branches/branch_3x/solr/contrib/extraction/src/test/resources/solr-extraction/conf/solrconfig.xml
Sat Feb 19 17:20:21 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/branches/branch_3x/solr/contrib/uima/src/test/resources/solr-uima/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/uima/src/test/resources/solr-uima/conf/solrconfig.xml?rev=1072400&r1=1072399&r2=1072400&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/uima/src/test/resources/solr-uima/conf/solrconfig.xml
(original)
+++ lucene/dev/branches/branch_3x/solr/contrib/uima/src/test/resources/solr-uima/conf/solrconfig.xml
Sat Feb 19 17:20:21 2011
@@ -74,7 +74,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/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-SOLR-749.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-SOLR-749.xml?rev=1072400&r1=1072399&r2=1072400&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-SOLR-749.xml (original)
+++ lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-SOLR-749.xml Sat
Feb 19 17:20:21 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/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-delpolicy1.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-delpolicy1.xml?rev=1072400&r1=1072399&r2=1072400&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-delpolicy1.xml
(original)
+++ lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-delpolicy1.xml
Sat Feb 19 17:20:21 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/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-delpolicy2.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-delpolicy2.xml?rev=1072400&r1=1072399&r2=1072400&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-delpolicy2.xml
(original)
+++ lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-delpolicy2.xml
Sat Feb 19 17:20:21 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/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-duh-optimize.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-duh-optimize.xml?rev=1072400&r1=1072399&r2=1072400&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-duh-optimize.xml
(original)
+++ lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-duh-optimize.xml
Sat Feb 19 17:20:21 2011
@@ -27,7 +27,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/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-elevate.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-elevate.xml?rev=1072400&r1=1072399&r2=1072400&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-elevate.xml (original)
+++ lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-elevate.xml Sat
Feb 19 17:20:21 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/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-enableplugin.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-enableplugin.xml?rev=1072400&r1=1072399&r2=1072400&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-enableplugin.xml
(original)
+++ lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-enableplugin.xml
Sat Feb 19 17:20:21 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/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-highlight.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-highlight.xml?rev=1072400&r1=1072399&r2=1072400&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-highlight.xml (original)
+++ lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-highlight.xml Sat
Feb 19 17:20:21 2011
@@ -27,7 +27,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/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-legacy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-legacy.xml?rev=1072400&r1=1072399&r2=1072400&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-legacy.xml (original)
+++ lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-legacy.xml Sat
Feb 19 17:20:21 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/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-master.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-master.xml?rev=1072400&r1=1072399&r2=1072400&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-master.xml (original)
+++ lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-master.xml Sat
Feb 19 17:20:21 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/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-master1.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-master1.xml?rev=1072400&r1=1072399&r2=1072400&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-master1.xml (original)
+++ lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-master1.xml Sat
Feb 19 17:20:21 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/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-master2.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-master2.xml?rev=1072400&r1=1072399&r2=1072400&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-master2.xml (original)
+++ lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-master2.xml Sat
Feb 19 17:20:21 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/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-propinject-indexdefault.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-propinject-indexdefault.xml?rev=1072400&r1=1072399&r2=1072400&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-propinject-indexdefault.xml
(original)
+++ lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-propinject-indexdefault.xml
Sat Feb 19 17:20:21 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/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-propinject.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-propinject.xml?rev=1072400&r1=1072399&r2=1072400&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-propinject.xml
(original)
+++ lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-propinject.xml
Sat Feb 19 17:20:21 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/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-repeater.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-repeater.xml?rev=1072400&r1=1072399&r2=1072400&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-repeater.xml (original)
+++ lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-repeater.xml Sat
Feb 19 17:20:21 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/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-slave.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-slave.xml?rev=1072400&r1=1072399&r2=1072400&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-slave.xml (original)
+++ lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-slave.xml Sat Feb
19 17:20:21 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/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-slave1.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-slave1.xml?rev=1072400&r1=1072399&r2=1072400&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-slave1.xml (original)
+++ lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-slave1.xml Sat
Feb 19 17:20:21 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/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-solcoreproperties.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-solcoreproperties.xml?rev=1072400&r1=1072399&r2=1072400&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-solcoreproperties.xml
(original)
+++ lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-solcoreproperties.xml
Sat Feb 19 17:20:21 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/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-spellcheckcomponent.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-spellcheckcomponent.xml?rev=1072400&r1=1072399&r2=1072400&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-spellcheckcomponent.xml
(original)
+++ lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-spellcheckcomponent.xml
Sat Feb 19 17:20:21 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/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-termindex.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-termindex.xml?rev=1072400&r1=1072399&r2=1072400&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-termindex.xml (original)
+++ lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-termindex.xml Sat
Feb 19 17:20:21 2011
@@ -35,7 +35,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/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-xinclude.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-xinclude.xml?rev=1072400&r1=1072399&r2=1072400&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-xinclude.xml (original)
+++ lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-xinclude.xml Sat
Feb 19 17:20:21 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/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig.xml?rev=1072400&r1=1072399&r2=1072400&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig.xml Sat Feb 19
17:20:21 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/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig_perf.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig_perf.xml?rev=1072400&r1=1072399&r2=1072400&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig_perf.xml (original)
+++ lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig_perf.xml Sat Feb
19 17:20:21 2011
@@ -30,7 +30,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.



Mime
View raw message