You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by el...@apache.org on 2013/05/29 21:21:15 UTC

svn commit: r1487602 - in /lucene/dev/trunk/solr: CHANGES.txt solrj/src/test/org/apache/solr/client/solrj/request/SolrPingTest.java

Author: elyograg
Date: Wed May 29 19:21:14 2013
New Revision: 1487602

URL: http://svn.apache.org/r1487602
Log:
SOLR-4228: fix maven test failure

Modified:
    lucene/dev/trunk/solr/CHANGES.txt
    lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/SolrPingTest.java

Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1487602&r1=1487601&r2=1487602&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Wed May 29 19:21:14 2013
@@ -85,7 +85,7 @@ New Features
 * SOLR-4048: Add findRecursive method to NamedList. (Shawn Heisey)
 
 * SOLR-4228: SolrJ's SolrPing object has new methods for ping, enable, and
-  disable. (Shawn Heisey)
+  disable. (Shawn Heisey, hossman, Steve Rowe)
 
 Bug Fixes
 ----------------------

Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/SolrPingTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/SolrPingTest.java?rev=1487602&r1=1487601&r2=1487602&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/SolrPingTest.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/SolrPingTest.java Wed May 29 19:21:14 2013
@@ -34,10 +34,7 @@ public class SolrPingTest extends SolrJe
   
   @BeforeClass
   public static void beforeClass() throws Exception {
-    // The following works, but it seems like it's probably the wrong way to do
-    // this.
-    initCore("solrconfig.xml", "schema.xml", "../../test-files/solrj/solr",
-        "collection1");
+    initCore("solrconfig.xml", "schema.xml", "solrj/solr", "collection1");
   }
   
   @Before