svn commit: r602003 - /lucene/solr/trunk/src/java/org/apache/solr/core/MultiCore.java

[ryan]

Author: ryan
Date: Thu Dec  6 22:21:03 2007
New Revision: 602003

URL: http://svn.apache.org/viewvc?rev=602003&view=rev
Log:
SOLR-350 -- allow configuration of dataDir via multicore.xml

Modified:
    lucene/solr/trunk/src/java/org/apache/solr/core/MultiCore.java

Modified: lucene/solr/trunk/src/java/org/apache/solr/core/MultiCore.java
URL: 
http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/core/MultiCore.java?rev=602003&r1=602002&r2=602003&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/core/MultiCore.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/core/MultiCore.java Thu Dec  6 
22:21:03 2007
@@ -99,6 +99,7 @@
       try {
         String name         = DOMUtil.getAttr(node,"name", "Core needs a name" 
);
         String instanceDir  = DOMUtil.getAttr(node,"instanceDir", "Missing 
required 'instanceDir'" );
+        String dataDir      = DOMUtil.getAttr(node,"dataDir", null );
         String defaultStr   = DOMUtil.getAttr(node,"default", null );
         
         // Make the instanceDir relative to the core config
@@ -109,7 +110,7 @@
         SolrResourceLoader solrLoader = new SolrResourceLoader(instanceDir, 
libLoader);
         SolrConfig solrConfig = new SolrConfig( solrLoader, 
SolrConfig.DEFAULT_CONF_FILE, null );
         IndexSchema schema = new IndexSchema(solrConfig, 
instanceDir+"/conf/schema.xml");
-        SolrCore core = new SolrCore( name, null, solrConfig, schema );
+        SolrCore core = new SolrCore( name, dataDir, solrConfig, schema );
         
         // Register the new core
         SolrCore old = this.register( core );