svn commit: r701539 [5/6] - in /lucene/solr/branches/sandbox/ryan: client/java/solrj/src/org/apache/solr/client/solrj/embedded/ client/java/solrj/src/org/apache/solr/client/solrj/impl/ client/java/solrj/src/org/apache/solr/client/solrj/response/ client...

[ry...@apache.org]

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java Fri Oct  3 14:26:50 2008
@@ -26,7 +26,6 @@
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.util.DOMUtil;
 import org.apache.solr.core.SolrConfig;
-import org.apache.solr.core.SolrResourceLoader;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/BasicFunctionalityTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/BasicFunctionalityTest.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/BasicFunctionalityTest.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/BasicFunctionalityTest.java Fri Oct  3 14:26:50 2008
@@ -40,8 +40,6 @@
 import java.io.ByteArrayInputStream;
 import java.util.Map;
 import java.util.HashMap;
-import java.util.List;
-import java.util.ArrayList;
 
 /**
  * Tests some basic functionality of Solr while demonstrating good

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/ConvertedLegacyTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/ConvertedLegacyTest.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/ConvertedLegacyTest.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/ConvertedLegacyTest.java Fri Oct  3 14:26:50 2008
@@ -91,9 +91,9 @@
     assertU("<delete><query>id:[100 TO 110]</query></delete>");
     assertU("<add allowDups=\"false\"><doc><field name=\"id\">101</field></doc></add>");
     assertU("<add allowDups=\"false\"><doc><field name=\"id\">101</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">105</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">105</field></doc></add>");
     assertU("<add allowDups=\"false\"><doc><field name=\"id\">102</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">103</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">103</field></doc></add>");
     assertU("<add allowDups=\"false\"><doc><field name=\"id\">101</field></doc></add>");
     assertU("<commit/>");
     assertQ(req("id:[100 TO 110]")
@@ -118,9 +118,9 @@
     // test range
 
     assertU("<delete><id>44</id></delete>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"val_s\">apple</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"val_s\">banana</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"val_s\">pear</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"val_s\">apple</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"val_s\">banana</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"val_s\">pear</field></doc></add>");
     assertU("<commit/>");
     assertQ(req("val_s:[a TO z]")
             ,"//*[@numFound='3'] "
@@ -310,7 +310,7 @@
 
     // check for docs that appear more than once in a range
 
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"val_s\">apple</field><field name=\"val_s\">banana</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"val_s\">apple</field><field name=\"val_s\">banana</field></doc></add>");
     assertU("<commit/>");
     assertQ(req("val_s:[* TO *] OR  val_s:[* TO *]")
             ,"//*[@numFound='4']"
@@ -341,8 +341,8 @@
     // allow duplicates
 
     assertU("<delete><id>44</id></delete>");
-    assertU("<add allowDups=\"true\" overwriteCommitted=\"false\" overwritePending=\"false\"><doc><field name=\"id\">44</field><field name=\"text\">red riding hood</field></doc></add>");
-    assertU("<add allowDups=\"true\" overwriteCommitted=\"false\" overwritePending=\"false\"><doc><field name=\"id\">44</field><field name=\"text\">big bad wolf</field></doc></add>");
+    assertU("<add overwrite=\"false\" overwriteCommitted=\"false\" overwritePending=\"false\"><doc><field name=\"id\">44</field><field name=\"text\">red riding hood</field></doc></add>");
+    assertU("<add overwrite=\"false\" overwriteCommitted=\"false\" overwritePending=\"false\"><doc><field name=\"id\">44</field><field name=\"text\">big bad wolf</field></doc></add>");
     assertU("<commit/>");
     assertQ(req("id:44")
             ,"//@numFound[.='2']"
@@ -502,16 +502,16 @@
     // test integer ranges and sorting
 
     assertU("<delete><id>44</id></delete>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"num_i\">1234567890</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"num_i\">10</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"num_i\">1</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"num_i\">2</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"num_i\">15</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"num_i\">-1</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"num_i\">-987654321</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"num_i\">2147483647</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"num_i\">-2147483648</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"num_i\">0</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"num_i\">1234567890</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"num_i\">10</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"num_i\">1</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"num_i\">2</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"num_i\">15</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"num_i\">-1</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"num_i\">-987654321</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"num_i\">2147483647</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"num_i\">-2147483648</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"num_i\">0</field></doc></add>");
     assertU("<commit/>");
     assertQ(req("id:44")
             ,"*[count(//doc)=10]"
@@ -545,16 +545,16 @@
     // test long ranges and sorting
 
     assertU("<delete><id>44</id></delete>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"num_l\">1234567890</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"num_l\">10</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"num_l\">1</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"num_l\">2</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"num_l\">15</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"num_l\">-1</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"num_l\">-987654321</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"num_l\">9223372036854775807</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"num_l\">-9223372036854775808</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"num_l\">0</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"num_l\">1234567890</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"num_l\">10</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"num_l\">1</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"num_l\">2</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"num_l\">15</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"num_l\">-1</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"num_l\">-987654321</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"num_l\">9223372036854775807</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"num_l\">-9223372036854775808</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"num_l\">0</field></doc></add>");
     assertU("<commit/>");
     assertQ(req("id:44")
             ,"*[count(//doc)=10]"
@@ -588,16 +588,16 @@
     // test binary float ranges and sorting
 
     assertU("<delete><id>44</id></delete>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"num_f\">1.4142135</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"num_f\">Infinity</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"num_f\">-Infinity</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"num_f\">NaN</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"num_f\">2</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"num_f\">-1</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"num_f\">-987654321</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"num_f\">-999999.99</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"num_f\">-1e20</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"num_f\">0</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"num_f\">1.4142135</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"num_f\">Infinity</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"num_f\">-Infinity</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"num_f\">NaN</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"num_f\">2</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"num_f\">-1</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"num_f\">-987654321</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"num_f\">-999999.99</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"num_f\">-1e20</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"num_f\">0</field></doc></add>");
     assertU("<commit/>");
     assertQ(req("id:44")
             ,"*[count(//doc)=10]"
@@ -637,16 +637,16 @@
     // test binary double ranges and sorting
 
     assertU("<delete><id>44</id></delete>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"num_d\">1.4142135</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"num_d\">Infinity</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"num_d\">-Infinity</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"num_d\">NaN</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"num_d\">2</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"num_d\">-1</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"num_d\">1e-100</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"num_d\">-999999.99</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"num_d\">-1e100</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"num_d\">0</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"num_d\">1.4142135</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"num_d\">Infinity</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"num_d\">-Infinity</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"num_d\">NaN</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"num_d\">2</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"num_d\">-1</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"num_d\">1e-100</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"num_d\">-999999.99</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"num_d\">-1e100</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"num_d\">0</field></doc></add>");
     assertU("<commit/>");
     assertQ(req("id:44")
             ,"*[count(//doc)=10]"
@@ -688,12 +688,12 @@
     // test sorting on multiple fields
 
     assertU("<delete><id>44</id></delete>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"a_i\">10</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"a_i\">1</field><field name=\"b_i\">100</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"a_i\">-1</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"a_i\">15</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"a_i\">1</field><field name=\"b_i\">50</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id\">44</field><field name=\"a_i\">0</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"a_i\">10</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"a_i\">1</field><field name=\"b_i\">100</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"a_i\">-1</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"a_i\">15</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"a_i\">1</field><field name=\"b_i\">50</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id\">44</field><field name=\"a_i\">0</field></doc></add>");
     assertU("<commit/>");
     assertQ(req("id:44")
             ,"*[count(//doc)=6]"
@@ -731,13 +731,13 @@
     // test sorting  with some docs missing the sort field
 
     assertU("<delete><query>id_i:[1000 TO 1010]</query></delete>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id_i\">1000</field><field name=\"a_i\">1</field><field name=\"nullfirst\">Z</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id_i\">1001</field><field name=\"a_i\">10</field><field name=\"nullfirst\">A</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id_i\">1002</field><field name=\"a_i\">1</field><field name=\"b_i\">100</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id_i\">1003</field><field name=\"a_i\">-1</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id_i\">1004</field><field name=\"a_i\">15</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id_i\">1005</field><field name=\"a_i\">1</field><field name=\"b_i\">50</field></doc></add>");
-    assertU("<add allowDups=\"true\"><doc><field name=\"id_i\">1006</field><field name=\"a_i\">0</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id_i\">1000</field><field name=\"a_i\">1</field><field name=\"nullfirst\">Z</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id_i\">1001</field><field name=\"a_i\">10</field><field name=\"nullfirst\">A</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id_i\">1002</field><field name=\"a_i\">1</field><field name=\"b_i\">100</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id_i\">1003</field><field name=\"a_i\">-1</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id_i\">1004</field><field name=\"a_i\">15</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id_i\">1005</field><field name=\"a_i\">1</field><field name=\"b_i\">50</field></doc></add>");
+    assertU("<add overwrite=\"false\"><doc><field name=\"id_i\">1006</field><field name=\"a_i\">0</field></doc></add>");
     assertU("<commit/>");
     assertQ(req("id_i:[1000 TO 1010]")
             ,"*[count(//doc)=7]"
@@ -1323,16 +1323,5 @@
     assertQ(req("+id:45 +text:\"cc dd\"")
             ,"//*[@numFound='1']"
             );
-
-
-    // trigger output of custom value test
-
-    args = new HashMap<String,String>();
-    args.put("version","2.0");
-    req = new LocalSolrQueryRequest(h.getCore(), "values",
-                                    "test", 0, 10, args);
-    assertQ(req
-            );
-
   }
 }

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/EchoParamsTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/EchoParamsTest.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/EchoParamsTest.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/EchoParamsTest.java Fri Oct  3 14:26:50 2008
@@ -23,7 +23,9 @@
 
 public class EchoParamsTest extends AbstractSolrTestCase {
 
+  @Override
   public String getSchemaFile() { return "solr/crazy-path-to-schema.xml"; }
+  @Override
   public String getSolrConfigFile() { return "solr/crazy-path-to-config.xml"; }
 
   private static final String HEADER_XPATH = "/response/lst[@name='responseHeader']";

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/OutputWriterTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/OutputWriterTest.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/OutputWriterTest.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/OutputWriterTest.java Fri Oct  3 14:26:50 2008
@@ -35,8 +35,10 @@
     /** The XML string that's output for testing purposes. */
     public static final String USELESS_OUTPUT = "useless output";
     
