You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by ma...@apache.org on 2010/03/22 14:30:36 UTC
svn commit: r926073 - in /lucene/solr/branches/newtrunk/solr: ./
src/java/org/apache/solr/util/ src/test/org/apache/solr/handler/component/
src/test/test-files/solr/conf/
Author: markrmiller
Date: Mon Mar 22 13:30:36 2010
New Revision: 926073
URL: http://svn.apache.org/viewvc?rev=926073&view=rev
Log:
use ramdir for local tests and fsdir for nightly tests
Modified:
lucene/solr/branches/newtrunk/solr/build.xml
lucene/solr/branches/newtrunk/solr/src/java/org/apache/solr/util/AbstractSolrTestCase.java
lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java
lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-SOLR-749.xml
lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-delpolicy1.xml
lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-delpolicy2.xml
lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-duh-optimize.xml
lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-elevate.xml
lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-enableplugin.xml
lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-facet-sort.xml
lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-functionquery.xml
lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-highlight.xml
lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-legacy.xml
lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-nocache.xml
lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-propinject-indexdefault.xml
lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-propinject.xml
lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-querysender.xml
lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-solcoreproperties.xml
lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-spellchecker.xml
lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-termindex.xml
lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-transformers.xml
lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-xinclude.xml
lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig.xml
lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig_perf.xml
Modified: lucene/solr/branches/newtrunk/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/build.xml?rev=926073&r1=926072&r2=926073&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/build.xml (original)
+++ lucene/solr/branches/newtrunk/solr/build.xml Mon Mar 22 13:30:36 2010
@@ -388,6 +388,10 @@
</or>
</not>
</condition>
+ <condition property="dir.prop" value="-Dsolr.directoryFactory=solr.StandardDirectoryFactory">
+ <isset property="use.fsdir"/>
+ </condition>
+ <property name="dir.prop" value=""/>
<junit printsummary="no"
haltonfailure="no"
errorProperty="tests.failed"
@@ -396,7 +400,9 @@
>
<sysproperty key="java.util.logging.config.file" value="${common-solr.dir}/testlogging.properties"/>
<sysproperty key="tests.luceneMatchVersion" value="${tests.luceneMatchVersion}"/>
+ <jvmarg line="${dir.prop}"/>
<jvmarg line="${args}"/>
+
<formatter type="brief" usefile="false" if="junit.details"/>
<classpath refid="test.run.classpath"/>
<formatter type="${junit.formatter}"/>
@@ -865,9 +871,14 @@
</target>
<target name="nightly"
- depends="test, create-package">
+ depends="set-fsdir, test, create-package">
<!-- no description, don't advertise -->
</target>
+
+ <target name="set-fsdir">
+ <property name="use.fsdir" value="true"/>
+ </target>
+
<target name="-taskdef">
<typedef resource="org/apache/rat/anttasks/antlib.xml" uri="antlib:rat.anttasks">
<classpath>
Modified: lucene/solr/branches/newtrunk/solr/src/java/org/apache/solr/util/AbstractSolrTestCase.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/java/org/apache/solr/util/AbstractSolrTestCase.java?rev=926073&r1=926072&r2=926073&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/java/org/apache/solr/util/AbstractSolrTestCase.java (original)
+++ lucene/solr/branches/newtrunk/solr/src/java/org/apache/solr/util/AbstractSolrTestCase.java Mon Mar 22 13:30:36 2010
@@ -105,7 +105,7 @@ public abstract class AbstractSolrTestCa
log.info("####SETUP_START " + getName());
factoryProp = System.getProperty("solr.directoryFactory");
if (factoryProp == null) {
- // System.setProperty("solr.directoryFactory","solr.RAMDirectoryFactory");
+ System.setProperty("solr.directoryFactory","solr.RAMDirectoryFactory");
}
dataDir = new File(System.getProperty("java.io.tmpdir")
+ System.getProperty("file.separator")
Modified: lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java?rev=926073&r1=926072&r2=926073&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java (original)
+++ lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java Mon Mar 22 13:30:36 2010
@@ -1,6 +1,7 @@
package org.apache.solr.handler.component;
import org.apache.solr.BaseDistributedSearchTestCase;
+import org.apache.solr.util.AbstractSolrTestCase;
/**
* Test for SpellCheckComponent's distributed querying
@@ -11,6 +12,21 @@ import org.apache.solr.BaseDistributedSe
*/
public class DistributedSpellCheckComponentTest extends BaseDistributedSearchTestCase {
+ private String saveProp;
+ @Override
+ public void setUp() throws Exception {
+ // this test requires FSDir
+ saveProp = System.getProperty("solr.directoryFactory");
+ System.setProperty("solr.directoryFactory", "solr.StandardDirectoryFactory");
+ super.setUp();
+ }
+
+ @Override
+ public void tearDown() throws Exception {
+ super.tearDown();
+ System.setProperty("solr.directoryFactory", saveProp);
+ }
+
@Override
public void doTest() throws Exception {
index(id, "1", "lowerfilt", "toyota");
Modified: lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-SOLR-749.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-SOLR-749.xml?rev=926073&r1=926072&r2=926073&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-SOLR-749.xml (original)
+++ lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-SOLR-749.xml Mon Mar 22 13:30:36 2010
@@ -31,6 +31,11 @@
not be changed if replication is in use. -->
<dataDir>${solr.data.dir:./solr/data}</dataDir>
+ <!-- The DirectoryFactory to use for indexes.
+ solr.StandardDirectoryFactory, the default, is filesystem based.
+ solr.RAMDirectoryFactory is memory based and not persistent. -->
+ <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+
<indexDefaults>
<!-- Values here affect all index writers and act as a default
unless overridden. -->
Modified: lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-delpolicy1.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-delpolicy1.xml?rev=926073&r1=926072&r2=926073&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-delpolicy1.xml (original)
+++ lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-delpolicy1.xml Mon Mar 22 13:30:36 2010
@@ -31,6 +31,12 @@
not be changed if replication is in use. -->
<dataDir>${solr.data.dir:./solr/data}</dataDir>
+ <!-- The DirectoryFactory to use for indexes.
+ solr.StandardDirectoryFactory, the default, is filesystem based.
+ solr.RAMDirectoryFactory is memory based and not persistent. -->
+ <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+
+
<indexDefaults>
<!-- Values here affect all index writers and act as a default
unless overridden. -->
Modified: lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-delpolicy2.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-delpolicy2.xml?rev=926073&r1=926072&r2=926073&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-delpolicy2.xml (original)
+++ lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-delpolicy2.xml Mon Mar 22 13:30:36 2010
@@ -31,6 +31,12 @@
not be changed if replication is in use. -->
<dataDir>${solr.data.dir:./solr/data}</dataDir>
+ <!-- The DirectoryFactory to use for indexes.
+ solr.StandardDirectoryFactory, the default, is filesystem based.
+ solr.RAMDirectoryFactory is memory based and not persistent. -->
+ <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+
+
<indexDefaults>
<!-- Values here affect all index writers and act as a default
unless overridden. -->
Modified: lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-duh-optimize.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-duh-optimize.xml?rev=926073&r1=926072&r2=926073&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-duh-optimize.xml (original)
+++ lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-duh-optimize.xml Mon Mar 22 13:30:36 2010
@@ -29,6 +29,12 @@
not be changed if replication is in use. -->
<dataDir>${solr.data.dir:./solr/data}</dataDir>
+ <!-- The DirectoryFactory to use for indexes.
+ solr.StandardDirectoryFactory, the default, is filesystem based.
+ solr.RAMDirectoryFactory is memory based and not persistent. -->
+ <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+
+
<indexDefaults>
<!-- Values here affect all index writers and act as a default
unless overridden. -->
Modified: lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-elevate.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-elevate.xml?rev=926073&r1=926072&r2=926073&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-elevate.xml (original)
+++ lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-elevate.xml Mon Mar 22 13:30:36 2010
@@ -31,6 +31,12 @@
not be changed if replication is in use. -->
<dataDir>${solr.data.dir:./solr/data}</dataDir>
+ <!-- The DirectoryFactory to use for indexes.
+ solr.StandardDirectoryFactory, the default, is filesystem based.
+ solr.RAMDirectoryFactory is memory based and not persistent. -->
+ <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+
+
<indexDefaults>
<!-- Values here affect all index writers and act as a default
unless overridden. -->
Modified: lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-enableplugin.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-enableplugin.xml?rev=926073&r1=926072&r2=926073&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-enableplugin.xml (original)
+++ lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-enableplugin.xml Mon Mar 22 13:30:36 2010
@@ -26,6 +26,12 @@
<dataDir>${solr.data.dir:./solr/data}</dataDir>
+ <!-- The DirectoryFactory to use for indexes.
+ solr.StandardDirectoryFactory, the default, is filesystem based.
+ solr.RAMDirectoryFactory is memory based and not persistent. -->
+ <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+
+
<indexDefaults>
<useCompoundFile>false</useCompoundFile>
<mergeFactor>10</mergeFactor>
Modified: lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-facet-sort.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-facet-sort.xml?rev=926073&r1=926072&r2=926073&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-facet-sort.xml (original)
+++ lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-facet-sort.xml Mon Mar 22 13:30:36 2010
@@ -31,6 +31,12 @@
not be changed if replication is in use. -->
<dataDir>${solr.data.dir:./solr/data}</dataDir>
+ <!-- The DirectoryFactory to use for indexes.
+ solr.StandardDirectoryFactory, the default, is filesystem based.
+ solr.RAMDirectoryFactory is memory based and not persistent. -->
+ <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+
+
<indexDefaults>
<!-- Values here affect all index writers and act as a default
unless overridden. -->
Modified: lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-functionquery.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-functionquery.xml?rev=926073&r1=926072&r2=926073&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-functionquery.xml (original)
+++ lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-functionquery.xml Mon Mar 22 13:30:36 2010
@@ -31,6 +31,12 @@
<indexDir>index</indexDir>
-->
+ <!-- The DirectoryFactory to use for indexes.
+ solr.StandardDirectoryFactory, the default, is filesystem based.
+ solr.RAMDirectoryFactory is memory based and not persistent. -->
+ <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+
+
<indexDefaults>
<!-- Values here affect all index writers and act as a default
unless overridden. -->
Modified: lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-highlight.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-highlight.xml?rev=926073&r1=926072&r2=926073&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-highlight.xml (original)
+++ lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-highlight.xml Mon Mar 22 13:30:36 2010
@@ -29,6 +29,12 @@
not be changed if replication is in use. -->
<dataDir>${solr.data.dir:./solr/data}</dataDir>
+ <!-- The DirectoryFactory to use for indexes.
+ solr.StandardDirectoryFactory, the default, is filesystem based.
+ solr.RAMDirectoryFactory is memory based and not persistent. -->
+ <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+
+
<indexDefaults>
<!-- Values here affect all index writers and act as a default
unless overridden. -->
Modified: lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-legacy.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-legacy.xml?rev=926073&r1=926072&r2=926073&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-legacy.xml (original)
+++ lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-legacy.xml Mon Mar 22 13:30:36 2010
@@ -45,6 +45,12 @@
not be changed if replication is in use. -->
<dataDir>${solr.data.dir:./solr/data}</dataDir>
+ <!-- The DirectoryFactory to use for indexes.
+ solr.StandardDirectoryFactory, the default, is filesystem based.
+ solr.RAMDirectoryFactory is memory based and not persistent. -->
+ <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+
+
<indexDefaults>
<!-- Values here affect all index writers and act as a default
unless overridden. -->
Modified: lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-nocache.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-nocache.xml?rev=926073&r1=926072&r2=926073&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-nocache.xml (original)
+++ lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-nocache.xml Mon Mar 22 13:30:36 2010
@@ -31,6 +31,12 @@
<indexDir>index</indexDir>
-->
+ <!-- The DirectoryFactory to use for indexes.
+ solr.StandardDirectoryFactory, the default, is filesystem based.
+ solr.RAMDirectoryFactory is memory based and not persistent. -->
+ <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+
+
<indexDefaults>
<!-- Values here affect all index writers and act as a default
unless overridden. -->
Modified: lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-propinject-indexdefault.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-propinject-indexdefault.xml?rev=926073&r1=926072&r2=926073&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-propinject-indexdefault.xml (original)
+++ lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-propinject-indexdefault.xml Mon Mar 22 13:30:36 2010
@@ -45,6 +45,12 @@
not be changed if replication is in use. -->
<dataDir>${solr.data.dir:./solr/data}</dataDir>
+ <!-- The DirectoryFactory to use for indexes.
+ solr.StandardDirectoryFactory, the default, is filesystem based.
+ solr.RAMDirectoryFactory is memory based and not persistent. -->
+ <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+
+
<indexDefaults>
<!-- Values here affect all index writers and act as a default
unless overridden. -->
Modified: lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-propinject.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-propinject.xml?rev=926073&r1=926072&r2=926073&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-propinject.xml (original)
+++ lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-propinject.xml Mon Mar 22 13:30:36 2010
@@ -45,6 +45,11 @@
not be changed if replication is in use. -->
<dataDir>${solr.data.dir:./solr/data}</dataDir>
+ <!-- The DirectoryFactory to use for indexes.
+ solr.StandardDirectoryFactory, the default, is filesystem based.
+ solr.RAMDirectoryFactory is memory based and not persistent. -->
+ <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+
<indexDefaults>
<!-- Values here affect all index writers and act as a default
unless overridden. -->
Modified: lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-querysender.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-querysender.xml?rev=926073&r1=926072&r2=926073&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-querysender.xml (original)
+++ lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-querysender.xml Mon Mar 22 13:30:36 2010
@@ -23,6 +23,10 @@
-->
<config>
+ <!-- The DirectoryFactory to use for indexes.
+ solr.StandardDirectoryFactory, the default, is filesystem based.
+ solr.RAMDirectoryFactory is memory based and not persistent. -->
+ <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<query>
Modified: lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-solcoreproperties.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-solcoreproperties.xml?rev=926073&r1=926072&r2=926073&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-solcoreproperties.xml (original)
+++ lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-solcoreproperties.xml Mon Mar 22 13:30:36 2010
@@ -26,6 +26,12 @@
<dataDir>${solr.data.dir:./solr/data}</dataDir>
+ <!-- The DirectoryFactory to use for indexes.
+ solr.StandardDirectoryFactory, the default, is filesystem based.
+ solr.RAMDirectoryFactory is memory based and not persistent. -->
+ <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+
+
<indexDefaults>
<useCompoundFile>false</useCompoundFile>
<mergeFactor>10</mergeFactor>
Modified: lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-spellchecker.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-spellchecker.xml?rev=926073&r1=926072&r2=926073&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-spellchecker.xml (original)
+++ lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-spellchecker.xml Mon Mar 22 13:30:36 2010
@@ -17,6 +17,12 @@
-->
<config>
+ <!-- The DirectoryFactory to use for indexes.
+ solr.StandardDirectoryFactory, the default, is filesystem based.
+ solr.RAMDirectoryFactory is memory based and not persistent. -->
+ <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+
+
<indexDefaults>
<useCompoundFile>false</useCompoundFile>
<mergeFactor>10</mergeFactor>
Modified: lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-termindex.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-termindex.xml?rev=926073&r1=926072&r2=926073&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-termindex.xml (original)
+++ lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-termindex.xml Mon Mar 22 13:30:36 2010
@@ -37,6 +37,11 @@
not be changed if replication is in use. -->
<dataDir>${solr.data.dir:./solr/data}</dataDir>
+ <!-- The DirectoryFactory to use for indexes.
+ solr.StandardDirectoryFactory, the default, is filesystem based.
+ solr.RAMDirectoryFactory is memory based and not persistent. -->
+ <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+
<indexDefaults>
<!-- Values here affect all index writers and act as a default
unless overridden. -->
Modified: lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-transformers.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-transformers.xml?rev=926073&r1=926072&r2=926073&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-transformers.xml (original)
+++ lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-transformers.xml Mon Mar 22 13:30:36 2010
@@ -19,6 +19,12 @@
<config>
+ <!-- The DirectoryFactory to use for indexes.
+ solr.StandardDirectoryFactory, the default, is filesystem based.
+ solr.RAMDirectoryFactory is memory based and not persistent. -->
+ <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+
+
<updateRequestProcessorChain name="standard">
<processor class="solr.LogUpdateProcessorFactory" >
<int name="maxNumToLog">100</int>
Modified: lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-xinclude.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-xinclude.xml?rev=926073&r1=926072&r2=926073&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-xinclude.xml (original)
+++ lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig-xinclude.xml Mon Mar 22 13:30:36 2010
@@ -30,6 +30,12 @@
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>
+
+ <!-- The DirectoryFactory to use for indexes.
+ solr.StandardDirectoryFactory, the default, is filesystem based.
+ solr.RAMDirectoryFactory is memory based and not persistent. -->
+ <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+
<indexDefaults>
<!-- Values here affect all index writers and act as a default
Modified: lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig.xml?rev=926073&r1=926072&r2=926073&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig.xml (original)
+++ lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig.xml Mon Mar 22 13:30:36 2010
@@ -48,7 +48,7 @@
<!-- The DirectoryFactory to use for indexes.
solr.StandardDirectoryFactory, the default, is filesystem based.
solr.RAMDirectoryFactory is memory based and not persistent. -->
- <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.StandardDirectoryFactory}"/>
+ <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<luceneMatchVersion>3.1</luceneMatchVersion>
Modified: lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig_perf.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig_perf.xml?rev=926073&r1=926072&r2=926073&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig_perf.xml (original)
+++ lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig_perf.xml Mon Mar 22 13:30:36 2010
@@ -31,6 +31,11 @@
If replication is in use, this should match the replication configuration. -->
<dataDir>${solr.data.dir:./solr/data}</dataDir>
+ <!-- The DirectoryFactory to use for indexes.
+ solr.StandardDirectoryFactory, the default, is filesystem based.
+ solr.RAMDirectoryFactory is memory based and not persistent. -->
+ <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+
<indexDefaults>
<!-- Values here affect all index writers and act as a default unless overridden. -->