svn commit: r1062566 - in /lucene/dev/branches/branch_3x: ./ lucene/ solr/ solr/src/java/org/apache/solr/core/CoreContainer.java solr/src/test-files/solr/shared/solr.xml solr/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java

[ma...@apache.org]

Author: markrmiller
Date: Sun Jan 23 23:02:36 2011
New Revision: 1062566

URL: http://svn.apache.org/viewvc?rev=1062566&view=rev
Log:
merge r1025547 from trunk - defaultCoreName not being persisted + test

Modified:
    lucene/dev/branches/branch_3x/   (props changed)
    lucene/dev/branches/branch_3x/lucene/   (props changed)
    lucene/dev/branches/branch_3x/solr/   (props changed)
    lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/core/CoreContainer.java
    lucene/dev/branches/branch_3x/solr/src/test-files/solr/shared/solr.xml
    lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java

Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/core/CoreContainer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/core/CoreContainer.java?rev=1062566&r1=1062565&r2=1062566&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/core/CoreContainer.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/core/CoreContainer.java Sun Jan 23 23:02:36 2011
@@ -712,6 +712,7 @@ public class CoreContainer 
     writeAttribute(w, "adminPath",adminPath);
     if(adminHandler != null) writeAttribute(w, "adminHandler",adminHandler);
     if(shareSchema) writeAttribute(w, "shareSchema","true");
+    if(!defaultCoreName.equals("")) writeAttribute(w, "defaultCoreName", defaultCoreName);
     w.write(">\n");
 
     synchronized(cores) {

Modified: lucene/dev/branches/branch_3x/solr/src/test-files/solr/shared/solr.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test-files/solr/shared/solr.xml?rev=1062566&r1=1062565&r2=1062566&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test-files/solr/shared/solr.xml (original)
+++ lucene/dev/branches/branch_3x/solr/src/test-files/solr/shared/solr.xml Sun Jan 23 23:02:36 2011
@@ -30,7 +30,7 @@
   adminPath: RequestHandler path to manage cores.  
     If 'null' (or absent), cores will not be manageable via REST
   -->
-  <cores adminPath="/admin/cores">
+  <cores adminPath="/admin/cores" defaultCoreName="core0">
     <core name="core0" instanceDir="./">
       <property name="version" value="3.5"/>
       <property name="l10n" value="EN"/>

Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java?rev=1062566&r1=1062565&r2=1062566&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java Sun Jan 23 23:02:36 2011
@@ -17,6 +17,17 @@
 
 package org.apache.solr.client.solrj.embedded;
 
+import java.io.File;
+import java.io.FileInputStream;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
+
+import org.apache.commons.io.IOUtils;
 import org.apache.lucene.util.LuceneTestCase;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.client.solrj.SolrQuery;
@@ -32,10 +43,10 @@ import org.apache.solr.util.AbstractSolr
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-
-import java.io.File;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
 
 /**
  * @version $Id$
@@ -44,6 +55,9 @@ import org.slf4j.LoggerFactory;
 public class TestSolrProperties extends LuceneTestCase {
   protected static Logger log = LoggerFactory.getLogger(TestSolrProperties.class);
   protected CoreContainer cores = null;
+  private File solrXml;
+  
+  private static final XPathFactory xpathFactory = XPathFactory.newInstance();
 
   public String getSolrHome() {
     return "solr/shared";
@@ -60,8 +74,8 @@ public class TestSolrProperties extends 
     System.setProperty("solr.solr.home", home.getAbsolutePath());
 
     log.info("pwd: " + (new File(".")).getAbsolutePath());
-    File f = new File(home, "solr.xml");
-    cores = new CoreContainer(home.getAbsolutePath(), f);
+    solrXml = new File(home, "solr.xml");
+    cores = new CoreContainer(home.getAbsolutePath(), solrXml);
   }
 
   @After
@@ -171,5 +185,22 @@ public class TestSolrProperties extends 
     assertTrue("should have more recent time: " + after + "," + before, after > before);
 
     mcr = CoreAdminRequest.persist("solr-persist.xml", coreadmin);
+    
+    // System.out.println(IOUtils.toString(new FileInputStream(new File(solrXml.getParent(), "solr-persist.xml"))));
+    DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+    FileInputStream fis = new FileInputStream(new File(solrXml.getParent(), "solr-persist.xml"));
+    try {
+      Document document = builder.parse(fis);
+      assertTrue(exists("/solr/cores[@defaultCoreName='core0']", document));
+    } finally {
+      fis.close();
+    }
+ 
+  }
+  
+  public static boolean exists(String xpathStr, Node node)
+      throws XPathExpressionException {
+    XPath xpath = xpathFactory.newXPath();
+    return (Boolean) xpath.evaluate(xpathStr, node, XPathConstants.BOOLEAN);
   }
 }