+    @Override
     public String getSchemaFile() { return "solr/crazy-path-to-schema.xml"; }
     
+    @Override
     public String getSolrConfigFile() { return "solr/crazy-path-to-config.xml"; }
     
     

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/SampleTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/SampleTest.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/SampleTest.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/SampleTest.java Fri Oct  3 14:26:50 2008
@@ -34,6 +34,7 @@
    * to any crazy path they want (as long as it works).
    * </p>
    */
+  @Override
   public String getSchemaFile() { return "solr/crazy-path-to-schema.xml"; } 
   
   /**
@@ -44,6 +45,7 @@
    * to any crazy path they want (as long as it works).
    * </p>
    */
+  @Override
   public String getSolrConfigFile() { return "solr/crazy-path-to-config.xml"; }
     
   /**

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/SolrInfoMBeanTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/SolrInfoMBeanTest.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/SolrInfoMBeanTest.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/SolrInfoMBeanTest.java Fri Oct  3 14:26:50 2008
@@ -7,10 +7,6 @@
 import java.util.Enumeration;
 import java.util.List;
 
-import javax.management.Query;
-
-import org.apache.lucene.search.function.FieldCacheSource;
-import org.apache.solr.common.util.NamedList;
 import org.apache.solr.core.SolrInfoMBean;
 import org.apache.solr.handler.StandardRequestHandler;
 import org.apache.solr.handler.admin.LukeRequestHandler;
@@ -18,9 +14,6 @@
 import org.apache.solr.handler.component.SearchHandler;
 import org.apache.solr.highlight.DefaultSolrHighlighter;
 import org.apache.solr.search.LRUCache;
-import org.apache.solr.search.QueryUtils;
-import org.apache.solr.update.UpdateHandler;
-
 import junit.framework.TestCase;
 
 /**

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/TestDistributedSearch.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/TestDistributedSearch.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/TestDistributedSearch.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/TestDistributedSearch.java Fri Oct  3 14:26:50 2008
@@ -18,20 +18,15 @@
 package org.apache.solr;
 
 import org.apache.solr.client.solrj.SolrServer;
-import org.apache.solr.client.solrj.SolrRequest;
-import org.apache.solr.client.solrj.SolrResponse;
 import org.apache.solr.client.solrj.SolrServerException;
 import org.apache.solr.client.solrj.response.QueryResponse;
-import org.apache.solr.client.solrj.request.QueryRequest;
 import org.apache.solr.client.solrj.embedded.JettySolrRunner;
 import org.apache.solr.client.solrj.impl.CommonsHttpSolrServer;
 import org.apache.solr.common.SolrInputDocument;
 import org.apache.solr.common.SolrDocumentList;
 import org.apache.solr.common.SolrDocument;
 import org.apache.solr.common.util.NamedList;
-import org.apache.solr.common.params.SolrParams;
 import org.apache.solr.common.params.ModifiableSolrParams;
-import org.apache.solr.request.SolrQueryRequest;
 import org.apache.solr.util.AbstractSolrTestCase;
 
 import java.io.File;

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/analysis/AnalysisTestCase.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/analysis/AnalysisTestCase.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/analysis/AnalysisTestCase.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/analysis/AnalysisTestCase.java Fri Oct  3 14:26:50 2008
@@ -31,6 +31,7 @@
   
   public String getSolrConfigFile() { return "solrconfig.xml"; }
 
+  @Override
   public void setUp() throws Exception {
     // if you override setUp or tearDown, you better call
     // the super classes version

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/analysis/BaseTokenTestCase.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/analysis/BaseTokenTestCase.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/analysis/BaseTokenTestCase.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/analysis/BaseTokenTestCase.java Fri Oct  3 14:26:50 2008
@@ -26,8 +26,6 @@
 import org.apache.lucene.analysis.Token;
 import org.apache.lucene.analysis.TokenStream;
 
-import junit.framework.TestCase;
-
 /**
  * General token testing helper functions
  */

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/analysis/HTMLStripReaderTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/analysis/HTMLStripReaderTest.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/analysis/HTMLStripReaderTest.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/analysis/HTMLStripReaderTest.java Fri Oct  3 14:26:50 2008
@@ -26,7 +26,6 @@
 import java.io.BufferedReader;
 import java.util.Set;
 import java.util.HashSet;
