lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject [18/50] [abbrv] lucene-solr:jira/solr-10262: SOLR-7041: Cut over tests from <defaultSearchField> in schema to df on requests
Date Mon, 08 May 2017 15:26:35 GMT
SOLR-7041: Cut over tests from <defaultSearchField> in schema to df on requests


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/e776cbe4
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/e776cbe4
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/e776cbe4

Branch: refs/heads/jira/solr-10262
Commit: e776cbe4464e52a28ceffd9fa46d7c47ed44bb57
Parents: de709b1
Author: Jan Høydahl <janhoy@apache.org>
Authored: Fri May 5 00:53:50 2017 +0200
Committer: Jan Høydahl <janhoy@apache.org>
Committed: Fri May 5 00:53:50 2017 +0200

----------------------------------------------------------------------
 solr/CHANGES.txt                                |  2 +
 .../collection1/conf/schema-folding-extra.xml   |  1 -
 .../collection1/conf/schema-icucollate-dv.xml   |  1 -
 .../solr/collection1/conf/schema-icucollate.xml |  1 -
 .../conf/schema-icucollateoptions.xml           |  1 -
 .../clustering/solr/collection1/conf/schema.xml |  3 -
 .../conf/dataimport-schema-no-unique-key.xml    |  3 -
 .../solr/collection1/conf/dataimport-schema.xml |  1 -
 .../conf/dataimport-solr_id-schema.xml          |  3 -
 .../collection1/conf/dataimport-solrconfig.xml  |  1 +
 .../dataimport/TestContentStreamDataSource.java |  2 +-
 .../extraction/solr/collection1/conf/schema.xml |  1 -
 .../extraction/TestXLSXResponseWriter.java      |  2 +-
 .../langid/solr/collection1/conf/schema.xml     |  1 -
 .../uima/solr/collection1/conf/schema.xml       |  6 --
 .../test-files/uima/uima-tokenizers-schema.xml  |  6 --
 .../velocity/solr/collection1/conf/schema.xml   |  2 -
 .../solr/analysisconfs/analysis-err-schema.xml  |  1 -
 .../conf/schema-HighlighterMaxOffsetTest.xml    |  1 -
 .../conf/schema-blockjoinfacetcomponent.xml     |  1 -
 .../solr/collection1/conf/schema-bm25.xml       |  1 -
 .../collection1/conf/schema-charfilters.xml     |  1 -
 .../solr/collection1/conf/schema-collate-dv.xml |  1 -
 .../solr/collection1/conf/schema-collate.xml    |  1 -
 .../collection1/conf/schema-copyfield-test.xml  |  1 -
 .../collection1/conf/schema-custom-field.xml    |  1 -
 .../solr/collection1/conf/schema-dfi.xml        |  1 -
 .../solr/collection1/conf/schema-dfr.xml        |  1 -
 .../conf/schema-distrib-interval-faceting.xml   |  1 -
 .../conf/schema-docValuesFaceting.xml           |  1 -
 .../collection1/conf/schema-docValuesJoin.xml   |  1 -
 .../conf/schema-field-sort-values.xml           |  1 -
 .../solr/collection1/conf/schema-folding.xml    |  1 -
 .../solr/collection1/conf/schema-hash.xml       |  1 -
 .../solr/collection1/conf/schema-ib.xml         |  1 -
 .../collection1/conf/schema-lmdirichlet.xml     |  1 -
 .../collection1/conf/schema-lmjelinekmercer.xml |  1 -
 .../conf/schema-not-required-unique-key.xml     |  1 -
 .../collection1/conf/schema-phrasesuggest.xml   |  1 -
 .../conf/schema-postingshighlight.xml           |  1 -
 .../collection1/conf/schema-psuedo-fields.xml   |  3 +-
 .../collection1/conf/schema-required-fields.xml |  1 -
 .../solr/collection1/conf/schema-rest.xml       |  1 -
 .../solr/collection1/conf/schema-reversed.xml   |  1 -
 .../solr/collection1/conf/schema-sim.xml        |  1 -
 .../collection1/conf/schema-simpleqpplugin.xml  |  1 -
 .../conf/schema-single-dynamic-copy-field.xml   |  1 -
 .../collection1/conf/schema-spellchecker.xml    |  3 -
 .../solr/collection1/conf/schema-sql.xml        |  1 -
 .../solr/collection1/conf/schema-stop-keep.xml  | 59 --------------------
 .../solr/collection1/conf/schema-sweetspot.xml  |  1 -
 .../conf/schema-synonym-tokenizer.xml           |  1 -
 .../solr/collection1/conf/schema-tfidf.xml      |  1 -
 .../solr/collection1/conf/schema-trie.xml       |  4 --
 .../conf/schema-unifiedhighlight.xml            |  1 -
 .../test-files/solr/collection1/conf/schema.xml |  1 -
 .../solr/collection1/conf/schema11.xml          | 12 ++--
 .../solr/collection1/conf/schema12.xml          |  1 -
 .../solr/collection1/conf/schema15.xml          |  1 -
 .../solr/collection1/conf/schema_codec.xml      |  1 -
 .../solr/collection1/conf/schemasurround.xml    |  1 -
 .../conf/solrconfig-cache-enable-disable.xml    |  8 ++-
 .../conf/solrconfig-collapseqparser.xml         |  5 ++
 .../collection1/conf/solrconfig-elevate.xml     |  6 ++
 .../conf/solrconfig-functionquery.xml           |  5 ++
 .../conf/solrconfig-managed-schema.xml          |  6 ++
 .../collection1/conf/solrconfig-minimal.xml     |  6 ++
 .../collection1/conf/solrconfig-nocache.xml     |  6 ++
 .../conf/solrconfig-plugcollector.xml           |  6 ++
 .../conf/solrconfig-postingshighlight.xml       |  1 +
 .../conf/solrconfig-response-log-component.xml  |  6 ++
 .../solrconfig-sortingmergepolicyfactory.xml    |  5 ++
 .../conf/solrconfig-spellcheckcomponent.xml     |  5 ++
 .../solrconfig-tlog-with-delayingcomponent.xml  |  5 ++
 .../solr/collection1/conf/solrconfig-tlog.xml   |  6 ++
 .../solr/collection1/conf/solrconfig.xml        |  6 ++
 .../configsets/cloud-dynamic/conf/schema.xml    |  1 -
 .../solr/configsets/doc-expiry/conf/schema.xml  |  1 -
 .../test-files/solr/crazy-path-to-config.xml    |  7 +++
 .../test-files/solr/crazy-path-to-schema.xml    |  1 -
 .../apache/solr/TestDistributedGrouping.java    |  4 +-
 .../apache/solr/core/TestSolrConfigHandler.java |  4 +-
 .../highlight/HighlighterMaxOffsetTest.java     |  3 +-
 .../schema/TestDefaultSearchFieldResource.java  | 28 ----------
 .../solr/rest/schema/TestSchemaResource.java    |  7 +--
 .../apache/solr/search/QueryEqualityTest.java   |  9 ++-
 .../apache/solr/search/QueryParsingTest.java    |  4 +-
 .../solr/search/TestExtendedDismaxParser.java   |  3 +
 .../solr/search/TestMaxScoreQueryParser.java    |  4 +-
 .../solr/search/TestReRankQParserPlugin.java    |  6 ++
 .../solr/search/TestSimpleQParserPlugin.java    |  4 +-
 .../search/join/BlockJoinFacetRandomTest.java   |  1 +
 .../apache/solr/util/SolrPluginUtilsTest.java   |  7 ++-
 .../solrj/solr/collection1/conf/schema-sql.xml  |  1 -
 .../solrj/solr/collection1/conf/schema.xml      |  1 -
 .../solr/configsets/shared/conf/schema.xml      |  3 -
 .../solr/configsets/shared/conf/solrconfig.xml  |  6 ++
 .../solr/configsets/streaming/conf/schema.xml   |  1 -
 .../configsets/streaming/conf/solrconfig.xml    |  8 ++-
 .../solrj/solr/crazy-path-to-schema.xml         |  1 -
 .../solrj/solr/multicore/core0/conf/schema.xml  |  3 -
 .../solr/multicore/core0/conf/solrconfig.xml    |  6 ++
 .../solrj/solr/multicore/core1/conf/schema.xml  |  3 -
 .../solr/multicore/core1/conf/solrconfig.xml    |  6 ++
 104 files changed, 158 insertions(+), 214 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index ddf694a..f9576c2 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -335,6 +335,8 @@ Other Changes
 * SOLR-9867: Adding isLoading=true as core status. Fixing start after stop scenario in bin/solr
   (Andrey Kudryavtsev, Mikhail Khludnev)
 