-import java.util.Collections;
 
 public class HTMLStripReaderTest extends TestCase {
 

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/analysis/TestBufferedTokenStream.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/analysis/TestBufferedTokenStream.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/analysis/TestBufferedTokenStream.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/analysis/TestBufferedTokenStream.java Fri Oct  3 14:26:50 2008
@@ -32,6 +32,7 @@
   /** Example of a class implementing the rule "A" "B" => "Q" "B" */
   public static class AB_Q_Stream extends BufferedTokenStream {
     public AB_Q_Stream(TokenStream input) {super(input);}
+    @Override
     protected Token process(Token t) throws IOException {
       if ("A".equals(new String(t.termBuffer(), 0, t.termLength()))) {
         Token t2 = read();
@@ -45,6 +46,7 @@
   /** Example of a class implementing "A" "B" => "A" "A" "B" */
   public static class AB_AAB_Stream extends BufferedTokenStream {
     public AB_AAB_Stream(TokenStream input) {super(input);}
+    @Override
     protected Token process(Token t) throws IOException {
       if ("A".equals(new String(t.termBuffer(), 0, t.termLength())) && 
           "B".equals(new String(peek(1).termBuffer(), 0, peek(1).termLength())))

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/analysis/TestPatternTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/analysis/TestPatternTokenizerFactory.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/analysis/TestPatternTokenizerFactory.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/analysis/TestPatternTokenizerFactory.java Fri Oct  3 14:26:50 2008
@@ -21,8 +21,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import junit.framework.TestCase;
-
 import org.apache.lucene.analysis.Token;
 import org.apache.lucene.analysis.TokenStream;
 
@@ -53,7 +51,7 @@
       tokenizer.init( args );
       
       TokenStream stream = tokenizer.create( new StringReader( test[2] ) );
-      String out = TestHyphenatedWordsFilter.tsToString( stream );
+      String out = BaseTokenTestCase.tsToString( stream );
       System.out.println( test[2] + " ==> " + out );
       
       assertEquals("pattern: "+test[2], test[3], out );

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/analysis/TestRemoveDuplicatesTokenFilter.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/analysis/TestRemoveDuplicatesTokenFilter.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/analysis/TestRemoveDuplicatesTokenFilter.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/analysis/TestRemoveDuplicatesTokenFilter.java Fri Oct  3 14:26:50 2008
@@ -17,7 +17,6 @@
 
 package org.apache.solr.analysis;
 
-import junit.framework.TestCase;
 import org.apache.lucene.analysis.Token;
 import org.apache.lucene.analysis.TokenStream;
 import java.util.Iterator;
@@ -41,10 +40,11 @@
     
     final TokenStream ts = new RemoveDuplicatesTokenFilter
       (new TokenStream() {
+          @Override
           public Token next() { return toks.hasNext() ? toks.next() : null; }
         });
     
-    final String actual = TestBufferedTokenStream.tsToString(ts);
+    final String actual = BaseTokenTestCase.tsToString(ts);
     assertEquals(expected + " != " + actual, expected, actual);
     
   }

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/analysis/TestWordDelimiterFilter.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/analysis/TestWordDelimiterFilter.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/analysis/TestWordDelimiterFilter.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/analysis/TestWordDelimiterFilter.java Fri Oct  3 14:26:50 2008
@@ -20,16 +20,15 @@
 import org.apache.solr.util.AbstractSolrTestCase;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.Token;
-import org.apache.lucene.analysis.WhitespaceTokenizer;
-
 import java.io.IOException;
-import java.io.StringReader;
 
 /**
  * New WordDelimiterFilter tests... most of the tests are in ConvertedLegacyTest
  */
 public class TestWordDelimiterFilter extends AbstractSolrTestCase {
+  @Override
   public String getSchemaFile() { return "solr/conf/schema.xml"; }
+  @Override
   public String getSolrConfigFile() { return "solr/conf/solrconfig.xml"; }
 
 
@@ -137,6 +136,7 @@
     WordDelimiterFilter wdf = new WordDelimiterFilter(
             new TokenStream() {
               Token t;
+              @Override
               public Token next() throws IOException {
                 if (t!=null) return null;
                 t = new Token("foo-bar", 5, 12);  // actual
@@ -171,6 +171,7 @@
     wdf = new WordDelimiterFilter(
             new TokenStream() {
               Token t;
+              @Override
               public Token next() throws IOException {
                 if (t!=null) return null;
                 t = new Token("foo-bar", 5, 6);  // a synonym

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/common/util/TestNamedListCodec.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/common/util/TestNamedListCodec.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/common/util/TestNamedListCodec.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/common/util/TestNamedListCodec.java Fri Oct  3 14:26:50 2008
@@ -22,13 +22,13 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.ByteArrayInputStream;
-import java.io.IOException;
 import java.util.List;
 import java.util.Random;
 import java.util.ArrayList;
 import java.util.Map;
 import java.util.HashMap;
 
+import junit.framework.Assert;
 import junit.framework.TestCase;
 
 public class TestNamedListCodec  extends TestCase {
@@ -253,7 +253,7 @@
       if (cmp != null) {
         System.out.println(nl);
         System.out.println(res);
-        TestCase.fail(cmp);
+        Assert.fail(cmp);
       }
     }
   }

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/core/DummyValueSourceParser.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/core/DummyValueSourceParser.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/core/DummyValueSourceParser.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/core/DummyValueSourceParser.java Fri Oct  3 14:26:50 2008
@@ -32,17 +32,21 @@
 public class DummyValueSourceParser extends ValueSourceParser {
   private NamedList args;
 
+  @Override
   public void init(NamedList args) {
     this.args = args;
   }
 
+  @Override
   public ValueSource parse(FunctionQParser fp) throws ParseException {
     ValueSource source = fp.parseValueSource();
     ValueSource result = new SimpleFloatFunction(source) {
+      @Override
       protected String name() {
         return "foo";
       }
 
+      @Override
       protected float func(int doc, DocValues vals) {
         float result = 0;
         return result;

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/core/RequestHandlersTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/core/RequestHandlersTest.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/core/RequestHandlersTest.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/core/RequestHandlersTest.java Fri Oct  3 14:26:50 2008
@@ -23,7 +23,9 @@
 
 public class RequestHandlersTest extends AbstractSolrTestCase {
 
+  @Override
   public String getSchemaFile() { return "schema.xml"; }
+  @Override
   public String getSolrConfigFile() { return "solrconfig.xml"; }
 
   

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/core/SOLR749Test.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/core/SOLR749Test.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/core/SOLR749Test.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/core/SOLR749Test.java Fri Oct  3 14:26:50 2008
@@ -27,10 +27,12 @@
  *
  **/
 public class SOLR749Test extends AbstractSolrTestCase{
+  @Override
   public String getSchemaFile() {
     return "schema.xml";
   }
 
+  @Override
   public String getSolrConfigFile() {
     return "solrconfig-SOLR-749.xml";
   }

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/core/SolrCoreTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/core/SolrCoreTest.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/core/SolrCoreTest.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/core/SolrCoreTest.java Fri Oct  3 14:26:50 2008
@@ -28,7 +28,9 @@
 import java.util.*;
 public class SolrCoreTest extends AbstractSolrTestCase {
 
+  @Override
   public String getSchemaFile() { return "schema.xml"; }
+  @Override
   public String getSolrConfigFile() { return "solrconfig.xml"; }
   
   public void testRequestHandlerRegistry() {

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/core/TestBadConfig.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/core/TestBadConfig.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/core/TestBadConfig.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/core/TestBadConfig.java Fri Oct  3 14:26:50 2008
@@ -23,9 +23,12 @@
 
 public class TestBadConfig extends AbstractSolrTestCase {
 
+  @Override
   public String getSchemaFile() { return "schema.xml"; }
+  @Override
   public String getSolrConfigFile() { return "bad_solrconfig.xml"; }
 
+  @Override
   public void setUp() throws Exception {
 
     dataDir = new File(System.getProperty("java.io.tmpdir")

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/core/TestConfig.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/core/TestConfig.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/core/TestConfig.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/core/TestConfig.java Fri Oct  3 14:26:50 2008
@@ -27,7 +27,9 @@
 
 public class TestConfig extends AbstractSolrTestCase {
 
+  @Override
   public String getSchemaFile() { return "schema.xml"; }
+  @Override
   public String getSolrConfigFile() { return "solrconfig.xml"; }
 
   public void testJavaProperty() {

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/core/TestJmxIntegration.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/core/TestJmxIntegration.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/core/TestJmxIntegration.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/core/TestJmxIntegration.java Fri Oct  3 14:26:50 2008
@@ -46,6 +46,7 @@
     return "solrconfig.xml";
   }
 
+  @Override
   @Before
   public void setUp() throws Exception {
     // Make sure that at least one MBeanServer is available
@@ -53,6 +54,7 @@
     super.setUp();
   }
 
+  @Override
   @After
   public void tearDown() throws Exception {
     super.tearDown();

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/core/TestQuerySenderListener.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/core/TestQuerySenderListener.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/core/TestQuerySenderListener.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/core/TestQuerySenderListener.java Fri Oct  3 14:26:50 2008
@@ -17,10 +17,6 @@
 
 package org.apache.solr.core;
 
-import org.apache.solr.handler.RequestHandlerBase;
-import org.apache.solr.request.SolrQueryRequest;
-import org.apache.solr.request.SolrQueryResponse;
-import org.apache.solr.request.SolrRequestHandler;
 import org.apache.solr.util.AbstractSolrTestCase;
 
 public class TestQuerySenderListener extends AbstractSolrTestCase {

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/handler/AnalysisRequestHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/handler/AnalysisRequestHandlerTest.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/handler/AnalysisRequestHandlerTest.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/handler/AnalysisRequestHandlerTest.java Fri Oct  3 14:26:50 2008
@@ -16,18 +16,15 @@
  * limitations under the License.
  */
 
-import javanet.staxutils.BaseXMLInputFactory;
-import org.apache.lucene.analysis.Token;
 import org.apache.solr.common.util.NamedList;
 import org.apache.solr.util.AbstractSolrTestCase;
 
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamReader;
 import java.io.StringReader;
-import java.util.List;
 
 public class AnalysisRequestHandlerTest extends AbstractSolrTestCase {
-  private XMLInputFactory inputFactory = BaseXMLInputFactory.newInstance();
+  private XMLInputFactory inputFactory = XMLInputFactory.newInstance();
 
   @Override
   public String getSchemaFile() {

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java Fri Oct  3 14:26:50 2008
@@ -24,7 +24,6 @@
 import org.apache.solr.common.params.CommonParams;
 import org.apache.solr.common.params.MoreLikeThisParams;
 import org.apache.solr.common.params.MultiMapSolrParams;
-import org.apache.solr.common.params.SolrParams;
 import org.apache.solr.common.util.ContentStream;
 import org.apache.solr.common.util.ContentStreamBase;
 import org.apache.solr.core.SolrCore;
@@ -55,7 +54,7 @@
     
     Map<String,String[]> params = new HashMap<String,String[]>();
     MultiMapSolrParams mmparams = new MultiMapSolrParams( params );
-    SolrQueryRequestBase req = new SolrQueryRequestBase( core, (SolrParams)mmparams ) {};
+    SolrQueryRequestBase req = new SolrQueryRequestBase( core, mmparams ) {};
     
     // requires 'q' or single content stream
     try {
@@ -87,7 +86,7 @@
     params.put(MoreLikeThisParams.MIN_TERM_FREQ,new String[]{"1"});
     params.put(MoreLikeThisParams.MIN_DOC_FREQ,new String[]{"1"});
     
-    SolrQueryRequest mltreq = new LocalSolrQueryRequest( core, (SolrParams)mmparams);
+    SolrQueryRequest mltreq = new LocalSolrQueryRequest( core, mmparams);
     assertQ("morelikethis - tom cruise",mltreq
         ,"//result/doc[1]/int[@name='id'][.='46']"
         ,"//result/doc[2]/int[@name='id'][.='43']");

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java Fri Oct  3 14:26:50 2008
@@ -4,18 +4,14 @@
 import java.io.StringReader;
 import java.util.Collection;
 
-import javanet.staxutils.BaseXMLInputFactory;
-
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamReader;
 
-import junit.framework.TestCase;
-
 import org.apache.solr.common.SolrInputDocument;
 
 public class XmlUpdateRequestHandlerTest extends AbstractSolrTestCase 
 {
-  private XMLInputFactory inputFactory = BaseXMLInputFactory.newInstance();
+  private XMLInputFactory inputFactory = XMLInputFactory.newInstance();
   protected XmlUpdateRequestHandler handler;
 
 @Override public String getSchemaFile() { return "schema.xml"; }

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java Fri Oct  3 14:26:50 2008
@@ -18,7 +18,6 @@
 package org.apache.solr.handler.component;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.PrintWriter;

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/highlight/HighlighterConfigTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/highlight/HighlighterConfigTest.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/highlight/HighlighterConfigTest.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/highlight/HighlighterConfigTest.java Fri Oct  3 14:26:50 2008
@@ -1,15 +1,7 @@
 package org.apache.solr.highlight;
 
-import java.io.IOException;
 import java.util.HashMap;
 
-import org.apache.lucene.search.Query;
-import org.apache.solr.common.util.NamedList;
-import org.apache.solr.common.util.SimpleOrderedMap;
-import org.apache.solr.core.Config;
-import org.apache.solr.core.SolrCore;
-import org.apache.solr.request.SolrQueryRequest;
-import org.apache.solr.search.DocList;
 import org.apache.solr.util.AbstractSolrTestCase;
 import org.apache.solr.util.TestHarness;
 

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/highlight/HighlighterTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/highlight/HighlighterTest.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/highlight/HighlighterTest.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/highlight/HighlighterTest.java Fri Oct  3 14:26:50 2008
@@ -17,7 +17,6 @@
 
 package org.apache.solr.highlight;
 
-import org.apache.solr.core.SolrCore;
 import org.apache.solr.util.*;
 import org.apache.solr.common.params.HighlightParams;
 

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/request/JSONWriterTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/request/JSONWriterTest.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/request/JSONWriterTest.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/request/JSONWriterTest.java Fri Oct  3 14:26:50 2008
@@ -18,10 +18,8 @@
 package org.apache.solr.request;
 
 import java.io.IOException;
-import java.io.Writer;
 import java.io.StringWriter;
 
-import org.apache.solr.common.util.NamedList;
 import org.apache.solr.util.AbstractSolrTestCase;
 
 /** Test some aspects of JSON/python writer output (very incomplete)
@@ -29,7 +27,9 @@
  */
 public class JSONWriterTest extends AbstractSolrTestCase {
     
+  @Override
   public String getSchemaFile() { return "schema.xml"; }
+  @Override
   public String getSolrConfigFile() { return "solrconfig.xml"; }
     
   public void testNaNInf() throws IOException {

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/request/TestWriterPerf.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/request/TestWriterPerf.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/request/TestWriterPerf.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/request/TestWriterPerf.java Fri Oct  3 14:26:50 2008
@@ -27,15 +27,19 @@
 
 
 public class TestWriterPerf extends AbstractSolrTestCase {
+  @Override
   public String getSchemaFile() { return "schema11.xml"; }
+  @Override
   public String getSolrConfigFile() { return "solrconfig-functionquery.xml"; }
   public String getCoreName() { return "basic"; }
 
+  @Override
   public void setUp() throws Exception {
     // if you override setUp or tearDown, you better call
     // the super classes version
     super.setUp();
   }
+  @Override
   public void tearDown() throws Exception {
     // if you override setUp or tearDown, you better call
     // the super classes version

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/schema/CustomSimilarityFactory.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/schema/CustomSimilarityFactory.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/schema/CustomSimilarityFactory.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/schema/CustomSimilarityFactory.java Fri Oct  3 14:26:50 2008
@@ -3,6 +3,7 @@
 import org.apache.lucene.search.Similarity;
 
 public class CustomSimilarityFactory extends SimilarityFactory {
+  @Override
   public Similarity getSimilarity() {
     return new MockConfigurableSimilarity(params.get("echo"));
   }

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/schema/DateFieldTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/schema/DateFieldTest.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/schema/DateFieldTest.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/schema/DateFieldTest.java Fri Oct  3 14:26:50 2008
@@ -19,19 +19,25 @@
 
 import org.apache.solr.schema.DateField;
 import org.apache.solr.util.DateMathParser;
-import org.apache.lucene.document.Fieldable;
 
 import java.util.Date;
-import java.util.TimeZone;
 import java.util.Locale;
-import java.text.DateFormat;
+import java.util.TimeZone;
 
 import junit.framework.TestCase;
 
-public class DateFieldTest extends LegacyDateFieldTest {
+public class DateFieldTest extends TestCase {
+  // if and when this class is removed, make sure to refactor all
+  // appropriate code to DateFieldTest
+
+  public static TimeZone UTC = TimeZone.getTimeZone("UTC");
+  protected DateField f = null;
+  protected DateMathParser p = null;
   
-  public void setUp()  throws Exception {
+  @Override
+  public void setUp() throws Exception {
     super.setUp();
+    p = new DateMathParser(UTC, Locale.US);
     f = new DateField();
   }
   
@@ -103,7 +109,14 @@
     assertEquals("1970-01-01T00:00:00",     f.formatDate(new Date(0)));
     assertEquals("1970-01-01T00:00:00.37",  f.formatDate(new Date(370)));
     assertEquals("1970-01-01T00:00:00.9",   f.formatDate(new Date(900)));
+  }
 
+  public void assertToI(String expected, String input) {
+    assertEquals("Input: " + input, expected, f.toInternal(input));
+  }
+  
+  public void assertToI(String expected, long input) {
+    assertEquals("Input: " + input, expected, f.toInternal(new Date(input)));
   }
 
 }

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/schema/IndexSchemaTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/schema/IndexSchemaTest.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/schema/IndexSchemaTest.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/schema/IndexSchemaTest.java Fri Oct  3 14:26:50 2008
@@ -23,7 +23,6 @@
 import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.common.params.CommonParams;
 import org.apache.solr.common.params.MapSolrParams;
-import org.apache.solr.common.params.ModifiableSolrParams;
 import org.apache.solr.core.SolrCore;
 import org.apache.solr.request.LocalSolrQueryRequest;
 import org.apache.solr.request.SolrQueryRequest;

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/schema/UUIDFieldTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/schema/UUIDFieldTest.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/schema/UUIDFieldTest.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/schema/UUIDFieldTest.java Fri Oct  3 14:26:50 2008
@@ -1,7 +1,5 @@
 package org.apache.solr.schema;
 
-import java.util.UUID;
-
 import junit.framework.TestCase;
 
 import org.apache.solr.common.SolrException;

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/search/FooQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/search/FooQParserPlugin.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/search/FooQParserPlugin.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/search/FooQParserPlugin.java Fri Oct  3 14:26:50 2008
@@ -27,6 +27,7 @@
 
 
 public class FooQParserPlugin extends QParserPlugin {
+  @Override
   public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
     return new FooQParser(qstr, localParams, params, req);
   }
@@ -40,6 +41,7 @@
     super(qstr, localParams, params, req);
   }
 
+  @Override
   public Query parse() throws ParseException {
     return new TermQuery(new Term(localParams.get(QueryParsing.F), localParams.get(QueryParsing.V)));
   }

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/search/function/NvlValueSourceParser.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/search/function/NvlValueSourceParser.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/search/function/NvlValueSourceParser.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/search/function/NvlValueSourceParser.java Fri Oct  3 14:26:50 2008
@@ -28,16 +28,19 @@
      */
     private float nvlFloatValue = 0.0f;
 
+    @Override
     public ValueSource parse(FunctionQParser fp) throws ParseException {
 	ValueSource source = fp.parseValueSource();
 	final float nvl = fp.parseFloat();
 
 	return new SimpleFloatFunction(source) {
-	    protected String name() {
+	    @Override
+      protected String name() {
 		return "nvl";
 	    }
 
-	    protected float func(int doc, DocValues vals) {
+	    @Override
+      protected float func(int doc, DocValues vals) {
 		float v = vals.floatVal(doc);
 		if (v == nvlFloatValue) {
 		    return nvl;
@@ -48,6 +51,7 @@
 	};
     }
 
+    @Override
     public void init(NamedList args) {
 	/* initialize the value to consider as null */
 	Float nvlFloatValueArg = (Float) args.get("nvlFloatValue");

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/search/function/TestFunctionQuery.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/search/function/TestFunctionQuery.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/search/function/TestFunctionQuery.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/search/function/TestFunctionQuery.java Fri Oct  3 14:26:50 2008
@@ -17,24 +17,11 @@
 
 package org.apache.solr.search.function;
 
-import org.apache.lucene.analysis.ngram.EdgeNGramTokenFilter;
-import org.apache.lucene.queryParser.ParseException;
-import org.apache.lucene.search.Query;
-import org.apache.solr.search.ValueSourceParser;
-import org.apache.solr.search.FunctionQParser;
-import org.apache.solr.search.function.DocValues;
-import org.apache.solr.search.function.QueryValueSource;
-import org.apache.solr.search.function.SimpleFloatFunction;
-import org.apache.solr.search.function.ValueSource;
 import org.apache.solr.util.AbstractSolrTestCase;
-import org.apache.solr.common.util.NamedList;
-import org.apache.solr.core.SolrCore;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 import java.util.Arrays;
-import java.io.File;
 import java.io.Writer;
 import java.io.OutputStreamWriter;
 import java.io.FileOutputStream;
@@ -45,15 +32,19 @@
  */
 public class TestFunctionQuery extends AbstractSolrTestCase {
 
+  @Override
   public String getSchemaFile() { return "schema11.xml"; }
+  @Override
   public String getSolrConfigFile() { return "solrconfig-functionquery.xml"; }
   public String getCoreName() { return "basic"; }
 
+  @Override
   public void setUp() throws Exception {
     // if you override setUp or tearDown, you better call
     // the super classes version
     super.setUp();
   }
+  @Override
   public void tearDown() throws Exception {
     // if you override setUp or tearDown, you better call
     // the super classes version

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/servlet/CacheHeaderTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/servlet/CacheHeaderTest.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/servlet/CacheHeaderTest.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/servlet/CacheHeaderTest.java Fri Oct  3 14:26:50 2008
@@ -76,6 +76,7 @@
         - d.getTime() > 100000);
   }
 
+  @Override
   protected void doLastModified(String method) throws Exception {
     // We do a first request to get the last modified
     // This must result in a 200 OK response
@@ -131,6 +132,7 @@
   }
 
   // test ETag
+  @Override
   protected void doETag(String method) throws Exception {
     HttpMethodBase get = getSelectMethod(method);
     getClient().executeMethod(get);
@@ -202,6 +204,7 @@
         .getStatusCode());
   }
 
+  @Override
   protected void doCacheControl(String method) throws Exception {
     if ("POST".equals(method)) {
       HttpMethodBase m = getSelectMethod(method);

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/servlet/CacheHeaderTestBase.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/servlet/CacheHeaderTestBase.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/servlet/CacheHeaderTestBase.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/servlet/CacheHeaderTestBase.java Fri Oct  3 14:26:50 2008
@@ -32,6 +32,7 @@
   
   abstract public String getSolrConfigFilename();
   
+  @Override
   public String getSolrConfigFile() { return getSolrHome()+"conf/"+getSolrConfigFilename(); }
   
   CommonsHttpSolrServer server;

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/servlet/DirectSolrConnectionTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/servlet/DirectSolrConnectionTest.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/servlet/DirectSolrConnectionTest.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/servlet/DirectSolrConnectionTest.java Fri Oct  3 14:26:50 2008
@@ -24,7 +24,9 @@
 
 public class DirectSolrConnectionTest extends AbstractSolrTestCase 
 {
+  @Override
   public String getSchemaFile() { return "solr/crazy-path-to-schema.xml"; }
+  @Override
   public String getSolrConfigFile() { return "solr/crazy-path-to-config.xml"; }
   
   DirectSolrConnection direct;

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/servlet/NoCacheHeaderTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/servlet/NoCacheHeaderTest.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/servlet/NoCacheHeaderTest.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/servlet/NoCacheHeaderTest.java Fri Oct  3 14:26:50 2008
@@ -29,22 +29,26 @@
   @Override public String getSolrConfigFilename() { return "solrconfig-nocache.xml";  }
 
   // The tests
+  @Override
   public void testLastModified() throws Exception {
     doLastModified("GET");
     doLastModified("HEAD");
   }
 
+  @Override
   public void testEtag() throws Exception {
     doETag("GET");
     doETag("HEAD");
   }
 
+  @Override
   public void testCacheControl() throws Exception {
     doCacheControl("GET");
     doCacheControl("HEAD");
     doCacheControl("POST");
   }
   
+  @Override
   protected void doLastModified(String method) throws Exception {
     // We do a first request to get the last modified
     // This must result in a 200 OK response
@@ -96,6 +100,7 @@
   }
 
   // test ETag
+  @Override
   protected void doETag(String method) throws Exception {
     HttpMethodBase get = getSelectMethod(method);
     getClient().executeMethod(get);
@@ -144,6 +149,7 @@
         .getStatusCode());
   }
 
+  @Override
   protected void doCacheControl(String method) throws Exception {
       HttpMethodBase m = getSelectMethod(method);
       getClient().executeMethod(m);

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/servlet/SolrRequestParserTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/servlet/SolrRequestParserTest.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/servlet/SolrRequestParserTest.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/servlet/SolrRequestParserTest.java Fri Oct  3 14:26:50 2008
@@ -40,11 +40,14 @@
 
 public class SolrRequestParserTest extends AbstractSolrTestCase {
 
+  @Override
   public String getSchemaFile() { return "schema.xml"; } 
+  @Override
   public String getSolrConfigFile() { return "solrconfig.xml"; } 
   
   SolrRequestParsers parser;
 
+  @Override
   public void setUp() throws Exception {
     super.setUp();
     parser = new SolrRequestParsers( h.getCore().getSolrConfig() );

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java Fri Oct  3 14:26:50 2008
@@ -34,7 +34,9 @@
  **/
 public class FileBasedSpellCheckerTest extends AbstractSolrTestCase{
 
+  @Override
   public String getSchemaFile() { return "schema.xml"; }
+  @Override
   public String getSolrConfigFile() { return "solrconfig.xml"; }
 
   private SpellingQueryConverter queryConverter;
@@ -63,12 +65,12 @@
     spellchecker.add(SolrSpellChecker.DICTIONARY_NAME, "external");
     File spelling = new File("spellings.txt");
     spellchecker.add(AbstractLuceneSpellChecker.LOCATION, spelling.getAbsolutePath());
-    spellchecker.add(IndexBasedSpellChecker.FIELD, "teststop");
+    spellchecker.add(AbstractLuceneSpellChecker.FIELD, "teststop");
     spellchecker.add(FileBasedSpellChecker.SOURCE_FILE_CHAR_ENCODING, "UTF-8");
     File tmpDir = new File(System.getProperty("java.io.tmpdir"));
     File indexDir = new File(tmpDir, "spellingIdx" + new Date().getTime());
     indexDir.mkdirs();
-    spellchecker.add(FileBasedSpellChecker.INDEX_DIR, indexDir.getAbsolutePath());
+    spellchecker.add(AbstractLuceneSpellChecker.INDEX_DIR, indexDir.getAbsolutePath());
     SolrCore core = h.getCore();
     String dictName = checker.init(spellchecker, core);
     assertTrue(dictName + " is not equal to " + "external", dictName.equals("external") == true);
@@ -99,13 +101,13 @@
     spellchecker.add(SolrSpellChecker.DICTIONARY_NAME, "external");
     File spelling = new File("spellings.txt");
     spellchecker.add(AbstractLuceneSpellChecker.LOCATION, spelling.getAbsolutePath());
-    spellchecker.add(IndexBasedSpellChecker.FIELD, "teststop");
+    spellchecker.add(AbstractLuceneSpellChecker.FIELD, "teststop");
     spellchecker.add(FileBasedSpellChecker.SOURCE_FILE_CHAR_ENCODING, "UTF-8");
     File tmpDir = new File(System.getProperty("java.io.tmpdir"));
     File indexDir = new File(tmpDir, "spellingIdx" + new Date().getTime());
     indexDir.mkdirs();
-    spellchecker.add(FileBasedSpellChecker.INDEX_DIR, indexDir.getAbsolutePath());
-    spellchecker.add(FileBasedSpellChecker.FIELD_TYPE, "teststop");
+    spellchecker.add(AbstractLuceneSpellChecker.INDEX_DIR, indexDir.getAbsolutePath());
+    spellchecker.add(AbstractLuceneSpellChecker.FIELD_TYPE, "teststop");
     spellchecker.add(AbstractLuceneSpellChecker.SPELLCHECKER_ARG_NAME, spellchecker);
     SolrCore core = h.getCore();
     String dictName = checker.init(spellchecker, core);
@@ -144,8 +146,8 @@
     File spelling = new File("spellings.txt");
     spellchecker.add(AbstractLuceneSpellChecker.LOCATION, spelling.getAbsolutePath());
     spellchecker.add(FileBasedSpellChecker.SOURCE_FILE_CHAR_ENCODING, "UTF-8");
-    spellchecker.add(IndexBasedSpellChecker.FIELD, "teststop");
-    spellchecker.add(FileBasedSpellChecker.FIELD_TYPE, "teststop");
+    spellchecker.add(AbstractLuceneSpellChecker.FIELD, "teststop");
+    spellchecker.add(AbstractLuceneSpellChecker.FIELD_TYPE, "teststop");
     spellchecker.add(AbstractLuceneSpellChecker.SPELLCHECKER_ARG_NAME, spellchecker);
 
     SolrCore core = h.getCore();

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/spelling/SpellingQueryConverterTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/spelling/SpellingQueryConverterTest.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/spelling/SpellingQueryConverterTest.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/spelling/SpellingQueryConverterTest.java Fri Oct  3 14:26:50 2008
@@ -31,10 +31,12 @@
  **/
 public class SpellingQueryConverterTest extends AbstractSolrTestCase {
 
+  @Override
   public String getSchemaFile() {
     return "schema.xml";
   }
 
+  @Override
   public String getSolrConfigFile() {
     return "solrconfig.xml";
   }

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/update/AutoCommitTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/update/AutoCommitTest.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/update/AutoCommitTest.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/update/AutoCommitTest.java Fri Oct  3 14:26:50 2008
@@ -64,7 +64,9 @@
 
 public class AutoCommitTest extends AbstractSolrTestCase {
 
+  @Override
   public String getSchemaFile() { return "schema.xml"; }
+  @Override
   public String getSolrConfigFile() { return "solrconfig.xml"; }
   
   /**

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java Fri Oct  3 14:26:50 2008
@@ -31,10 +31,12 @@
  **/
 public class DirectUpdateHandlerOptimizeTest extends AbstractSolrTestCase {
 
+  @Override
   public String getSchemaFile() {
     return "schema.xml";
   }
 
+  @Override
   public String getSolrConfigFile() {
     return "solrconfig-duh-optimize.xml";
   }
@@ -45,8 +47,6 @@
 
     UpdateHandler updater = core.getUpdateHandler();
     AddUpdateCommand cmd = new AddUpdateCommand();
-    cmd.overwriteCommitted = true;
-    cmd.overwritePending = true;
     cmd.allowDups = false;
     //add just under the merge factor, so no segments are merged
     //the merge factor is 100 and the maxBufferedDocs is 2, so there should be 50 segments

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java Fri Oct  3 14:26:50 2008
@@ -31,7 +31,9 @@
  */
 public class DirectUpdateHandlerTest extends AbstractSolrTestCase {
 
+  @Override
   public String getSchemaFile() { return "schema.xml"; }
+  @Override
   public String getSolrConfigFile() { return "solrconfig.xml"; }
   
 
@@ -42,8 +44,6 @@
     UpdateHandler updater = core.getUpdateHandler();
     
     AddUpdateCommand cmd = new AddUpdateCommand();
-    cmd.overwriteCommitted = true;
-    cmd.overwritePending = true;
     cmd.allowDups = false;
     
     // Add a valid document

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/util/ArraysUtilsTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/util/ArraysUtilsTest.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/util/ArraysUtilsTest.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/util/ArraysUtilsTest.java Fri Oct  3 14:26:50 2008
@@ -25,9 +25,11 @@
     super(s);
   }
 
+  @Override
   protected void setUp() {
   }
 
+  @Override
   protected void tearDown() {
 
   }

Modified: lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/util/TestNumberUtils.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/util/TestNumberUtils.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/util/TestNumberUtils.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/org/apache/solr/util/TestNumberUtils.java Fri Oct  3 14:26:50 2008
@@ -183,72 +183,88 @@
 }
 
 class Int2Int extends Converter {
+  @Override
   public String toInternal(String val) {
     return Integer.toString(Integer.parseInt(val));
   }
+  @Override
   public String toExternal(String val) {
     return Integer.toString(Integer.parseInt(val));
   }
 }
 
 class SortInt extends Converter {
+  @Override
   public String toInternal(String val) {
     return NumberUtils.int2sortableStr(val);
   }
+  @Override
   public String toExternal(String val) {
     return NumberUtils.SortableStr2int(val);
   }
 }
 
 class SortLong extends Converter {
+  @Override
   public String toInternal(String val) {
     return NumberUtils.long2sortableStr(val);
   }
+  @Override
   public String toExternal(String val) {
     return NumberUtils.SortableStr2long(val);
   }
 }
 
 class Float2Float extends Converter {
+  @Override
   public String toInternal(String val) {
     return Float.toString(Float.parseFloat(val));
   }
+  @Override
   public String toExternal(String val) {
     return Float.toString(Float.parseFloat(val));
   }
 }
 
 class SortFloat extends Converter {
+  @Override
   public String toInternal(String val) {
     return NumberUtils.float2sortableStr(val);
   }
+  @Override
   public String toExternal(String val) {
     return NumberUtils.SortableStr2floatStr(val);
   }
 }
 
 class SortDouble extends Converter {
+  @Override
   public String toInternal(String val) {
     return NumberUtils.double2sortableStr(val);
   }
+  @Override
   public String toExternal(String val) {
     return NumberUtils.SortableStr2doubleStr(val);
   }
 }
 
 class Base100S extends Converter {
+  @Override
   public String toInternal(String val) {
     return BCDUtils.base10toBase100SortableInt(val);
   }
+  @Override
   public String toExternal(String val) {
     return BCDUtils.base100SortableIntToBase10(val);
   }
 }
 
 class Base10kS extends Converter {
+  @Override
   public String toInternal(String val) {
     return BCDUtils.base10toBase10kSortableInt(val);
   }
+  @Override
   public String toExternal(String val) {
     return BCDUtils.base10kSortableIntToBase10(val);
   }

Modified: lucene/solr/branches/sandbox/ryan/src/test/test-files/solr/conf/solrconfig-SOLR-749.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/test-files/solr/conf/solrconfig-SOLR-749.xml?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/test-files/solr/conf/solrconfig-SOLR-749.xml (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/test-files/solr/conf/solrconfig-SOLR-749.xml Fri Oct  3 14:26:50 2008
@@ -272,18 +272,6 @@
      <int name="ps">100</int>
     </lst>
   </requestHandler>
-  <requestHandler name="old" class="solr.tst.OldRequestHandler" >
-    <int name="myparam">1000</int>
-    <float name="ratio">1.4142135</float>
-    <arr name="myarr"><int>1</int><int>2</int></arr>
-    <str>foo</str>
-  </requestHandler>
-  <requestHandler name="oldagain" class="solr.tst.OldRequestHandler" >
-    <lst name="lst1"> <str name="op">sqrt</str> <int name="val">2</int> </lst>
-    <lst name="lst2"> <str name="op">log</str> <float name="val">10</float> </lst>
-  </requestHandler>
-
-  <requestHandler name="test" class="solr.tst.TestRequestHandler" />
 
   <!-- test query parameter defaults -->
   <requestHandler name="defaults" class="solr.StandardRequestHandler">

Modified: lucene/solr/branches/sandbox/ryan/src/test/test-files/solr/conf/solrconfig-delpolicy1.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/test-files/solr/conf/solrconfig-delpolicy1.xml?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/test-files/solr/conf/solrconfig-delpolicy1.xml (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/test-files/solr/conf/solrconfig-delpolicy1.xml Fri Oct  3 14:26:50 2008
@@ -281,19 +281,7 @@
      <int name="ps">100</int>
     </lst>
   </requestHandler>
-  <requestHandler name="old" class="solr.tst.OldRequestHandler" >
-    <int name="myparam">1000</int>
-    <float name="ratio">1.4142135</float>
-    <arr name="myarr"><int>1</int><int>2</int></arr>
-    <str>foo</str>
-  </requestHandler>
-  <requestHandler name="oldagain" class="solr.tst.OldRequestHandler" >
-    <lst name="lst1"> <str name="op">sqrt</str> <int name="val">2</int> </lst>
-    <lst name="lst2"> <str name="op">log</str> <float name="val">10</float> </lst>
-  </requestHandler>
-
-  <requestHandler name="test" class="solr.tst.TestRequestHandler" />
-
+  
   <!-- test query parameter defaults -->
   <requestHandler name="defaults" class="solr.StandardRequestHandler">
     <lst name="defaults">

Modified: lucene/solr/branches/sandbox/ryan/src/test/test-files/solr/conf/solrconfig-delpolicy2.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/test-files/solr/conf/solrconfig-delpolicy2.xml?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/test-files/solr/conf/solrconfig-delpolicy2.xml (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/test-files/solr/conf/solrconfig-delpolicy2.xml Fri Oct  3 14:26:50 2008
@@ -278,18 +278,6 @@
      <int name="ps">100</int>
     </lst>
   </requestHandler>
-  <requestHandler name="old" class="solr.tst.OldRequestHandler" >
-    <int name="myparam">1000</int>
-    <float name="ratio">1.4142135</float>
-    <arr name="myarr"><int>1</int><int>2</int></arr>
-    <str>foo</str>
-  </requestHandler>
-  <requestHandler name="oldagain" class="solr.tst.OldRequestHandler" >
-    <lst name="lst1"> <str name="op">sqrt</str> <int name="val">2</int> </lst>
-    <lst name="lst2"> <str name="op">log</str> <float name="val">10</float> </lst>
-  </requestHandler>
-
-  <requestHandler name="test" class="solr.tst.TestRequestHandler" />
 
   <!-- test query parameter defaults -->
   <requestHandler name="defaults" class="solr.StandardRequestHandler">

Modified: lucene/solr/branches/sandbox/ryan/src/test/test-files/solr/conf/solrconfig-duh-optimize.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/test-files/solr/conf/solrconfig-duh-optimize.xml?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/test-files/solr/conf/solrconfig-duh-optimize.xml (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/test-files/solr/conf/solrconfig-duh-optimize.xml Fri Oct  3 14:26:50 2008
@@ -270,18 +270,6 @@
      <int name="ps">100</int>
     </lst>
   </requestHandler>
-  <requestHandler name="old" class="solr.tst.OldRequestHandler" >
-    <int name="myparam">1000</int>
-    <float name="ratio">1.4142135</float>
-    <arr name="myarr"><int>1</int><int>2</int></arr>
-    <str>foo</str>
-  </requestHandler>
-  <requestHandler name="oldagain" class="solr.tst.OldRequestHandler" >
-    <lst name="lst1"> <str name="op">sqrt</str> <int name="val">2</int> </lst>
-    <lst name="lst2"> <str name="op">log</str> <float name="val">10</float> </lst>
-  </requestHandler>
-
-  <requestHandler name="test" class="solr.tst.TestRequestHandler" />
 
   <!-- test query parameter defaults -->
   <requestHandler name="defaults" class="solr.StandardRequestHandler">

Modified: lucene/solr/branches/sandbox/ryan/src/test/test-files/solr/conf/solrconfig-functionquery.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/test-files/solr/conf/solrconfig-functionquery.xml?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/test-files/solr/conf/solrconfig-functionquery.xml (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/test-files/solr/conf/solrconfig-functionquery.xml Fri Oct  3 14:26:50 2008
@@ -232,18 +232,6 @@
      <int name="ps">100</int>
     </lst>
   </requestHandler>
-  <requestHandler name="old" class="solr.tst.OldRequestHandler" >
-    <int name="myparam">1000</int>
-    <float name="ratio">1.4142135</float>
-    <arr name="myarr"><int>1</int><int>2</int></arr>
-    <str>foo</str>
-  </requestHandler>
-  <requestHandler name="oldagain" class="solr.tst.OldRequestHandler" >
-    <lst name="lst1"> <str name="op">sqrt</str> <int name="val">2</int> </lst>
-    <lst name="lst2"> <str name="op">log</str> <float name="val">10</float> </lst>
-  </requestHandler>
-
-  <requestHandler name="test" class="solr.tst.TestRequestHandler" />
 
   <!-- test query parameter defaults --> 
   <requestHandler name="defaults" class="solr.StandardRequestHandler">

Modified: lucene/solr/branches/sandbox/ryan/src/test/test-files/solr/conf/solrconfig-highlight.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/test-files/solr/conf/solrconfig-highlight.xml?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/test-files/solr/conf/solrconfig-highlight.xml (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/test-files/solr/conf/solrconfig-highlight.xml Fri Oct  3 14:26:50 2008
@@ -268,18 +268,6 @@
      <int name="ps">100</int>
     </lst>
   </requestHandler>
-  <requestHandler name="old" class="solr.tst.OldRequestHandler" >
-    <int name="myparam">1000</int>
-    <float name="ratio">1.4142135</float>
-    <arr name="myarr"><int>1</int><int>2</int></arr>
-    <str>foo</str>
-  </requestHandler>
-  <requestHandler name="oldagain" class="solr.tst.OldRequestHandler" >
-    <lst name="lst1"> <str name="op">sqrt</str> <int name="val">2</int> </lst>
-    <lst name="lst2"> <str name="op">log</str> <float name="val">10</float> </lst>
-  </requestHandler>
-
-  <requestHandler name="test" class="solr.tst.TestRequestHandler" />
 
   <!-- test query parameter defaults --> 
   <requestHandler name="defaults" class="solr.StandardRequestHandler">

Modified: lucene/solr/branches/sandbox/ryan/src/test/test-files/solr/conf/solrconfig-nocache.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/test-files/solr/conf/solrconfig-nocache.xml?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/test-files/solr/conf/solrconfig-nocache.xml (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/test-files/solr/conf/solrconfig-nocache.xml Fri Oct  3 14:26:50 2008
@@ -232,18 +232,6 @@
      <int name="ps">100</int>
     </lst>
   </requestHandler>
-  <requestHandler name="old" class="solr.tst.OldRequestHandler" >
-    <int name="myparam">1000</int>
-    <float name="ratio">1.4142135</float>
-    <arr name="myarr"><int>1</int><int>2</int></arr>
-    <str>foo</str>
-  </requestHandler>
-  <requestHandler name="oldagain" class="solr.tst.OldRequestHandler" >
-    <lst name="lst1"> <str name="op">sqrt</str> <int name="val">2</int> </lst>
-    <lst name="lst2"> <str name="op">log</str> <float name="val">10</float> </lst>
-  </requestHandler>
-
-  <requestHandler name="test" class="solr.tst.TestRequestHandler" />
 
   <!-- test query parameter defaults --> 
   <requestHandler name="defaults" class="solr.StandardRequestHandler">

Modified: lucene/solr/branches/sandbox/ryan/src/test/test-files/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/test/test-files/solr/conf/solrconfig.xml?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/test/test-files/solr/conf/solrconfig.xml (original)
+++ lucene/solr/branches/sandbox/ryan/src/test/test-files/solr/conf/solrconfig.xml Fri Oct  3 14:26:50 2008
@@ -272,19 +272,7 @@
      <int name="ps">100</int>
     </lst>
   </requestHandler>
-  <requestHandler name="old" class="solr.tst.OldRequestHandler" >
-    <int name="myparam">1000</int>
-    <float name="ratio">1.4142135</float>
-    <arr name="myarr"><int>1</int><int>2</int></arr>
-    <str>foo</str>
-  </requestHandler>
-  <requestHandler name="oldagain" class="solr.tst.OldRequestHandler" >
-    <lst name="lst1"> <str name="op">sqrt</str> <int name="val">2</int> </lst>
-    <lst name="lst2"> <str name="op">log</str> <float name="val">10</float> </lst>
-  </requestHandler>
-
-  <requestHandler name="test" class="solr.tst.TestRequestHandler" />
-
+  
   <!-- test query parameter defaults -->
   <requestHandler name="defaults" class="solr.StandardRequestHandler">
     <lst name="defaults">

Modified: lucene/solr/branches/sandbox/ryan/src/webapp/src/org/apache/solr/servlet/DirectSolrConnection.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/webapp/src/org/apache/solr/servlet/DirectSolrConnection.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/webapp/src/org/apache/solr/servlet/DirectSolrConnection.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/webapp/src/org/apache/solr/servlet/DirectSolrConnection.java Fri Oct  3 14:26:50 2008
@@ -53,17 +53,6 @@
   final SolrRequestParsers parser;
   
   /**
-   * Initialize using the static singleton SolrCore.getSolrCore().
-   * 
-   * @deprecated use {@link #DirectSolrConnection(SolrCore)}
-   */
-  @Deprecated
-  public DirectSolrConnection()
-  {
-    this( SolrCore.getSolrCore() );
-  }
-
-  /**
    * Initialize using an explicit SolrCore
    */
   public DirectSolrConnection( SolrCore c )