+* SOLR-7041: Cutover tests to using 'q.op' and 'df' instead of schema 'defaultOperator' and 'defaultSearchField' (janhoy)
+
 ==================  6.5.1 ==================
 
 Bug Fixes

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-folding-extra.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-folding-extra.xml b/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-folding-extra.xml
index 8e13cf6..573ca53 100644
--- a/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-folding-extra.xml
+++ b/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-folding-extra.xml
@@ -47,7 +47,6 @@
   <field name="content_icutransform" type="text_icutransform" indexed="true" stored="true"/>
 
 
-  <defaultSearchField>id</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
 </schema>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate-dv.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate-dv.xml b/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate-dv.xml
index 3631077..1e2029d 100644
--- a/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate-dv.xml
+++ b/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate-dv.xml
@@ -46,7 +46,6 @@
   <field name="sort_da" type="sort_da_t" indexed="false" stored="false" multiValued="false" docValues="true"/>
   <field name="sort_custom" type="sort_custom_t" indexed="false" stored="false" multiValued="true" docValues="true"/>
 
-  <defaultSearchField>text</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
   <!-- copy our text to some sort fields with different orders -->

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate.xml b/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate.xml
index 563669a..1d121f2 100644
--- a/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate.xml
+++ b/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate.xml
@@ -46,7 +46,6 @@
   <field name="sort_custom" type="sort_custom_t" indexed="true" stored="false" multiValued="false"/>
 
 
-  <defaultSearchField>text</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
   <!-- copy our text to some sort fields with different orders -->

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollateoptions.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollateoptions.xml b/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollateoptions.xml
index 525b73f..cc8e340 100644
--- a/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollateoptions.xml
+++ b/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollateoptions.xml
@@ -57,7 +57,6 @@
   <field name="sort_uppercase_first" type="sort_uppercase_first_t" indexed="true" stored="false" multiValued="false"/>
 
 
-  <defaultSearchField>text</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
   <!-- copy our text to some sort fields with different orders -->

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/schema.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/schema.xml b/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/schema.xml
index 254cc85..66a6223 100644
--- a/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/schema.xml
+++ b/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/schema.xml
@@ -334,9 +334,6 @@
     -->
   <uniqueKey>id</uniqueKey>
 
-  <!-- field for the QueryParser to use when an explicit fieldname is absent -->
-  <defaultSearchField>text</defaultSearchField>
-
   <!-- copyField commands copy one field to another at the time a document
         is added to the index.  It's used either to index the same field differently,
         or to add multiple fields to the same field for easier/faster searching.  -->

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-schema-no-unique-key.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-schema-no-unique-key.xml b/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-schema-no-unique-key.xml
index bfe918c..ad01778 100644
--- a/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-schema-no-unique-key.xml
+++ b/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-schema-no-unique-key.xml
@@ -202,7 +202,4 @@
   <field name="text" type="text" indexed="true" stored="true"/>
   <field name="foo_i" type="int" indexed="true" stored="false"/>
   <field name="home" type="latLon" indexed="true" stored="true"/>
-
-  <!-- field for the QueryParser to use when an explicit fieldname is absent -->
-  <defaultSearchField>text</defaultSearchField>
 </schema>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-schema.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-schema.xml b/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-schema.xml
index e770523..7f34e00 100644
--- a/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-schema.xml
+++ b/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-schema.xml
@@ -67,5 +67,4 @@
   <dynamicField name="*_dt" type="date" indexed="true" stored="true"/>
 
   <uniqueKey>id</uniqueKey>
-  <defaultSearchField>desc</defaultSearchField>
 </schema>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solr_id-schema.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solr_id-schema.xml b/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solr_id-schema.xml
index 8927bce..fabe7e2 100644
--- a/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solr_id-schema.xml
+++ b/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solr_id-schema.xml
@@ -310,7 +310,4 @@
        Unless this field is marked with required="false", it will be a required field
     -->
   <uniqueKey>solr_id</uniqueKey>
-
-  <!-- field for the QueryParser to use when an explicit fieldname is absent -->
-  <defaultSearchField>desc</defaultSearchField>
 </schema>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solrconfig.xml b/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solrconfig.xml
index e3fb314..1029373 100644
--- a/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solrconfig.xml
+++ b/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solrconfig.xml
@@ -232,6 +232,7 @@
     <!-- default values for query parameters -->
      <lst name="defaults">
        <str name="echoParams">explicit</str>
+       <str name="df">desc</str>
        <!-- 
        <int name="rows">10</int>
        <str name="fl">*</str>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java
index 089a133..06fd51c 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java
@@ -92,7 +92,7 @@ public class TestContentStreamDataSource extends AbstractDataImportHandlerTestCa
     try (HttpSolrClient solrServer = getHttpSolrClient(buildUrl(jetty.getLocalPort(), "/solr/collection1"))) {
       solrServer.request(req);
       Thread.sleep(100);
-      ModifiableSolrParams queryAll = params("q", "*");
+      ModifiableSolrParams queryAll = params("q", "*", "df", "desc");
       QueryResponse qres = solrServer.query(queryAll);
       SolrDocumentList results = qres.getResults();
       assertEquals(0, results.getNumFound());

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/schema.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/schema.xml b/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/schema.xml
index b65c345..2865653 100644
--- a/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/schema.xml
+++ b/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/schema.xml
@@ -478,7 +478,6 @@
   <dynamicField name="ignored_*" type="text" indexed="false" stored="false"/>
 
 
-  <defaultSearchField>text</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
   <!-- copyField commands copy one field to another at the time a document

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/TestXLSXResponseWriter.java
----------------------------------------------------------------------
diff --git a/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/TestXLSXResponseWriter.java b/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/TestXLSXResponseWriter.java
index fd4e63d..5c79f0d 100644
--- a/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/TestXLSXResponseWriter.java
+++ b/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/TestXLSXResponseWriter.java
@@ -218,7 +218,7 @@ public class TestXLSXResponseWriter extends SolrTestCaseJ4 {
     assertEquals("1,0,hi", lines[1] );
 
     //assertions specific to multiple pseudofields functions like abs, div, exists, etc.. (SOLR-5423)
-    String funcText = getStringFromSheet(getWSResultForQuery(req("q","*", "wt","xlsx", "fl","XXX:id,YYY:exists(foo_s1)")));
+    String funcText = getStringFromSheet(getWSResultForQuery(req("df", "text", "q","*", "wt","xlsx", "fl","XXX:id,YYY:exists(foo_s1)")));
     String[] funcLines = funcText.split("\n");
     assertEquals(5, funcLines.length);
     assertEquals("XXX,YYY", funcLines[0] );

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/schema.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/schema.xml b/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/schema.xml
index 8fe71e9..5e52e99 100644
--- a/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/schema.xml
+++ b/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/schema.xml
@@ -68,7 +68,6 @@
   <dynamicField name="subject_*" type="string" indexed="true" stored="false"/>
 
 
-  <defaultSearchField>name</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/schema.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/schema.xml b/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/schema.xml
index e15fed8..35d3131 100644
--- a/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/schema.xml
+++ b/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/schema.xml
@@ -579,12 +579,6 @@
   <uniqueKey>id</uniqueKey>
 
   <!--
-    field for the QueryParser to use when an explicit fieldname is
-    absent
-  -->
-  <defaultSearchField>text</defaultSearchField>
-
-  <!--
     copyField commands copy one field to another at the time a document
     is added to the index. It's used either to index the same field
     differently, or to add multiple fields to the same field for

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/contrib/uima/src/test-files/uima/uima-tokenizers-schema.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/uima/src/test-files/uima/uima-tokenizers-schema.xml b/solr/contrib/uima/src/test-files/uima/uima-tokenizers-schema.xml
index 38241fc..bf4c72d 100644
--- a/solr/contrib/uima/src/test-files/uima/uima-tokenizers-schema.xml
+++ b/solr/contrib/uima/src/test-files/uima/uima-tokenizers-schema.xml
@@ -577,12 +577,6 @@
   <uniqueKey>id</uniqueKey>
 
   <!--
-    field for the QueryParser to use when an explicit fieldname is
-    absent
-  -->
-  <defaultSearchField>text</defaultSearchField>
-
-  <!--
     copyField commands copy one field to another at the time a document
     is added to the index. It's used either to index the same field
     differently, or to add multiple fields to the same field for

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/schema.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/schema.xml b/solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/schema.xml
index e156406..5b12cda 100644
--- a/solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/schema.xml
+++ b/solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/schema.xml
@@ -23,6 +23,4 @@
   <dynamicField name="*_s" type="string" indexed="true" stored="true"/>
 
   <uniqueKey>id</uniqueKey>
-
-  <defaultSearchField>id</defaultSearchField>
 </schema>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/analysisconfs/analysis-err-schema.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/analysisconfs/analysis-err-schema.xml b/solr/core/src/test-files/solr/analysisconfs/analysis-err-schema.xml
index 54f1b1c..168df6b 100644
--- a/solr/core/src/test-files/solr/analysisconfs/analysis-err-schema.xml
+++ b/solr/core/src/test-files/solr/analysisconfs/analysis-err-schema.xml
@@ -36,6 +36,5 @@
   <field name="text" type="text" indexed="true" stored="true"/>
   <field name="_version_" type="long"/>
 
-  <defaultSearchField>text</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 </schema>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/schema-HighlighterMaxOffsetTest.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-HighlighterMaxOffsetTest.xml b/solr/core/src/test-files/solr/collection1/conf/schema-HighlighterMaxOffsetTest.xml
index b13f598..c447222 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-HighlighterMaxOffsetTest.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-HighlighterMaxOffsetTest.xml
@@ -37,7 +37,6 @@ Test for HighlighterMaxOffsetTest which requires the use of ReversedWildcardFilt
 
 
   <uniqueKey>id</uniqueKey>
-  <defaultSearchField>content</defaultSearchField>
 
 
   <fieldType name="string" class="solr.StrField" sortMissingLast="true"/>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/schema-blockjoinfacetcomponent.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-blockjoinfacetcomponent.xml b/solr/core/src/test-files/solr/collection1/conf/schema-blockjoinfacetcomponent.xml
index 9ea5ec7..e262b73 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-blockjoinfacetcomponent.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-blockjoinfacetcomponent.xml
@@ -36,6 +36,5 @@
   <dynamicField name="*_f_multi" type="float" indexed="true" stored="true" docValues="true" multiValued="true"/>
 
 
-  <defaultSearchField>name</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 </schema>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/schema-bm25.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-bm25.xml b/solr/core/src/test-files/solr/collection1/conf/schema-bm25.xml
index ad76b6e..13924b7 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-bm25.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-bm25.xml
@@ -41,7 +41,6 @@
   <field name="text" type="text" indexed="true" stored="false"/>
   <field name="text_params" type="text_params" indexed="true" stored="false"/>
 
-  <defaultSearchField>text</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
 </schema>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/schema-charfilters.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-charfilters.xml b/solr/core/src/test-files/solr/collection1/conf/schema-charfilters.xml
index 852c9cf..11e2aa7 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-charfilters.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-charfilters.xml
@@ -42,7 +42,6 @@
   <field name="content" type="text" indexed="true" stored="true"/>
   <field name="content2" type="text2" indexed="true" stored="true"/>
 
-  <defaultSearchField>content</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
 </schema>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/schema-collate-dv.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-collate-dv.xml b/solr/core/src/test-files/solr/collection1/conf/schema-collate-dv.xml
index 20d2da0..af74654 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-collate-dv.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-collate-dv.xml
@@ -47,7 +47,6 @@
   <field name="sort_da" type="sort_da_t" indexed="false" stored="false" multiValued="false" docValues="true"/>
   <field name="sort_custom" type="sort_custom_t" indexed="false" stored="false" multiValued="true" docValues="true"/>
 
-  <defaultSearchField>text</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
   <!-- copy our text to some sort fields with different orders -->

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/schema-collate.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-collate.xml b/solr/core/src/test-files/solr/collection1/conf/schema-collate.xml
index 5167134..d5c4d69 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-collate.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-collate.xml
@@ -46,7 +46,6 @@
   <field name="sort_da" type="sort_da_t" indexed="true" stored="false" multiValued="false"/>
   <field name="sort_custom" type="sort_custom_t" indexed="true" stored="false" multiValued="false"/>
 
-  <defaultSearchField>text</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
   <!-- copy our text to some sort fields with different orders -->

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml b/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml
index 665114a..c16bf55 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml
@@ -462,7 +462,6 @@
                 termVectors="true" termPositions="true" termOffsets="true"/>
 
 
-  <defaultSearchField>text</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
   <!-- copyField commands copy one field to another at the time a document

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/schema-custom-field.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-custom-field.xml b/solr/core/src/test-files/solr/collection1/conf/schema-custom-field.xml
index cdf5dee..58c40d5 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-custom-field.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-custom-field.xml
@@ -36,6 +36,5 @@
 
   <!-- catchall wildcard to help ensure we aren't breaking function sorting -->
   <dynamicField name="*" type="string" indexed="true" stored="true"/>
-  <defaultSearchField>text</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 </schema>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/schema-dfi.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-dfi.xml b/solr/core/src/test-files/solr/collection1/conf/schema-dfi.xml
index 038ce51..c3dc509 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-dfi.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-dfi.xml
@@ -43,7 +43,6 @@
   <field name="text" type="text" indexed="true" stored="false"/>
   <field name="text_params" type="text_params" indexed="true" stored="false"/>
 
-  <defaultSearchField>text</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
   <similarity class="solr.SchemaSimilarityFactory"/>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/schema-dfr.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-dfr.xml b/solr/core/src/test-files/solr/collection1/conf/schema-dfr.xml
index f99a776..4b27707 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-dfr.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-dfr.xml
@@ -59,7 +59,6 @@
   <field name="text_params" type="text_params" indexed="true" stored="false"/>
   <field name="text_paramc" type="text_paramc" indexed="true" stored="false"/>
 
-  <defaultSearchField>text</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
 </schema>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/schema-distrib-interval-faceting.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-distrib-interval-faceting.xml b/solr/core/src/test-files/solr/collection1/conf/schema-distrib-interval-faceting.xml
index e843e0a..37da642 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-distrib-interval-faceting.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-distrib-interval-faceting.xml
@@ -73,7 +73,6 @@
   <dynamicField name="*_d1" type="double" indexed="true" stored="true" multiValued="false"/>
   <dynamicField name="*_dt1" type="date" indexed="true" stored="true" multiValued="false"/>
 
-  <defaultSearchField>id</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
   <copyField source="*_i" dest="*_i_dv"/>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/schema-docValuesFaceting.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-docValuesFaceting.xml b/solr/core/src/test-files/solr/collection1/conf/schema-docValuesFaceting.xml
index 0917ff5..571d915 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-docValuesFaceting.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-docValuesFaceting.xml
@@ -64,7 +64,6 @@
   <dynamicField name="*_dt_dv" type="${solr.tests.dateClass:pdate}" indexed="true" stored="false" docValues="true"/>
   <dynamicField name="*_dts_dv" type="${solr.tests.dateClass:pdate}" indexed="true" stored="false" docValues="true" multiValued="true"/>
 
-  <defaultSearchField>id</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
   <copyField source="*_i" dest="*_i_dv"/>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/schema-docValuesJoin.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-docValuesJoin.xml b/solr/core/src/test-files/solr/collection1/conf/schema-docValuesJoin.xml
index d152d98..d2188fc 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-docValuesJoin.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-docValuesJoin.xml
@@ -93,7 +93,6 @@
   <field name="_version_" type="long" indexed="true" stored="true" multiValued="false"/>
 
 
-  <defaultSearchField>id</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
   <copyField source="*_i" dest="*_i_dv"/>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/schema-field-sort-values.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-field-sort-values.xml b/solr/core/src/test-files/solr/collection1/conf/schema-field-sort-values.xml
index f678663..0cd22b0 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-field-sort-values.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-field-sort-values.xml
@@ -32,6 +32,5 @@
   <field name="payload" type="wrapped_int" indexed="false"
          stored="true" multiValued="false" docValues="true" required="true"/>
 
-  <defaultSearchField>text</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 </schema>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/schema-folding.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-folding.xml b/solr/core/src/test-files/solr/collection1/conf/schema-folding.xml
index 2b0bf32..5962136 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-folding.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-folding.xml
@@ -256,7 +256,6 @@
   <dynamicField name="*_fr" type="text_fr" indexed="true" stored="true"/>
 
 
-  <defaultSearchField>content</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
 </schema>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/schema-hash.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-hash.xml b/solr/core/src/test-files/solr/collection1/conf/schema-hash.xml
index 6a7987c..07ef7b1 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-hash.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-hash.xml
@@ -609,7 +609,6 @@
   <dynamicField name="*_sim3" type="sim3" indexed="true" stored="true"/>
   -->
 
-  <defaultSearchField>text</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
   <!-- copyField commands copy one field to another at the time a document

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/schema-ib.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-ib.xml b/solr/core/src/test-files/solr/collection1/conf/schema-ib.xml
index db7d5a3..e477e25 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-ib.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-ib.xml
@@ -46,7 +46,6 @@
   <field name="text" type="text" indexed="true" stored="false"/>
   <field name="text_params" type="text_params" indexed="true" stored="false"/>
 
-  <defaultSearchField>text</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
 </schema>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/schema-lmdirichlet.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-lmdirichlet.xml b/solr/core/src/test-files/solr/collection1/conf/schema-lmdirichlet.xml
index 063957b..a51685e 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-lmdirichlet.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-lmdirichlet.xml
@@ -39,7 +39,6 @@
   <field name="text" type="text" indexed="true" stored="false"/>
   <field name="text_params" type="text_params" indexed="true" stored="false"/>
 
-  <defaultSearchField>text</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
 </schema>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/schema-lmjelinekmercer.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-lmjelinekmercer.xml b/solr/core/src/test-files/solr/collection1/conf/schema-lmjelinekmercer.xml
index e137bd7..7c0fcd3 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-lmjelinekmercer.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-lmjelinekmercer.xml
@@ -39,7 +39,6 @@
   <field name="text" type="text" indexed="true" stored="false"/>
   <field name="text_params" type="text_params" indexed="true" stored="false"/>
 
-  <defaultSearchField>text</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
 </schema>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/schema-not-required-unique-key.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-not-required-unique-key.xml b/solr/core/src/test-files/solr/collection1/conf/schema-not-required-unique-key.xml
index fa61c89..e2bbef3 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-not-required-unique-key.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-not-required-unique-key.xml
@@ -36,6 +36,5 @@
   <field name="signatureField" type="string" indexed="true" stored="false"/>
   <dynamicField name="*_sS" type="string" indexed="false" stored="true"/>
 
-  <defaultSearchField>subject</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 </schema>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/schema-phrasesuggest.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-phrasesuggest.xml b/solr/core/src/test-files/solr/collection1/conf/schema-phrasesuggest.xml
index 0c8261c..0bc78d6 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-phrasesuggest.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-phrasesuggest.xml
@@ -52,6 +52,5 @@
   <field name="text" type="text" indexed="true" stored="false"/>
   <field name="stext" type="text" indexed="true" stored="true"/>
 
-  <defaultSearchField>text</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 </schema>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/schema-postingshighlight.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-postingshighlight.xml b/solr/core/src/test-files/solr/collection1/conf/schema-postingshighlight.xml
index cdacba4..18aa51a 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-postingshighlight.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-postingshighlight.xml
@@ -42,6 +42,5 @@
   <field name="text2" type="text" indexed="true" stored="true"/>
   <field name="text3" type="text_offsets" indexed="true" stored="true"/>
 
-  <defaultSearchField>text</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 </schema>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/schema-psuedo-fields.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-psuedo-fields.xml b/solr/core/src/test-files/solr/collection1/conf/schema-psuedo-fields.xml
index f3b0e30..5e048bd 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-psuedo-fields.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-psuedo-fields.xml
@@ -35,8 +35,7 @@
   <dynamicField name="*" type="string" indexed="true" stored="true" />
 
   <uniqueKey>id</uniqueKey>
-  <defaultSearchField>text</defaultSearchField>
-  
+
   <fieldType name="ignored" class="solr.StrField" indexed="false" stored="false"/>
   <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
   <fieldType name="long" class="solr.TrieLongField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/schema-required-fields.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-required-fields.xml b/solr/core/src/test-files/solr/collection1/conf/schema-required-fields.xml
index cf980ca..f394bbb 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-required-fields.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-required-fields.xml
@@ -426,7 +426,6 @@
   <dynamicField name="*aaa" type="int" indexed="false" stored="true"/>
 
 
-  <defaultSearchField>text</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
   <!-- copyField commands copy one field to another at the time a document

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/schema-rest.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-rest.xml b/solr/core/src/test-files/solr/collection1/conf/schema-rest.xml
index ca50051..3233258 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-rest.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-rest.xml
@@ -657,7 +657,6 @@
   <dynamicField name="random_*" type="random"/>
 
 
-  <defaultSearchField>text</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
   <copyField source="title" dest="title_stemmed" maxChars="200"/>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/schema-reversed.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-reversed.xml b/solr/core/src/test-files/solr/collection1/conf/schema-reversed.xml
index 8730e93..63887cb 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-reversed.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-reversed.xml
@@ -77,7 +77,6 @@
   <dynamicField name="*_sS" type="string" indexed="false" stored="true"/>
 
 
-  <defaultSearchField>one</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/schema-sim.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-sim.xml b/solr/core/src/test-files/solr/collection1/conf/schema-sim.xml
index cffd1e5..68c4d6d 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-sim.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-sim.xml
@@ -56,7 +56,6 @@
   <dynamicField name="*_sim2" type="sim2" indexed="true" stored="true"/>
   <dynamicField name="*_sim3" type="sim3" indexed="true" stored="true"/>
 
-  <defaultSearchField>sim1text</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
   <!-- Global similarity, defers to the fieldType.

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/schema-simpleqpplugin.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-simpleqpplugin.xml b/solr/core/src/test-files/solr/collection1/conf/schema-simpleqpplugin.xml
index 507024f..1183fd0 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-simpleqpplugin.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-simpleqpplugin.xml
@@ -56,6 +56,5 @@
   <field name="text-keyword0" type="text-keyword" indexed="true" stored="true"/>
   <field name="text-query0" type="text-query" indexed="true" stored="true"/>
 
-  <defaultSearchField>text0</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 </schema>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/schema-single-dynamic-copy-field.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-single-dynamic-copy-field.xml b/solr/core/src/test-files/solr/collection1/conf/schema-single-dynamic-copy-field.xml
index b185576..1652d88 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-single-dynamic-copy-field.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-single-dynamic-copy-field.xml
@@ -657,7 +657,6 @@
   <dynamicField name="random_*" type="random"/>
 
 
-  <defaultSearchField>text</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
   <copyField source="*" dest="text"/>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/schema-spellchecker.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-spellchecker.xml b/solr/core/src/test-files/solr/collection1/conf/schema-spellchecker.xml
index 7d3618a..3b6174f 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-spellchecker.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-spellchecker.xml
@@ -71,7 +71,4 @@
 
   <!-- field to use to determine and enforce document uniqueness. -->
   <uniqueKey>id</uniqueKey>
-
-  <!-- field for the QueryParser to use when an explicit fieldname is absent -->
-  <defaultSearchField>text</defaultSearchField>
 </schema>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/schema-sql.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-sql.xml b/solr/core/src/test-files/solr/collection1/conf/schema-sql.xml
index dbaac57..efa110c 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-sql.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-sql.xml
@@ -616,7 +616,6 @@
   <dynamicField name="*_sim3" type="sim3" indexed="true" stored="true"/>
   -->
 
-  <defaultSearchField>text</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
   <!-- copyField commands copy one field to another at the time a document

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/schema-stop-keep.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-stop-keep.xml b/solr/core/src/test-files/solr/collection1/conf/schema-stop-keep.xml
deleted file mode 100644
index b787c0c..0000000
--- a/solr/core/src/test-files/solr/collection1/conf/schema-stop-keep.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!--
-
-  For testing stopword configuration and keep word configuration
-
-  -->
-
-<schema name="test" version="1.0">
-
-  <fieldType name="integer" class="solr.TrieIntField" precisionStep="0"/>
-
-  <fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
-  <fieldType name="stop-one" class="solr.TextField">
-    <analyzer>
-      <tokenizer class="solr.MockTokenizerFactory"/>
-      <filter class="solr.LowerCaseFilterFactory"/>
-      <filter class="solr.StopFilterFactory" ignoreCase="true"
-              words="stop-1.txt"/>
-
-    </analyzer>
-  </fieldType>
-  <fieldType name="stop-two" class="solr.TextField">
-    <analyzer>
-      <tokenizer class="solr.MockTokenizerFactory"/>
-      <filter class="solr.LowerCaseFilterFactory"/>
-      <filter class="solr.StopFilterFactory" ignoreCase="true"
-              words="stop-1.txt,stop-2.txt"/>
-
-    </analyzer>
-  </fieldType>
-
-
-  <field name="id" type="integer" indexed="true" stored="true" multiValued="false" required="false"/>
-  <field name="one" type="stop-one" indexed="true" stored="false"/>
-  <field name="two" type="stop-two" indexed="true" stored="false"/>
-
-
-  <defaultSearchField>one</defaultSearchField>
-  <uniqueKey>id</uniqueKey>
-
-
-</schema>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/schema-sweetspot.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-sweetspot.xml b/solr/core/src/test-files/solr/collection1/conf/schema-sweetspot.xml
index a3933a9..ba021a2 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-sweetspot.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-sweetspot.xml
@@ -64,7 +64,6 @@
   <field name="text_baseline" type="text_baseline"/>
   <field name="text_hyperbolic" type="text_hyperbolic"/>
 
-  <defaultSearchField>text</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
 </schema>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/schema-synonym-tokenizer.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-synonym-tokenizer.xml b/solr/core/src/test-files/solr/collection1/conf/schema-synonym-tokenizer.xml
index e3ff5ec..09792f9 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-synonym-tokenizer.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-synonym-tokenizer.xml
@@ -36,6 +36,5 @@
   <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
   <field name="text" type="text_synonyms" indexed="true" stored="false"/>
 
-  <defaultSearchField>text</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 </schema>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/schema-tfidf.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-tfidf.xml b/solr/core/src/test-files/solr/collection1/conf/schema-tfidf.xml
index 97a68d1..0bec86f 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-tfidf.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-tfidf.xml
@@ -40,6 +40,5 @@
 
   <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
   <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
-  <defaultSearchField>text</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 </schema>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/schema-trie.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-trie.xml b/solr/core/src/test-files/solr/collection1/conf/schema-trie.xml
index f3d4c10..8cab0c8 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-trie.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-trie.xml
@@ -323,8 +323,4 @@
        Unless this field is marked with required="false", it will be a required field
     -->
   <uniqueKey>id</uniqueKey>
-
-  <!-- field for the QueryParser to use when an explicit fieldname is absent -->
-  <defaultSearchField>text</defaultSearchField>
-
 </schema>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/schema-unifiedhighlight.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-unifiedhighlight.xml b/solr/core/src/test-files/solr/collection1/conf/schema-unifiedhighlight.xml
index 8d71088..3e093f3 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-unifiedhighlight.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-unifiedhighlight.xml
@@ -41,6 +41,5 @@
   <field name="text2" type="text" indexed="true" stored="true"/>
   <field name="text3" type="text_offsets" indexed="true" stored="true"         large="true"/>
 
-  <defaultSearchField>text</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 </schema>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/schema.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema.xml b/solr/core/src/test-files/solr/collection1/conf/schema.xml
index bdda244..05145f9 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema.xml
@@ -773,7 +773,6 @@
   <copyField source="single_d_dvn" dest="copy_single_d_dvn"/>
   <copyField source="single_s_dvn" dest="copy_single_s_dvn"/>
 
-  <defaultSearchField>text</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
   <!-- copyField commands copy one field to another at the time a document

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/schema11.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema11.xml b/solr/core/src/test-files/solr/collection1/conf/schema11.xml
index 179f804..caa24cc 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema11.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema11.xml
@@ -482,12 +482,8 @@ valued. -->
     </analyzer>
   </fieldType>
 
-  <!-- Field to use to determine and enforce document uniqueness.
-       Unless this field is marked with required="false", it will be a required field
-    -->
-  <uniqueKey>id</uniqueKey>
-
- <!-- field for the QueryParser to use when an explicit fieldname is absent -->
- <defaultSearchField>text</defaultSearchField>
- 
+ <!-- Field to use to determine and enforce document uniqueness. 
+      Unless this field is marked with required="false", it will be a required field
+   -->
+ <uniqueKey>id</uniqueKey>
 </schema>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/schema12.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema12.xml b/solr/core/src/test-files/solr/collection1/conf/schema12.xml
index 5a85c1f..214fc26 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema12.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema12.xml
@@ -641,7 +641,6 @@
   <dynamicField name="*core" type="ignored" multiValued="true"/>
 
 
-  <defaultSearchField>text</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
   <copyField source="title" dest="title_stemmed"/>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/schema15.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema15.xml b/solr/core/src/test-files/solr/collection1/conf/schema15.xml
index 9b4f0b1..7db2142 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema15.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema15.xml
@@ -627,7 +627,6 @@
   </fieldType>
 
 
-  <defaultSearchField>text</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
   <copyField source="title" dest="title_stemmed"/>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/schema_codec.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema_codec.xml b/solr/core/src/test-files/solr/collection1/conf/schema_codec.xml
index 0454f3e..a90cf9c 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema_codec.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema_codec.xml
@@ -50,6 +50,5 @@
   <dynamicField name="*_disk" type="string_disk" indexed="false" stored="false" docValues="true"/>
   <dynamicField name="*_memory" type="string_memory" indexed="false" stored="false" docValues="true"/>
 
-  <defaultSearchField>string_f</defaultSearchField>
   <uniqueKey>string_f</uniqueKey>
 </schema>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/schemasurround.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schemasurround.xml b/solr/core/src/test-files/solr/collection1/conf/schemasurround.xml
index a0c29c9..c941f6f 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schemasurround.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schemasurround.xml
@@ -615,7 +615,6 @@
   <dynamicField name="random_*" type="random"/>
 
 
-  <defaultSearchField>text</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
   <copyField source="title" dest="title_stemmed"/>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/solrconfig-cache-enable-disable.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-cache-enable-disable.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-cache-enable-disable.xml
index 4053ebe..5990a81 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-cache-enable-disable.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-cache-enable-disable.xml
@@ -73,7 +73,13 @@
     <boolTofilterOptimizer enabled="false" cacheSize="32" threshold=".05"/>
 
   </query>
-  
+
+  <initParams path="standard">
+    <lst name="defaults">
+      <str name="df">text</str>
+    </lst>
+  </initParams>
+
 </config>
 
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml
index 3ac0b50..77b456c 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml
@@ -448,5 +448,10 @@ based HashBitset. -->
     <processor class="solr.RunUpdateProcessorFactory" />
   </updateRequestProcessorChain>
 
+  <initParams path="/elevate,standard">
+    <lst name="defaults">
+      <str name="df">text</str>
+    </lst>
+  </initParams>
 </config>
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml
index a591816..e190d68 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml
@@ -169,4 +169,10 @@
 
   <queryParser name="foo" class="FooQParserPlugin"/>
 
+  <initParams path="/elevate,/dataElevate">
+    <lst name="defaults">
+      <str name="df">text</str>
+    </lst>
+  </initParams>
+
 </config>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/solrconfig-functionquery.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-functionquery.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-functionquery.xml
index 37c2057..10f5e85 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-functionquery.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-functionquery.xml
@@ -39,5 +39,10 @@
   <valueSourceParser name="nvl" class="org.apache.solr.search.function.NvlValueSourceParser">
     <float name="nvlFloatValue">0.0</float>
   </valueSourceParser>
+  <initParams path="standard">
+    <lst name="defaults">
+      <str name="df">text</str>
+    </lst>
+  </initParams>
 
 </config>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema.xml
index c1390c8..146b154 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema.xml
@@ -72,4 +72,10 @@
     </lst>
   </requestHandler>
 
+  <initParams path="standard">
+    <lst name="defaults">
+      <str name="df">text</str>
+    </lst>
+  </initParams>
+
 </config>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/solrconfig-minimal.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-minimal.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-minimal.xml
index 75e71d9..aedb683 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-minimal.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-minimal.xml
@@ -55,5 +55,11 @@
 
   </requestHandler>
 
+  <initParams path="/select">
+    <lst name="defaults">
+      <str name="df">text</str>
+    </lst>
+  </initParams>
+
 </config>
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml
index 0f13842..c6d33b2 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml
@@ -39,4 +39,10 @@
     <httpCaching never304="true" />
   </requestDispatcher>
 
+  <initParams path="standard">
+    <lst name="defaults">
+      <str name="df">text</str>
+    </lst>
+  </initParams>
+
 </config>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml
index c61ce08..75f7ced 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml
@@ -550,5 +550,11 @@ based HashBitset. -->
     <processor class="solr.RunUpdateProcessorFactory" />
   </updateRequestProcessorChain>
 
+  <initParams path="standard,dismax,defaults,lazy,spellCheckCompRH,spellCheckWithWordbreak,spellCheckCompRH_Direct,spellCheckCompRH1,mltrh,tvrh,/terms">
+    <lst name="defaults">
+      <str name="df">text</str>
+    </lst>
+  </initParams>
+
 </config>
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/solrconfig-postingshighlight.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-postingshighlight.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-postingshighlight.xml
index 30f4158..9db6205 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-postingshighlight.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-postingshighlight.xml
@@ -27,6 +27,7 @@
   <requestHandler name="standard" class="solr.StandardRequestHandler">
     <lst name="defaults">
       <bool name="hl.defaultSummary">false</bool>
+      <str name="df">text</str>
     </lst>
   </requestHandler>
   <searchComponent class="solr.HighlightComponent" name="highlight">

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/solrconfig-response-log-component.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-response-log-component.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-response-log-component.xml
index bf8ed42..f89b187 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-response-log-component.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-response-log-component.xml
@@ -52,4 +52,10 @@
     </lst>
   </requestHandler>
 
+  <initParams path="withlog,nolog">
+    <lst name="defaults">
+      <str name="df">text</str>
+    </lst>
+  </initParams>
+
 </config>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingmergepolicyfactory.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingmergepolicyfactory.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingmergepolicyfactory.xml
index 3746827..a7a8358 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingmergepolicyfactory.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingmergepolicyfactory.xml
@@ -47,5 +47,10 @@
       <maxTime>${solr.autoSoftCommit.maxTime:-1}</maxTime>
     </autoSoftCommit>
   </updateHandler>
+  <initParams path="standard">
+    <lst name="defaults">
+      <str name="df">text</str>
+    </lst>
+  </initParams>
 
 </config>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml
index 23e1cd2..5324a35 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml
@@ -189,5 +189,10 @@
       <str>spellcheck</str>
     </arr>
   </requestHandler>
+  <initParams path="spellCheckCompRH,spellCheckCompRH1,spellCheckWithWordbreak">
+    <lst name="defaults">
+      <str name="df">text</str>
+    </lst>
+  </initParams>
 
 </config>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog-with-delayingcomponent.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog-with-delayingcomponent.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog-with-delayingcomponent.xml
index 4b04cab..4083975 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog-with-delayingcomponent.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog-with-delayingcomponent.xml
@@ -115,5 +115,10 @@
       <str>delayingSearchComponent</str>
     </arr>
   </requestHandler>
+  <initParams path="standard,/select">
+    <lst name="defaults">
+      <str name="df">text</str>
+    </lst>
+  </initParams>
 
 </config>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml
index 315d1be..b08af83 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml
@@ -158,4 +158,10 @@
 
   </query>
 
+  <initParams path="standard">
+    <lst name="defaults">
+      <str name="df">text</str>
+    </lst>
+  </initParams>
+
 </config>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
index 0d01067..58f9551 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
@@ -572,5 +572,11 @@
     <str name="storageIO">org.apache.solr.rest.ManagedResourceStorage$InMemoryStorageIO</str>
   </restManager>
 
+  <initParams path="standard,dismax,defaults,lazy,spellCheckCompRH,spellCheckWithWordbreak,spellCheckCompRH_Direct,spellCheckCompRH1,mltrh,tvrh,/search-facet-def,/search-facet-invariants,/terms">
+    <lst name="defaults">
+      <str name="df">text</str>
+    </lst>
+  </initParams>
+
 </config>
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/configsets/cloud-dynamic/conf/schema.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/configsets/cloud-dynamic/conf/schema.xml b/solr/core/src/test-files/solr/configsets/cloud-dynamic/conf/schema.xml
index d15c199..5612724 100644
--- a/solr/core/src/test-files/solr/configsets/cloud-dynamic/conf/schema.xml
+++ b/solr/core/src/test-files/solr/configsets/cloud-dynamic/conf/schema.xml
@@ -283,7 +283,6 @@
   <dynamicField name="random_*" type="random"/>
 
 
-  <defaultSearchField>text</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
   <!-- example of a custom similarity -->

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/configsets/doc-expiry/conf/schema.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/configsets/doc-expiry/conf/schema.xml b/solr/core/src/test-files/solr/configsets/doc-expiry/conf/schema.xml
index c622eba..7adede3 100644
--- a/solr/core/src/test-files/solr/configsets/doc-expiry/conf/schema.xml
+++ b/solr/core/src/test-files/solr/configsets/doc-expiry/conf/schema.xml
@@ -277,7 +277,6 @@
   <dynamicField name="random_*" type="random"/>
 
 
-  <defaultSearchField>text</defaultSearchField>
   <uniqueKey>id</uniqueKey>
 
   <!-- example of a custom similarity -->

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/crazy-path-to-config.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/crazy-path-to-config.xml b/solr/core/src/test-files/solr/crazy-path-to-config.xml
index 4b086dc..c6dc859 100644
--- a/solr/core/src/test-files/solr/crazy-path-to-config.xml
+++ b/solr/core/src/test-files/solr/crazy-path-to-config.xml
@@ -42,6 +42,7 @@
   <requestHandler name="crazy_custom_qt" class="solr.StandardRequestHandler">
     <lst name="defaults">
       <str name="fl">implicit</str>
+      <str name="df">subject</str>
     </lst>
   </requestHandler>
   
@@ -54,4 +55,10 @@
     <gettableFiles>solrconfig.xml schema.xml</gettableFiles>
   </admin>
 
+  <initParams path="standard,crazy_custom_qt">
+    <lst name="defaults">
+      <str name="df">subject</str>
+    </lst>
+  </initParams>
+
 </config>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test-files/solr/crazy-path-to-schema.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/crazy-path-to-schema.xml b/solr/core/src/test-files/solr/crazy-path-to-schema.xml
index 7d06ff9..ef9ce3a 100644
--- a/solr/core/src/test-files/solr/crazy-path-to-schema.xml
+++ b/solr/core/src/test-files/solr/crazy-path-to-schema.xml
@@ -41,6 +41,5 @@
    <field name="subject" type="text" indexed="true" stored="true"/>
  </fields>
 
- <defaultSearchField>subject</defaultSearchField>
  <uniqueKey>id</uniqueKey>
 </schema>

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java b/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java
index a9e6d57..ca7f9ee 100644
--- a/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java
+++ b/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java
@@ -62,7 +62,7 @@ public class TestDistributedGrouping extends BaseDistributedSearchTestCase {
     query("q", "*:*", "rows", 100, "fl", "id," + i1, "group", "true", "group.field", i1, "group.limit", -1, "sort", i1 + " asc, id asc", "hl","true","hl.fl",t1);
     query("q", "*:*", "rows", 100, "fl", "id," + i1, "group", "true", "group.field", i1, "group.limit", -1, "sort", i1 + " asc, id asc", "facet", "true", "facet.field", t1);
     query("q", "*:*", "rows", 100, "fl", "id," + i1, "group", "true", "group.field", i1, "group.limit", -1, "sort", i1 + " asc, id asc", "stats", "true", "stats.field", i1);
-    query("q", "kings", "rows", 100, "fl", "id," + i1, "group", "true", "group.field", i1, "group.limit", -1, "sort", i1 + " asc, id asc", "spellcheck", "true", "spellcheck.build", "true", "qt", "spellCheckCompRH");
+    query("q", "kings", "rows", 100, "fl", "id," + i1, "group", "true", "group.field", i1, "group.limit", -1, "sort", i1 + " asc, id asc", "spellcheck", "true", "spellcheck.build", "true", "qt", "spellCheckCompRH", "df", "subject");
     query("q", "*:*", "fq", s1 + ":a", "rows", 100, "fl", "id," + i1, "group", "true", "group.field", i1, "group.limit", -1, "sort", i1 + " asc, id asc", "group.truncate", "true", "facet", "true", "facet.field", t1);
 
     indexr(id,1, i1, 100, tlong, 100, i1dv, 100, t1,"now is the time for all good men",
@@ -160,7 +160,7 @@ public class TestDistributedGrouping extends BaseDistributedSearchTestCase {
     query("q", "*:*", "rows", 100, "fl", "id," + i1, "group", "true", "group.field", i1, "group.limit", -1, "sort", "{!func}add(" + i1 + ",5) asc, id asc");
     query("q", "*:*", "rows", 100, "fl", "id," + i1, "group", "true", "group.field", i1, "group.limit", -1, "sort", i1 + " asc, id asc", "facet", "true", "facet.field", t1);
     query("q", "*:*", "rows", 100, "fl", "id," + i1, "group", "true", "group.field", i1, "group.limit", -1, "sort", i1 + " asc, id asc", "stats", "true", "stats.field", tlong);
-    query("q", "kings", "rows", 100, "fl", "id," + i1, "group", "true", "group.field", i1, "group.limit", -1, "sort", i1 + " asc, id asc", "spellcheck", "true", "spellcheck.build", "true", "qt", "spellCheckCompRH");
+    query("q", "kings", "rows", 100, "fl", "id," + i1, "group", "true", "group.field", i1, "group.limit", -1, "sort", i1 + " asc, id asc", "spellcheck", "true", "spellcheck.build", "true", "qt", "spellCheckCompRH", "df", "subject");
     query("q", "*:*", "rows", 100, "fl", "id," + i1, "group", "true", "group.field", i1, "group.limit", -1, "sort", i1 + " asc, id asc", "facet", "true", "hl","true","hl.fl",t1);
     query("q", "*:*", "rows", 100, "fl", "id," + i1, "group", "true", "group.field", i1, "group.limit", -1, "sort", i1 + " asc, id asc", "group.sort", "id desc");
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java b/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
index ec81c25..13d4d01 100644
--- a/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
+++ b/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
@@ -414,8 +414,8 @@ public class TestSolrConfigHandler extends RestTestBase {
 
     List l = (List) Utils.getObjectByPath(map, false, Arrays.asList("config", "initParams"));
     assertNotNull("no object /config/initParams : "+ TestBlobHandler.getAsString(map) , l);
-    assertEquals( 1, l.size());
-    assertEquals( "val", ((Map)l.get(0)).get("key") );
+    assertEquals( 2, l.size());
+    assertEquals( "val", ((Map)l.get(1)).get("key") );
 
 
     payload = "{\n" +

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test/org/apache/solr/highlight/HighlighterMaxOffsetTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/highlight/HighlighterMaxOffsetTest.java b/solr/core/src/test/org/apache/solr/highlight/HighlighterMaxOffsetTest.java
index fb47f6e..5be67b9 100644
--- a/solr/core/src/test/org/apache/solr/highlight/HighlighterMaxOffsetTest.java
+++ b/solr/core/src/test/org/apache/solr/highlight/HighlighterMaxOffsetTest.java
@@ -101,7 +101,8 @@ public class HighlighterMaxOffsetTest extends SolrTestCaseJ4 {
 
   private static void assertHighlighting(String field) throws Exception {
     assertQ(req("q", "id:DOC1", 
-                "hl.q", "JPEG", 
+                "df", "content",
+                "hl.q", "JPEG",
                 "indent", "true", 
                 "hl", "true", 
                 "hl.fl", field, 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test/org/apache/solr/rest/schema/TestDefaultSearchFieldResource.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/rest/schema/TestDefaultSearchFieldResource.java b/solr/core/src/test/org/apache/solr/rest/schema/TestDefaultSearchFieldResource.java
deleted file mode 100644
index 84ccd0a..0000000
--- a/solr/core/src/test/org/apache/solr/rest/schema/TestDefaultSearchFieldResource.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.solr.rest.schema;
-import org.apache.solr.rest.SolrRestletTestBase;
-import org.junit.Test;
-
-public class TestDefaultSearchFieldResource  extends SolrRestletTestBase {
-  @Test
-  public void testGetDefaultSearchField() throws Exception {
-    assertQ("/schema/defaultsearchfield?indent=on&wt=xml",
-            "count(/response/str[@name='defaultSearchField']) = 1",
-            "/response/str[@name='defaultSearchField'][.='text']");
-  }
-}

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test/org/apache/solr/rest/schema/TestSchemaResource.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/rest/schema/TestSchemaResource.java b/solr/core/src/test/org/apache/solr/rest/schema/TestSchemaResource.java
index 9fa75df..cc8cc33 100644
--- a/solr/core/src/test/org/apache/solr/rest/schema/TestSchemaResource.java
+++ b/solr/core/src/test/org/apache/solr/rest/schema/TestSchemaResource.java
@@ -32,9 +32,6 @@ public class TestSchemaResource extends SolrRestletTestBase {
             "count(/response/lst[@name='schema']/str[@name='uniqueKey']) = 1",
             "/response/lst[@name='schema']/str[@name='uniqueKey'][.='id']",
         
-            "count(/response/lst[@name='schema']/str[@name='defaultSearchField']) = 1",
-            "/response/lst[@name='schema']/str[@name='defaultSearchField'][.='text']",
-
             "(/response/lst[@name='schema']/arr[@name='fieldTypes']/lst/str[@name='name'])[1] = 'HTMLstandardtok'",
             "(/response/lst[@name='schema']/arr[@name='fieldTypes']/lst/str[@name='name'])[2] = 'HTMLwhitetok'",
             "(/response/lst[@name='schema']/arr[@name='fieldTypes']/lst/str[@name='name'])[3] = 'boolean'",
@@ -111,8 +108,7 @@ public class TestSchemaResource extends SolrRestletTestBase {
              "/schema/name=='test-rest'",
              "/schema/version==1.6",
              "/schema/uniqueKey=='id'",
-             "/schema/defaultSearchField=='text'",
-        
+
              "/schema/fieldTypes/[0]/name=='HTMLstandardtok'",
              "/schema/fieldTypes/[1]/name=='HTMLwhitetok'",
              "/schema/fieldTypes/[2]/name=='boolean'",
@@ -151,7 +147,6 @@ public class TestSchemaResource extends SolrRestletTestBase {
             "/schema/@name = 'test-rest'",
             "/schema/@version = '1.6'",
             "/schema/uniqueKey = 'id'",
-            "/schema/defaultSearchField = 'text'",
 
             "(/schema/fieldType)[1]/@name = 'HTMLstandardtok'",
             "(/schema/fieldType)[2]/@name = 'HTMLwhitetok'",

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java b/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java
index 7745817..1ec4198 100644
--- a/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java
+++ b/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java
@@ -1011,7 +1011,7 @@ public class QueryEqualityTest extends SolrTestCaseJ4 {
    */
   protected void assertQueryEquals(final String defType,
                                    final String... inputs) throws Exception {
-    SolrQueryRequest req = req();
+    SolrQueryRequest req = req(new String[] {"df", "text"});
     try {
       assertQueryEquals(defType, req, inputs);
     } finally {
@@ -1173,4 +1173,9 @@ public class QueryEqualityTest extends SolrTestCaseJ4 {
       req.close();
     }
   }
-}
\ No newline at end of file
+
+  // Override req to add df param
+  public static SolrQueryRequest req(String... q) {
+    return SolrTestCaseJ4.req(q, "df", "text");
+  }
+}

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test/org/apache/solr/search/QueryParsingTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/QueryParsingTest.java b/solr/core/src/test/org/apache/solr/search/QueryParsingTest.java
index b703846..925f71b 100644
--- a/solr/core/src/test/org/apache/solr/search/QueryParsingTest.java
+++ b/solr/core/src/test/org/apache/solr/search/QueryParsingTest.java
@@ -40,8 +40,8 @@ public class QueryParsingTest extends SolrTestCaseJ4 {
    */
   public void testQParserEmptyInput() throws Exception {
     
-    SolrQueryRequest req = req();
-    
+    SolrQueryRequest req = req("df", "text");
+
     final String[] parsersTested = new String[] {
       OldLuceneQParserPlugin.NAME,
       LuceneQParserPlugin.NAME,

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e776cbe4/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java b/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java
index 6a211d0..d416b22 100644
--- a/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java
+++ b/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java
@@ -1771,10 +1771,13 @@ public class TestExtendedDismaxParser extends SolrTestCaseJ4 {
 
   public void testAutoGeneratePhraseQueries() throws Exception {
     ModifiableSolrParams noSowParams = new ModifiableSolrParams();
+    noSowParams.add("df", "text");
     ModifiableSolrParams sowFalseParams = new ModifiableSolrParams();
     sowFalseParams.add("sow", "false");
+    sowFalseParams.add("df", "text");
     ModifiableSolrParams sowTrueParams = new ModifiableSolrParams();
     sowTrueParams.add("sow", "true");
+    sowTrueParams.add("df", "text");
 
     // From synonyms.txt:
     //


Mime
View raw message