You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ds...@apache.org on 2017/06/28 21:22:56 UTC
[1/4] lucene-solr:master: SOLR-6807: requestDispatcher/@handleSelect
now defaults to false; stop using it. Deprecated StandardRequestHandler;
stop using it.
Repository: lucene-solr
Updated Branches:
refs/heads/master d5963bebc -> 82a44beb3
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test/org/apache/solr/spelling/WordBreakSolrSpellCheckerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/spelling/WordBreakSolrSpellCheckerTest.java b/solr/core/src/test/org/apache/solr/spelling/WordBreakSolrSpellCheckerTest.java
index f24bcba..258594a 100644
--- a/solr/core/src/test/org/apache/solr/spelling/WordBreakSolrSpellCheckerTest.java
+++ b/solr/core/src/test/org/apache/solr/spelling/WordBreakSolrSpellCheckerTest.java
@@ -158,7 +158,7 @@ public class WordBreakSolrSpellCheckerTest extends SolrTestCaseJ4 {
public void testInConjunction() throws Exception {
assertQ(req(
"q", "lowerfilt:(paintable pine apple good ness)",
- "qt", "spellCheckWithWordbreak",
+ "qt", "/spellCheckWithWordbreak",
"indent", "true",
SpellCheckComponent.SPELLCHECK_BUILD, "true",
SpellCheckComponent.COMPONENT_NAME, "true",
@@ -222,7 +222,7 @@ public class WordBreakSolrSpellCheckerTest extends SolrTestCaseJ4 {
public void testCollate() throws Exception {
assertQ(req(
"q", "lowerfilt:(paintable pine apple godness)",
- "qt", "spellCheckWithWordbreak",
+ "qt", "/spellCheckWithWordbreak",
"indent", "true",
SpellCheckComponent.SPELLCHECK_BUILD, "true",
SpellCheckComponent.COMPONENT_NAME, "true",
@@ -248,7 +248,7 @@ public class WordBreakSolrSpellCheckerTest extends SolrTestCaseJ4 {
);
assertQ(req(
"q", "lowerfilt:(pine AND apple)",
- "qt", "spellCheckWithWordbreak",
+ "qt", "/spellCheckWithWordbreak",
"indent", "true",
SpellCheckComponent.COMPONENT_NAME, "true",
SpellCheckComponent.SPELLCHECK_ACCURACY, ".75",
@@ -262,7 +262,7 @@ public class WordBreakSolrSpellCheckerTest extends SolrTestCaseJ4 {
);
assertQ(req(
"q", "lowerfilt:pine AND NOT lowerfilt:apple",
- "qt", "spellCheckWithWordbreak",
+ "qt", "/spellCheckWithWordbreak",
"indent", "true",
SpellCheckComponent.COMPONENT_NAME, "true",
SpellCheckComponent.SPELLCHECK_ACCURACY, ".75",
@@ -275,7 +275,7 @@ public class WordBreakSolrSpellCheckerTest extends SolrTestCaseJ4 {
);
assertQ(req(
"q", "lowerfilt:pine NOT lowerfilt:apple",
- "qt", "spellCheckWithWordbreak",
+ "qt", "/spellCheckWithWordbreak",
"indent", "true",
SpellCheckComponent.COMPONENT_NAME, "true",
SpellCheckComponent.SPELLCHECK_ACCURACY, ".75",
@@ -288,7 +288,7 @@ public class WordBreakSolrSpellCheckerTest extends SolrTestCaseJ4 {
);
assertQ(req(
"q", "lowerfilt:(+pine -apple)",
- "qt", "spellCheckWithWordbreak",
+ "qt", "/spellCheckWithWordbreak",
"indent", "true",
SpellCheckComponent.COMPONENT_NAME, "true",
SpellCheckComponent.SPELLCHECK_ACCURACY, ".75",
@@ -301,7 +301,7 @@ public class WordBreakSolrSpellCheckerTest extends SolrTestCaseJ4 {
);
assertQ(req(
"q", "lowerfilt:(+printableinpuntableplantable)",
- "qt", "spellCheckWithWordbreak",
+ "qt", "/spellCheckWithWordbreak",
"indent", "true",
SpellCheckComponent.COMPONENT_NAME, "true",
SpellCheckComponent.SPELLCHECK_ACCURACY, "1",
@@ -313,7 +313,7 @@ public class WordBreakSolrSpellCheckerTest extends SolrTestCaseJ4 {
);
assertQ(req(
"q", "zxcv AND qwtp AND fghj",
- "qt", "spellCheckWithWordbreak",
+ "qt", "/spellCheckWithWordbreak",
"defType", "edismax",
"qf", "lowerfilt",
"indent", "true",
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/example/example-DIH/solr/db/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/example/example-DIH/solr/db/conf/solrconfig.xml b/solr/example/example-DIH/solr/db/conf/solrconfig.xml
index 46e7b87..c03529e 100644
--- a/solr/example/example-DIH/solr/db/conf/solrconfig.xml
+++ b/solr/example/example-DIH/solr/db/conf/solrconfig.xml
@@ -587,22 +587,8 @@
This section contains instructions for how the SolrDispatchFilter
should behave when processing requests for this SolrCore.
-
- handleSelect is a legacy option that affects the behavior of requests
- such as /select?qt=XXX
-
- handleSelect="true" will cause the SolrDispatchFilter to process
- the request and dispatch the query to a handler specified by the
- "qt" param, assuming "/select" isn't already registered.
-
- handleSelect="false" will cause the SolrDispatchFilter to
- ignore "/select" requests, resulting in a 404 unless a handler
- is explicitly registered with the name "/select"
-
- handleSelect="true" is not recommended for new users, but is the default
- for backwards compatibility
-->
- <requestDispatcher handleSelect="false" >
+ <requestDispatcher>
<!-- Request Parsing
These settings indicate how Solr Requests may be parsed, and
@@ -699,14 +685,6 @@
Incoming queries will be dispatched to a specific handler by name
based on the path specified in the request.
- Legacy behavior: If the request path uses "/select" but no Request
- Handler has that name, and if handleSelect="true" has been specified in
- the requestDispatcher, then the Request Handler is dispatched based on
- the qt parameter. Handlers without a leading '/' are accessed this way
- like so: http://host/app/[core/]select?qt=name If no qt is
- given, then the requestHandler that declares default="true" will be
- used or the one named "standard".
-
If a Request Handler is declared with startup="lazy", then it will
not be initialized until the first request that uses it.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/example/example-DIH/solr/mail/conf/solrconfig.xml b/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
index 950a891..28f415c 100644
--- a/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
+++ b/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
@@ -590,22 +590,8 @@
This section contains instructions for how the SolrDispatchFilter
should behave when processing requests for this SolrCore.
-
- handleSelect is a legacy option that affects the behavior of requests
- such as /select?qt=XXX
-
- handleSelect="true" will cause the SolrDispatchFilter to process
- the request and dispatch the query to a handler specified by the
- "qt" param, assuming "/select" isn't already registered.
-
- handleSelect="false" will cause the SolrDispatchFilter to
- ignore "/select" requests, resulting in a 404 unless a handler
- is explicitly registered with the name "/select"
-
- handleSelect="true" is not recommended for new users, but is the default
- for backwards compatibility
-->
- <requestDispatcher handleSelect="false" >
+ <requestDispatcher>
<!-- Request Parsing
These settings indicate how Solr Requests may be parsed, and
@@ -702,14 +688,6 @@
Incoming queries will be dispatched to a specific handler by name
based on the path specified in the request.
- Legacy behavior: If the request path uses "/select" but no Request
- Handler has that name, and if handleSelect="true" has been specified in
- the requestDispatcher, then the Request Handler is dispatched based on
- the qt parameter. Handlers without a leading '/' are accessed this way
- like so: http://host/app/[core/]select?qt=name If no qt is
- given, then the requestHandler that declares default="true" will be
- used or the one named "standard".
-
If a Request Handler is declared with startup="lazy", then it will
not be initialized until the first request that uses it.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/example/example-DIH/solr/solr/conf/solrconfig.xml b/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
index 0fd689f..7019be7 100644
--- a/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
+++ b/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
@@ -587,22 +587,8 @@
This section contains instructions for how the SolrDispatchFilter
should behave when processing requests for this SolrCore.
-
- handleSelect is a legacy option that affects the behavior of requests
- such as /select?qt=XXX
-
- handleSelect="true" will cause the SolrDispatchFilter to process
- the request and dispatch the query to a handler specified by the
- "qt" param, assuming "/select" isn't already registered.
-
- handleSelect="false" will cause the SolrDispatchFilter to
- ignore "/select" requests, resulting in a 404 unless a handler
- is explicitly registered with the name "/select"
-
- handleSelect="true" is not recommended for new users, but is the default
- for backwards compatibility
-->
- <requestDispatcher handleSelect="false" >
+ <requestDispatcher>
<!-- Request Parsing
These settings indicate how Solr Requests may be parsed, and
@@ -699,14 +685,6 @@
Incoming queries will be dispatched to a specific handler by name
based on the path specified in the request.
- Legacy behavior: If the request path uses "/select" but no Request
- Handler has that name, and if handleSelect="true" has been specified in
- the requestDispatcher, then the Request Handler is dispatched based on
- the qt parameter. Handlers without a leading '/' are accessed this way
- like so: http://host/app/[core/]select?qt=name If no qt is
- given, then the requestHandler that declares default="true" will be
- used or the one named "standard".
-
If a Request Handler is declared with startup="lazy", then it will
not be initialized until the first request that uses it.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/example/files/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/example/files/conf/solrconfig.xml b/solr/example/files/conf/solrconfig.xml
index d16ddb1..71fdd47 100644
--- a/solr/example/files/conf/solrconfig.xml
+++ b/solr/example/files/conf/solrconfig.xml
@@ -585,22 +585,8 @@
This section contains instructions for how the SolrDispatchFilter
should behave when processing requests for this SolrCore.
-
- handleSelect is a legacy option that affects the behavior of requests
- such as /select?qt=XXX
-
- handleSelect="true" will cause the SolrDispatchFilter to process
- the request and dispatch the query to a handler specified by the
- "qt" param, assuming "/select" isn't already registered.
-
- handleSelect="false" will cause the SolrDispatchFilter to
- ignore "/select" requests, resulting in a 404 unless a handler
- is explicitly registered with the name "/select"
-
- handleSelect="true" is not recommended for new users, but is the default
- for backwards compatibility
-->
- <requestDispatcher handleSelect="false" >
+ <requestDispatcher>
<!-- Request Parsing
These settings indicate how Solr Requests may be parsed, and
@@ -697,14 +683,6 @@
Incoming queries will be dispatched to a specific handler by name
based on the path specified in the request.
- Legacy behavior: If the request path uses "/select" but no Request
- Handler has that name, and if handleSelect="true" has been specified in
- the requestDispatcher, then the Request Handler is dispatched based on
- the qt parameter. Handlers without a leading '/' are accessed this way
- like so: http://host/app/[core/]select?qt=name If no qt is
- given, then the requestHandler that declares default="true" will be
- used or the one named "standard".
-
If a Request Handler is declared with startup="lazy", then it will
not be initialized until the first request that uses it.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/server/solr/configsets/_default/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/server/solr/configsets/_default/conf/solrconfig.xml b/solr/server/solr/configsets/_default/conf/solrconfig.xml
index e524dbf..f75303f 100644
--- a/solr/server/solr/configsets/_default/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/_default/conf/solrconfig.xml
@@ -598,21 +598,8 @@
This section contains instructions for how the SolrDispatchFilter
should behave when processing requests for this SolrCore.
- handleSelect is a legacy option that affects the behavior of requests
- such as /select?qt=XXX
-
- handleSelect="true" will cause the SolrDispatchFilter to process
- the request and dispatch the query to a handler specified by the
- "qt" param, assuming "/select" isn't already registered.
-
- handleSelect="false" will cause the SolrDispatchFilter to
- ignore "/select" requests, resulting in a 404 unless a handler
- is explicitly registered with the name "/select"
-
- handleSelect="true" is not recommended for new users, but is the default
- for backwards compatibility
-->
- <requestDispatcher handleSelect="false" >
+ <requestDispatcher>
<!-- Request Parsing
These settings indicate how Solr Requests may be parsed, and
@@ -709,14 +696,6 @@
Incoming queries will be dispatched to a specific handler by name
based on the path specified in the request.
- Legacy behavior: If the request path uses "/select" but no Request
- Handler has that name, and if handleSelect="true" has been specified in
- the requestDispatcher, then the Request Handler is dispatched based on
- the qt parameter. Handlers without a leading '/' are accessed this way
- like so: http://host/app/[core/]select?qt=name If no qt is
- given, then the requestHandler that declares default="true" will be
- used or the one named "standard".
-
If a Request Handler is declared with startup="lazy", then it will
not be initialized until the first request that uses it.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
index 73899a6..6d0ce68 100644
--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
@@ -631,21 +631,8 @@
This section contains instructions for how the SolrDispatchFilter
should behave when processing requests for this SolrCore.
- handleSelect is a legacy option that affects the behavior of requests
- such as /select?qt=XXX
-
- handleSelect="true" will cause the SolrDispatchFilter to process
- the request and dispatch the query to a handler specified by the
- "qt" param, assuming "/select" isn't already registered.
-
- handleSelect="false" will cause the SolrDispatchFilter to
- ignore "/select" requests, resulting in a 404 unless a handler
- is explicitly registered with the name "/select"
-
- handleSelect="true" is not recommended for new users, but is the default
- for backwards compatibility
-->
- <requestDispatcher handleSelect="false" >
+ <requestDispatcher>
<!-- Request Parsing
These settings indicate how Solr Requests may be parsed, and
@@ -742,14 +729,6 @@
Incoming queries will be dispatched to a specific handler by name
based on the path specified in the request.
- Legacy behavior: If the request path uses "/select" but no Request
- Handler has that name, and if handleSelect="true" has been specified in
- the requestDispatcher, then the Request Handler is dispatched based on
- the qt parameter. Handlers without a leading '/' are accessed this way
- like so: http://host/app/[core/]select?qt=name If no qt is
- given, then the requestHandler that declares default="true" will be
- used or the one named "standard".
-
If a Request Handler is declared with startup="lazy", then it will
not be initialized until the first request that uses it.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/solr-ref-guide/src/distributed-requests.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/distributed-requests.adoc b/solr/solr-ref-guide/src/distributed-requests.adoc
index b89878f..6d2c585 100644
--- a/solr/solr-ref-guide/src/distributed-requests.adoc
+++ b/solr/solr-ref-guide/src/distributed-requests.adoc
@@ -76,11 +76,11 @@ http://localhost:8983/solr/gettingstarted/select?q=*:*&shards=shard1,localhost:7
You can directly configure aspects of the concurrency and thread-pooling used within distributed search in Solr. This allows for finer grained control and you can tune it to target your own specific requirements. The default configuration favors throughput over latency.
-To configure the standard handler, provide a configuration like this in `solrconfig.xml`:
+To configure the standard search handler, provide a configuration like this in `solrconfig.xml`:
[source,xml]
----
-<requestHandler name="standard" class="solr.SearchHandler" default="true">
+<requestHandler name="/select" class="solr.SearchHandler">
<!-- other params go here -->
<shardHandler class="HttpShardHandlerFactory">
<int name="socketTimeOut">1000</int>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/solr-ref-guide/src/the-dismax-query-parser.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/the-dismax-query-parser.adoc b/solr/solr-ref-guide/src/the-dismax-query-parser.adoc
index d624d7c..378fd93 100644
--- a/solr/solr-ref-guide/src/the-dismax-query-parser.adoc
+++ b/solr/solr-ref-guide/src/the-dismax-query-parser.adoc
@@ -20,9 +20,9 @@
The DisMax query parser is designed to process simple phrases (without complex syntax) entered by users and to search for individual terms across several fields using different weighting (boosts) based on the significance of each field. Additional options enable users to influence the score based on rules specific to each use case (independent of user input).
-In general, the DisMax query parser's interface is more like that of Google than the interface of the 'standard' Solr request handler. This similarity makes DisMax the appropriate query parser for many consumer applications. It accepts a simple syntax, and it rarely produces error messages.
+In general, the DisMax query parser's interface is more like that of Google than the interface of the 'lucene' Solr query parser. This similarity makes DisMax the appropriate query parser for many consumer applications. It accepts a simple syntax, and it rarely produces error messages.
-The DisMax query parser supports an extremely simplified subset of the Lucene QueryParser syntax. As in Lucene, quotes can be used to group phrases, and +/- can be used to denote mandatory and optional clauses. All other Lucene query parser special characters (except AND and OR) are escaped to simplify the user experience. The DisMax query parser takes responsibility for building a good query from the user's input using Boolean clauses containing DisMax queries across fields and boosts specified by the user. It also lets the Solr administrator provide additional boosting queries, boosting functions, and filtering queries to artificially affect the outcome of all searches. These options can all be specified as default parameters for the handler in the `solrconfig.xml` file or overridden in the Solr query URL.
+The DisMax query parser supports an extremely simplified subset of the Lucene QueryParser syntax. As in Lucene, quotes can be used to group phrases, and +/- can be used to denote mandatory and optional clauses. All other Lucene query parser special characters (except AND and OR) are escaped to simplify the user experience. The DisMax query parser takes responsibility for building a good query from the user's input using Boolean clauses containing DisMax queries across fields and boosts specified by the user. It also lets the Solr administrator provide additional boosting queries, boosting functions, and filtering queries to artificially affect the outcome of all searches. These options can all be specified as default parameters for the request handler in the `solrconfig.xml` file or overridden in the Solr query URL.
Interested in the technical concept behind the DisMax name? DisMax stands for Maximum Disjunction. Here's a definition of a Maximum Disjunction or "DisMax" query:
@@ -190,11 +190,11 @@ All of the sample URLs in this section assume you are running Solr's "techproduc
bin/solr -e techproducts
----
-Normal results for the word "video" using the StandardRequestHandler with the default search field:
+Results for the word "video" using the standard query parser, and we assume "df" is pointing to a field to search:
`\http://localhost:8983/solr/techproducts/select?q=video&fl=name+score`
-The "dismax" handler is configured to search across the text, features, name, sku, id, manu, and cat fields all with varying boosts designed to ensure that "better" matches appear first, specifically: documents which match on the name and cat fields get higher scores.
+The "dismax" parser is configured to search across the text, features, name, sku, id, manu, and cat fields all with varying boosts designed to ensure that "better" matches appear first, specifically: documents which match on the name and cat fields get higher scores.
`\http://localhost:8983/solr/techproducts/select?defType=dismax&q=video`
@@ -210,13 +210,13 @@ You can boost results that have a field that matches a specific value.
`\http://localhost:8983/solr/techproducts/select?defType=dismax&q=video&bq=cat:electronics^5.0`
-Another instance of the handler is registered using the `qt` "instock" and has slightly different configuration options, notably: a filter for (you guessed it) `inStock:true)`.
+Another request handler is registered at "/instock" and has slightly different configuration options, notably: a filter for (you guessed it) `inStock:true)`.
`\http://localhost:8983/solr/techproducts/select?defType=dismax&q=video&fl=name,score,inStock`
-`\http://localhost:8983/solr/techproducts/select?defType=dismax&q=video&qt=instock&fl=name,score,inStock`
+`\http://localhost:8983/solr/techproducts/instock?defType=dismax&q=video&fl=name,score,inStock`
-One of the other really cool features in this handler is robust support for specifying the "BooleanQuery.minimumNumberShouldMatch" you want to be used based on how many terms are in your user's query. These allows flexibility for typos and partial matches. For the dismax handler, one and two word queries require that all of the optional clauses match, but for three to five word queries one missing word is allowed.
+One of the other really cool features in this parser is robust support for specifying the "BooleanQuery.minimumNumberShouldMatch" you want to be used based on how many terms are in your user's query. These allows flexibility for typos and partial matches. For the dismax parser, one and two word queries require that all of the optional clauses match, but for three to five word queries one missing word is allowed.
`\http://localhost:8983/solr/techproducts/select?defType=dismax&q=belkin+ipod`
@@ -224,7 +224,7 @@ One of the other really cool features in this handler is robust support for spec
`\http://localhost:8983/solr/techproducts/select?defType=dismax&q=belkin+ipod+apple`
-Just like the StandardRequestHandler, it supports the debugQuery option to viewing the parsed query, and the score explanations for each document.
+Use the debugQuery option to see the parsed query, and the score explanations for each document.
`\http://localhost:8983/solr/techproducts/select?defType=dismax&q=belkin+ipod+gibberish&debugQuery=true`
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/solrj/src/java/org/apache/solr/common/params/MoreLikeThisParams.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/common/params/MoreLikeThisParams.java b/solr/solrj/src/java/org/apache/solr/common/params/MoreLikeThisParams.java
index 919f786..882a32e 100644
--- a/solr/solrj/src/java/org/apache/solr/common/params/MoreLikeThisParams.java
+++ b/solr/solrj/src/java/org/apache/solr/common/params/MoreLikeThisParams.java
@@ -19,11 +19,10 @@ package org.apache.solr.common.params;
import java.util.Locale;
/**
- * @since solr 1.3
+ * Params for {@code MoreLikeThisHandler}.
*/
public interface MoreLikeThisParams
{
- // enable more like this -- this only applies to 'StandardRequestHandler' maybe DismaxRequestHandler
public final static String MLT = "mlt";
public final static String PREFIX = "mlt.";
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-slave1.xml
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-slave1.xml b/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-slave1.xml
index 9114cfd..a68ac11 100644
--- a/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-slave1.xml
+++ b/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-slave1.xml
@@ -29,17 +29,17 @@
<updateHandler class="solr.DirectUpdateHandler2">
</updateHandler>
- <requestHandler name="standard" class="solr.StandardRequestHandler">
+ <requestHandler name="/select" class="solr.SearchHandler">
<bool name="httpCaching">true</bool>
</requestHandler>
<!-- test query parameter defaults -->
- <requestHandler name="defaults" class="solr.StandardRequestHandler">
+ <requestHandler name="/defaults" class="solr.SearchHandler">
</requestHandler>
<!-- test query parameter defaults -->
- <requestHandler name="lazy" class="solr.StandardRequestHandler" startup="lazy">
+ <requestHandler name="/lazy" class="solr.SearchHandler" startup="lazy">
</requestHandler>
<requestHandler name="/replication" class="solr.ReplicationHandler">
@@ -47,7 +47,7 @@
</requestHandler>
- <requestDispatcher handleSelect="true">
+ <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1"/>
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-sql.xml
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-sql.xml b/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-sql.xml
index 6a0c5b5..af659ad 100644
--- a/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-sql.xml
+++ b/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-sql.xml
@@ -44,13 +44,13 @@
</lst>
</requestHandler>
- <requestDispatcher handleSelect="true" >
+ <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
</requestDispatcher>
<requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" />
- <requestHandler name="standard" class="solr.StandardRequestHandler" default="true" />
+ <requestHandler name="/select" class="solr.SearchHandler"/>
<requestHandler name="/update" class="solr.UpdateRequestHandler" />
<requestHandler name="/admin/ping" class="solr.PingRequestHandler">
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig.xml b/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig.xml
index a2db090..78bba01 100644
--- a/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig.xml
+++ b/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig.xml
@@ -35,11 +35,11 @@
</updateLog>
</updateHandler>
- <requestDispatcher handleSelect="true" >
+ <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
</requestDispatcher>
- <requestHandler name="standard" class="solr.StandardRequestHandler" default="true" />
+ <requestHandler name="/select" class="solr.SearchHandler"/>
<requestHandler name="/admin/ping" class="solr.PingRequestHandler">
<lst name="invariants">
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/solrj/src/test-files/solrj/solr/configsets/ml/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test-files/solrj/solr/configsets/ml/conf/solrconfig.xml b/solr/solrj/src/test-files/solrj/solr/configsets/ml/conf/solrconfig.xml
index b404e87..b002a30 100644
--- a/solr/solrj/src/test-files/solrj/solr/configsets/ml/conf/solrconfig.xml
+++ b/solr/solrj/src/test-files/solrj/solr/configsets/ml/conf/solrconfig.xml
@@ -36,11 +36,11 @@
</updateHandler>
- <requestDispatcher handleSelect="true" >
+ <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
</requestDispatcher>
- <requestHandler name="standard" class="solr.StandardRequestHandler" default="true" />
+ <requestHandler name="/select" class="solr.SearchHandler"/>
<!-- config for the admin interface -->
<admin>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/solrconfig.xml b/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/solrconfig.xml
index 6beb0b7..fbfa82b 100644
--- a/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/solrconfig.xml
+++ b/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/solrconfig.xml
@@ -35,18 +35,18 @@
</updateLog>
</updateHandler>
- <requestDispatcher handleSelect="true" >
+ <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
</requestDispatcher>
-
- <requestHandler name="standard" class="solr.StandardRequestHandler" default="true" />
+
+ <requestHandler name="/select" class="solr.SearchHandler"/>
<!-- config for the admin interface -->
<admin>
<defaultQuery>solr</defaultQuery>
</admin>
- <initParams path="standard">
+ <initParams path="/select">
<lst name="defaults">
<str name="df">name</str>
</lst>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/solrj/src/test-files/solrj/solr/configsets/streaming/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test-files/solrj/solr/configsets/streaming/conf/solrconfig.xml b/solr/solrj/src/test-files/solrj/solr/configsets/streaming/conf/solrconfig.xml
index c7985d2..70e9403 100644
--- a/solr/solrj/src/test-files/solrj/solr/configsets/streaming/conf/solrconfig.xml
+++ b/solr/solrj/src/test-files/solrj/solr/configsets/streaming/conf/solrconfig.xml
@@ -36,18 +36,18 @@
</updateHandler>
- <requestDispatcher handleSelect="true" >
+ <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
</requestDispatcher>
- <requestHandler name="standard" class="solr.StandardRequestHandler" default="true"/>
+ <requestHandler name="/select" class="solr.SearchHandler"/>
<!-- config for the admin interface -->
<admin>
<defaultQuery>solr</defaultQuery>
</admin>
- <initParams path="standard">
+ <initParams path="/select">
<lst name="defaults">
<str name="df">text</str>
</lst>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/solrj/src/test-files/solrj/solr/multicore/core0/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test-files/solrj/solr/multicore/core0/conf/solrconfig.xml b/solr/solrj/src/test-files/solrj/solr/multicore/core0/conf/solrconfig.xml
index 58a7892..633f9d6 100644
--- a/solr/solrj/src/test-files/solrj/solr/multicore/core0/conf/solrconfig.xml
+++ b/solr/solrj/src/test-files/solrj/solr/multicore/core0/conf/solrconfig.xml
@@ -57,18 +57,18 @@
</updateLog>
</updateHandler>
- <requestDispatcher handleSelect="true" >
+ <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" formdataUploadLimitInKB="-1" />
</requestDispatcher>
-
- <requestHandler name="standard" class="solr.StandardRequestHandler" default="true" />
+
+ <requestHandler name="/select" class="solr.SearchHandler"/>
<!-- config for the admin interface -->
<admin>
<defaultQuery>solr</defaultQuery>
</admin>
- <initParams path="standard">
+ <initParams path="/select">
<lst name="defaults">
<str name="df">name</str>
</lst>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/solrj/src/test-files/solrj/solr/multicore/core1/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test-files/solrj/solr/multicore/core1/conf/solrconfig.xml b/solr/solrj/src/test-files/solrj/solr/multicore/core1/conf/solrconfig.xml
index 81ee32a..097b705 100644
--- a/solr/solrj/src/test-files/solrj/solr/multicore/core1/conf/solrconfig.xml
+++ b/solr/solrj/src/test-files/solrj/solr/multicore/core1/conf/solrconfig.xml
@@ -57,18 +57,18 @@
</updateLog>
</updateHandler>
- <requestDispatcher handleSelect="true" >
+ <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" formdataUploadLimitInKB="-1" />
</requestDispatcher>
-
- <requestHandler name="standard" class="solr.StandardRequestHandler" default="true" />
+
+ <requestHandler name="/select" class="solr.SearchHandler"/>
<!-- config for the admin interface -->
<admin>
<defaultQuery>solr</defaultQuery>
</admin>
- <initParams path="standard">
+ <initParams path="/select">
<lst name="defaults">
<str name="df">name</str>
</lst>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java
index c91cb67..49cec5d 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java
@@ -456,7 +456,7 @@ public class CloudSolrClientTest extends SolrCloudTestCase {
private Long getNumRequests(String baseUrl, String collectionName) throws
SolrServerException, IOException {
- return getNumRequests(baseUrl, collectionName, "QUERY", "standard", null, false);
+ return getNumRequests(baseUrl, collectionName, "QUERY", "/select", null, false);
}
private Long getNumRequests(String baseUrl, String collectionName, String category, String key, String scope, boolean returnNumErrors) throws
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
----------------------------------------------------------------------
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
index c8ec6c0..f9a93f7 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
@@ -489,7 +489,7 @@ public abstract class SolrTestCaseJ4 extends LuceneTestCase {
xmlStr = "<solr></solr>";
Files.write(solrHome.resolve(SolrXmlConfig.SOLR_XML_FILE), xmlStr.getBytes(StandardCharsets.UTF_8));
h = new TestHarness(SolrXmlConfig.fromSolrHome(solrHome));
- lrf = h.getRequestFactory("standard", 0, 20, CommonParams.VERSION, "2.2");
+ lrf = h.getRequestFactory("/select", 0, 20, CommonParams.VERSION, "2.2");
}
/**
@@ -687,20 +687,20 @@ public abstract class SolrTestCaseJ4 extends LuceneTestCase {
solrConfig,
getSchemaFile());
lrf = h.getRequestFactory
- ("standard",0,20,CommonParams.VERSION,"2.2");
+ ("",0,20,CommonParams.VERSION,"2.2");
}
public static CoreContainer createCoreContainer(Path solrHome, String solrXML) {
testSolrHome = requireNonNull(solrHome);
h = new TestHarness(solrHome, solrXML);
- lrf = h.getRequestFactory("standard", 0, 20, CommonParams.VERSION, "2.2");
+ lrf = h.getRequestFactory("", 0, 20, CommonParams.VERSION, "2.2");
return h.getCoreContainer();
}
public static CoreContainer createCoreContainer(NodeConfig config, CoresLocator locator) {
testSolrHome = config.getSolrResourceLoader().getInstancePath();
h = new TestHarness(config, locator);
- lrf = h.getRequestFactory("standard", 0, 20, CommonParams.VERSION, "2.2");
+ lrf = h.getRequestFactory("", 0, 20, CommonParams.VERSION, "2.2");
return h.getCoreContainer();
}
@@ -715,7 +715,7 @@ public abstract class SolrTestCaseJ4 extends LuceneTestCase {
public static CoreContainer createDefaultCoreContainer(Path solrHome) {
testSolrHome = requireNonNull(solrHome);
h = new TestHarness("collection1", initCoreDataDir.getAbsolutePath(), "solrconfig.xml", "schema.xml");
- lrf = h.getRequestFactory("standard", 0, 20, CommonParams.VERSION, "2.2");
+ lrf = h.getRequestFactory("", 0, 20, CommonParams.VERSION, "2.2");
return h.getCoreContainer();
}
[3/4] lucene-solr:master: SOLR-6807: requestDispatcher/@handleSelect
now defaults to false; stop using it. Deprecated StandardRequestHandler;
stop using it.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-hash.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-hash.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-hash.xml
index 94cceb61..cad70d8 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-hash.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-hash.xml
@@ -46,11 +46,11 @@
</lst>
</requestHandler>
- <requestDispatcher handleSelect="true" >
+ <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
</requestDispatcher>
- <requestHandler name="standard" class="solr.StandardRequestHandler" default="true" />
+ <requestHandler name="/select" class="solr.SearchHandler" />
<!-- config for the admin interface -->
<admin>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-headers.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-headers.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-headers.xml
index f7b4940..328fc9b 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-headers.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-headers.xml
@@ -24,7 +24,7 @@
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<schemaFactory class="ClassicIndexSchemaFactory"/>
<searchComponent name="componentThatAddsHeader" class="org.apache.solr.servlet.ResponseHeaderTest$ComponentThatAddsHeader"/>
- <requestHandler name="/withHeaders" class="solr.StandardRequestHandler">
+ <requestHandler name="/withHeaders" class="solr.SearchHandler">
<arr name="first-components">
<str>componentThatAddsHeader</str>
</arr>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-highlight.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-highlight.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-highlight.xml
index 577f182..c714a41 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-highlight.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-highlight.xml
@@ -31,7 +31,7 @@
<updateHandler class="solr.DirectUpdateHandler2">
</updateHandler>
- <requestHandler name="standard" class="solr.StandardRequestHandler"/>
+ <requestHandler name="/select" class="solr.SearchHandler"/>
<searchComponent class="solr.HighlightComponent" name="highlight">
<highlighting class="org.apache.solr.highlight.DummyHighlighter">
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-implicitproperties.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-implicitproperties.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-implicitproperties.xml
index d87d364..5ef9d72 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-implicitproperties.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-implicitproperties.xml
@@ -49,7 +49,7 @@
</query>
- <requestDispatcher handleSelect="false">
+ <requestDispatcher>
<httpCaching never304="true"/>
</requestDispatcher>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-infixsuggesters.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-infixsuggesters.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-infixsuggesters.xml
index 8fc42ff..a30186d 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-infixsuggesters.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-infixsuggesters.xml
@@ -25,7 +25,7 @@
<updateHandler class="solr.DirectUpdateHandler2"/>
- <requestHandler name="standard" class="solr.StandardRequestHandler" />
+ <requestHandler name="/select" class="solr.SearchHandler" />
<searchComponent class="solr.SuggestComponent" name="analyzing_infix_suggester_random_short_dictionary">
<lst name="suggester">
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-logmergepolicyfactory.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-logmergepolicyfactory.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-logmergepolicyfactory.xml
index 27a1867..539fd5c 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-logmergepolicyfactory.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-logmergepolicyfactory.xml
@@ -32,6 +32,6 @@
</mergePolicyFactory>
</indexConfig>
- <requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
+ <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
</config>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema-test.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema-test.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema-test.xml
index 22aeeda..666132f 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema-test.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema-test.xml
@@ -23,5 +23,5 @@
<dataDir>${solr.data.dir:}</dataDir>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
- <requestHandler name="standard" class="solr.StandardRequestHandler" />
+ <requestHandler name="/select" class="solr.SearchHandler" />
</config>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/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 146b154..739ad22 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
@@ -60,7 +60,7 @@
</updateLog>
</updateHandler>
- <requestHandler name="standard" class="solr.StandardRequestHandler">
+ <requestHandler name="/select" class="solr.SearchHandler">
<bool name="httpCaching">true</bool>
</requestHandler>
@@ -72,7 +72,7 @@
</lst>
</requestHandler>
- <initParams path="standard">
+ <initParams path="/select">
<lst name="defaults">
<str name="df">text</str>
</lst>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-master-throttled.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master-throttled.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master-throttled.xml
index 516d504..4a53776 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master-throttled.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master-throttled.xml
@@ -28,7 +28,7 @@
<updateHandler class="solr.DirectUpdateHandler2">
</updateHandler>
- <requestHandler name="standard" class="solr.StandardRequestHandler">
+ <requestHandler name="/select" class="solr.SearchHandler">
<bool name="httpCaching">true</bool>
</requestHandler>
@@ -39,7 +39,7 @@
</requestHandler>
<!-- test query parameter defaults -->
- <requestHandler name="defaults" class="solr.StandardRequestHandler">
+ <requestHandler name="/defaults" class="solr.SearchHandler">
<lst name="defaults">
<int name="rows">4</int>
<bool name="hl">true</bool>
@@ -48,7 +48,7 @@
</requestHandler>
<!-- test query parameter defaults -->
- <requestHandler name="lazy" class="solr.StandardRequestHandler" startup="lazy">
+ <requestHandler name="/lazy" class="solr.SearchHandler" startup="lazy">
<lst name="defaults">
<int name="rows">4</int>
<bool name="hl">true</bool>
@@ -56,7 +56,7 @@
</lst>
</requestHandler>
- <requestDispatcher handleSelect="true">
+ <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1"/>
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-master.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master.xml
index b1345ac..e501af2 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master.xml
@@ -28,7 +28,7 @@
<updateHandler class="solr.DirectUpdateHandler2">
</updateHandler>
- <requestHandler name="standard" class="solr.StandardRequestHandler">
+ <requestHandler name="/select" class="solr.SearchHandler">
<bool name="httpCaching">true</bool>
</requestHandler>
@@ -43,7 +43,7 @@
</requestHandler>
<!-- test query parameter defaults -->
- <requestHandler name="defaults" class="solr.StandardRequestHandler">
+ <requestHandler name="/defaults" class="solr.SearchHandler">
<lst name="defaults">
<int name="rows">4</int>
<bool name="hl">true</bool>
@@ -52,7 +52,7 @@
</requestHandler>
<!-- test query parameter defaults -->
- <requestHandler name="lazy" class="solr.StandardRequestHandler" startup="lazy">
+ <requestHandler name="/lazy" class="solr.SearchHandler" startup="lazy">
<lst name="defaults">
<int name="rows">4</int>
<bool name="hl">true</bool>
@@ -60,7 +60,7 @@
</lst>
</requestHandler>
- <requestDispatcher handleSelect="true">
+ <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1"/>
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml
index 69f7659..bcd7874 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml
@@ -27,7 +27,7 @@
<updateHandler class="solr.DirectUpdateHandler2">
</updateHandler>
- <requestHandler name="standard" class="solr.StandardRequestHandler" />
+ <requestHandler name="/select" class="solr.SearchHandler" />
<requestHandler name="/replication" class="solr.ReplicationHandler">
<lst name="master">
@@ -39,7 +39,7 @@
</requestHandler>
- <requestDispatcher handleSelect="true">
+ <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1"/>
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1.xml
index db39b1f..9271686 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1.xml
@@ -28,7 +28,7 @@
<updateHandler class="solr.DirectUpdateHandler2">
</updateHandler>
- <requestHandler name="standard" class="solr.StandardRequestHandler">
+ <requestHandler name="/select" class="solr.SearchHandler">
<bool name="httpCaching">true</bool>
</requestHandler>
@@ -41,7 +41,7 @@
</requestHandler>
<!-- test query parameter defaults -->
- <requestHandler name="defaults" class="solr.StandardRequestHandler">
+ <requestHandler name="/defaults" class="solr.SearchHandler">
<lst name="defaults">
<int name="rows">4</int>
<bool name="hl">true</bool>
@@ -50,7 +50,7 @@
</requestHandler>
<!-- test query parameter defaults -->
- <requestHandler name="lazy" class="solr.StandardRequestHandler" startup="lazy">
+ <requestHandler name="/lazy" class="solr.SearchHandler" startup="lazy">
<lst name="defaults">
<int name="rows">4</int>
<bool name="hl">true</bool>
@@ -58,7 +58,7 @@
</lst>
</requestHandler>
- <requestDispatcher handleSelect="true">
+ <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1"/>
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml
index 91923c9..55301c2 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml
@@ -27,7 +27,7 @@
<updateHandler class="solr.DirectUpdateHandler2">
</updateHandler>
- <requestHandler name="standard" class="solr.StandardRequestHandler">
+ <requestHandler name="/select" class="solr.SearchHandler">
<bool name="httpCaching">true</bool>
</requestHandler>
@@ -39,7 +39,7 @@
</requestHandler>
<!-- test query parameter defaults -->
- <requestHandler name="defaults" class="solr.StandardRequestHandler">
+ <requestHandler name="/defaults" class="solr.SearchHandler">
<lst name="defaults">
<int name="rows">4</int>
<bool name="hl">true</bool>
@@ -48,7 +48,7 @@
</requestHandler>
<!-- test query parameter defaults -->
- <requestHandler name="lazy" class="solr.StandardRequestHandler" startup="lazy">
+ <requestHandler name="/lazy" class="solr.SearchHandler" startup="lazy">
<lst name="defaults">
<int name="rows">4</int>
<bool name="hl">true</bool>
@@ -56,7 +56,7 @@
</lst>
</requestHandler>
- <requestDispatcher handleSelect="true">
+ <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1"/>
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-master3.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master3.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master3.xml
index b03aef4..1c1dd40 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master3.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master3.xml
@@ -27,7 +27,7 @@
<updateHandler class="solr.DirectUpdateHandler2">
</updateHandler>
- <requestHandler name="standard" class="solr.StandardRequestHandler">
+ <requestHandler name="/select" class="solr.SearchHandler">
<bool name="httpCaching">true</bool>
</requestHandler>
@@ -40,7 +40,7 @@
</requestHandler>
<!-- test query parameter defaults -->
- <requestHandler name="defaults" class="solr.StandardRequestHandler">
+ <requestHandler name="/defaults" class="solr.SearchHandler">
<lst name="defaults">
<int name="rows">4</int>
<bool name="hl">true</bool>
@@ -49,7 +49,7 @@
</requestHandler>
<!-- test query parameter defaults -->
- <requestHandler name="lazy" class="solr.StandardRequestHandler" startup="lazy">
+ <requestHandler name="/lazy" class="solr.SearchHandler" startup="lazy">
<lst name="defaults">
<int name="rows">4</int>
<bool name="hl">true</bool>
@@ -57,7 +57,7 @@
</lst>
</requestHandler>
- <requestDispatcher handleSelect="true">
+ <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1"/>
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-defaults.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-defaults.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-defaults.xml
index aaf8593..3e0cf19 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-defaults.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-defaults.xml
@@ -28,6 +28,6 @@
-->
</indexConfig>
- <requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
+ <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
</config>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-legacy.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-legacy.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-legacy.xml
index a7361cc..b67d664 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-legacy.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-legacy.xml
@@ -26,6 +26,6 @@
<useCompoundFile>${useCompoundFile:false}</useCompoundFile>
</indexConfig>
- <requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
+ <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
</config>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicyfactory-nocfs.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicyfactory-nocfs.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicyfactory-nocfs.xml
index 4dd82d7..b93fabd 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicyfactory-nocfs.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicyfactory-nocfs.xml
@@ -29,6 +29,6 @@
</mergePolicyFactory>
</indexConfig>
- <requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
+ <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
</config>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/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 15e58af..137c519 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
@@ -31,15 +31,15 @@
<updateHandler class="solr.DirectUpdateHandler2">
</updateHandler>
-
- <requestHandler name="standard" class="solr.StandardRequestHandler"/>
- <requestDispatcher handleSelect="true" >
+ <requestHandler name="/select" class="solr.SearchHandler" />
+
+ <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
<httpCaching never304="true" />
</requestDispatcher>
- <initParams path="standard">
+ <initParams path="/select">
<lst name="defaults">
<str name="df">text</str>
</lst>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-nomergepolicyfactory.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-nomergepolicyfactory.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-nomergepolicyfactory.xml
index a9e3801..62fb05b 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-nomergepolicyfactory.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-nomergepolicyfactory.xml
@@ -27,6 +27,6 @@
<mergePolicyFactory class="org.apache.solr.index.NoMergePolicyFactory" />
</indexConfig>
- <requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
+ <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
</config>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-noopregen.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-noopregen.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-noopregen.xml
index 1f54630..a3cd7b6 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-noopregen.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-noopregen.xml
@@ -24,7 +24,7 @@
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<schemaFactory class="ClassicIndexSchemaFactory"/>
- <requestHandler name="standard" class="solr.StandardRequestHandler" />
+ <requestHandler name="/select" class="solr.SearchHandler" />
<query>
<cache name="myPerSegmentCache"
class="solr.LRUCache"
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-paramset.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-paramset.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-paramset.xml
index c006ce7..7eefc9d 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-paramset.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-paramset.xml
@@ -25,7 +25,7 @@
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<schemaFactory class="ClassicIndexSchemaFactory"/>
- <requestHandler name="standard" class="solr.StandardRequestHandler"/>
+ <requestHandler name="/select" class="solr.SearchHandler"/>
<initParams name="a" path="/dump3,/dump6,/root/*,/root1/**">
<lst name="defaults">
<str name="a">A</str>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-parsing-update-processor-chains.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-parsing-update-processor-chains.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-parsing-update-processor-chains.xml
index f83df6c..5930d37 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-parsing-update-processor-chains.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-parsing-update-processor-chains.xml
@@ -23,7 +23,7 @@
-->
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
- <requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
+ <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<schemaFactory class="ClassicIndexSchemaFactory"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-phrasesuggest.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-phrasesuggest.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-phrasesuggest.xml
index 4507666..0f79d7c 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-phrasesuggest.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-phrasesuggest.xml
@@ -24,7 +24,7 @@
<dataDir>${solr.data.dir:}</dataDir>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<schemaFactory class="ClassicIndexSchemaFactory"/>
- <requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
+ <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
<!-- WFSTLookup suggest component -->
<searchComponent class="solr.SpellCheckComponent" name="suggest_wfst">
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/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 09f0974..431447c 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
@@ -190,12 +190,12 @@ based HashBitset. -->
The "standard" request handler is the default and will be used if qt
is not specified in the request.
-->
- <requestHandler name="standard" class="solr.StandardRequestHandler">
+ <requestHandler name="/select" class="solr.SearchHandler">
<bool name="httpCaching">true</bool>
</requestHandler>
- <requestHandler name="dismax" class="solr.SearchHandler" >
+ <requestHandler name="/dismax" class="solr.SearchHandler" >
<lst name="defaults">
<str name="defType">dismax</str>
<str name="q.alt">*:*</str>
@@ -216,10 +216,10 @@ based HashBitset. -->
</lst>
</requestHandler>
- <requestHandler name="mock" class="org.apache.solr.core.MockQuerySenderListenerReqHandler"/>
+ <requestHandler name="/mock" class="org.apache.solr.core.MockQuerySenderListenerReqHandler"/>
<!-- test query parameter defaults -->
- <requestHandler name="defaults" class="solr.StandardRequestHandler">
+ <requestHandler name="/defaults" class="solr.SearchHandler">
<lst name="defaults">
<int name="rows">4</int>
<bool name="hl">true</bool>
@@ -228,7 +228,7 @@ based HashBitset. -->
</requestHandler>
<!-- test query parameter defaults -->
- <requestHandler name="lazy" class="solr.StandardRequestHandler" startup="lazy">
+ <requestHandler name="/lazy" class="solr.SearchHandler" startup="lazy">
<lst name="defaults">
<int name="rows">4</int>
<bool name="hl">true</bool>
@@ -322,7 +322,7 @@ based HashBitset. -->
-->
<queryConverter name="queryConverter" class="org.apache.solr.spelling.SpellingQueryConverter"/>
- <requestHandler name="spellCheckCompRH" class="org.apache.solr.handler.component.SearchHandler">
+ <requestHandler name="/spellCheckCompRH" class="org.apache.solr.handler.component.SearchHandler">
<lst name="defaults">
<!-- omp = Only More Popular -->
<str name="spellcheck.onlyMorePopular">false</str>
@@ -335,7 +335,7 @@ based HashBitset. -->
<str>spellcheck</str>
</arr>
</requestHandler>
- <requestHandler name="spellCheckCompRH_Direct" class="org.apache.solr.handler.component.SearchHandler">
+ <requestHandler name="/spellCheckCompRH_Direct" class="org.apache.solr.handler.component.SearchHandler">
<lst name="defaults">
<str name="spellcheck.dictionary">direct</str>
<str name="spellcheck.onlyMorePopular">false</str>
@@ -346,7 +346,7 @@ based HashBitset. -->
<str>spellcheck</str>
</arr>
</requestHandler>
- <requestHandler name="spellCheckWithWordbreak" class="org.apache.solr.handler.component.SearchHandler">
+ <requestHandler name="/spellCheckWithWordbreak" class="org.apache.solr.handler.component.SearchHandler">
<lst name="defaults">
<str name="spellcheck.dictionary">default</str>
<str name="spellcheck.dictionary">wordbreak</str>
@@ -356,7 +356,7 @@ based HashBitset. -->
<str>spellcheck</str>
</arr>
</requestHandler>
- <requestHandler name="spellCheckWithWordbreak_Direct" class="org.apache.solr.handler.component.SearchHandler">
+ <requestHandler name="/spellCheckWithWordbreak_Direct" class="org.apache.solr.handler.component.SearchHandler">
<lst name="defaults">
<str name="spellcheck.dictionary">direct</str>
<str name="spellcheck.dictionary">wordbreak</str>
@@ -366,7 +366,7 @@ based HashBitset. -->
<str>spellcheck</str>
</arr>
</requestHandler>
- <requestHandler name="spellCheckCompRH1" class="org.apache.solr.handler.component.SearchHandler">
+ <requestHandler name="/spellCheckCompRH1" class="org.apache.solr.handler.component.SearchHandler">
<lst name="defaults">
<str name="defType">dismax</str>
<str name="qf">lowerfilt1^1</str>
@@ -376,13 +376,13 @@ based HashBitset. -->
</arr>
</requestHandler>
- <requestHandler name="mltrh" class="org.apache.solr.handler.component.SearchHandler">
+ <requestHandler name="/mltrh" class="org.apache.solr.handler.component.SearchHandler">
</requestHandler>
<searchComponent name="tvComponent" class="org.apache.solr.handler.component.TermVectorComponent"/>
- <requestHandler name="tvrh" class="org.apache.solr.handler.component.SearchHandler">
+ <requestHandler name="/tvrh" class="org.apache.solr.handler.component.SearchHandler">
<lst name="defaults">
</lst>
@@ -458,7 +458,7 @@ based HashBitset. -->
</highlighting>
</searchComponent>
- <requestDispatcher handleSelect="true" >
+ <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl>
@@ -549,7 +549,7 @@ based HashBitset. -->
<processor class="solr.RunUpdateProcessorFactory" />
</updateRequestProcessorChain>
- <initParams path="standard,dismax,defaults,lazy,spellCheckCompRH,spellCheckWithWordbreak,spellCheckCompRH_Direct,spellCheckCompRH1,mltrh,tvrh,/terms">
+ <initParams path="/select,/dismax,/defaults,/lazy,/spellCheckCompRH,/spellCheckWithWordbreak,/spellCheckCompRH_Direct,/spellCheckCompRH1,/mltrh,/tvrh,/terms">
<lst name="defaults">
<str name="df">text</str>
</lst>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/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 9db6205..a578563 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
@@ -24,7 +24,7 @@
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<schemaFactory class="ClassicIndexSchemaFactory"/>
- <requestHandler name="standard" class="solr.StandardRequestHandler">
+ <requestHandler name="/select" class="solr.SearchHandler">
<lst name="defaults">
<bool name="hl.defaultSummary">false</bool>
<str name="df">text</str>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-query-parser-init.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-query-parser-init.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-query-parser-init.xml
index 24c2ea8..eb538fa 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-query-parser-init.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-query-parser-init.xml
@@ -23,7 +23,7 @@
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
+ <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<schemaFactory class="ClassicIndexSchemaFactory"/>
<!-- query parser without final NAME field lead to NPE during query parser initialization-->
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender-noquery.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender-noquery.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender-noquery.xml
index 0945be2..9d4f83d 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender-noquery.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender-noquery.xml
@@ -68,7 +68,7 @@
</query>
- <requestHandler name="mock" class="org.apache.solr.core.MockQuerySenderListenerReqHandler" default="true">
+ <requestHandler name="/mock" class="org.apache.solr.core.MockQuerySenderListenerReqHandler" default="true">
<!-- default values for query parameters -->
</requestHandler>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender.xml
index 7f7bf18..1404f8a 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender.xml
@@ -42,8 +42,8 @@
local query request for each NamedList in sequence. -->
<listener event="newSearcher" class="solr.QuerySenderListener">
<arr name="queries">
- <lst> <str name="q">solr</str> <str name="start">0</str> <str name="rows">10</str> <str name="qt">mock</str></lst>
- <lst> <str name="q">rocks</str> <str name="start">0</str> <str name="rows">10</str> <str name="qt">mock</str></lst>
+ <lst> <str name="q">solr</str> <str name="start">0</str> <str name="rows">10</str> <str name="qt">/mock</str></lst>
+ <lst> <str name="q">rocks</str> <str name="start">0</str> <str name="rows">10</str> <str name="qt">/mock</str></lst>
</arr>
</listener>
<listener event="newSearcher"
@@ -55,7 +55,7 @@
<listener event="firstSearcher" class="solr.QuerySenderListener">
<arr name="queries">
<lst> <str name="q">fast_warm</str> <str name="start">0</str> <str name="rows">10</str>
- <str name="qt">mock</str>
+ <str name="qt">/mock</str>
</lst>
</arr>
</listener>
@@ -64,7 +64,7 @@
</query>
- <requestHandler name="mock" class="org.apache.solr.core.MockQuerySenderListenerReqHandler" default="true">
+ <requestHandler name="/mock" class="org.apache.solr.core.MockQuerySenderListenerReqHandler" default="true">
<!-- default values for query parameters -->
</requestHandler>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml
index 76c379c..761d45d 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml
@@ -28,17 +28,17 @@
<updateHandler class="solr.DirectUpdateHandler2">
</updateHandler>
- <requestHandler name="standard" class="solr.StandardRequestHandler">
+ <requestHandler name="/select" class="solr.SearchHandler">
<bool name="httpCaching">true</bool>
</requestHandler>
<!-- test query parameter defaults -->
- <requestHandler name="defaults" class="solr.StandardRequestHandler">
+ <requestHandler name="/defaults" class="solr.SearchHandler">
</requestHandler>
<!-- test query parameter defaults -->
- <requestHandler name="lazy" class="solr.StandardRequestHandler" startup="lazy">
+ <requestHandler name="/lazy" class="solr.SearchHandler" startup="lazy">
</requestHandler>
<requestHandler name="/replication" class="solr.ReplicationHandler">
@@ -51,7 +51,7 @@
</lst>
</requestHandler>
- <requestDispatcher handleSelect="true">
+ <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1"/>
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-reqHandler.incl
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-reqHandler.incl b/solr/core/src/test-files/solr/collection1/conf/solrconfig-reqHandler.incl
index 03f236f..cc97504 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-reqHandler.incl
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-reqHandler.incl
@@ -1,5 +1,5 @@
- <requestHandler name="includedHandler"
+ <requestHandler name="/includedHandler"
class="solr.SearchHandler" >
</requestHandler>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/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 f89b187..643d9a6 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
@@ -20,8 +20,8 @@
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <requestHandler name="standard"
- class="solr.StandardRequestHandler"></requestHandler>
+ <requestHandler name="/select"
+ class="solr.SearchHandler"></requestHandler>
<!-- Used to specify an alternate directory to hold all index data.
It defaults to "index" if not present, and should probably
@@ -37,22 +37,22 @@
<searchComponent name="responselog" class="org.apache.solr.handler.component.ResponseLogComponent" />
<!-- Log retrievedDocs -->
- <requestHandler name="withlog" class="org.apache.solr.handler.component.SearchHandler">
- <lst name="defaults">
- <str name="defType">dismax</str>
- </lst>
+ <requestHandler name="/withlog" class="org.apache.solr.handler.component.SearchHandler">
+ <lst name="defaults">
+ <str name="defType">dismax</str>
+ </lst>
<arr name="last-components">
<str>responselog</str>
</arr>
</requestHandler>
- <requestHandler name="nolog" class="org.apache.solr.handler.component.SearchHandler">
+ <requestHandler name="/nolog" class="org.apache.solr.handler.component.SearchHandler">
<lst name="defaults">
<str name="defType">dismax</str>
</lst>
</requestHandler>
- <initParams path="withlog,nolog">
+ <initParams path="/withlog,/nolog">
<lst name="defaults">
<str name="df">text</str>
</lst>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml
index ac8321b..04ba1f2 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml
@@ -35,7 +35,7 @@
</updateLog>
</updateHandler>
- <requestHandler name="standard" class="solr.StandardRequestHandler">
+ <requestHandler name="/select" class="solr.SearchHandler">
<bool name="httpCaching">true</bool>
</requestHandler>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-script-updateprocessor.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-script-updateprocessor.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-script-updateprocessor.xml
index 8fa8dcf..f87385e 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-script-updateprocessor.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-script-updateprocessor.xml
@@ -24,7 +24,7 @@
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
+ <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<schemaFactory class="ClassicIndexSchemaFactory"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-searcher-listeners1.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-searcher-listeners1.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-searcher-listeners1.xml
index 73fb42a..c71f8ba 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-searcher-listeners1.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-searcher-listeners1.xml
@@ -41,7 +41,7 @@
<queryResponseWriter name="xml" default="true"
class="solr.XMLResponseWriter" />
- <requestHandler name="standard" class="solr.StandardRequestHandler"/>
+ <requestHandler name="/select" class="solr.SearchHandler"/>
<searchComponent name="mock" class="org.apache.solr.search.TestIndexSearcher$MockSearchComponent"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml
index 5ca7184..39a7870 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml
@@ -28,17 +28,17 @@
<updateHandler class="solr.DirectUpdateHandler2">
</updateHandler>
- <requestHandler name="standard" class="solr.StandardRequestHandler">
+ <requestHandler name="/select" class="solr.SearchHandler">
<bool name="httpCaching">true</bool>
</requestHandler>
<!-- test query parameter defaults -->
- <requestHandler name="defaults" class="solr.StandardRequestHandler">
+ <requestHandler name="/defaults" class="solr.SearchHandler">
</requestHandler>
<!-- test query parameter defaults -->
- <requestHandler name="lazy" class="solr.StandardRequestHandler" startup="lazy">
+ <requestHandler name="/lazy" class="solr.SearchHandler" startup="lazy">
</requestHandler>
<requestHandler name="/replication" class="solr.ReplicationHandler">
@@ -49,7 +49,7 @@
</lst>
</requestHandler>
- <requestDispatcher handleSelect="true">
+ <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1"/>
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml
index aa2f8a4..26821b4 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml
@@ -28,21 +28,21 @@
<updateHandler class="solr.DirectUpdateHandler2">
</updateHandler>
- <requestHandler name="standard" class="solr.StandardRequestHandler">
+ <requestHandler name="/select" class="solr.SearchHandler">
<bool name="httpCaching">true</bool>
</requestHandler>
<!-- test query parameter defaults -->
- <requestHandler name="defaults" class="solr.StandardRequestHandler">
+ <requestHandler name="/defaults" class="solr.SearchHandler">
</requestHandler>
<!-- test query parameter defaults -->
- <requestHandler name="lazy" class="solr.StandardRequestHandler" startup="lazy">
+ <requestHandler name="/lazy" class="solr.SearchHandler" startup="lazy">
</requestHandler>
- <requestDispatcher handleSelect="true">
+ <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1"/>
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-solcoreproperties.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-solcoreproperties.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-solcoreproperties.xml
index 4278d67..fc707d4 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-solcoreproperties.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-solcoreproperties.xml
@@ -26,7 +26,7 @@
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <requestHandler name="/select" class="solr.StandardRequestHandler">
+ <requestHandler name="/select" class="solr.SearchHandler">
<lst name="defaults">
<str name="p1">${foo.foo1}</str>
<str name="p2">${foo.foo2}</str>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/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 a7a8358..17e6f4c 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
@@ -31,7 +31,7 @@
<lockType>${solr.tests.lockType:single}</lockType>
</indexConfig>
- <requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
+ <requestHandler name="/select" class="solr.SearchHandler" />
<updateHandler class="solr.DirectUpdateHandler2">
<updateLog>
@@ -47,7 +47,7 @@
<maxTime>${solr.autoSoftCommit.maxTime:-1}</maxTime>
</autoSoftCommit>
</updateHandler>
- <initParams path="standard">
+ <initParams path="/select">
<lst name="defaults">
<str name="df">text</str>
</lst>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingresponse.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingresponse.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingresponse.xml
index 35ad58b..efb9eea 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingresponse.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingresponse.xml
@@ -25,7 +25,7 @@
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<schemaFactory class="ClassicIndexSchemaFactory"/>
- <requestHandler name="standard" class="solr.StandardRequestHandler" />
+ <requestHandler name="/select" class="solr.SearchHandler" />
<query>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-spatial.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-spatial.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-spatial.xml
index 243eb5e..646a9eb 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-spatial.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-spatial.xml
@@ -24,7 +24,7 @@
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<schemaFactory class="ClassicIndexSchemaFactory"/>
- <requestHandler name="standard" class="solr.StandardRequestHandler" />
+ <requestHandler name="/select" class="solr.SearchHandler" />
<query>
<cache name="perSegSpatialFieldCache_srptgeom"
class="solr.LRUCache"
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/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 cf923c4..7760eb2 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
@@ -33,8 +33,8 @@
<maxWarmingSearchers>1</maxWarmingSearchers>
</query>
</indexConfig>
- <requestHandler name="standard"
- class="solr.StandardRequestHandler"></requestHandler>
+ <requestHandler name="/select"
+ class="solr.SearchHandler"></requestHandler>
<!-- Used to specify an alternate directory to hold all index data.
It defaults to "index" if not present, and should probably
@@ -156,7 +156,7 @@
-->
<queryConverter name="queryConverter" class="org.apache.solr.spelling.SpellingQueryConverter"/>
- <requestHandler name="spellCheckCompRH" class="org.apache.solr.handler.component.SearchHandler">
+ <requestHandler name="/spellCheckCompRH" class="org.apache.solr.handler.component.SearchHandler">
<lst name="defaults">
<!-- omp = Only More Popular -->
<str name="spellcheck.onlyMorePopular">false</str>
@@ -169,7 +169,7 @@
<str>spellcheck</str>
</arr>
</requestHandler>
- <requestHandler name="spellCheckCompRH1" class="org.apache.solr.handler.component.SearchHandler">
+ <requestHandler name="/spellCheckCompRH1" class="org.apache.solr.handler.component.SearchHandler">
<lst name="defaults">
<str name="defType">dismax</str>
<str name="qf">lowerfilt1^1</str>
@@ -178,7 +178,7 @@
<str>spellcheck</str>
</arr>
</requestHandler>
- <requestHandler name="spellCheckWithWordbreak" class="org.apache.solr.handler.component.SearchHandler">
+ <requestHandler name="/spellCheckWithWordbreak" class="org.apache.solr.handler.component.SearchHandler">
<lst name="defaults">
<str name="spellcheck.dictionary">default</str>
<str name="spellcheck.dictionary">wordbreak</str>
@@ -188,7 +188,7 @@
<str>spellcheck</str>
</arr>
</requestHandler>
- <initParams path="spellCheckCompRH,spellCheckCompRH1,spellCheckWithWordbreak">
+ <initParams path="/spellCheckCompRH,/spellCheckCompRH1,/spellCheckWithWordbreak">
<lst name="defaults">
<str name="df">text</str>
</lst>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellchecker.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellchecker.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellchecker.xml
index 3b0aff6..a876fb6 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellchecker.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellchecker.xml
@@ -29,7 +29,7 @@
<updateHandler class="solr.DirectUpdateHandler2">
</updateHandler>
- <requestHandler name="standard" class="solr.StandardRequestHandler" />
+ <requestHandler name="/select" class="solr.SearchHandler" />
<!-- Suggest component -->
<searchComponent class="solr.SpellCheckComponent" name="suggest_jaspell">
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-sql.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-sql.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-sql.xml
index 6a0c5b5..8ec6489 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-sql.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-sql.xml
@@ -44,13 +44,13 @@
</lst>
</requestHandler>
- <requestDispatcher handleSelect="true" >
+ <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
</requestDispatcher>
<requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" />
- <requestHandler name="standard" class="solr.StandardRequestHandler" default="true" />
+ <requestHandler name="/select" class="solr.SearchHandler" />
<requestHandler name="/update" class="solr.UpdateRequestHandler" />
<requestHandler name="/admin/ping" class="solr.PingRequestHandler">
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-suggestercomponent-context-filter-query.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-suggestercomponent-context-filter-query.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-suggestercomponent-context-filter-query.xml
index 394b25e..36b6755 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-suggestercomponent-context-filter-query.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-suggestercomponent-context-filter-query.xml
@@ -27,7 +27,7 @@
<updateHandler class="solr.DirectUpdateHandler2"/>
- <requestHandler name="standard" class="solr.StandardRequestHandler" />
+ <requestHandler name="/select" class="solr.SearchHandler" />
<searchComponent class="solr.SuggestComponent" name="suggest">
<!--Suggest Component for context filtering test -->
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-suggestercomponent.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-suggestercomponent.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-suggestercomponent.xml
index 661913c..857fb11 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-suggestercomponent.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-suggestercomponent.xml
@@ -28,7 +28,7 @@
<updateHandler class="solr.DirectUpdateHandler2"/>
- <requestHandler name="standard" class="solr.StandardRequestHandler" />
+ <requestHandler name="/select" class="solr.SearchHandler" />
<searchComponent class="solr.SuggestComponent" name="suggest">
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml
index 3dba272..dc7bb66 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml
@@ -45,8 +45,8 @@
attr2="${non.existent.sys.prop:default-from-config}">prefix-${solr.test.sys.prop2}-suffix</propTest>
<!-- see TestConfig.testDisableRequetsHandler -->
- <requestHandler name="disabled" class="solr.StandardRequestHandler" enable="false"/>
- <requestHandler name="enabled" class="solr.StandardRequestHandler" enable="true"/>
+ <requestHandler name="/disabled" class="solr.SearchHandler" enable="false"/>
+ <requestHandler name="/enabled" class="solr.SearchHandler" enable="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-testxmlparser.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-testxmlparser.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-testxmlparser.xml
index 40c39a1..401710e 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-testxmlparser.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-testxmlparser.xml
@@ -24,7 +24,7 @@
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<schemaFactory class="ClassicIndexSchemaFactory"/>
- <requestHandler name="standard" class="solr.StandardRequestHandler" />
+ <requestHandler name="/select" class="solr.SearchHandler" />
<queryParser name="testxmlparser" class="XmlQParserPlugin">
<str name="HandyQuery">org.apache.solr.search.HandyQueryBuilder</str>
<str name="HelloQuery">org.apache.solr.search.HelloQueryBuilder</str>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-tieredmergepolicyfactory.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-tieredmergepolicyfactory.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-tieredmergepolicyfactory.xml
index af5d208..4a58100 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-tieredmergepolicyfactory.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-tieredmergepolicyfactory.xml
@@ -36,6 +36,6 @@
</mergeScheduler>
</indexConfig>
- <requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
+ <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
</config>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/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 cf12c4a..12e5089 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
@@ -44,8 +44,7 @@
<processor class="solr.RunUpdateProcessorFactory" />
</updateRequestProcessorChain>
- <requestHandler name="standard" class="solr.StandardRequestHandler">
- </requestHandler>
+ <requestHandler name="/select" class="solr.SearchHandler" />
<peerSync>
<useRangeVersions>${solr.peerSync.useRangeVersions:true}</useRangeVersions>
@@ -158,7 +157,7 @@
</query>
- <initParams path="standard">
+ <initParams path="/select">
<lst name="defaults">
<str name="df">text</str>
</lst>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-uninvertdocvaluesmergepolicyfactory.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-uninvertdocvaluesmergepolicyfactory.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-uninvertdocvaluesmergepolicyfactory.xml
index 613357b..5f15430 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-uninvertdocvaluesmergepolicyfactory.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-uninvertdocvaluesmergepolicyfactory.xml
@@ -33,6 +33,6 @@
<mergeScheduler class="org.apache.lucene.index.ConcurrentMergeScheduler"/>
</indexConfig>
- <requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
+ <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
</config>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-update-processor-chains.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-update-processor-chains.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-update-processor-chains.xml
index 426f3c0..4113bd1 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-update-processor-chains.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-update-processor-chains.xml
@@ -25,7 +25,7 @@
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
+ <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
<requestHandler name="/update" class="solr.UpdateRequestHandler" />
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<schemaFactory class="ClassicIndexSchemaFactory"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-warmer-randommergepolicyfactory.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-warmer-randommergepolicyfactory.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-warmer-randommergepolicyfactory.xml
index 1e1936b..21101b1 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-warmer-randommergepolicyfactory.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-warmer-randommergepolicyfactory.xml
@@ -24,7 +24,7 @@
<dataDir>${solr.data.dir:}</dataDir>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<schemaFactory class="ClassicIndexSchemaFactory"/>
- <requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
+ <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
<indexConfig>
<!-- we don't use solrconfig.snippet.randomindexconfig.xml here
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/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 7466d01..41726ce 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
@@ -200,17 +200,13 @@
If the set cardinality <= maxSize elements, then HashDocSet will be used instead of the bitset
based HashBitset. -->
- <!-- requestHandler plugins... incoming queries will be dispatched to the
- correct handler based on the 'qt' param matching the
- name of registered handlers.
- The "standard" request handler is the default and will be used if qt
- is not specified in the request.
+ <!-- requestHandler plugins
-->
- <requestHandler name="standard" class="solr.StandardRequestHandler">
+ <requestHandler name="/select" class="solr.SearchHandler">
<bool name="httpCaching">true</bool>
</requestHandler>
- <requestHandler name="dismax" class="solr.SearchHandler" >
+ <requestHandler name="/dismax" class="solr.SearchHandler" >
<lst name="defaults">
<str name="defType">dismax</str>
<str name="q.alt">*:*</str>
@@ -231,10 +227,10 @@
</lst>
</requestHandler>
- <requestHandler name="mock" class="org.apache.solr.core.MockQuerySenderListenerReqHandler"/>
+ <requestHandler name="/mock" class="org.apache.solr.core.MockQuerySenderListenerReqHandler"/>
<!-- test query parameter defaults -->
- <requestHandler name="defaults" class="solr.StandardRequestHandler">
+ <requestHandler name="/defaults" class="solr.SearchHandler">
<lst name="defaults">
<int name="rows">4</int>
<bool name="hl">true</bool>
@@ -243,7 +239,7 @@
</requestHandler>
<!-- test query parameter defaults -->
- <requestHandler name="lazy" class="solr.StandardRequestHandler" startup="lazy">
+ <requestHandler name="/lazy" class="solr.SearchHandler" startup="lazy">
<lst name="defaults">
<int name="rows">4</int>
<bool name="hl">true</bool>
@@ -341,7 +337,7 @@
-->
<queryConverter name="queryConverter" class="org.apache.solr.spelling.SpellingQueryConverter"/>
- <requestHandler name="spellCheckCompRH" class="org.apache.solr.handler.component.SearchHandler">
+ <requestHandler name="/spellCheckCompRH" class="org.apache.solr.handler.component.SearchHandler">
<lst name="defaults">
<!-- omp = Only More Popular -->
<str name="spellcheck.onlyMorePopular">false</str>
@@ -354,7 +350,7 @@
<str>spellcheck</str>
</arr>
</requestHandler>
- <requestHandler name="spellCheckCompRH_Direct" class="org.apache.solr.handler.component.SearchHandler">
+ <requestHandler name="/spellCheckCompRH_Direct" class="org.apache.solr.handler.component.SearchHandler">
<lst name="defaults">
<str name="spellcheck.dictionary">direct</str>
<str name="spellcheck.onlyMorePopular">false</str>
@@ -365,7 +361,7 @@
<str>spellcheck</str>
</arr>
</requestHandler>
- <requestHandler name="spellCheckWithWordbreak" class="org.apache.solr.handler.component.SearchHandler">
+ <requestHandler name="/spellCheckWithWordbreak" class="org.apache.solr.handler.component.SearchHandler">
<lst name="defaults">
<str name="spellcheck.dictionary">default</str>
<str name="spellcheck.dictionary">wordbreak</str>
@@ -375,7 +371,7 @@
<str>spellcheck</str>
</arr>
</requestHandler>
- <requestHandler name="spellCheckWithWordbreak_Direct" class="org.apache.solr.handler.component.SearchHandler">
+ <requestHandler name="/spellCheckWithWordbreak_Direct" class="org.apache.solr.handler.component.SearchHandler">
<lst name="defaults">
<str name="spellcheck.dictionary">direct</str>
<str name="spellcheck.dictionary">wordbreak</str>
@@ -385,7 +381,7 @@
<str>spellcheck</str>
</arr>
</requestHandler>
- <requestHandler name="spellCheckCompRH1" class="org.apache.solr.handler.component.SearchHandler">
+ <requestHandler name="/spellCheckCompRH1" class="org.apache.solr.handler.component.SearchHandler">
<lst name="defaults">
<str name="defType">dismax</str>
<str name="qf">lowerfilt1^1</str>
@@ -395,13 +391,13 @@
</arr>
</requestHandler>
- <requestHandler name="mltrh" class="org.apache.solr.handler.component.SearchHandler">
+ <requestHandler name="/mltrh" class="org.apache.solr.handler.component.SearchHandler">
</requestHandler>
<searchComponent name="tvComponent" class="org.apache.solr.handler.component.TermVectorComponent"/>
- <requestHandler name="tvrh" class="org.apache.solr.handler.component.SearchHandler">
+ <requestHandler name="/tvrh" class="org.apache.solr.handler.component.SearchHandler">
<lst name="defaults">
</lst>
@@ -460,7 +456,7 @@
</highlighting>
</searchComponent>
- <requestDispatcher handleSelect="true" >
+ <requestDispatcher>
<requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="-1" />
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl>
@@ -578,7 +574,8 @@
<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">
+ <!-- warning: not a best practice; requests generally ought to be explicit to thus not require this -->
+ <initParams path="/select,/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>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig_SimpleTextCodec.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig_SimpleTextCodec.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig_SimpleTextCodec.xml
index f3abf9b..7b0c3e3 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig_SimpleTextCodec.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig_SimpleTextCodec.xml
@@ -21,6 +21,6 @@
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<schemaFactory class="ClassicIndexSchemaFactory"/>
- <requestHandler name="standard" class="solr.StandardRequestHandler"/>
+ <requestHandler name="/select" class="solr.SearchHandler"/>
<codecFactory class="solr.SimpleTextCodecFactory"/>
</config>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig_codec.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig_codec.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig_codec.xml
index 0c3e81e..ad08096 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig_codec.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig_codec.xml
@@ -21,7 +21,7 @@
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<schemaFactory class="ClassicIndexSchemaFactory"/>
- <requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
+ <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
<codecFactory class="solr.SchemaCodecFactory">
<str name="compressionMode">${tests.COMPRESSION_MODE:BEST_COMPRESSION}</str>
</codecFactory>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig_codec2.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig_codec2.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig_codec2.xml
index d3790a4..c4a8ae7 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig_codec2.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig_codec2.xml
@@ -20,7 +20,7 @@
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
- <requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
+ <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
<schemaFactory class="ClassicIndexSchemaFactory"/>
<codecFactory class="solr.SchemaCodecFactory"/>
</config>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml
index cc6f97b..6f35efa 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml
@@ -60,7 +60,7 @@
</query>
- <requestDispatcher handleSelect="true" >
+ <requestDispatcher>
<!--Make sure your system has some authentication before enabling remote streaming! -->
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
<httpCaching lastModifiedFrom="openTime"
@@ -68,7 +68,6 @@
</httpCaching>
</requestDispatcher>
- <requestHandler name="standard" class="solr.SearchHandler" default="true">
- </requestHandler>
+ <requestHandler name="/select" class="solr.SearchHandler" />
</config>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/configsets/bad-mergepolicy/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/configsets/bad-mergepolicy/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/bad-mergepolicy/conf/solrconfig.xml
index 49bbf58..3ef080d 100644
--- a/solr/core/src/test-files/solr/configsets/bad-mergepolicy/conf/solrconfig.xml
+++ b/solr/core/src/test-files/solr/configsets/bad-mergepolicy/conf/solrconfig.xml
@@ -31,6 +31,6 @@
<updateHandler class="solr.DirectUpdateHandler2"/>
<schemaFactory class="ClassicIndexSchemaFactory"/>
- <requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
+ <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
</config>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/configsets/cdcr-source/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/configsets/cdcr-source/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/cdcr-source/conf/solrconfig.xml
index f2528c3..6469038 100644
--- a/solr/core/src/test-files/solr/configsets/cdcr-source/conf/solrconfig.xml
+++ b/solr/core/src/test-files/solr/configsets/cdcr-source/conf/solrconfig.xml
@@ -64,8 +64,7 @@
</updateLog>
</updateHandler>
- <requestHandler name="standard" class="solr.StandardRequestHandler">
- </requestHandler>
+ <requestHandler name="/select" class="solr.SearchHandler" />
<requestHandler name="/update" class="solr.UpdateRequestHandler">
<lst name="defaults">
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/configsets/cdcr-target/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/configsets/cdcr-target/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/cdcr-target/conf/solrconfig.xml
index ef24fa4..bb4a774 100644
--- a/solr/core/src/test-files/solr/configsets/cdcr-target/conf/solrconfig.xml
+++ b/solr/core/src/test-files/solr/configsets/cdcr-target/conf/solrconfig.xml
@@ -51,8 +51,7 @@
</updateLog>
</updateHandler>
- <requestHandler name="standard" class="solr.StandardRequestHandler">
- </requestHandler>
+ <requestHandler name="/select" class="solr.SearchHandler" />
<requestHandler name="/update" class="solr.UpdateRequestHandler">
<lst name="defaults">
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/configsets/exitable-directory/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/configsets/exitable-directory/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/exitable-directory/conf/solrconfig.xml
index 31c374c..af1036f 100644
--- a/solr/core/src/test-files/solr/configsets/exitable-directory/conf/solrconfig.xml
+++ b/solr/core/src/test-files/solr/configsets/exitable-directory/conf/solrconfig.xml
@@ -42,7 +42,7 @@
<processor class="solr.RunUpdateProcessorFactory" />
</updateRequestProcessorChain>
- <requestHandler name="standard" class="solr.StandardRequestHandler">
+ <requestHandler name="/select" class="solr.SearchHandler">
</requestHandler>
<updateHandler class="solr.DirectUpdateHandler2">
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/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 c6dc859..00781a9 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
@@ -37,9 +37,11 @@
<HashDocSet maxSize="3000" loadFactor="0.75"/>
<boolTofilterOptimizer enabled="true" cacheSize="32" threshold=".05"/>
</query>
-
- <requestHandler name="standard" class="solr.StandardRequestHandler" />
- <requestHandler name="crazy_custom_qt" class="solr.StandardRequestHandler">
+
+ <requestDispatcher/>
+
+ <requestHandler name="/select" class="solr.SearchHandler" />
+ <requestHandler name="/crazy_custom_qt" class="solr.SearchHandler">
<lst name="defaults">
<str name="fl">implicit</str>
<str name="df">subject</str>
@@ -55,7 +57,7 @@
<gettableFiles>solrconfig.xml schema.xml</gettableFiles>
</admin>
- <initParams path="standard,crazy_custom_qt">
+ <initParams path="/select,/crazy_custom_qt">
<lst name="defaults">
<str name="df">subject</str>
</lst>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java b/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
index 2122c90..52e2e78 100644
--- a/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
+++ b/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
@@ -122,7 +122,7 @@ public class BasicFunctionalityTest extends SolrTestCaseJ4 {
SolrCore core = h.getCore();
// test that we got the expected config, not just hardcoded defaults
- assertNotNull(core.getRequestHandler("mock"));
+ assertNotNull(core.getRequestHandler("/mock"));
// test stats call
SolrMetricManager manager = core.getCoreContainer().getMetricManager();
@@ -756,12 +756,12 @@ public class BasicFunctionalityTest extends SolrTestCaseJ4 {
);
assertQ("defaults handler returns fewer matches",
- req("q", "id:[42 TO 47]", "qt","defaults"),
+ req("q", "id:[42 TO 47]", "qt","/defaults"),
"*[count(//doc)=4]"
);
assertQ("defaults handler includes highlighting",
- req("q", "name:Zapp OR title:General", "qt","defaults"),
+ req("q", "name:Zapp OR title:General", "qt","/defaults"),
"//lst[@name='highlighting']"
);
[4/4] lucene-solr:master: SOLR-6807: requestDispatcher/@handleSelect
now defaults to false; stop using it. Deprecated StandardRequestHandler;
stop using it.
Posted by ds...@apache.org.
SOLR-6807: requestDispatcher/@handleSelect now defaults to false; stop using it.
Deprecated StandardRequestHandler; stop using it.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/82a44beb
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/82a44beb
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/82a44beb
Branch: refs/heads/master
Commit: 82a44beb3cbb685e4d30d55d06eb78f012afb93c
Parents: d5963be
Author: David Smiley <ds...@apache.org>
Authored: Wed Jun 28 17:22:43 2017 -0400
Committer: David Smiley <ds...@apache.org>
Committed: Wed Jun 28 17:22:44 2017 -0400
----------------------------------------------------------------------
solr/CHANGES.txt | 12 +
.../collection1/conf/solrconfig-icucollate.xml | 2 +-
.../collection1/conf/solrconfig-analytics.xml | 2 +-
.../solr/collection1/conf/solrconfig.xml | 20 +-
.../clustering/ClusteringComponentTest.java | 2 +-
.../collection1/conf/dataimport-solrconfig.xml | 40 ++--
.../conf/contentstream-solrconfig.xml | 42 ++--
.../conf/dataimport-nodatasource-solrconfig.xml | 42 ++--
.../collection1/conf/dataimport-solrconfig.xml | 42 ++--
.../solr/collection1/conf/solrconfig.xml | 37 +--
.../extraction/TestXLSXResponseWriter.java | 2 +-
.../conf/solrconfig-languageidentifier.xml | 4 +-
.../uima/solr/collection1/conf/solrconfig.xml | 25 +-
.../uima/uima-tokenizers-solrconfig.xml | 15 +-
.../java/org/apache/solr/core/SolrConfig.java | 3 +-
.../solr/handler/MoreLikeThisHandler.java | 2 +-
.../apache/solr/handler/RequestHandlerBase.java | 1 -
.../solr/handler/StandardRequestHandler.java | 19 +-
.../org/apache/solr/util/SolrPluginUtils.java | 12 +-
.../resources/SystemCollectionSolrConfig.xml | 2 +-
.../collection1/conf/bad-error-solrconfig.xml | 2 +-
.../collection1/conf/bad-mpf-solrconfig.xml | 2 +-
...dd-schema-fields-update-processor-chains.xml | 2 +-
.../conf/solrconfig-altdirectory.xml | 2 +-
.../conf/solrconfig-analytics-query.xml | 227 +------------------
.../solr/collection1/conf/solrconfig-basic.xml | 2 +-
.../conf/solrconfig-blockjoinfacetcomponent.xml | 11 +-
.../conf/solrconfig-cache-enable-disable.xml | 4 +-
.../solr/collection1/conf/solrconfig-cdcr.xml | 2 +-
.../conf/solrconfig-cdcrupdatelog.xml | 2 +-
.../conf/solrconfig-classification.xml | 2 +-
.../conf/solrconfig-collapseqparser.xml | 125 +---------
.../conf/solrconfig-components-name.xml | 4 +-
.../solrconfig-configurerecoverystrategy.xml | 2 +-
.../conf/solrconfig-customrecoverystrategy.xml | 2 +-
.../conf/solrconfig-delaying-component.xml | 2 +-
.../collection1/conf/solrconfig-delpolicy1.xml | 2 +-
.../collection1/conf/solrconfig-delpolicy2.xml | 2 +-
...lrconfig-distrib-update-processor-chains.xml | 3 +-
.../conf/solrconfig-doctransformers.xml | 4 +-
.../collection1/conf/solrconfig-elevate.xml | 2 +-
.../solrconfig-externalversionconstraint.xml | 2 +-
.../conf/solrconfig-functionquery.xml | 4 +-
.../solr/collection1/conf/solrconfig-hash.xml | 4 +-
.../collection1/conf/solrconfig-headers.xml | 2 +-
.../collection1/conf/solrconfig-highlight.xml | 2 +-
.../conf/solrconfig-implicitproperties.xml | 2 +-
.../conf/solrconfig-infixsuggesters.xml | 2 +-
.../conf/solrconfig-logmergepolicyfactory.xml | 2 +-
.../conf/solrconfig-managed-schema-test.xml | 2 +-
.../conf/solrconfig-managed-schema.xml | 4 +-
.../conf/solrconfig-master-throttled.xml | 8 +-
.../solr/collection1/conf/solrconfig-master.xml | 8 +-
.../conf/solrconfig-master1-keepOneBackup.xml | 4 +-
.../collection1/conf/solrconfig-master1.xml | 8 +-
.../collection1/conf/solrconfig-master2.xml | 8 +-
.../collection1/conf/solrconfig-master3.xml | 8 +-
.../conf/solrconfig-mergepolicy-defaults.xml | 2 +-
.../conf/solrconfig-mergepolicy-legacy.xml | 2 +-
.../solrconfig-mergepolicyfactory-nocfs.xml | 2 +-
.../collection1/conf/solrconfig-nocache.xml | 8 +-
.../conf/solrconfig-nomergepolicyfactory.xml | 2 +-
.../collection1/conf/solrconfig-noopregen.xml | 2 +-
.../collection1/conf/solrconfig-paramset.xml | 2 +-
...lrconfig-parsing-update-processor-chains.xml | 2 +-
.../conf/solrconfig-phrasesuggest.xml | 2 +-
.../conf/solrconfig-plugcollector.xml | 28 +--
.../conf/solrconfig-postingshighlight.xml | 2 +-
.../conf/solrconfig-query-parser-init.xml | 2 +-
.../conf/solrconfig-querysender-noquery.xml | 2 +-
.../collection1/conf/solrconfig-querysender.xml | 8 +-
.../collection1/conf/solrconfig-repeater.xml | 8 +-
.../collection1/conf/solrconfig-reqHandler.incl | 2 +-
.../conf/solrconfig-response-log-component.xml | 16 +-
.../collection1/conf/solrconfig-schemaless.xml | 2 +-
.../conf/solrconfig-script-updateprocessor.xml | 2 +-
.../conf/solrconfig-searcher-listeners1.xml | 2 +-
.../solr/collection1/conf/solrconfig-slave.xml | 8 +-
.../solr/collection1/conf/solrconfig-slave1.xml | 8 +-
.../conf/solrconfig-solcoreproperties.xml | 2 +-
.../solrconfig-sortingmergepolicyfactory.xml | 4 +-
.../conf/solrconfig-sortingresponse.xml | 2 +-
.../collection1/conf/solrconfig-spatial.xml | 2 +-
.../conf/solrconfig-spellcheckcomponent.xml | 12 +-
.../conf/solrconfig-spellchecker.xml | 2 +-
.../solr/collection1/conf/solrconfig-sql.xml | 4 +-
...-suggestercomponent-context-filter-query.xml | 2 +-
.../conf/solrconfig-suggestercomponent.xml | 2 +-
.../collection1/conf/solrconfig-test-misc.xml | 4 +-
.../conf/solrconfig-testxmlparser.xml | 2 +-
.../solrconfig-tieredmergepolicyfactory.xml | 2 +-
.../solr/collection1/conf/solrconfig-tlog.xml | 5 +-
...nfig-uninvertdocvaluesmergepolicyfactory.xml | 2 +-
.../conf/solrconfig-update-processor-chains.xml | 2 +-
...lrconfig-warmer-randommergepolicyfactory.xml | 2 +-
.../solr/collection1/conf/solrconfig.xml | 35 ++-
.../conf/solrconfig_SimpleTextCodec.xml | 2 +-
.../solr/collection1/conf/solrconfig_codec.xml | 2 +-
.../solr/collection1/conf/solrconfig_codec2.xml | 2 +-
.../solr/collection1/conf/solrconfig_perf.xml | 5 +-
.../bad-mergepolicy/conf/solrconfig.xml | 2 +-
.../configsets/cdcr-source/conf/solrconfig.xml | 3 +-
.../configsets/cdcr-target/conf/solrconfig.xml | 3 +-
.../exitable-directory/conf/solrconfig.xml | 2 +-
.../test-files/solr/crazy-path-to-config.xml | 10 +-
.../org/apache/solr/BasicFunctionalityTest.java | 6 +-
.../org/apache/solr/ConvertedLegacyTest.java | 46 ++--
.../apache/solr/DisMaxRequestHandlerTest.java | 8 +-
.../test/org/apache/solr/EchoParamsTest.java | 4 +-
.../src/test/org/apache/solr/SampleTest.java | 2 +-
.../test/org/apache/solr/SolrInfoBeanTest.java | 4 +-
.../org/apache/solr/TestDistributedSearch.java | 6 +-
.../test/org/apache/solr/cloud/BasicZkTest.java | 2 +-
.../cloud/TestRandomRequestDistribution.java | 4 +-
.../solr/core/AlternateDirectoryTest.java | 2 +-
.../apache/solr/core/RequestHandlersTest.java | 8 +-
.../test/org/apache/solr/core/SolrCoreTest.java | 2 +-
.../test/org/apache/solr/core/TestConfig.java | 4 +-
.../solr/core/TestQuerySenderListener.java | 2 +-
.../solr/core/TestQuerySenderNoQuery.java | 2 +-
.../apache/solr/core/TestXIncludeConfig.java | 2 +-
.../solr/handler/MoreLikeThisHandlerTest.java | 1 -
.../apache/solr/handler/SearchHandlerTest.java | 80 +++++++
.../handler/StandardRequestHandlerTest.java | 88 -------
.../DistributedSpellCheckComponentTest.java | 10 +-
.../handler/component/FacetPivotSmallTest.java | 1 -
.../component/ResponseLogComponentTest.java | 12 +-
.../component/SpellCheckComponentTest.java | 10 +-
.../handler/component/StatsComponentTest.java | 1 -
.../handler/component/SuggestComponentTest.java | 2 +-
.../component/TermVectorComponentTest.java | 2 +-
.../highlight/FastVectorHighlighterTest.java | 2 +-
.../solr/highlight/HighlighterConfigTest.java | 2 +-
.../apache/solr/highlight/HighlighterTest.java | 84 +++----
.../metrics/SolrMetricsIntegrationTest.java | 2 +-
.../apache/solr/request/SimpleFacetsTest.java | 4 +-
.../solr/request/TestIntervalFaceting.java | 2 +-
.../search/TestComplexPhraseQParserPlugin.java | 8 +-
.../search/join/BlockJoinFacetDistribTest.java | 2 +-
.../search/join/BlockJoinFacetRandomTest.java | 2 +-
.../search/join/BlockJoinFacetSimpleTest.java | 2 +-
.../spelling/DirectSolrSpellCheckerTest.java | 2 +-
.../solr/spelling/SpellCheckCollatorTest.java | 43 ++--
.../SpellCheckCollatorWithCollapseTest.java | 2 +-
.../spelling/WordBreakSolrSpellCheckerTest.java | 16 +-
.../example-DIH/solr/db/conf/solrconfig.xml | 24 +-
.../example-DIH/solr/mail/conf/solrconfig.xml | 24 +-
.../example-DIH/solr/solr/conf/solrconfig.xml | 24 +-
solr/example/files/conf/solrconfig.xml | 24 +-
.../configsets/_default/conf/solrconfig.xml | 23 +-
.../conf/solrconfig.xml | 23 +-
.../src/distributed-requests.adoc | 4 +-
.../src/the-dismax-query-parser.adoc | 16 +-
.../solr/common/params/MoreLikeThisParams.java | 3 +-
.../solr/collection1/conf/solrconfig-slave1.xml | 8 +-
.../solr/collection1/conf/solrconfig-sql.xml | 4 +-
.../solrj/solr/collection1/conf/solrconfig.xml | 4 +-
.../solr/configsets/ml/conf/solrconfig.xml | 4 +-
.../solr/configsets/shared/conf/solrconfig.xml | 8 +-
.../configsets/streaming/conf/solrconfig.xml | 6 +-
.../solr/multicore/core0/conf/solrconfig.xml | 8 +-
.../solr/multicore/core1/conf/solrconfig.xml | 8 +-
.../client/solrj/impl/CloudSolrClientTest.java | 2 +-
.../java/org/apache/solr/SolrTestCaseJ4.java | 10 +-
164 files changed, 561 insertions(+), 1183 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 9578698..be23b3a 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -120,6 +120,13 @@ Upgrading from Solr 6.x
fields, a new JSON request language, and more. DocValues are now required for any field used in the analytics expression
whereas previously docValues was not required. Please see SOLR-10123 for details.
+* solrconfig.xml: <requestDispatcher handleSelect="..."> now defaults to false when luceneMatchVersion >= 7.0,
+ thus ignoring "qt". Regardless, "qt" is still used as a SolrJ special parameter that specifies the request handler
+ (tail URL path) to use. If you have request handlers without a leading '/', you can set handleSelect="true"
+ or better yet consider migrating.
+
+* StandardRequestHandler is deprecated. Simply use SearchHandler instead.
+
New Features
----------------------
* SOLR-9857, SOLR-9858: Collect aggregated metrics from nodes and shard leaders in overseer. (ab)
@@ -351,6 +358,11 @@ Other Changes
- SOLR-10946: Randomize the usage of Points based numerics in solrj test schemas (hossman)
- SOLR-10947: Randomize the usage of Points based numerics in contrib test schemas (hossman)
+* SOLR-6807: Changed requestDispatcher's handleSelect to default to false, thus ignoring "qt".
+ Simplified configs to not refer to handleSelect or "qt". Switch all tests that assumed true to assume false
+ (added leading '/' in request handlers). Switch all tests referring to "standard" request handler to
+ instead refer to "/select" with SearchHandler. Deprecated the old StandardRequestHandler. (David Smiley)
+
================== 6.7.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig-icucollate.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig-icucollate.xml b/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig-icucollate.xml
index 8266aae..90c52d7 100644
--- a/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig-icucollate.xml
+++ b/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig-icucollate.xml
@@ -22,6 +22,6 @@
<indexConfig>
<useCompoundFile>${useCompoundFile:false}</useCompoundFile>
</indexConfig>
- <requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
+ <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
</config>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/contrib/analytics/src/test-files/solr/collection1/conf/solrconfig-analytics.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/analytics/src/test-files/solr/collection1/conf/solrconfig-analytics.xml b/solr/contrib/analytics/src/test-files/solr/collection1/conf/solrconfig-analytics.xml
index 31d6437..4c359a6 100644
--- a/solr/contrib/analytics/src/test-files/solr/collection1/conf/solrconfig-analytics.xml
+++ b/solr/contrib/analytics/src/test-files/solr/collection1/conf/solrconfig-analytics.xml
@@ -24,7 +24,7 @@
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<schemaFactory class="ClassicIndexSchemaFactory"/>
- <requestHandler name="standard" class="solr.StandardRequestHandler">
+ <requestHandler name="/select" class="solr.SearchHandler">
<arr name="components">
<str>query</str>
<str>facet</str>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xml b/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xml
index 74d903e..8d0f82e 100644
--- a/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xml
+++ b/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xml
@@ -214,12 +214,7 @@
</query>
- <!--
- Let the dispatch filter handler /select?qt=XXX
- handleSelect=true will use consistent error handling for /select and /update
- handleSelect=false will use solr1.1 style error formatting
- -->
- <requestDispatcher handleSelect="true" >
+ <requestDispatcher>
<!--Make sure your system has some authentication before enabling remote streaming!
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
-->
@@ -260,17 +255,8 @@
<!-- <cacheControl>max-age=30, public</cacheControl> -->
</httpCaching>
</requestDispatcher>
-
-
- <!-- requestHandler plugins... incoming queries will be dispatched to the
- correct handler based on the path or the 'qt' param.
- Names starting with a '/' are accessed with the a path equal to the
- registered name. Names without a leading '/' are accessed with:
- http://host/app/select?qt=name
- If no qt is defined, the requestHandler that declares default="true"
- will be used.
- -->
- <requestHandler name="standard" class="solr.SearchHandler" default="true">
+
+ <requestHandler name="/select" class="solr.SearchHandler">
<!-- default values for query parameters -->
<lst name="defaults">
<str name="echoParams">explicit</str>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentTest.java
----------------------------------------------------------------------
diff --git a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentTest.java b/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentTest.java
index bff9f37..8ccc8ed 100644
--- a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentTest.java
+++ b/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentTest.java
@@ -66,7 +66,7 @@ public class ClusteringComponentTest extends AbstractClusteringTestCase {
params.add(ClusteringParams.USE_SEARCH_RESULTS, "true");
- SolrRequestHandler handler = core.getRequestHandler("standard");
+ SolrRequestHandler handler = core.getRequestHandler("/select");
SolrQueryResponse rsp;
rsp = new SolrQueryResponse();
rsp.addResponseHeader(new SimpleOrderedMap<>());
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-solrconfig.xml b/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-solrconfig.xml
index 7672cab..d426320 100644
--- a/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-solrconfig.xml
+++ b/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-solrconfig.xml
@@ -144,21 +144,21 @@
and there is a current searcher handling requests (aka registered). -->
<!-- QuerySenderListener takes an array of NamedList and executes a
local query request for each NamedList in sequence. -->
- <listener event="newSearcher" class="solr.QuerySenderListener">
- <arr name="queries">
- <lst> <str name="q">solr</str> <str name="start">0</str> <str name="rows">10</str> </lst>
- <lst> <str name="q">rocks</str> <str name="start">0</str> <str name="rows">10</str> </lst>
- <lst><str name="q">static newSearcher warming query from solrconfig.xml</str></lst>
- </arr>
- </listener>
+ <!--<listener event="newSearcher" class="solr.QuerySenderListener">-->
+ <!--<arr name="queries">-->
+ <!--<lst> <str name="q">solr</str> <str name="start">0</str> <str name="rows">10</str> </lst>-->
+ <!--<lst> <str name="q">rocks</str> <str name="start">0</str> <str name="rows">10</str> </lst>-->
+ <!--<lst><str name="q">static newSearcher warming query from solrconfig.xml</str></lst>-->
+ <!--</arr>-->
+ <!--</listener>-->
<!-- a firstSearcher event is fired whenever a new searcher is being
prepared but there is no current registered searcher to handle
requests or to gain autowarming data from. -->
- <listener event="firstSearcher" class="solr.QuerySenderListener">
- <arr name="queries">
- </arr>
- </listener>
+ <!--<listener event="firstSearcher" class="solr.QuerySenderListener">-->
+ <!--<arr name="queries">-->
+ <!--</arr>-->
+ <!--</listener>-->
<!-- If a search request comes in and there is no current registered searcher,
then immediately register the still warming searcher and use it. If
@@ -173,12 +173,7 @@
</query>
- <!--
- Let the dispatch filter handler /select?qt=XXX
- handleSelect=true will use consistent error handling for /select and /update
- handleSelect=false will use solr1.1 style error formatting
- -->
- <requestDispatcher handleSelect="true" >
+ <requestDispatcher>
<!--Make sure your system has some authentication before enabling remote streaming!
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
-->
@@ -220,16 +215,7 @@
</httpCaching>
</requestDispatcher>
-
- <!-- requestHandler plugins... incoming queries will be dispatched to the
- correct handler based on the path or the 'qt' param.
- Names starting with a '/' are accessed with the a path equal to the
- registered name. Names without a leading '/' are accessed with:
- http://host/app/select?qt=name
- If no qt is defined, the requestHandler that declares default="true"
- will be used.
- -->
- <requestHandler name="standard" class="solr.StandardRequestHandler" default="true">
+ <requestHandler name="/select" class="solr.SearchHandler">
<!-- default values for query parameters -->
<lst name="defaults">
<str name="echoParams">explicit</str>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/contentstream-solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/contentstream-solrconfig.xml b/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/contentstream-solrconfig.xml
index 235b15c..a07ab78 100644
--- a/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/contentstream-solrconfig.xml
+++ b/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/contentstream-solrconfig.xml
@@ -144,21 +144,21 @@
and there is a current searcher handling requests (aka registered). -->
<!-- QuerySenderListener takes an array of NamedList and executes a
local query request for each NamedList in sequence. -->
- <listener event="newSearcher" class="solr.QuerySenderListener">
- <arr name="queries">
- <lst> <str name="q">solr</str> <str name="start">0</str> <str name="rows">10</str> </lst>
- <lst> <str name="q">rocks</str> <str name="start">0</str> <str name="rows">10</str> </lst>
- <lst><str name="q">static newSearcher warming query from solrconfig.xml</str></lst>
- </arr>
- </listener>
+ <!--<listener event="newSearcher" class="solr.QuerySenderListener">-->
+ <!--<arr name="queries">-->
+ <!--<lst> <str name="q">solr</str> <str name="start">0</str> <str name="rows">10</str> </lst>-->
+ <!--<lst> <str name="q">rocks</str> <str name="start">0</str> <str name="rows">10</str> </lst>-->
+ <!--<lst><str name="q">static newSearcher warming query from solrconfig.xml</str></lst>-->
+ <!--</arr>-->
+ <!--</listener>-->
<!-- a firstSearcher event is fired whenever a new searcher is being
prepared but there is no current registered searcher to handle
requests or to gain autowarming data from. -->
- <listener event="firstSearcher" class="solr.QuerySenderListener">
- <arr name="queries">
- </arr>
- </listener>
+ <!--<listener event="firstSearcher" class="solr.QuerySenderListener">-->
+ <!--<arr name="queries">-->
+ <!--</arr>-->
+ <!--</listener>-->
<!-- If a search request comes in and there is no current registered searcher,
then immediately register the still warming searcher and use it. If
@@ -173,12 +173,7 @@
</query>
- <!--
- Let the dispatch filter handler /select?qt=XXX
- handleSelect=true will use consistent error handling for /select and /update
- handleSelect=false will use solr1.1 style error formatting
- -->
- <requestDispatcher handleSelect="true" >
+ <requestDispatcher>
<!--Make sure your system has some authentication before enabling remote streaming!
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
-->
@@ -219,17 +214,8 @@
<!-- <cacheControl>max-age=30, public</cacheControl> -->
</httpCaching>
</requestDispatcher>
-
-
- <!-- requestHandler plugins... incoming queries will be dispatched to the
- correct handler based on the path or the 'qt' param.
- Names starting with a '/' are accessed with the a path equal to the
- registered name. Names without a leading '/' are accessed with:
- http://host/app/select?qt=name
- If no qt is defined, the requestHandler that declares default="true"
- will be used.
- -->
- <requestHandler name="standard" class="solr.StandardRequestHandler" default="true">
+
+ <requestHandler name="/select" class="solr.SearchHandler">
<!-- default values for query parameters -->
<lst name="defaults">
<str name="echoParams">explicit</str>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-nodatasource-solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-nodatasource-solrconfig.xml b/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-nodatasource-solrconfig.xml
index 7f20677..6754f9e 100644
--- a/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-nodatasource-solrconfig.xml
+++ b/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-nodatasource-solrconfig.xml
@@ -146,21 +146,21 @@
and there is a current searcher handling requests (aka registered). -->
<!-- QuerySenderListener takes an array of NamedList and executes a
local query request for each NamedList in sequence. -->
- <listener event="newSearcher" class="solr.QuerySenderListener">
- <arr name="queries">
- <lst> <str name="q">solr</str> <str name="start">0</str> <str name="rows">10</str> </lst>
- <lst> <str name="q">rocks</str> <str name="start">0</str> <str name="rows">10</str> </lst>
- <lst><str name="q">static newSearcher warming query from solrconfig.xml</str></lst>
- </arr>
- </listener>
+ <!--<listener event="newSearcher" class="solr.QuerySenderListener">-->
+ <!--<arr name="queries">-->
+ <!--<lst> <str name="q">solr</str> <str name="start">0</str> <str name="rows">10</str> </lst>-->
+ <!--<lst> <str name="q">rocks</str> <str name="start">0</str> <str name="rows">10</str> </lst>-->
+ <!--<lst><str name="q">static newSearcher warming query from solrconfig.xml</str></lst>-->
+ <!--</arr>-->
+ <!--</listener>-->
<!-- a firstSearcher event is fired whenever a new searcher is being
prepared but there is no current registered searcher to handle
requests or to gain autowarming data from. -->
- <listener event="firstSearcher" class="solr.QuerySenderListener">
- <arr name="queries">
- </arr>
- </listener>
+ <!--<listener event="firstSearcher" class="solr.QuerySenderListener">-->
+ <!--<arr name="queries">-->
+ <!--</arr>-->
+ <!--</listener>-->
<!-- If a search request comes in and there is no current registered searcher,
then immediately register the still warming searcher and use it. If
@@ -175,12 +175,7 @@
</query>
- <!--
- Let the dispatch filter handler /select?qt=XXX
- handleSelect=true will use consistent error handling for /select and /update
- handleSelect=false will use solr1.1 style error formatting
- -->
- <requestDispatcher handleSelect="true" >
+ <requestDispatcher>
<!--Make sure your system has some authentication before enabling remote streaming!
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
-->
@@ -221,17 +216,8 @@
<!-- <cacheControl>max-age=30, public</cacheControl> -->
</httpCaching>
</requestDispatcher>
-
-
- <!-- requestHandler plugins... incoming queries will be dispatched to the
- correct handler based on the path or the 'qt' param.
- Names starting with a '/' are accessed with the a path equal to the
- registered name. Names without a leading '/' are accessed with:
- http://host/app/select?qt=name
- If no qt is defined, the requestHandler that declares default="true"
- will be used.
- -->
- <requestHandler name="standard" class="solr.StandardRequestHandler" default="true">
+
+ <requestHandler name="/select" class="solr.SearchHandler">
<!-- default values for query parameters -->
<lst name="defaults">
<str name="echoParams">explicit</str>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/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 2eacf8a..a662fd9 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
@@ -144,21 +144,21 @@
and there is a current searcher handling requests (aka registered). -->
<!-- QuerySenderListener takes an array of NamedList and executes a
local query request for each NamedList in sequence. -->
- <listener event="newSearcher" class="solr.QuerySenderListener">
- <arr name="queries">
- <lst> <str name="q">solr</str> <str name="start">0</str> <str name="rows">10</str> </lst>
- <lst> <str name="q">rocks</str> <str name="start">0</str> <str name="rows">10</str> </lst>
- <lst><str name="q">static newSearcher warming query from solrconfig.xml</str></lst>
- </arr>
- </listener>
+ <!--<listener event="newSearcher" class="solr.QuerySenderListener">-->
+ <!--<arr name="queries">-->
+ <!--<lst> <str name="q">solr</str> <str name="start">0</str> <str name="rows">10</str> </lst>-->
+ <!--<lst> <str name="q">rocks</str> <str name="start">0</str> <str name="rows">10</str> </lst>-->
+ <!--<lst><str name="q">static newSearcher warming query from solrconfig.xml</str></lst>-->
+ <!--</arr>-->
+ <!--</listener>-->
<!-- a firstSearcher event is fired whenever a new searcher is being
prepared but there is no current registered searcher to handle
requests or to gain autowarming data from. -->
- <listener event="firstSearcher" class="solr.QuerySenderListener">
- <arr name="queries">
- </arr>
- </listener>
+ <!--<listener event="firstSearcher" class="solr.QuerySenderListener">-->
+ <!--<arr name="queries">-->
+ <!--</arr>-->
+ <!--</listener>-->
<!-- If a search request comes in and there is no current registered searcher,
then immediately register the still warming searcher and use it. If
@@ -173,12 +173,7 @@
</query>
- <!--
- Let the dispatch filter handler /select?qt=XXX
- handleSelect=true will use consistent error handling for /select and /update
- handleSelect=false will use solr1.1 style error formatting
- -->
- <requestDispatcher handleSelect="true" >
+ <requestDispatcher>
<!--Make sure your system has some authentication before enabling remote streaming!
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
-->
@@ -219,17 +214,8 @@
<!-- <cacheControl>max-age=30, public</cacheControl> -->
</httpCaching>
</requestDispatcher>
-
-
- <!-- requestHandler plugins... incoming queries will be dispatched to the
- correct handler based on the path or the 'qt' param.
- Names starting with a '/' are accessed with the a path equal to the
- registered name. Names without a leading '/' are accessed with:
- http://host/app/select?qt=name
- If no qt is defined, the requestHandler that declares default="true"
- will be used.
- -->
- <requestHandler name="standard" class="solr.StandardRequestHandler" default="true">
+
+ <requestHandler name="/select" class="solr.SearchHandler">
<!-- default values for query parameters -->
<lst name="defaults">
<str name="echoParams">explicit</str>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml b/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml
index 261263e..4dbf082 100644
--- a/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml
+++ b/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml
@@ -149,42 +149,9 @@
</query>
- <!-- An alternate set representation that uses an integer hash to store filters (sets of docids).
- If the set cardinality <= maxSize elements, then HashDocSet will be used instead of the bitset
- based HashBitset. -->
-
- <!-- requestHandler plugins... incoming queries will be dispatched to the
- correct handler based on the 'qt' param matching the
- name of registered handlers.
- The "standard" request handler is the default and will be used if qt
- is not specified in the request.
- -->
- <requestHandler name="standard" class="solr.StandardRequestHandler">
+ <requestHandler name="/select" class="solr.SearchHandler">
<bool name="httpCaching">true</bool>
</requestHandler>
- <requestHandler name="dismax" class="solr.SearchHandler" >
- <lst name="defaults">
- <str name="defType">dismax</str>
- </lst>
- </requestHandler>
-
- <!-- test query parameter defaults -->
- <requestHandler name="defaults" class="solr.StandardRequestHandler">
- <lst name="defaults">
- <int name="rows">4</int>
- <bool name="hl">true</bool>
- <str name="hl.fl">text,name,subject,title,whitetok</str>
- </lst>
- </requestHandler>
-
- <!-- test query parameter defaults -->
- <requestHandler name="lazy" class="solr.StandardRequestHandler" startup="lazy">
- <lst name="defaults">
- <int name="rows">4</int>
- <bool name="hl">true</bool>
- <str name="hl.fl">text,name,subject,title,whitetok</str>
- </lst>
- </requestHandler>
<requestHandler name="/update/extract" class="org.apache.solr.handler.extraction.ExtractingRequestHandler">
<str name="parseContext.config">parseContext.xml</str>
@@ -227,7 +194,7 @@
</highlighting>
- <requestDispatcher handleSelect="true" >
+ <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/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 5c79f0d..7d37844 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
@@ -228,7 +228,7 @@ public class TestXLSXResponseWriter extends SolrTestCaseJ4 {
// returns first worksheet as XLSXResponseWriter only returns one sheet
private XSSFSheet getWSResultForQuery(SolrQueryRequest req) throws IOException, Exception {
- SolrQueryResponse rsp = h.queryAndResponse("standard", req);
+ SolrQueryResponse rsp = h.queryAndResponse("", req);
return getWSResultForQuery(req, rsp);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/solrconfig-languageidentifier.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/solrconfig-languageidentifier.xml b/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/solrconfig-languageidentifier.xml
index 04b75f2..9ae54ad 100644
--- a/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/solrconfig-languageidentifier.xml
+++ b/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/solrconfig-languageidentifier.xml
@@ -44,11 +44,11 @@
</lst>
</requestHandler>
- <requestHandler name="standard" class="solr.StandardRequestHandler">
+ <requestHandler name="/select" class="solr.SearchHandler">
<bool name="httpCaching">true</bool>
</requestHandler>
- <requestDispatcher handleSelect="true" >
+ <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/solrconfig.xml b/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/solrconfig.xml
index a79db3f..96392d3 100644
--- a/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/solrconfig.xml
+++ b/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/solrconfig.xml
@@ -315,12 +315,7 @@
</query>
- <!--
- Let the dispatch filter handler /select?qt=XXX handleSelect=true
- will use consistent error handling for /select and /update
- handleSelect=false will use solr1.1 style error formatting
- -->
- <requestDispatcher handleSelect="true">
+ <requestDispatcher>
<!--
Make sure your system has some authentication before enabling
remote streaming!
@@ -360,17 +355,7 @@
</httpCaching>
</requestDispatcher>
-
- <!--
- requestHandler plugins... incoming queries will be dispatched to the
- correct handler based on the path or the 'qt' param.
- Names starting with a '/' are accessed with the a path equal to the
- registered name. Names without a leading '/' are accessed with:
- http://host/app/select?qt=name If no qt is defined, the
- requestHandler that declares default="true" will be used.
- -->
- <requestHandler name="standard" class="solr.SearchHandler"
- default="true">
+ <requestHandler name="/select" class="solr.SearchHandler">
<!-- default values for query parameters -->
<lst name="defaults">
<str name="echoParams">explicit</str>
@@ -387,7 +372,7 @@
standard SearchHandler with a default query parser of "dismax". see
http://wiki.apache.org/solr/DisMaxRequestHandler
-->
- <requestHandler name="dismax" class="solr.SearchHandler">
+ <requestHandler name="/dismax" class="solr.SearchHandler">
<lst name="defaults">
<str name="defType">dismax</str>
<str name="echoParams">explicit</str>
@@ -427,7 +412,7 @@
Note how you can register the same handler multiple times with
different names (and different init parameters)
-->
- <requestHandler name="partitioned" class="solr.SearchHandler">
+ <requestHandler name="/partitioned" class="solr.SearchHandler">
<lst name="defaults">
<str name="defType">dismax</str>
<str name="echoParams">explicit</str>
@@ -568,7 +553,7 @@
example. You will likely want to add the component to your already
specified request handlers.
-->
- <requestHandler name="tvrh"
+ <requestHandler name="/tvrh"
class="org.apache.solr.handler.component.SearchHandler">
<lst name="defaults">
<bool name="tv">true</bool>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/contrib/uima/src/test-files/uima/uima-tokenizers-solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/uima/src/test-files/uima/uima-tokenizers-solrconfig.xml b/solr/contrib/uima/src/test-files/uima/uima-tokenizers-solrconfig.xml
index 1a0f58b..df7dc1e 100644
--- a/solr/contrib/uima/src/test-files/uima/uima-tokenizers-solrconfig.xml
+++ b/solr/contrib/uima/src/test-files/uima/uima-tokenizers-solrconfig.xml
@@ -314,12 +314,7 @@
</query>
- <!--
- Let the dispatch filter handler /select?qt=XXX handleSelect=true
- will use consistent error handling for /select and /update
- handleSelect=false will use solr1.1 style error formatting
- -->
- <requestDispatcher handleSelect="true">
+ <requestDispatcher>
<!--
Make sure your system has some authentication before enabling
remote streaming!
@@ -368,7 +363,7 @@
http://host/app/select?qt=name If no qt is defined, the
requestHandler that declares default="true" will be used.
-->
- <requestHandler name="standard" class="solr.SearchHandler"
+ <requestHandler name="/select" class="solr.SearchHandler"
default="true">
<!-- default values for query parameters -->
<lst name="defaults">
@@ -386,7 +381,7 @@
standard SearchHandler with a default query parser of "dismax". see
http://wiki.apache.org/solr/DisMaxRequestHandler
-->
- <requestHandler name="dismax" class="solr.SearchHandler">
+ <requestHandler name="/dismax" class="solr.SearchHandler">
<lst name="defaults">
<str name="defType">dismax</str>
<str name="echoParams">explicit</str>
@@ -426,7 +421,7 @@
Note how you can register the same handler multiple times with
different names (and different init parameters)
-->
- <requestHandler name="partitioned" class="solr.SearchHandler">
+ <requestHandler name="/partitioned" class="solr.SearchHandler">
<lst name="defaults">
<str name="defType">dismax</str>
<str name="echoParams">explicit</str>
@@ -567,7 +562,7 @@
example. You will likely want to add the component to your already
specified request handlers.
-->
- <requestHandler name="tvrh"
+ <requestHandler name="/tvrh"
class="org.apache.solr.handler.component.SearchHandler">
<lst name="defaults">
<bool name="tv">true</bool>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/java/org/apache/solr/core/SolrConfig.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/core/SolrConfig.java b/solr/core/src/java/org/apache/solr/core/SolrConfig.java
index dc7fe28..9942323 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrConfig.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrConfig.java
@@ -308,9 +308,8 @@ public class SolrConfig extends Config implements MapSerializable {
enableRemoteStreams = getBool(
"requestDispatcher/requestParsers/@enableRemoteStreaming", false);
- // Let this filter take care of /select?xxx format
handleSelect = getBool(
- "requestDispatcher/@handleSelect", true);
+ "requestDispatcher/@handleSelect", !luceneMatchVersion.onOrAfter(Version.LUCENE_7_0_0));
addHttpRequestToContext = getBool(
"requestDispatcher/requestParsers/@addHttpRequestToContext", false);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java b/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
index 0d12136..62f1016 100644
--- a/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
@@ -249,7 +249,7 @@ public class MoreLikeThisHandler extends RequestHandlerBase
dbgQuery = true;
dbgResults = true;
}
- // Copied from StandardRequestHandler... perhaps it should be added to doStandardDebug?
+ // TODO resolve duplicated code with DebugComponent. Perhaps it should be added to doStandardDebug?
if (dbg == true) {
try {
NamedList<Object> dbgInfo = SolrPluginUtils.doStandardDebug(req, q, mlt.getRawMLTQuery(), mltDocs.docList, dbgQuery, dbgResults);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java b/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java
index 4219768..990d475 100644
--- a/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java
+++ b/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java
@@ -125,7 +125,6 @@ public abstract class RequestHandlerBase implements SolrRequestHandler, SolrInfo
public void init(NamedList args) {
initArgs = args;
- // Copied from StandardRequestHandler
if( args != null ) {
defaults = getSolrParamsFromNamedList(args, "defaults");
appends = getSolrParamsFromNamedList(args, "appends");
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/java/org/apache/solr/handler/StandardRequestHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/StandardRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/StandardRequestHandler.java
index f167b1d..e87aa68 100644
--- a/solr/core/src/java/org/apache/solr/handler/StandardRequestHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/StandardRequestHandler.java
@@ -18,24 +18,7 @@ package org.apache.solr.handler;
import org.apache.solr.handler.component.*;
-/**
- *
- *
- * All of the following options may be configured for this handler
- * in the solrconfig as defaults, and may be overridden as request parameters.
- * (TODO: complete documentation of request parameters here, rather than only
- * on the wiki).
- *
- * <ul>
- * <li> highlight - Set to any value not .equal() to "false" to enable highlight
- * generation</li>
- * <li> highlightFields - Set to a comma- or space-delimited list of fields to
- * highlight. If unspecified, uses the default query field</li>
- * <li> maxSnippets - maximum number of snippets to generate per field-highlight.
- * </li>
- * </ul>
- *
- */
+@Deprecated
public class StandardRequestHandler extends SearchHandler
{
//////////////////////// SolrInfoMBeans methods //////////////////////
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java b/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java
index 1d265c7..01c7c33 100644
--- a/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java
+++ b/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java
@@ -88,17 +88,7 @@ import static org.apache.solr.core.PluginInfo.INVARIANTS;
import static org.apache.solr.core.RequestParams.USEPARAM;
/**
- * <p>Utilities that may be of use to RequestHandlers.</p>
- *
- * <p>
- * Many of these functions have code that was stolen/mutated from
- * StandardRequestHandler.
- * </p>
- *
- * <p>:TODO: refactor StandardRequestHandler to use these utilities</p>
- *
- * <p>:TODO: Many "standard" functionality methods are not cognisant of
- * default parameter settings.
+ * Utilities that may be of use to RequestHandlers.
*/
public class SolrPluginUtils {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/resources/SystemCollectionSolrConfig.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/resources/SystemCollectionSolrConfig.xml b/solr/core/src/resources/SystemCollectionSolrConfig.xml
index 7b1da63..f857561 100644
--- a/solr/core/src/resources/SystemCollectionSolrConfig.xml
+++ b/solr/core/src/resources/SystemCollectionSolrConfig.xml
@@ -10,7 +10,7 @@
<maxDocs>1</maxDocs>
<openSearcher>true</openSearcher>
</autoCommit></updateHandler>
- <requestHandler name="standard" class="solr.StandardRequestHandler" default="true" />
+ <requestHandler name="/select" class="solr.SearchHandler" default="true" />
<requestHandler name="/blob" class="solr.BlobHandler">
<lst name="invariants">
<str name="maxSize">${blob.max.size.mb:5}</str>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/bad-error-solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-error-solrconfig.xml b/solr/core/src/test-files/solr/collection1/conf/bad-error-solrconfig.xml
index 75014ac..c8bb8cf 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-error-solrconfig.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-error-solrconfig.xml
@@ -23,7 +23,7 @@
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
- <requestHandler name="my_error_handler" class="solr.ThrowErrorOnInitRequestHandler"></requestHandler>
+ <requestHandler name="/my_error_handler" class="solr.ThrowErrorOnInitRequestHandler"></requestHandler>
<schemaFactory class="ClassicIndexSchemaFactory"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/bad-mpf-solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-mpf-solrconfig.xml b/solr/core/src/test-files/solr/collection1/conf/bad-mpf-solrconfig.xml
index 0adf321..189d449 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-mpf-solrconfig.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-mpf-solrconfig.xml
@@ -30,7 +30,7 @@
</indexConfig>
<updateHandler class="solr.DirectUpdateHandler2"/>
- <requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
+ <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
<schemaFactory class="ClassicIndexSchemaFactory"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-add-schema-fields-update-processor-chains.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-add-schema-fields-update-processor-chains.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-add-schema-fields-update-processor-chains.xml
index 4541fbc..f2e0f3e 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-add-schema-fields-update-processor-chains.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-add-schema-fields-update-processor-chains.xml
@@ -23,7 +23,7 @@
-->
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
- <requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
+ <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<schemaFactory class="ManagedIndexSchemaFactory">
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-altdirectory.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-altdirectory.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-altdirectory.xml
index cb4cd7c..0c62584 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-altdirectory.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-altdirectory.xml
@@ -20,7 +20,7 @@
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
+ <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
<directoryFactory name="DirectoryFactory" class="org.apache.solr.core.AlternateDirectoryTest$TestFSDirectoryFactory"></directoryFactory>
<indexReaderFactory name="IndexReaderFactory" class="org.apache.solr.core.AlternateDirectoryTest$TestIndexReaderFactory"></indexReaderFactory >
<schemaFactory class="ClassicIndexSchemaFactory"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml
index f729afa..fc33e46 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml
@@ -187,233 +187,12 @@
If the set cardinality <= maxSize elements, then HashDocSet will be used instead of the bitset
based HashBitset. -->
- <!-- requestHandler plugins... incoming queries will be dispatched to the
- correct handler based on the 'qt' param matching the
- name of registered handlers.
- The "standard" request handler is the default and will be used if qt
- is not specified in the request.
+ <!-- requestHandler plugins.
-->
- <requestHandler name="standard" class="solr.StandardRequestHandler">
+ <requestHandler name="/select" class="solr.SearchHandler">
<bool name="httpCaching">true</bool>
</requestHandler>
-
- <requestHandler name="dismax" class="solr.SearchHandler" >
- <lst name="defaults">
- <str name="defType">dismax</str>
- <str name="q.alt">*:*</str>
- <float name="tie">0.01</float>
- <str name="qf">
- text^0.5 features_t^1.0 subject^1.4 title_stemmed^2.0
- </str>
- <str name="pf">
- text^0.2 features_t^1.1 subject^1.4 title_stemmed^2.0 title^1.5
- </str>
- <str name="bf">
- ord(weight)^0.5 recip(rord(iind),1,1000,1000)^0.3
- </str>
- <str name="mm">
- 3<-1 5<-2 6<90%
- </str>
- <int name="ps">100</int>
- </lst>
- </requestHandler>
-
- <requestHandler name="mock" class="org.apache.solr.core.MockQuerySenderListenerReqHandler"/>
-
- <!-- test query parameter defaults -->
- <requestHandler name="defaults" class="solr.StandardRequestHandler">
- <lst name="defaults">
- <int name="rows">4</int>
- <bool name="hl">true</bool>
- <str name="hl.fl">text,name,subject,title,whitetok</str>
- </lst>
- </requestHandler>
-
- <!-- test query parameter defaults -->
- <requestHandler name="lazy" class="solr.StandardRequestHandler" startup="lazy">
- <lst name="defaults">
- <int name="rows">4</int>
- <bool name="hl">true</bool>
- <str name="hl.fl">text,name,subject,title,whitetok</str>
- </lst>
- </requestHandler>
-
- <searchComponent name="spellcheck" class="org.apache.solr.handler.component.SpellCheckComponent">
- <!-- This is slightly different from the field value so we can test dealing with token offset changes -->
- <str name="queryAnalyzerFieldType">lowerpunctfilt</str>
-
- <lst name="spellchecker">
- <str name="name">default</str>
- <str name="field">lowerfilt</str>
- <str name="spellcheckIndexDir">spellchecker1</str>
- <str name="buildOnCommit">false</str>
- </lst>
- <lst name="spellchecker">
- <str name="name">direct</str>
- <str name="classname">DirectSolrSpellChecker</str>
- <str name="field">lowerfilt</str>
- <int name="minQueryLength">3</int>
- </lst>
- <lst name="spellchecker">
- <str name="name">wordbreak</str>
- <str name="classname">solr.WordBreakSolrSpellChecker</str>
- <str name="field">lowerfilt</str>
- <str name="combineWords">true</str>
- <str name="breakWords">true</str>
- <int name="maxChanges">10</int>
- </lst>
- <lst name="spellchecker">
- <str name="name">multipleFields</str>
- <str name="field">lowerfilt1and2</str>
- <str name="spellcheckIndexDir">spellcheckerMultipleFields</str>
- <str name="buildOnCommit">false</str>
- </lst>
- <!-- Example of using different distance measure -->
- <lst name="spellchecker">
- <str name="name">jarowinkler</str>
- <str name="field">lowerfilt</str>
- <!-- Use a different Distance Measure -->
- <str name="distanceMeasure">org.apache.lucene.search.spell.JaroWinklerDistance</str>
- <str name="spellcheckIndexDir">spellchecker2</str>
-
- </lst>
- <lst name="spellchecker">
- <str name="classname">solr.FileBasedSpellChecker</str>
- <str name="name">external</str>
- <str name="sourceLocation">spellings.txt</str>
- <str name="characterEncoding">UTF-8</str>
- <str name="spellcheckIndexDir">spellchecker3</str>
- </lst>
- <!-- Comparator -->
- <lst name="spellchecker">
- <str name="name">freq</str>
- <str name="field">lowerfilt</str>
- <str name="spellcheckIndexDir">spellcheckerFreq</str>
- <!-- comparatorClass be one of:
- 1. score (default)
- 2. freq (Frequency first, then score)
- 3. A fully qualified class name
- -->
- <str name="comparatorClass">freq</str>
- <str name="buildOnCommit">false</str>
- </lst>
- <lst name="spellchecker">
- <str name="name">fqcn</str>
- <str name="field">lowerfilt</str>
- <str name="spellcheckIndexDir">spellcheckerFQCN</str>
- <str name="comparatorClass">org.apache.solr.spelling.SampleComparator</str>
- <str name="buildOnCommit">false</str>
- </lst>
- <lst name="spellchecker">
- <str name="name">perDict</str>
- <str name="classname">org.apache.solr.handler.component.DummyCustomParamSpellChecker</str>
- <str name="field">lowerfilt</str>
- </lst>
- </searchComponent>
-
- <searchComponent name="termsComp" class="org.apache.solr.handler.component.TermsComponent"/>
-
- <requestHandler name="/terms" class="org.apache.solr.handler.component.SearchHandler">
- <arr name="components">
- <str>termsComp</str>
- </arr>
- </requestHandler>
- <!--
- The SpellingQueryConverter to convert raw (CommonParams.Q) queries into tokens. Uses a simple regular expression
- to strip off field markup, boosts, ranges, etc. but it is not guaranteed to match an exact parse from the query parser.
- -->
- <queryConverter name="queryConverter" class="org.apache.solr.spelling.SpellingQueryConverter"/>
-
- <requestHandler name="spellCheckCompRH" class="org.apache.solr.handler.component.SearchHandler">
- <lst name="defaults">
- <!-- omp = Only More Popular -->
- <str name="spellcheck.onlyMorePopular">false</str>
- <!-- exr = Extended Results -->
- <str name="spellcheck.extendedResults">false</str>
- <!-- The number of suggestions to return -->
- <str name="spellcheck.count">1</str>
- </lst>
- <arr name="last-components">
- <str>spellcheck</str>
- </arr>
- </requestHandler>
- <requestHandler name="spellCheckCompRH_Direct" class="org.apache.solr.handler.component.SearchHandler">
- <lst name="defaults">
- <str name="spellcheck.dictionary">direct</str>
- <str name="spellcheck.onlyMorePopular">false</str>
- <str name="spellcheck.extendedResults">false</str>
- <str name="spellcheck.count">1</str>
- </lst>
- <arr name="last-components">
- <str>spellcheck</str>
- </arr>
- </requestHandler>
- <requestHandler name="spellCheckWithWordbreak" class="org.apache.solr.handler.component.SearchHandler">
- <lst name="defaults">
- <str name="spellcheck.dictionary">default</str>
- <str name="spellcheck.dictionary">wordbreak</str>
- <str name="spellcheck.count">20</str>
- </lst>
- <arr name="last-components">
- <str>spellcheck</str>
- </arr>
- </requestHandler>
- <requestHandler name="spellCheckWithWordbreak_Direct" class="org.apache.solr.handler.component.SearchHandler">
- <lst name="defaults">
- <str name="spellcheck.dictionary">direct</str>
- <str name="spellcheck.dictionary">wordbreak</str>
- <str name="spellcheck.count">20</str>
- </lst>
- <arr name="last-components">
- <str>spellcheck</str>
- </arr>
- </requestHandler>
- <requestHandler name="spellCheckCompRH1" class="org.apache.solr.handler.component.SearchHandler">
- <lst name="defaults">
- <str name="defType">dismax</str>
- <str name="qf">lowerfilt1^1</str>
- </lst>
- <arr name="last-components">
- <str>spellcheck</str>
- </arr>
- </requestHandler>
-
- <requestHandler name="mltrh" class="org.apache.solr.handler.component.SearchHandler">
-
- </requestHandler>
-
- <searchComponent name="tvComponent" class="org.apache.solr.handler.component.TermVectorComponent"/>
-
- <requestHandler name="tvrh" class="org.apache.solr.handler.component.SearchHandler">
- <lst name="defaults">
-
- </lst>
- <arr name="last-components">
- <str>tvComponent</str>
- </arr>
- </requestHandler>
-
- <!-- test elevation -->
- <searchComponent name="elevate" class="org.apache.solr.handler.component.QueryElevationComponent" >
- <str name="queryFieldType">string</str>
- <str name="config-file">elevate.xml</str>
- </searchComponent>
-
-
- <requestHandler name="/elevate" class="org.apache.solr.handler.component.SearchHandler">
- <lst name="defaults">
- <str name="echoParams">explicit</str>
- </lst>
- <arr name="last-components">
- <str>elevate</str>
- </arr>
- </requestHandler>
-
- <requestHandler name="/mlt" class="solr.MoreLikeThisHandler">
- </requestHandler>
-
-
<searchComponent class="solr.HighlightComponent" name="highlight">
<highlighting>
<!-- Configure the standard fragmenter -->
@@ -461,7 +240,7 @@ based HashBitset. -->
</highlighting>
</searchComponent>
- <requestDispatcher handleSelect="true" >
+ <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-basic.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-basic.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-basic.xml
index ff9fab2..d98ecac 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-basic.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-basic.xml
@@ -25,5 +25,5 @@
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<schemaFactory class="ClassicIndexSchemaFactory"/>
- <requestHandler name="standard" class="solr.StandardRequestHandler" />
+ <requestHandler name="/select" class="solr.SearchHandler" />
</config>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-blockjoinfacetcomponent.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-blockjoinfacetcomponent.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-blockjoinfacetcomponent.xml
index b222693..b114535 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-blockjoinfacetcomponent.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-blockjoinfacetcomponent.xml
@@ -24,8 +24,7 @@
<schemaFactory class="ClassicIndexSchemaFactory"/>
<dataDir>${solr.data.dir:}</dataDir>
- <requestHandler name="standard" class="solr.StandardRequestHandler">
- </requestHandler>
+ <requestHandler name="/select" class="solr.SearchHandler" />
<requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" />
@@ -38,18 +37,18 @@
<searchComponent name="blockJoinFacet" class="org.apache.solr.search.join.BlockJoinFacetComponent"/>
<searchComponent name="blockJoinDocSetFacet" class="org.apache.solr.search.join.BlockJoinDocSetFacetComponent"/>
- <requestHandler name="blockJoinFacetRH" class="org.apache.solr.handler.component.SearchHandler">
+ <requestHandler name="/blockJoinFacetRH" class="org.apache.solr.handler.component.SearchHandler">
<lst name="defaults">
- <str name="shards.qt">blockJoinFacetRH</str>
+ <str name="shards.qt">/blockJoinFacetRH</str>
</lst>
<arr name="last-components">
<str>blockJoinFacet</str>
</arr>
</requestHandler>
- <requestHandler name="blockJoinDocSetFacetRH" class="org.apache.solr.handler.component.SearchHandler">
+ <requestHandler name="/blockJoinDocSetFacetRH" class="org.apache.solr.handler.component.SearchHandler">
<lst name="defaults">
- <str name="shards.qt">blockJoinDocSetFacetRH</str>
+ <str name="shards.qt">/blockJoinDocSetFacetRH</str>
</lst>
<arr name="last-components">
<str>blockJoinDocSetFacet</str>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/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 5990a81..b8e3dd7 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
@@ -23,7 +23,7 @@
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<schemaFactory class="ClassicIndexSchemaFactory"/>
- <requestHandler name="standard" class="solr.StandardRequestHandler" />
+ <requestHandler name="/select" class="solr.SearchHandler" />
<query>
<!-- Maximum number of clauses in a boolean query... can affect
@@ -74,7 +74,7 @@
</query>
- <initParams path="standard">
+ <initParams path="/select">
<lst name="defaults">
<str name="df">text</str>
</lst>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-cdcr.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-cdcr.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-cdcr.xml
index df50f41..c6b360c 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-cdcr.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-cdcr.xml
@@ -37,7 +37,7 @@
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <requestHandler name="standard" class="solr.StandardRequestHandler">
+ <requestHandler name="/select" class="solr.SearchHandler">
</requestHandler>
<requestHandler name="/update" class="solr.UpdateRequestHandler">
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-cdcrupdatelog.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-cdcrupdatelog.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-cdcrupdatelog.xml
index c9b9d80..86b2d2b 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-cdcrupdatelog.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-cdcrupdatelog.xml
@@ -37,7 +37,7 @@
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <requestHandler name="standard" class="solr.StandardRequestHandler">
+ <requestHandler name="/select" class="solr.SearchHandler">
</requestHandler>
<updateHandler class="solr.DirectUpdateHandler2">
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-classification.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-classification.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-classification.xml
index f688ed1..3370600 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-classification.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-classification.xml
@@ -23,7 +23,7 @@
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="solrconfig.snippet.randomindexconfig.xml"/>
- <requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
+ <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<schemaFactory class="ClassicIndexSchemaFactory"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/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 8267451..65820e0 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
@@ -192,77 +192,29 @@ based HashBitset. -->
The "standard" request handler is the default and will be used if qt
is not specified in the request.
-->
- <requestHandler name="standard" class="solr.StandardRequestHandler">
+ <requestHandler name="/select" class="solr.SearchHandler">
<bool name="httpCaching">true</bool>
</requestHandler>
- <requestHandler name="dismax" class="solr.SearchHandler" >
- <lst name="defaults">
- <str name="defType">dismax</str>
- <str name="q.alt">*:*</str>
- <float name="tie">0.01</float>
- <str name="qf">
- text^0.5 features_t^1.0 subject^1.4 title_stemmed^2.0
- </str>
- <str name="pf">
- text^0.2 features_t^1.1 subject^1.4 title_stemmed^2.0 title^1.5
- </str>
- <str name="bf">
- ord(weight)^0.5 recip(rord(iind),1,1000,1000)^0.3
- </str>
- <str name="mm">
- 3<-1 5<-2 6<90%
- </str>
- <int name="ps">100</int>
- </lst>
- </requestHandler>
-
- <requestHandler name="mock" class="org.apache.solr.core.MockQuerySenderListenerReqHandler"/>
-
- <!-- test query parameter defaults -->
- <requestHandler name="defaults" class="solr.StandardRequestHandler">
- <lst name="defaults">
- <int name="rows">4</int>
- <bool name="hl">true</bool>
- <str name="hl.fl">text,name,subject,title,whitetok</str>
- </lst>
- </requestHandler>
-
- <!-- test query parameter defaults -->
- <requestHandler name="lazy" class="solr.StandardRequestHandler" startup="lazy">
- <lst name="defaults">
- <int name="rows">4</int>
- <bool name="hl">true</bool>
- <str name="hl.fl">text,name,subject,title,whitetok</str>
- </lst>
- </requestHandler>
-
<searchComponent name="spellcheck" class="org.apache.solr.handler.component.SpellCheckComponent">
<!-- This is slightly different from the field value so we can test dealing with token offset changes -->
<str name="queryAnalyzerFieldType">a_s</str>
- <lst name="spellchecker">
+ <lst name="spellchecker">
<str name="name">direct</str>
<str name="classname">DirectSolrSpellChecker</str>
<str name="field">a_s</str>
<int name="minQueryLength">3</int>
- </lst>
+ </lst>
</searchComponent>
- <searchComponent name="termsComp" class="org.apache.solr.handler.component.TermsComponent"/>
-
- <requestHandler name="/terms" class="org.apache.solr.handler.component.SearchHandler">
- <arr name="components">
- <str>termsComp</str>
- </arr>
- </requestHandler>
<!--
The SpellingQueryConverter to convert raw (CommonParams.Q) queries into tokens. Uses a simple regular expression
to strip off field markup, boosts, ranges, etc. but it is not guaranteed to match an exact parse from the query parser.
-->
<queryConverter name="queryConverter" class="org.apache.solr.spelling.SpellingQueryConverter"/>
- <requestHandler name="spellCheckCompRH_Direct" class="org.apache.solr.handler.component.SearchHandler">
+ <requestHandler name="/spellCheckCompRH_Direct" class="org.apache.solr.handler.component.SearchHandler">
<lst name="defaults">
<str name="spellcheck.dictionary">direct</str>
<str name="spellcheck.onlyMorePopular">false</str>
@@ -274,21 +226,6 @@ based HashBitset. -->
</arr>
</requestHandler>
- <requestHandler name="mltrh" class="org.apache.solr.handler.component.SearchHandler">
-
- </requestHandler>
-
- <searchComponent name="tvComponent" class="org.apache.solr.handler.component.TermVectorComponent"/>
-
- <requestHandler name="tvrh" class="org.apache.solr.handler.component.SearchHandler">
- <lst name="defaults">
-
- </lst>
- <arr name="last-components">
- <str>tvComponent</str>
- </arr>
- </requestHandler>
-
<!-- test elevation -->
<searchComponent name="elevate" class="org.apache.solr.handler.component.QueryElevationComponent" >
<str name="queryFieldType">string</str>
@@ -305,57 +242,7 @@ based HashBitset. -->
</arr>
</requestHandler>
- <requestHandler name="/mlt" class="solr.MoreLikeThisHandler">
- </requestHandler>
-
- <searchComponent class="solr.HighlightComponent" name="highlight">
- <highlighting>
- <!-- Configure the standard fragmenter -->
- <fragmenter name="gap" class="org.apache.solr.highlight.GapFragmenter" default="true">
- <lst name="defaults">
- <int name="hl.fragsize">100</int>
- </lst>
- </fragmenter>
-
- <fragmenter name="regex" class="org.apache.solr.highlight.RegexFragmenter">
- <lst name="defaults">
- <int name="hl.fragsize">70</int>
- </lst>
- </fragmenter>
-
- <!-- Configure the standard formatter -->
- <formatter name="html" class="org.apache.solr.highlight.HtmlFormatter" default="true">
- <lst name="defaults">
- <str name="hl.simple.pre"><![CDATA[<em>]]></str>
- <str name="hl.simple.post"><![CDATA[</em>]]></str>
- </lst>
- </formatter>
-
- <!-- Configure the standard fragListBuilder -->
- <fragListBuilder name="simple" class="org.apache.solr.highlight.SimpleFragListBuilder" default="true"/>
-
- <!-- Configure the standard fragmentsBuilder -->
- <fragmentsBuilder name="simple" class="org.apache.solr.highlight.SimpleFragmentsBuilder" default="true"/>
- <fragmentsBuilder name="scoreOrder" class="org.apache.solr.highlight.ScoreOrderFragmentsBuilder"/>
-
- <boundaryScanner name="simple" class="solr.highlight.SimpleBoundaryScanner" default="true">
- <lst name="defaults">
- <str name="hl.bs.maxScan">10</str>
- <str name="hl.bs.chars">.,!? 	 </str>
- </lst>
- </boundaryScanner>
-
- <boundaryScanner name="breakIterator" class="solr.highlight.BreakIteratorBoundaryScanner">
- <lst name="defaults">
- <str name="hl.bs.type">WORD</str>
- <str name="hl.bs.language">en</str>
- <str name="hl.bs.country">US</str>
- </lst>
- </boundaryScanner>
- </highlighting>
- </searchComponent>
-
- <requestDispatcher handleSelect="true" >
+ <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl>
@@ -447,7 +334,7 @@ based HashBitset. -->
<processor class="solr.RunUpdateProcessorFactory" />
</updateRequestProcessorChain>
- <initParams path="/elevate,standard">
+ <initParams path="/elevate,/select">
<lst name="defaults">
<str name="df">text</str>
</lst>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml
index fe0e55c..8d311dd 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml
@@ -42,7 +42,7 @@
<queryResponseWriter name="xml" default="true"
class="solr.XMLResponseWriter" />
- <requestHandler name="standard" class="solr.StandardRequestHandler">
+ <requestHandler name="/select" class="solr.SearchHandler">
<bool name="httpCaching">true</bool>
<arr name="first-components">
<str>component1</str>
@@ -52,7 +52,7 @@
</arr>
</requestHandler>
- <requestDispatcher handleSelect="true" >
+ <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-configurerecoverystrategy.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-configurerecoverystrategy.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-configurerecoverystrategy.xml
index 62e671d..d86a6de 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-configurerecoverystrategy.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-configurerecoverystrategy.xml
@@ -20,7 +20,7 @@
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
+ <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
<recoveryStrategy>
<int name="maxRetries">250</int>
</recoveryStrategy>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-customrecoverystrategy.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-customrecoverystrategy.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-customrecoverystrategy.xml
index d43ed29..4e8effa 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-customrecoverystrategy.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-customrecoverystrategy.xml
@@ -20,7 +20,7 @@
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
+ <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
<!--
The RecoveryStrategy and RecoveryStrategy.Builder classes may change in future and customisations
are not supported between versions in terms of API or back compat behaviour.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-delaying-component.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-delaying-component.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-delaying-component.xml
index 91f1068..c1b1b02 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-delaying-component.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-delaying-component.xml
@@ -34,7 +34,7 @@
</arr>
</requestHandler>
- <requestDispatcher handleSelect="true" >
+ <requestDispatcher >
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
<httpCaching never304="true" />
</requestDispatcher>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy1.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy1.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy1.xml
index 36b4b98..424783b 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy1.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy1.xml
@@ -23,7 +23,7 @@
<schemaFactory class="ClassicIndexSchemaFactory"/>
<updateHandler class="solr.DirectUpdateHandler2"/>
- <requestHandler name="standard" class="solr.StandardRequestHandler"/>
+ <requestHandler name="/select" class="solr.SearchHandler"/>
<indexConfig>
<!-- we can't include solrconfig.snippet.randomindexconfig.xml because we need
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy2.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy2.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy2.xml
index 06352f3..bb4d3f8 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy2.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy2.xml
@@ -43,6 +43,6 @@
</deletionPolicy>
</indexConfig>
- <requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
+ <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
</config>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-distrib-update-processor-chains.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-distrib-update-processor-chains.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-distrib-update-processor-chains.xml
index 97ed18b..f91be75 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-distrib-update-processor-chains.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-distrib-update-processor-chains.xml
@@ -43,8 +43,7 @@
<processor class="solr.RunUpdateProcessorFactory" />
</updateRequestProcessorChain>
- <requestHandler name="standard" class="solr.StandardRequestHandler">
- </requestHandler>
+ <requestHandler name="/select" class="solr.SearchHandler"/>
<requestHandler name="/get" class="solr.RealTimeGetHandler">
<lst name="defaults">
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-doctransformers.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-doctransformers.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-doctransformers.xml
index b242f11..5a7d65e 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-doctransformers.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-doctransformers.xml
@@ -37,9 +37,9 @@
<transformer name="custom" class="org.apache.solr.response.TestCustomDocTransformer$CustomTransformerFactory" />
- <requestHandler name="/select" class="solr.StandardRequestHandler"/>
+ <requestHandler name="/select" class="solr.SearchHandler"/>
- <requestDispatcher handleSelect="true" >
+ <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
</requestDispatcher>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/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 03efed6..083333c 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
@@ -150,7 +150,7 @@
</arr>
</requestHandler>-->
- <requestDispatcher handleSelect="true" >
+ <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test-files/solr/collection1/conf/solrconfig-externalversionconstraint.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-externalversionconstraint.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-externalversionconstraint.xml
index eef941e..3a0adbe 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-externalversionconstraint.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-externalversionconstraint.xml
@@ -109,7 +109,7 @@
<processor class="solr.RunUpdateProcessorFactory" />
</updateRequestProcessorChain>
- <requestHandler name="standard" class="solr.StandardRequestHandler">
+ <requestHandler name="/select" class="solr.SearchHandler">
</requestHandler>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/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 10f5e85..ef0c39a 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
@@ -28,7 +28,7 @@
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<schemaFactory class="ClassicIndexSchemaFactory"/>
- <requestHandler name="standard" class="solr.StandardRequestHandler"/>
+ <requestHandler name="/select" class="solr.SearchHandler"/>
<updateHandler class="solr.DirectUpdateHandler2"/>
@@ -39,7 +39,7 @@
<valueSourceParser name="nvl" class="org.apache.solr.search.function.NvlValueSourceParser">
<float name="nvlFloatValue">0.0</float>
</valueSourceParser>
- <initParams path="standard">
+ <initParams path="/select">
<lst name="defaults">
<str name="df">text</str>
</lst>
[2/4] lucene-solr:master: SOLR-6807: requestDispatcher/@handleSelect
now defaults to false; stop using it. Deprecated StandardRequestHandler;
stop using it.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test/org/apache/solr/ConvertedLegacyTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/ConvertedLegacyTest.java b/solr/core/src/test/org/apache/solr/ConvertedLegacyTest.java
index bf7925a..35bd107 100644
--- a/solr/core/src/test/org/apache/solr/ConvertedLegacyTest.java
+++ b/solr/core/src/test/org/apache/solr/ConvertedLegacyTest.java
@@ -134,7 +134,7 @@ public class ConvertedLegacyTest extends SolrTestCaseJ4 {
);
args = new HashMap<>();
req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]",
- "standard", 2, 5 , args);
+ "/select", 2, 5 , args);
assertQ(req
,"//*[@numFound='3'] "
,"*[count(//doc)=1] "
@@ -143,28 +143,28 @@ public class ConvertedLegacyTest extends SolrTestCaseJ4 {
);
args = new HashMap<>();
req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]",
- "standard", 3, 5 , args);
+ "/select", 3, 5 , args);
assertQ(req
,"//*[@numFound='3'] "
,"*[count(//doc)=0]"
);
args = new HashMap<>();
req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]",
- "standard", 4, 5 , args);
+ "/select", 4, 5 , args);
assertQ(req
,"//*[@numFound='3'] "
,"*[count(//doc)=0]"
);
args = new HashMap<>();
req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]",
- "standard", 25, 5 , args);
+ "/select", 25, 5 , args);
assertQ(req
,"//*[@numFound='3'] "
,"*[count(//doc)=0]"
);
args = new HashMap<>();
req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]",
- "standard", 0, 1 , args);
+ "/select", 0, 1 , args);
assertQ(req
,"//*[@numFound='3'] "
,"*[count(//doc)=1] "
@@ -172,7 +172,7 @@ public class ConvertedLegacyTest extends SolrTestCaseJ4 {
);
args = new HashMap<>();
req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]",
- "standard", 0, 2 , args);
+ "/select", 0, 2 , args);
assertQ(req
,"//*[@numFound='3'] "
,"*[count(//doc)=2] "
@@ -180,7 +180,7 @@ public class ConvertedLegacyTest extends SolrTestCaseJ4 {
);
args = new HashMap<>();
req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]",
- "standard", 1, 1 , args);
+ "/select", 1, 1 , args);
assertQ(req
,"//*[@numFound='3'] "
,"*[count(//doc)=1] "
@@ -188,28 +188,28 @@ public class ConvertedLegacyTest extends SolrTestCaseJ4 {
);
args = new HashMap<>();
req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]",
- "standard", 3, 1 , args);
+ "/select", 3, 1 , args);
assertQ(req
,"//*[@numFound='3'] "
,"*[count(//doc)=0]"
);
args = new HashMap<>();
req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]",
- "standard", 4, 1 , args);
+ "/select", 4, 1 , args);
assertQ(req
,"//*[@numFound='3'] "
,"*[count(//doc)=0]"
);
args = new HashMap<>();
req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]",
- "standard", 1, 0 , args);
+ "/select", 1, 0 , args);
assertQ(req
,"//*[@numFound='3'] "
,"*[count(//doc)=0]"
);
args = new HashMap<>();
req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]",
- "standard", 0, 0 , args);
+ "/select", 0, 0 , args);
assertQ(req
,"//*[@numFound='3'] "
,"*[count(//doc)=0]"
@@ -217,7 +217,7 @@ public class ConvertedLegacyTest extends SolrTestCaseJ4 {
args = new HashMap<>();
args.put("defType","lucenePlusSort");
req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z];val_s1 asc",
- "standard", 0, 0 , args);
+ "/select", 0, 0 , args);
assertQ(req
,"//*[@numFound='3'] "
,"*[count(//doc)=0]"
@@ -225,7 +225,7 @@ public class ConvertedLegacyTest extends SolrTestCaseJ4 {
args = new HashMap<>();
args.put("defType","lucenePlusSort");
req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z];val_s1 desc",
- "standard", 0, 0 , args);
+ "/select", 0, 0 , args);
assertQ(req
,"//*[@numFound='3'] "
,"*[count(//doc)=0]"
@@ -1109,7 +1109,7 @@ public class ConvertedLegacyTest extends SolrTestCaseJ4 {
args = new HashMap<>();
args.put("fl","fname_s,arr_f ");
req = new LocalSolrQueryRequest(h.getCore(), "id:44",
- "standard", 0, 10, args);
+ "/select", 0, 10, args);
assertQ(req
,"//str[.='Yonik'] "
,"//float[.='1.4142135']"
@@ -1117,7 +1117,7 @@ public class ConvertedLegacyTest extends SolrTestCaseJ4 {
args = new HashMap<>();
args.put("fl","fname_s,score");
req = new LocalSolrQueryRequest(h.getCore(), "id:44",
- "standard", 0, 10, args);
+ "/select", 0, 10, args);
assertQ(req
,"//str[.='Yonik']"
,"//float[@name='score' and . > 0]"
@@ -1128,7 +1128,7 @@ public class ConvertedLegacyTest extends SolrTestCaseJ4 {
args = new HashMap<>();
args.put("fl","score,* ");
req = new LocalSolrQueryRequest(h.getCore(), "id:44",
- "standard", 0, 10, args);
+ "/select", 0, 10, args);
assertQ(req
,"//str[.='Yonik'] "
,"//float[.='1.4142135'] "
@@ -1138,7 +1138,7 @@ public class ConvertedLegacyTest extends SolrTestCaseJ4 {
args = new HashMap<>();
args.put("fl","*,score ");
req = new LocalSolrQueryRequest(h.getCore(), "id:44",
- "standard", 0, 10, args);
+ "/select", 0, 10, args);
assertQ(req
,"//str[.='Yonik'] "
,"//float[.='1.4142135'] "
@@ -1148,7 +1148,7 @@ public class ConvertedLegacyTest extends SolrTestCaseJ4 {
args = new HashMap<>();
args.put("fl","* ");
req = new LocalSolrQueryRequest(h.getCore(), "id:44",
- "standard", 0, 10, args);
+ "/select", 0, 10, args);
assertQ(req
,"//str[.='Yonik'] "
,"//float[.='1.4142135'] "
@@ -1160,7 +1160,7 @@ public class ConvertedLegacyTest extends SolrTestCaseJ4 {
args = new HashMap<>();
args.put("fl","score ");
req = new LocalSolrQueryRequest(h.getCore(), "id:44",
- "standard", 0, 10, args);
+ "/select", 0, 10, args);
assertQ(req
,"//result[@maxScore>0]"
);
@@ -1168,7 +1168,7 @@ public class ConvertedLegacyTest extends SolrTestCaseJ4 {
args.put("fl","score ");
args.put("defType","lucenePlusSort");
req = new LocalSolrQueryRequest(h.getCore(), "id:44;id desc;",
- "standard", 0, 10, args);
+ "/select", 0, 10, args);
assertQ(req
,"//result[@maxScore>0]"
);
@@ -1176,7 +1176,7 @@ public class ConvertedLegacyTest extends SolrTestCaseJ4 {
args.put("fl","score ");
args.put("defType","lucenePlusSort");
req = new LocalSolrQueryRequest(h.getCore(), "id:44;",
- "standard", 0, 10, args);
+ "/select", 0, 10, args);
assertQ(req
,"//@maxScore = //doc/float[@name='score']"
);
@@ -1184,7 +1184,7 @@ public class ConvertedLegacyTest extends SolrTestCaseJ4 {
args.put("fl","score ");
args.put("defType","lucenePlusSort");
req = new LocalSolrQueryRequest(h.getCore(), "id:44;id desc;",
- "standard", 0, 10, args);
+ "/select", 0, 10, args);
assertQ(req
,"//@maxScore = //doc/float[@name='score']"
);
@@ -1192,7 +1192,7 @@ public class ConvertedLegacyTest extends SolrTestCaseJ4 {
args.put("fl","*,score");
args.put("defType","lucenePlusSort");
req = new LocalSolrQueryRequest(h.getCore(), "id:44;id desc;",
- "standard", 0, 0 , args);
+ "/select", 0, 0 , args);
assertQ(req
,"//result[@maxScore>0]"
);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test/org/apache/solr/DisMaxRequestHandlerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/DisMaxRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/DisMaxRequestHandlerTest.java
index bdeeb40..386f690 100644
--- a/solr/core/src/test/org/apache/solr/DisMaxRequestHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/DisMaxRequestHandlerTest.java
@@ -30,7 +30,7 @@ public class DisMaxRequestHandlerTest extends SolrTestCaseJ4 {
public static void beforeClass() throws Exception {
initCore("solrconfig.xml","schema.xml");
lrf = h.getRequestFactory
- ("dismax", 0, 20,
+ ("/dismax", 0, 20,
CommonParams.VERSION,"2.2",
"facet", "true",
"facet.field","t_s"
@@ -69,7 +69,7 @@ public class DisMaxRequestHandlerTest extends SolrTestCaseJ4 {
@Test
public void testSomeStuff() throws Exception {
- doTestSomeStuff("dismax");
+ doTestSomeStuff("/dismax");
}
public void doTestSomeStuff(final String qt) throws Exception {
@@ -179,7 +179,7 @@ public class DisMaxRequestHandlerTest extends SolrTestCaseJ4 {
Pattern p = Pattern.compile("subject:hell\\s*subject:cool");
Pattern p_bool = Pattern.compile("\\(subject:hell\\s*subject:cool\\)");
String resp = h.query(req("q", "cool stuff"
- ,"qt", "dismax"
+ ,"qt", "/dismax"
,CommonParams.VERSION, "2.2"
,"bq", "subject:hell OR subject:cool"
,CommonParams.DEBUG_QUERY, "true"
@@ -188,7 +188,7 @@ public class DisMaxRequestHandlerTest extends SolrTestCaseJ4 {
assertFalse(p_bool.matcher(resp).find());
resp = h.query(req("q", "cool stuff"
- ,"qt", "dismax"
+ ,"qt", "/dismax"
,CommonParams.VERSION, "2.2"
,"bq", "subject:hell OR subject:cool"
,"bq",""
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test/org/apache/solr/EchoParamsTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/EchoParamsTest.java b/solr/core/src/test/org/apache/solr/EchoParamsTest.java
index a89a512..44699e8 100644
--- a/solr/core/src/test/org/apache/solr/EchoParamsTest.java
+++ b/solr/core/src/test/org/apache/solr/EchoParamsTest.java
@@ -66,7 +66,7 @@ public class EchoParamsTest extends SolrTestCaseJ4 {
private void allEchoParams() {
lrf = h.getRequestFactory
- ("crazy_custom_qt", 0, 20,
+ ("/crazy_custom_qt", 0, 20,
CommonParams.VERSION,"2.2",
"wt","xml",
"echoParams", "all",
@@ -74,7 +74,7 @@ public class EchoParamsTest extends SolrTestCaseJ4 {
);
assertQ(req("foo"),HEADER_XPATH + "/lst[@name='params']/str[@name='fl'][.='implicit']");
- assertQ(req("foo"),HEADER_XPATH + "/str[@name='handler'][.='org.apache.solr.handler.StandardRequestHandler']");
+ assertQ(req("foo"),HEADER_XPATH + "/str[@name='handler'][.='org.apache.solr.handler.component.SearchHandler']");
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test/org/apache/solr/SampleTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/SampleTest.java b/solr/core/src/test/org/apache/solr/SampleTest.java
index 244272f..407a483 100644
--- a/solr/core/src/test/org/apache/solr/SampleTest.java
+++ b/solr/core/src/test/org/apache/solr/SampleTest.java
@@ -102,7 +102,7 @@ public class SampleTest extends SolrTestCaseJ4 {
* Note: the qt proves we are using our custom config...
*/
TestHarness.LocalRequestFactory l = h.getRequestFactory
- ("crazy_custom_qt",100,200,CommonParams.VERSION,"2.2");
+ ("/crazy_custom_qt",100,200,CommonParams.VERSION,"2.2");
assertQ("how did i find Mack Daddy? ",
l.makeRequest( "Mack Daddy" )
,"//result[@numFound=0]"
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test/org/apache/solr/SolrInfoBeanTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/SolrInfoBeanTest.java b/solr/core/src/test/org/apache/solr/SolrInfoBeanTest.java
index d39c87f..72fdf25 100644
--- a/solr/core/src/test/org/apache/solr/SolrInfoBeanTest.java
+++ b/solr/core/src/test/org/apache/solr/SolrInfoBeanTest.java
@@ -18,9 +18,9 @@ package org.apache.solr;
import org.apache.lucene.util.TestUtil;
import org.apache.solr.core.SolrInfoBean;
-import org.apache.solr.handler.StandardRequestHandler;
import org.apache.solr.handler.admin.LukeRequestHandler;
import org.apache.solr.handler.component.SearchComponent;
+import org.apache.solr.handler.component.SearchHandler;
import org.apache.solr.highlight.DefaultSolrHighlighter;
import org.apache.solr.metrics.SolrMetricManager;
import org.apache.solr.metrics.SolrMetricProducer;
@@ -49,7 +49,7 @@ public class SolrInfoBeanTest extends SolrTestCaseJ4
*/
public void testCallMBeanInfo() throws Exception {
List<Class> classes = new ArrayList<>();
- classes.addAll(getClassesForPackage(StandardRequestHandler.class.getPackage().getName()));
+ classes.addAll(getClassesForPackage(SearchHandler.class.getPackage().getName()));
classes.addAll(getClassesForPackage(SearchComponent.class.getPackage().getName()));
classes.addAll(getClassesForPackage(LukeRequestHandler.class.getPackage().getName()));
classes.addAll(getClassesForPackage(DefaultSolrHighlighter.class.getPackage().getName()));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test/org/apache/solr/TestDistributedSearch.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/TestDistributedSearch.java b/solr/core/src/test/org/apache/solr/TestDistributedSearch.java
index 9a821aa..02754f0 100644
--- a/solr/core/src/test/org/apache/solr/TestDistributedSearch.java
+++ b/solr/core/src/test/org/apache/solr/TestDistributedSearch.java
@@ -386,7 +386,7 @@ public class TestDistributedSearch extends BaseDistributedSearchTestCase {
query("q","*:*", "fl","n_*","sort",i1 + " desc");
// basic spellcheck testing
- query("q", "toyata", "fl", "id,lowerfilt", "spellcheck", true, "spellcheck.q", "toyata", "qt", "spellCheckCompRH_Direct", "shards.qt", "spellCheckCompRH_Direct");
+ query("q", "toyata", "fl", "id,lowerfilt", "spellcheck", true, "spellcheck.q", "toyata", "qt", "/spellCheckCompRH_Direct", "shards.qt", "/spellCheckCompRH_Direct");
stress=0; // turn off stress... we want to tex max combos in min time
for (int i=0; i<25*RANDOM_MULTIPLIER; i++) {
@@ -1012,8 +1012,8 @@ public class TestDistributedSearch extends BaseDistributedSearchTestCase {
"q", "toyata",
"spellcheck", "true",
"spellcheck.q", "toyata",
- "qt", "spellCheckCompRH_Direct",
- "shards.qt", "spellCheckCompRH_Direct",
+ "qt", "/spellCheckCompRH_Direct",
+ "shards.qt", "/spellCheckCompRH_Direct",
ShardParams.SHARDS_INFO, "true",
ShardParams.SHARDS_TOLERANT, "true");
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java b/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java
index 7a9dbdb..79b49dc 100644
--- a/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java
@@ -58,7 +58,7 @@ public class BasicZkTest extends AbstractZkTestCase {
SolrCore core = h.getCore();
// test that we got the expected config, not just hardcoded defaults
- assertNotNull(core.getRequestHandler("mock"));
+ assertNotNull(core.getRequestHandler("/mock"));
lrf.args.put(CommonParams.VERSION, "2.2");
assertQ("test query on empty index", request("qlkciyopsbgzyvkylsjhchghjrdf"),
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test/org/apache/solr/cloud/TestRandomRequestDistribution.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestRandomRequestDistribution.java b/solr/core/src/test/org/apache/solr/cloud/TestRandomRequestDistribution.java
index 30898b9..55cdee8 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestRandomRequestDistribution.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestRandomRequestDistribution.java
@@ -108,7 +108,7 @@ public class TestRandomRequestDistribution extends AbstractFullDistribZkTestBase
SolrMetricManager metricManager = container.getMetricManager();
for (SolrCore core : container.getCores()) {
String registry = core.getCoreMetricManager().getRegistryName();
- Counter cnt = metricManager.counter(null, registry, "requests", "QUERY.standard");
+ Counter cnt = metricManager.counter(null, registry, "requests", "QUERY./select");
SolrRequestHandler select = core.getRequestHandler("");
// long c = (long) select.getStatistics().get("requests");
shardVsCount.put(core.getName(), (int) cnt.getCount());
@@ -188,7 +188,7 @@ public class TestRandomRequestDistribution extends AbstractFullDistribZkTestBase
SolrMetricManager leaderMetricManager = leaderCore.getCoreContainer().getMetricManager();
String leaderRegistry = leaderCore.getCoreMetricManager().getRegistryName();
- Counter cnt = leaderMetricManager.counter(null, leaderRegistry, "requests", "QUERY.standard");
+ Counter cnt = leaderMetricManager.counter(null, leaderRegistry, "requests", "QUERY./select");
// All queries should be served by the active replica
// To make sure that's true we keep querying the down replica
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test/org/apache/solr/core/AlternateDirectoryTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/core/AlternateDirectoryTest.java b/solr/core/src/test/org/apache/solr/core/AlternateDirectoryTest.java
index cf8d7c6..9bf08a5 100644
--- a/solr/core/src/test/org/apache/solr/core/AlternateDirectoryTest.java
+++ b/solr/core/src/test/org/apache/solr/core/AlternateDirectoryTest.java
@@ -37,7 +37,7 @@ public class AlternateDirectoryTest extends SolrTestCaseJ4 {
}
public void testAltDirectoryUsed() throws Exception {
- assertQ(req("q","*:*","qt","standard"));
+ assertQ(req("q","*:*","qt","/select"));
assertTrue(TestFSDirectoryFactory.openCalled);
assertTrue(TestIndexReaderFactory.newReaderCalled);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test/org/apache/solr/core/RequestHandlersTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/core/RequestHandlersTest.java b/solr/core/src/test/org/apache/solr/core/RequestHandlersTest.java
index 3c13645..637aa24 100644
--- a/solr/core/src/test/org/apache/solr/core/RequestHandlersTest.java
+++ b/solr/core/src/test/org/apache/solr/core/RequestHandlersTest.java
@@ -36,7 +36,7 @@ public class RequestHandlersTest extends SolrTestCaseJ4 {
public void testInitCount() {
String registry = h.getCore().getCoreMetricManager().getRegistryName();
SolrMetricManager manager = h.getCoreContainer().getMetricManager();
- Gauge<Number> g = (Gauge<Number>)manager.registry(registry).getMetrics().get("QUERY.mock.initCount");
+ Gauge<Number> g = (Gauge<Number>)manager.registry(registry).getMetrics().get("QUERY./mock.initCount");
assertEquals("Incorrect init count",
1, g.getValue().intValue());
}
@@ -52,7 +52,7 @@ public class RequestHandlersTest extends SolrTestCaseJ4 {
@Test
public void testLazyLoading() {
SolrCore core = h.getCore();
- PluginBag.PluginHolder<SolrRequestHandler> handler = core.getRequestHandlers().getRegistry().get("lazy");
+ PluginBag.PluginHolder<SolrRequestHandler> handler = core.getRequestHandlers().getRegistry().get("/lazy");
assertFalse(handler.isLoaded());
assertU(adoc("id", "42",
@@ -75,12 +75,12 @@ public class RequestHandlersTest extends SolrTestCaseJ4 {
// But it should behave just like the 'defaults' request handler above
assertQ("lazy handler returns fewer matches",
- req("q", "id:[42 TO 47]", "qt","lazy"),
+ req("q", "id:[42 TO 47]", "qt","/lazy"),
"*[count(//doc)=4]"
);
assertQ("lazy handler includes highlighting",
- req("q", "name:Zapp OR title:General", "qt","lazy"),
+ req("q", "name:Zapp OR title:General", "qt","/lazy"),
"//lst[@name='highlighting']"
);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java b/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java
index c042bd6..62f4d2e 100644
--- a/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java
+++ b/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java
@@ -254,7 +254,7 @@ public class SolrCoreTest extends SolrTestCaseJ4 {
bean = infoRegistry.get(QueryComponent.COMPONENT_NAME);
assertNotNull("bean not registered", bean);
//try a Req Handler, which are stored by name, not clas
- bean = infoRegistry.get("standard");
+ bean = infoRegistry.get("/select");
assertNotNull("bean not registered", bean);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test/org/apache/solr/core/TestConfig.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/core/TestConfig.java b/solr/core/src/test/org/apache/solr/core/TestConfig.java
index 87a453f..5a7b706 100644
--- a/solr/core/src/test/org/apache/solr/core/TestConfig.java
+++ b/solr/core/src/test/org/apache/solr/core/TestConfig.java
@@ -69,8 +69,8 @@ public class TestConfig extends SolrTestCaseJ4 {
}
@Test
public void testDisableRequetsHandler() throws Exception {
- assertNull(h.getCore().getRequestHandler("disabled"));
- assertNotNull(h.getCore().getRequestHandler("enabled"));
+ assertNull(h.getCore().getRequestHandler("/disabled"));
+ assertNotNull(h.getCore().getRequestHandler("/enabled"));
}
@Test
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test/org/apache/solr/core/TestQuerySenderListener.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/core/TestQuerySenderListener.java b/solr/core/src/test/org/apache/solr/core/TestQuerySenderListener.java
index c1eb873..900f024 100644
--- a/solr/core/src/test/org/apache/solr/core/TestQuerySenderListener.java
+++ b/solr/core/src/test/org/apache/solr/core/TestQuerySenderListener.java
@@ -75,7 +75,7 @@ public class TestQuerySenderListener extends SolrTestCaseJ4 {
RefCounted<SolrIndexSearcher> currentSearcherRef = core.getSearcher();
SolrIndexSearcher currentSearcher = currentSearcherRef.get();
qsl.newSearcher(currentSearcher, null);//test new Searcher
- MockQuerySenderListenerReqHandler mock = (MockQuerySenderListenerReqHandler) core.getRequestHandler("mock");
+ MockQuerySenderListenerReqHandler mock = (MockQuerySenderListenerReqHandler) core.getRequestHandler("/mock");
assertNotNull("Mock is null", mock);
String evt = mock.req.getParams().get(EventParams.EVENT);
assertNotNull("Event is null", evt);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test/org/apache/solr/core/TestQuerySenderNoQuery.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/core/TestQuerySenderNoQuery.java b/solr/core/src/test/org/apache/solr/core/TestQuerySenderNoQuery.java
index 425f04a..76ac7c3 100644
--- a/solr/core/src/test/org/apache/solr/core/TestQuerySenderNoQuery.java
+++ b/solr/core/src/test/org/apache/solr/core/TestQuerySenderNoQuery.java
@@ -70,7 +70,7 @@ public class TestQuerySenderNoQuery extends SolrTestCaseJ4 {
SolrIndexSearcher currentSearcher = currentSearcherRef.get();
SolrIndexSearcher dummy = null;
qsl.newSearcher(currentSearcher, dummy);//test first Searcher (since param is null)
- MockQuerySenderListenerReqHandler mock = (MockQuerySenderListenerReqHandler) core.getRequestHandler("mock");
+ MockQuerySenderListenerReqHandler mock = (MockQuerySenderListenerReqHandler) core.getRequestHandler("/mock");
assertNotNull("Mock is null", mock);
assertNull("Req (firstsearcher) is not null", mock.req);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test/org/apache/solr/core/TestXIncludeConfig.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/core/TestXIncludeConfig.java b/solr/core/src/test/org/apache/solr/core/TestXIncludeConfig.java
index 529fa06..32be46e 100644
--- a/solr/core/src/test/org/apache/solr/core/TestXIncludeConfig.java
+++ b/solr/core/src/test/org/apache/solr/core/TestXIncludeConfig.java
@@ -52,7 +52,7 @@ public class TestXIncludeConfig extends AbstractSolrTestCase {
SolrCore core = h.getCore();
assertNotNull("includedHandler is null",
- core.getRequestHandler("includedHandler"));
+ core.getRequestHandler("/includedHandler"));
UpdateRequestProcessorChain chain
= core.getUpdateProcessingChain("special-include");
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java
index 6da06b1..aa63ce3 100644
--- a/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java
@@ -38,7 +38,6 @@ public class MoreLikeThisHandlerTest extends SolrTestCaseJ4 {
@BeforeClass
public static void moreLikeThisBeforeClass() throws Exception {
initCore("solrconfig.xml", "schema.xml");
- lrf = h.getRequestFactory("standard", 0, 20 );
}
@Test
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test/org/apache/solr/handler/SearchHandlerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/SearchHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/SearchHandlerTest.java
new file mode 100644
index 0000000..b35103b
--- /dev/null
+++ b/solr/core/src/test/org/apache/solr/handler/SearchHandlerTest.java
@@ -0,0 +1,80 @@
+/*
+ * 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.handler;
+
+import org.apache.solr.util.AbstractSolrTestCase;
+import org.junit.BeforeClass;
+
+/**
+ * Most of the tests for {@link org.apache.solr.handler.component.SearchHandler} are in {@link org.apache.solr.ConvertedLegacyTest}.
+ */
+public class SearchHandlerTest extends AbstractSolrTestCase {
+
+ @BeforeClass
+ public static void beforeClass() throws Exception {
+ initCore("solrconfig.xml", "schema.xml");
+ }
+
+ public void testSorting() throws Exception {
+ assertU(adoc("id", "10", "title", "test", "val_s1", "aaa"));
+ assertU(adoc("id", "11", "title", "test", "val_s1", "bbb"));
+ assertU(adoc("id", "12", "title", "test", "val_s1", "ccc"));
+ assertU(commit());
+
+ assertQ(req("q", "title:test")
+ ,"//*[@numFound='3']"
+ );
+
+ assertQ(req("q", "title:test", "sort","val_s1 asc")
+ ,"//*[@numFound='3']"
+ ,"//result/doc[1]/str[@name='id'][.='10']"
+ ,"//result/doc[2]/str[@name='id'][.='11']"
+ ,"//result/doc[3]/str[@name='id'][.='12']"
+ );
+
+ assertQ(req("q", "title:test", "sort","val_s1 desc")
+ ,"//*[@numFound='3']"
+ ,"//result/doc[1]/str[@name='id'][.='12']"
+ ,"//result/doc[2]/str[@name='id'][.='11']"
+ ,"//result/doc[3]/str[@name='id'][.='10']"
+ );
+
+ // Make sure score parsing works
+ assertQ(req("q", "title:test", "sort","score desc")
+ ,"//*[@numFound='3']"
+ );
+
+ assertQ(req("q", "title:test", "sort","score asc")
+ ,"//*[@numFound='3']"
+ );
+
+ // Using legacy ';' param
+ assertQ(req("q", "title:test; val_s1 desc", "defType","lucenePlusSort")
+ ,"//*[@numFound='3']"
+ ,"//result/doc[1]/str[@name='id'][.='12']"
+ ,"//result/doc[2]/str[@name='id'][.='11']"
+ ,"//result/doc[3]/str[@name='id'][.='10']"
+ );
+
+ assertQ(req("q", "title:test; val_s1 asc", "defType","lucenePlusSort")
+ ,"//*[@numFound='3']"
+ ,"//result/doc[1]/str[@name='id'][.='10']"
+ ,"//result/doc[2]/str[@name='id'][.='11']"
+ ,"//result/doc[3]/str[@name='id'][.='12']"
+ );
+ }
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test/org/apache/solr/handler/StandardRequestHandlerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/StandardRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/StandardRequestHandlerTest.java
deleted file mode 100644
index 668fefd..0000000
--- a/solr/core/src/test/org/apache/solr/handler/StandardRequestHandlerTest.java
+++ /dev/null
@@ -1,88 +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.handler;
-
-import org.apache.solr.core.SolrCore;
-import org.apache.solr.util.AbstractSolrTestCase;
-import org.junit.BeforeClass;
-
-/**
- * Most of the tests for StandardRequestHandler are in ConvertedLegacyTest
- *
- */
-public class StandardRequestHandlerTest extends AbstractSolrTestCase {
-
- @BeforeClass
- public static void beforeClass() throws Exception {
- initCore("solrconfig.xml", "schema.xml");
- }
-
- @Override public void setUp() throws Exception {
- super.setUp();
- lrf = h.getRequestFactory("standard", 0, 20 );
- }
-
- public void testSorting() throws Exception {
- SolrCore core = h.getCore();
- assertU(adoc("id", "10", "title", "test", "val_s1", "aaa"));
- assertU(adoc("id", "11", "title", "test", "val_s1", "bbb"));
- assertU(adoc("id", "12", "title", "test", "val_s1", "ccc"));
- assertU(commit());
-
- assertQ(req("q", "title:test")
- ,"//*[@numFound='3']"
- );
-
- assertQ(req("q", "title:test", "sort","val_s1 asc")
- ,"//*[@numFound='3']"
- ,"//result/doc[1]/str[@name='id'][.='10']"
- ,"//result/doc[2]/str[@name='id'][.='11']"
- ,"//result/doc[3]/str[@name='id'][.='12']"
- );
-
- assertQ(req("q", "title:test", "sort","val_s1 desc")
- ,"//*[@numFound='3']"
- ,"//result/doc[1]/str[@name='id'][.='12']"
- ,"//result/doc[2]/str[@name='id'][.='11']"
- ,"//result/doc[3]/str[@name='id'][.='10']"
- );
-
- // Make sure score parsing works
- assertQ(req("q", "title:test", "sort","score desc")
- ,"//*[@numFound='3']"
- );
-
- assertQ(req("q", "title:test", "sort","score asc")
- ,"//*[@numFound='3']"
- );
-
- // Using legacy ';' param
- assertQ(req("q", "title:test; val_s1 desc", "defType","lucenePlusSort")
- ,"//*[@numFound='3']"
- ,"//result/doc[1]/str[@name='id'][.='12']"
- ,"//result/doc[2]/str[@name='id'][.='11']"
- ,"//result/doc[3]/str[@name='id'][.='10']"
- );
-
- assertQ(req("q", "title:test; val_s1 asc", "defType","lucenePlusSort")
- ,"//*[@numFound='3']"
- ,"//result/doc[1]/str[@name='id'][.='10']"
- ,"//result/doc[2]/str[@name='id'][.='11']"
- ,"//result/doc[3]/str[@name='id'][.='12']"
- );
- }
-}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java
index 40e952a..9e84fd2 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java
@@ -124,11 +124,11 @@ public class DistributedSpellCheckComponentTest extends BaseDistributedSearchTes
handle.put("grouped", SKIP);
//Randomly select either IndexBasedSpellChecker or DirectSolrSpellChecker
- String requestHandlerName = "spellCheckCompRH_Direct";
- String reqHandlerWithWordbreak = "spellCheckWithWordbreak_Direct";
+ String requestHandlerName = "/spellCheckCompRH_Direct";
+ String reqHandlerWithWordbreak = "/spellCheckWithWordbreak_Direct";
if(random().nextBoolean()) {
- requestHandlerName = "spellCheckCompRH";
- reqHandlerWithWordbreak = "spellCheckWithWordbreak";
+ requestHandlerName = "/spellCheckCompRH";
+ reqHandlerWithWordbreak = "/spellCheckWithWordbreak";
}
//Shortcut names
@@ -143,7 +143,7 @@ public class DistributedSpellCheckComponentTest extends BaseDistributedSearchTes
String maxResults = SpellingParams.SPELLCHECK_MAX_RESULTS_FOR_SUGGEST;
//Build the dictionary for IndexBasedSpellChecker
- q(buildRequest("*:*", false, "spellCheckCompRH", false, build, "true"));
+ q(buildRequest("*:*", false, "/spellCheckCompRH", false, build, "true"));
//Test Basic Functionality
query(buildRequest("toyata", true, requestHandlerName, random().nextBoolean(), (String[]) null));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test/org/apache/solr/handler/component/FacetPivotSmallTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/component/FacetPivotSmallTest.java b/solr/core/src/test/org/apache/solr/handler/component/FacetPivotSmallTest.java
index 4b5e8a7..0f4ec06 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/FacetPivotSmallTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/FacetPivotSmallTest.java
@@ -40,7 +40,6 @@ public class FacetPivotSmallTest extends SolrTestCaseJ4 {
super.setUp();
clearIndex();
assertU(commit());
- lrf = h.getRequestFactory("standard", 0, 20);
}
/**
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test/org/apache/solr/handler/component/ResponseLogComponentTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/component/ResponseLogComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/ResponseLogComponentTest.java
index 7e309fc..cf657da 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/ResponseLogComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/ResponseLogComponentTest.java
@@ -38,8 +38,8 @@ public class ResponseLogComponentTest extends SolrTestCaseJ4 {
public void testToLogIds() throws Exception {
SolrQueryRequest req = null;
try {
- String handler="withlog";
- req = req("indent","true", "qt","withlog", "q","aa", "rows","2",
+ String handler="/withlog";
+ req = req("indent","true", "qt","/withlog", "q","aa", "rows","2",
"fl","id,subject", "responseLog","true");
SolrQueryResponse qr = h.queryAndResponse(handler, req);
NamedList<Object> entries = qr.getToLog();
@@ -55,8 +55,8 @@ public class ResponseLogComponentTest extends SolrTestCaseJ4 {
public void testToLogScores() throws Exception {
SolrQueryRequest req = null;
try {
- String handler="withlog";
- req = req("indent","true", "qt","withlog", "q","aa", "rows","2",
+ String handler="/withlog";
+ req = req("indent","true", "qt","/withlog", "q","aa", "rows","2",
"fl","id,subject,score", "responseLog","true");
SolrQueryResponse qr = h.queryAndResponse(handler, req);
NamedList<Object> entries = qr.getToLog();
@@ -72,8 +72,8 @@ public class ResponseLogComponentTest extends SolrTestCaseJ4 {
public void testDisabling() throws Exception {
SolrQueryRequest req = null;
try {
- String handler="withlog";
- req = req("indent","true", "qt","withlog", "q","aa", "rows","2",
+ String handler="/withlog";
+ req = req("indent","true", "qt","/withlog", "q","aa", "rows","2",
"fl","id,subject", "responseLog","false");
SolrQueryResponse qr = h.queryAndResponse(handler, req);
NamedList<Object> entries = qr.getToLog();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java
index 37d02d9..d3b0828 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java
@@ -43,7 +43,7 @@ import org.junit.Test;
@Slow
@SuppressTempFileChecks(bugUrl = "https://issues.apache.org/jira/browse/SOLR-1877 Spellcheck IndexReader leak bug?")
public class SpellCheckComponentTest extends SolrTestCaseJ4 {
- static String rh = "spellCheckCompRH";
+ static String rh = "/spellCheckCompRH";
@BeforeClass
@@ -254,7 +254,7 @@ public class SpellCheckComponentTest extends SolrTestCaseJ4 {
public void testReloadOnStart() throws Exception {
assertU(adoc("id", "0", "lowerfilt", "This is a title"));
assertU(commit());
- SolrQueryRequest request = req("qt", "spellCheckCompRH", "q", "*:*",
+ SolrQueryRequest request = req("qt", "/spellCheckCompRH", "q", "*:*",
"spellcheck.q", "ttle", "spellcheck", "true", "spellcheck.dictionary",
"default", "spellcheck.build", "true");
assertQ(request, "//arr[@name='suggestion'][.='title']");
@@ -271,7 +271,7 @@ public class SpellCheckComponentTest extends SolrTestCaseJ4 {
checker.init(args);
checker.inform(h.getCore());
- request = req("qt", "spellCheckCompRH", "q", "*:*", "spellcheck.q", "ttle",
+ request = req("qt", "/spellCheckCompRH", "q", "*:*", "spellcheck.q", "ttle",
"spellcheck", "true", "spellcheck.dictionary", "default",
"spellcheck.reload", "true");
List<SearchComponent> components = new ArrayList<>();
@@ -293,7 +293,7 @@ public class SpellCheckComponentTest extends SolrTestCaseJ4 {
@SuppressWarnings("unchecked")
@Test
public void testRebuildOnCommit() throws Exception {
- SolrQueryRequest req = req("q", "lowerfilt:lucenejavt", "qt", "spellCheckCompRH", "spellcheck", "true");
+ SolrQueryRequest req = req("q", "lowerfilt:lucenejavt", "qt", "/spellCheckCompRH", "spellcheck", "true");
String response = h.query(req);
assertFalse("No suggestions should be returned", response.contains("lucenejava"));
@@ -330,7 +330,7 @@ public class SpellCheckComponentTest extends SolrTestCaseJ4 {
params.add(SpellingParams.SPELLCHECK_EXTENDED_RESULTS,"true");
params.add(CommonParams.Q, "anotheq");
- SolrRequestHandler handler = core.getRequestHandler("spellCheckCompRH");
+ SolrRequestHandler handler = core.getRequestHandler("/spellCheckCompRH");
SolrQueryResponse rsp = new SolrQueryResponse();
rsp.addResponseHeader(new SimpleOrderedMap());
SolrQueryRequest req = new LocalSolrQueryRequest(core, params);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
index 3bb4974..cee1ab5 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
@@ -78,7 +78,6 @@ public class StatsComponentTest extends AbstractSolrTestCase {
super.setUp();
clearIndex();
assertU(commit());
- lrf = h.getRequestFactory("standard", 0, 20);
}
public void testStats() throws Exception {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test/org/apache/solr/handler/component/SuggestComponentTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/component/SuggestComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/SuggestComponentTest.java
index ed7a9e7..b15e167 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/SuggestComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/SuggestComponentTest.java
@@ -516,7 +516,7 @@ public class SuggestComponentTest extends SolrTestCaseJ4 {
waitForWarming();
}
- assertQ(req("qt", "standard",
+ assertQ(req("qt", "/select",
"q", "*:*"),
"//*[@numFound='11']"
);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java
index abee4bd..91a5869 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java
@@ -118,7 +118,7 @@ public class TermVectorComponentTest extends SolrTestCaseJ4 {
assertNull(h.validateUpdate(commit()));
}
- static String tv = "tvrh";
+ static String tv = "/tvrh";
@Test
public void testBasics() throws Exception {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test/org/apache/solr/highlight/FastVectorHighlighterTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/highlight/FastVectorHighlighterTest.java b/solr/core/src/test/org/apache/solr/highlight/FastVectorHighlighterTest.java
index aafe3f5..99868a7 100644
--- a/solr/core/src/test/org/apache/solr/highlight/FastVectorHighlighterTest.java
+++ b/solr/core/src/test/org/apache/solr/highlight/FastVectorHighlighterTest.java
@@ -77,7 +77,7 @@ public class FastVectorHighlighterTest extends SolrTestCaseJ4 {
args.put("hl.method", "fastVector"); // the new way
}
TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory(
- "standard",0,200,args);
+ "",0,200,args);
assertU(adoc("tv_text", "basic fast vector highlighter test",
"id", "1"));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test/org/apache/solr/highlight/HighlighterConfigTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/highlight/HighlighterConfigTest.java b/solr/core/src/test/org/apache/solr/highlight/HighlighterConfigTest.java
index f022e96..5832132 100644
--- a/solr/core/src/test/org/apache/solr/highlight/HighlighterConfigTest.java
+++ b/solr/core/src/test/org/apache/solr/highlight/HighlighterConfigTest.java
@@ -62,7 +62,7 @@ public class HighlighterConfigTest extends AbstractSolrTestCase {
args.put("df", "t_text");
args.put("hl.fl", "");
TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory(
- "standard", 0, 200, args);
+ "", 0, 200, args);
assertU(adoc("t_text", "a long day's night", "id", "1"));
assertU(commit());
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test/org/apache/solr/highlight/HighlighterTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/highlight/HighlighterTest.java b/solr/core/src/test/org/apache/solr/highlight/HighlighterTest.java
index f0b58cd..759de00 100644
--- a/solr/core/src/test/org/apache/solr/highlight/HighlighterTest.java
+++ b/solr/core/src/test/org/apache/solr/highlight/HighlighterTest.java
@@ -119,7 +119,7 @@ public class HighlighterTest extends SolrTestCaseJ4 {
args.put(HighlightParams.MERGE_CONTIGUOUS_FRAGMENTS, "true");
args.put(HighlightParams.METHOD, "original"); // test works; no complaints
TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory(
- "standard", 0, 200, args);
+ "", 0, 200, args);
String input = "this is some long text. It has the word long in many places. In fact, it has long on some different fragments. " +
"Let us see what happens to long in this case.";
String gold = "this is some <em>long</em> text. It has the word <em>long</em> in many places. In fact, it has <em>long</em> on some different fragments. " +
@@ -145,7 +145,7 @@ public class HighlighterTest extends SolrTestCaseJ4 {
args.put(HighlightParams.MERGE_CONTIGUOUS_FRAGMENTS, "false");
args.put("f.t_text." + HighlightParams.MERGE_CONTIGUOUS_FRAGMENTS, "false");
sumLRF = h.getRequestFactory(
- "standard", 0, 200, args);
+ "", 0, 200, args);
assertQ("Merge Contiguous",
sumLRF.makeRequest("t_text:long"),
"//lst[@name='highlighting']/lst[@name='1']",
@@ -165,7 +165,7 @@ public class HighlighterTest extends SolrTestCaseJ4 {
args.put("hl.fl", "tv_text");
args.put("hl.snippets", "2");
TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory(
- "standard",0,200,args);
+ "",0,200,args);
assertU(adoc("tv_text", LONG_TEXT,
"id", "1"));
@@ -186,7 +186,7 @@ public class HighlighterTest extends SolrTestCaseJ4 {
args.put("hl", "true");
args.put("hl.fl", "tv_no_off_text");
- TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory("standard", 0, 200, args);
+ TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory("", 0, 200, args);
assertU(adoc("tv_no_off_text", "Crackerjack Cameron", "id", "1"));
assertU(commit());
@@ -229,7 +229,7 @@ public class HighlighterTest extends SolrTestCaseJ4 {
args.put("hl.fl", "tv_mv_text");
args.put("hl.snippets", "2");
TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory(
- "standard",0,200,args);
+ "",0,200,args);
assertU(adoc("tv_mv_text", LONG_TEXT,
"tv_mv_text", LONG_TEXT,
@@ -256,7 +256,7 @@ public class HighlighterTest extends SolrTestCaseJ4 {
args.put("hl.fl", "tv_mv_text");
args.put("hl.snippets", "2");
TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory(
- "standard",0,200,args);
+ "",0,200,args);
String shortText = "short";
assertU(adoc("tv_mv_text", shortText,
@@ -282,7 +282,7 @@ public class HighlighterTest extends SolrTestCaseJ4 {
args.put("qf", "tv_text");
args.put("q.alt", "*:*");
TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory(
- "dismax",0,200,args);
+ "/dismax",0,200,args);
assertU(adoc("tv_text", "a long day's night", "id", "1"));
assertU(commit());
@@ -309,7 +309,7 @@ public class HighlighterTest extends SolrTestCaseJ4 {
args.put("hl.fl", "textgap");
args.put("df", "textgap");
TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory(
- "standard", 0, 200, args);
+ "", 0, 200, args);
assertU(adoc("textgap", "first entry hasnt queryword",
"textgap", "second entry has queryword long",
@@ -331,7 +331,7 @@ public class HighlighterTest extends SolrTestCaseJ4 {
args.put("hl.fl", "textgap");
args.put("df", "textgap");
TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory(
- "standard", 0, 200, args);
+ "", 0, 200, args);
assertU(adoc("textgap", "first entry has one word foo",
"textgap", "second entry has both words foo bar",
@@ -370,7 +370,7 @@ public class HighlighterTest extends SolrTestCaseJ4 {
args.put("df", "t_text");
args.put("hl.fl", "");
TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory(
- "standard", 0, 200, args);
+ "", 0, 200, args);
assertU(adoc("t_text", "a long day's night", "id", "1"));
assertU(commit());
@@ -392,7 +392,7 @@ public class HighlighterTest extends SolrTestCaseJ4 {
args.put("hl", "false");
args.put("hl.fl", "t_text");
TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory(
- "standard", 0, 200, args);
+ "", 0, 200, args);
assertU(adoc("t_text", "a long day's night", "id", "1"));
assertU(commit());
@@ -410,7 +410,7 @@ public class HighlighterTest extends SolrTestCaseJ4 {
args.put("hl", "true");
args.put("hl.fl", "t_text tv_text");
TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory(
- "standard", 0, 200, args);
+ "", 0, 200, args);
assertU(adoc("t_text", "a long day's night", "id", "1",
"tv_text", "a long night's day"));
@@ -437,7 +437,7 @@ public class HighlighterTest extends SolrTestCaseJ4 {
args.put("hl.fl", "t_text1 t_text2");
TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory(
- "standard", 0, 200, args);
+ "", 0, 200, args);
// default should highlight both random and words in both fields
assertQ("Test Default",
sumLRF.makeRequest("t_text1:random OR t_text2:words"),
@@ -449,7 +449,7 @@ public class HighlighterTest extends SolrTestCaseJ4 {
// requireFieldMatch=true - highlighting should only occur if term matched in that field
args.put("hl.requireFieldMatch", "true");
sumLRF = h.getRequestFactory(
- "standard", 0, 200, args);
+ "", 0, 200, args);
assertQ("Test RequireFieldMatch",
sumLRF.makeRequest("t_text1:random OR t_text2:words"),
"//lst[@name='highlighting']/lst[@name='1']",
@@ -463,7 +463,7 @@ public class HighlighterTest extends SolrTestCaseJ4 {
assertU(delI("1"));
assertU(commit());
sumLRF = h.getRequestFactory(
- "standard", 0, 200, args);
+ "", 0, 200, args);
assertQ("Test RequireFieldMatch on un-optimized index",
sumLRF.makeRequest("t_text1:random OR t_text2:words"),
"//lst[@name='highlighting']/lst[@name='2']",
@@ -482,7 +482,7 @@ public class HighlighterTest extends SolrTestCaseJ4 {
args.put("hl.simple.pre","<B>");
args.put("hl.simple.post", "</B>");
TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory(
- "standard", 0, 200, args);
+ "", 0, 200, args);
assertU(adoc("t_text", "a long days night", "id", "1"));
assertU(commit());
@@ -497,7 +497,7 @@ public class HighlighterTest extends SolrTestCaseJ4 {
args.put("f.t_text.hl.simple.pre", "<I>");
args.put("f.t_text.hl.simple.post", "</I>");
sumLRF = h.getRequestFactory(
- "standard", 0, 200, args);
+ "", 0, 200, args);
assertQ("Basic summarization",
sumLRF.makeRequest("t_text:long"),
"//lst[@name='highlighting']/lst[@name='1']",
@@ -513,7 +513,7 @@ public class HighlighterTest extends SolrTestCaseJ4 {
args.put("hl", "true");
args.put("hl.fl", "tv_text");
TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory(
- "standard", 0, 200, args);
+ "", 0, 200, args);
String text =
@@ -537,7 +537,7 @@ public class HighlighterTest extends SolrTestCaseJ4 {
final String field = random().nextBoolean() ? "t_text" : "tv_text";
args.put("hl.fl", field);
TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory(
- "standard", 0, 200, args);
+ "", 0, 200, args);
assertU(adoc(field, LONG_TEXT, "id", "1"));
@@ -549,14 +549,14 @@ public class HighlighterTest extends SolrTestCaseJ4 {
"//lst[@name='1']/arr[count(str)=1]"
);
args.put("hl.maxAnalyzedChars", "20");
- sumLRF = h.getRequestFactory("standard", 0, 200, args);
+ sumLRF = h.getRequestFactory("", 0, 200, args);
assertQ("token at end of text",
sumLRF.makeRequest(field + ":disjoint"),
"//lst[@name='highlighting']/lst[@name='1']",
"//lst[@name='1'][not(*)]"
);
args.put("hl.maxAnalyzedChars", "-1");
- sumLRF = h.getRequestFactory("standard", 0, 200, args);
+ sumLRF = h.getRequestFactory("", 0, 200, args);
assertQ("token at start of text",
sumLRF.makeRequest(field + ":disjoint"),
"//lst[@name='highlighting']/lst[@name='1']",
@@ -598,7 +598,7 @@ public class HighlighterTest extends SolrTestCaseJ4 {
args.put("hl.regex.pattern", "[-\\w ,\"']{20,200}");
args.put("hl.regex.slop", ".9");
TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory(
- "standard", 0, 200, args);
+ "", 0, 200, args);
String t = "This is an example of a sentence. Another example \"sentence\" with " +
"special characters\nand a line-break! Miscellaneous character like ^ are " +
@@ -617,7 +617,7 @@ public class HighlighterTest extends SolrTestCaseJ4 {
);
// try with some punctuation included
args.put("hl.regex.pattern", "[-\\w ,^/\\n\"']{20,200}");
- sumLRF = h.getRequestFactory("standard", 0, 200, args);
+ sumLRF = h.getRequestFactory("", 0, 200, args);
assertQ("regex fragmenter 2",
sumLRF.makeRequest("t_text:example"),
"//lst[@name='highlighting']/lst[@name='1']",
@@ -640,7 +640,7 @@ public class HighlighterTest extends SolrTestCaseJ4 {
args.put("hl", "true");
args.put("hl.fl", "tv_text");
TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory(
- "standard", 0, 200, args);
+ "", 0, 200, args);
assertQ("Basic summarization",
sumLRF.makeRequest("tv_text:long"),
"//lst[@name='highlighting']/lst[@name='1']",
@@ -650,7 +650,7 @@ public class HighlighterTest extends SolrTestCaseJ4 {
// 25
args.put("hl.fragsize","25");
sumLRF = h.getRequestFactory(
- "standard", 0, 200, args);
+ "", 0, 200, args);
assertQ("Basic summarization",
sumLRF.makeRequest("tv_text:long"),
"//lst[@name='highlighting']/lst[@name='1']",
@@ -660,7 +660,7 @@ public class HighlighterTest extends SolrTestCaseJ4 {
// 0 - NullFragmenter
args.put("hl.fragsize","0");
sumLRF = h.getRequestFactory(
- "standard", 0, 200, args);
+ "", 0, 200, args);
assertQ("Basic summarization",
sumLRF.makeRequest("tv_text:long"),
"//lst[@name='highlighting']/lst[@name='1']",
@@ -684,7 +684,7 @@ public class HighlighterTest extends SolrTestCaseJ4 {
args.put("hl.fragsize","0");
args.put("hl.fl", "t_text");
TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory(
- "standard", 0, 200, args);
+ "", 0, 200, args);
// no alternate
assertQ("Alternate summarization",
@@ -695,7 +695,7 @@ public class HighlighterTest extends SolrTestCaseJ4 {
// with an alternate
args.put("hl.alternateField", "foo_t");
- sumLRF = h.getRequestFactory("standard", 0, 200, args);
+ sumLRF = h.getRequestFactory("", 0, 200, args);
assertQ("Alternate summarization",
sumLRF.makeRequest("tv_text:keyword"),
"//lst[@name='highlighting']/lst[@name='1' and count(*)=1]",
@@ -705,7 +705,7 @@ public class HighlighterTest extends SolrTestCaseJ4 {
// with an alternate + max length
args.put("hl.alternateField", "t_text");
args.put("hl.maxAlternateFieldLength", "15");
- sumLRF = h.getRequestFactory("standard", 0, 200, args);
+ sumLRF = h.getRequestFactory("", 0, 200, args);
assertQ("Alternate summarization",
sumLRF.makeRequest("tv_text:keyword"),
"//lst[@name='highlighting']/lst[@name='1' and count(*)=1]",
@@ -715,7 +715,7 @@ public class HighlighterTest extends SolrTestCaseJ4 {
// with a non-existing alternate field + max length
args.put("hl.alternateField", "NonExistingField");
args.put("hl.maxAlternateFieldLength", "15");
- sumLRF = h.getRequestFactory("standard", 0, 200, args);
+ sumLRF = h.getRequestFactory("", 0, 200, args);
assertQ("Alternate summarization",
sumLRF.makeRequest("tv_text:keyword"),
"//lst[@name='highlighting']/lst[@name='1' and count(*)=1]",
@@ -744,7 +744,7 @@ public class HighlighterTest extends SolrTestCaseJ4 {
args.put("hl.alternateField", "tv_text");
args.put("hl.maxAlternateFieldLength", "39");
TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory(
- "standard", 0, 200, args);
+ "", 0, 200, args);
assertQ("Alternate summarization with highlighting",
sumLRF.makeRequest("tv_text:keyword"),
"//lst[@name='highlighting']/lst[@name='1' and count(*)=1]",
@@ -761,7 +761,7 @@ public class HighlighterTest extends SolrTestCaseJ4 {
// With hl.requireFieldMatch, will not highlight but fall back to plain-text alternate
args.put("hl.requireFieldMatch", "true");
sumLRF = h.getRequestFactory(
- "standard", 0, 200, args);
+ "", 0, 200, args);
assertQ("Alternate summarization with highlighting, requireFieldMatch",
sumLRF.makeRequest("other_t:keyword"),
"//lst[@name='highlighting']/lst[@name='1' and count(*)=1]",
@@ -774,7 +774,7 @@ public class HighlighterTest extends SolrTestCaseJ4 {
args.remove("hl.alternateField");
args.put("f.t_text.hl.alternateField", "tv_text");
args.put("f.t_text.hl.maxAlternateFieldLength", "0");
- sumLRF = h.getRequestFactory("standard", 0, 200, args);
+ sumLRF = h.getRequestFactory("", 0, 200, args);
assertQ("Alternate summarization with highlighting",
sumLRF.makeRequest("tv_text:keyword"),
"//lst[@name='highlighting']/lst[@name='1' and count(*)=1]",
@@ -786,7 +786,7 @@ public class HighlighterTest extends SolrTestCaseJ4 {
args.put("hl.tag.pre", "<fvhpre>");
args.put("hl.tag.post", "</fvhpost>");
args.put("f.t_text.hl.maxAlternateFieldLength", "18");
- sumLRF = h.getRequestFactory("standard", 0, 200, args);
+ sumLRF = h.getRequestFactory("", 0, 200, args);
assertQ("Alternate summarization with highlighting using FVH",
sumLRF.makeRequest("tv_text:keyword"),
"//lst[@name='highlighting']/lst[@name='1' and count(*)=1]",
@@ -795,7 +795,7 @@ public class HighlighterTest extends SolrTestCaseJ4 {
// Prove it is possible to turn off highlighting of alternate field
args.put("hl.highlightAlternate", "false");
- sumLRF = h.getRequestFactory("standard", 0, 200, args);
+ sumLRF = h.getRequestFactory("", 0, 200, args);
assertQ("Alternate summarization without highlighting",
sumLRF.makeRequest("tv_text:keyword"),
"//lst[@name='highlighting']/lst[@name='1' and count(*)=1]",
@@ -813,7 +813,7 @@ public class HighlighterTest extends SolrTestCaseJ4 {
args.put("hl.usePhraseHighlighter", "false");
TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory(
- "standard", 0, 200, args);
+ "", 0, 200, args);
// String borrowed from Lucene's HighlighterTest
String t = "This piece of text refers to Kennedy at the beginning then has a longer piece of text that is very long in the middle and finally ends with another reference to Kennedy";
@@ -843,7 +843,7 @@ public class HighlighterTest extends SolrTestCaseJ4 {
// now check if Lucene-794 highlighting works as expected
args.put("hl.usePhraseHighlighter", "true");
- sumLRF = h.getRequestFactory("standard", 0, 200, args);
+ sumLRF = h.getRequestFactory("", 0, 200, args);
// check phrase highlighting
assertQ("Phrase highlighting - Lucene-794",
@@ -877,7 +877,7 @@ public class HighlighterTest extends SolrTestCaseJ4 {
assertU(commit());
assertU(optimize());
- TestHarness.LocalRequestFactory lrf = h.getRequestFactory("standard", 0,
+ TestHarness.LocalRequestFactory lrf = h.getRequestFactory("", 0,
10, args);
SolrQueryRequest request = lrf.makeRequest("test");
@@ -893,7 +893,7 @@ public class HighlighterTest extends SolrTestCaseJ4 {
request.close();
args.put("hl.fl", "foo_*");
- lrf = h.getRequestFactory("standard", 0, 10, args);
+ lrf = h.getRequestFactory("", 0, 10, args);
request = lrf.makeRequest("test");
highlighter = HighlightComponent.getHighlighter(h.getCore());
highlightFieldNames = Arrays.asList(highlighter.getHighlightFields(null,
@@ -906,7 +906,7 @@ public class HighlighterTest extends SolrTestCaseJ4 {
// SOLR-5127
args.put("hl.fl", (random().nextBoolean() ? "foo_*,bar_*" : "bar_*,foo_*"));
- lrf = h.getRequestFactory("standard", 0, 10, args);
+ lrf = h.getRequestFactory("", 0, 10, args);
// hl.fl ordering need not be preserved in output
final Set<String> highlightedSetExpected = new HashSet<String>();
highlightedSetExpected.add("foo_s");
@@ -931,7 +931,7 @@ public class HighlighterTest extends SolrTestCaseJ4 {
args.put("hl.usePhraseHighlighter", "true");
args.put("hl.highlightMultiTerm", "true");
TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory(
- "standard", 0, 200, args);
+ "", 0, 200, args);
assertU(adoc("t_text", "a long day's night", "id", "1"));
assertU(commit());
@@ -955,7 +955,7 @@ public class HighlighterTest extends SolrTestCaseJ4 {
args.put("hl.usePhraseHighlighter", "true");
args.put("hl.highlightMultiTerm", "true");
TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory(
- "standard", 0, 200, args);
+ "", 0, 200, args);
assertU(adoc("t_text", "a long day's night", "id", "1"));
assertU(commit());
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test/org/apache/solr/metrics/SolrMetricsIntegrationTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/metrics/SolrMetricsIntegrationTest.java b/solr/core/src/test/org/apache/solr/metrics/SolrMetricsIntegrationTest.java
index a8e7ecd..b2cb5f3 100644
--- a/solr/core/src/test/org/apache/solr/metrics/SolrMetricsIntegrationTest.java
+++ b/solr/core/src/test/org/apache/solr/metrics/SolrMetricsIntegrationTest.java
@@ -43,7 +43,7 @@ public class SolrMetricsIntegrationTest extends SolrTestCaseJ4 {
private static final int MAX_ITERATIONS = 20;
private static final String CORE_NAME = "metrics_integration";
private static final String METRIC_NAME = "requestTimes";
- private static final String HANDLER_NAME = "standard";
+ private static final String HANDLER_NAME = "/select";
private static final String[] REPORTER_NAMES = {"reporter1", "reporter2"};
private static final String UNIVERSAL = "universal";
private static final String SPECIFIC = "specific";
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java b/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java
index 0ee345e..35a66c3 100644
--- a/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java
+++ b/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java
@@ -3312,7 +3312,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
SolrQueryRequest req = req(params);
log.info("Using Params: " + params);
try {
- SolrQueryResponse rsp = h.queryAndResponse("standard", req);
+ SolrQueryResponse rsp = h.queryAndResponse("", req);
rangeFacetsFilter = (NamedList<Object>) ((NamedList<Object>) rsp.getValues().get("facet_counts")).get("facet_ranges");
} finally {
req.close();
@@ -3320,7 +3320,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
params.add("facet.range.method", FacetRangeMethod.DV.toString());
req = req(params);
try {
- SolrQueryResponse rsp = h.queryAndResponse("standard", req);
+ SolrQueryResponse rsp = h.queryAndResponse("", req);
rangeFacetsDv = (NamedList<Object>) ((NamedList<Object>) rsp.getValues().get("facet_counts")).get("facet_ranges");
} finally {
req.close();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test/org/apache/solr/request/TestIntervalFaceting.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/request/TestIntervalFaceting.java b/solr/core/src/test/org/apache/solr/request/TestIntervalFaceting.java
index fc8ddff..df0031f 100644
--- a/solr/core/src/test/org/apache/solr/request/TestIntervalFaceting.java
+++ b/solr/core/src/test/org/apache/solr/request/TestIntervalFaceting.java
@@ -326,7 +326,7 @@ public class TestIntervalFaceting extends SolrTestCaseJ4 {
}
SolrQueryRequest req = req(params);
try {
- SolrQueryResponse rsp = h.queryAndResponse("standard", req);
+ SolrQueryResponse rsp = h.queryAndResponse("", req);
NamedList<Object> facetQueries = (NamedList<Object>) ((NamedList<Object>) rsp.getValues().get("facet_counts")).get("facet_queries");
NamedList<Object> facetIntervals = (NamedList<Object>) ((NamedList<Object>) (NamedList<Object>) ((NamedList<Object>) rsp.getValues().get("facet_counts"))
.get("facet_intervals")).get(field);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test/org/apache/solr/search/TestComplexPhraseQParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestComplexPhraseQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/TestComplexPhraseQParserPlugin.java
index 8c59281..02060a9 100644
--- a/solr/core/src/test/org/apache/solr/search/TestComplexPhraseQParserPlugin.java
+++ b/solr/core/src/test/org/apache/solr/search/TestComplexPhraseQParserPlugin.java
@@ -102,7 +102,7 @@ public class TestComplexPhraseQParserPlugin extends AbstractSolrTestCase {
args.put(CommonParams.FL, "id");
TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory(
- "standard", 0, 200, args);
+ "", 0, 200, args);
assertU(adoc("name", "john smith", "id", "1"));
assertU(adoc("name", "johathon smith", "id", "2"));
@@ -181,7 +181,7 @@ public class TestComplexPhraseQParserPlugin extends AbstractSolrTestCase {
TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory(
- "standard", 0, 200, args);
+ "", 0, 200, args);
assertU(adoc("name", "john smith smith john", "id", "1"));
assertU(adoc("name", "johathon smith smith johathon", "id", "2"));
@@ -198,7 +198,7 @@ public class TestComplexPhraseQParserPlugin extends AbstractSolrTestCase {
);
- sumLRF = h.getRequestFactory("standard", 0, 200, args);
+ sumLRF = h.getRequestFactory("", 0, 200, args);
assertQ("PhraseHighlighter=true Test",
sumLRF.makeRequest("name:\"(john johathon) smith\""),
"//lst[@name='highlighting']/lst[@name='1']",
@@ -209,7 +209,7 @@ public class TestComplexPhraseQParserPlugin extends AbstractSolrTestCase {
args.put(HighlightParams.USE_PHRASE_HIGHLIGHTER, Boolean.FALSE.toString());
- sumLRF = h.getRequestFactory("standard", 0, 200, args);
+ sumLRF = h.getRequestFactory("", 0, 200, args);
assertQ("PhraseHighlighter=false Test",
sumLRF.makeRequest("name:\"(john johathon) smith\""),
"//lst[@name='highlighting']/lst[@name='1']",
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test/org/apache/solr/search/join/BlockJoinFacetDistribTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/join/BlockJoinFacetDistribTest.java b/solr/core/src/test/org/apache/solr/search/join/BlockJoinFacetDistribTest.java
index 1b12657..123ce97 100644
--- a/solr/core/src/test/org/apache/solr/search/join/BlockJoinFacetDistribTest.java
+++ b/solr/core/src/test/org/apache/solr/search/join/BlockJoinFacetDistribTest.java
@@ -137,7 +137,7 @@ public class BlockJoinFacetDistribTest extends SolrCloudTestCase{
oldFacetsEnabled&&usually() ? "facet.limit" : "ignore" , "1",
oldFacetsEnabled&&usually() ? "facet.mincount" : "ignore" , "2",
oldFacetsEnabled&&usually() ? "facet.overrequest.count" : "ignore" , "0",
- "qt", random().nextBoolean() ? "blockJoinDocSetFacetRH" : "blockJoinFacetRH",
+ "qt", random().nextBoolean() ? "/blockJoinDocSetFacetRH" : "/blockJoinFacetRH",
"child.facet.field", "COLOR_s",
"child.facet.field", "SIZE_s",
"distrib.singlePass", random().nextBoolean() ? "true":"false",
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test/org/apache/solr/search/join/BlockJoinFacetRandomTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/join/BlockJoinFacetRandomTest.java b/solr/core/src/test/org/apache/solr/search/join/BlockJoinFacetRandomTest.java
index 1b04d79..21ec780 100644
--- a/solr/core/src/test/org/apache/solr/search/join/BlockJoinFacetRandomTest.java
+++ b/solr/core/src/test/org/apache/solr/search/join/BlockJoinFacetRandomTest.java
@@ -46,7 +46,7 @@ public class BlockJoinFacetRandomTest extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeClass() throws Exception {
initCore("solrconfig-blockjoinfacetcomponent.xml", "schema-blockjoinfacetcomponent.xml");
- handler = random().nextBoolean() ? "blockJoinDocSetFacetRH":"blockJoinFacetRH";
+ handler = random().nextBoolean() ? "/blockJoinDocSetFacetRH":"/blockJoinFacetRH";
facets = createFacets();
createIndex();
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test/org/apache/solr/search/join/BlockJoinFacetSimpleTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/join/BlockJoinFacetSimpleTest.java b/solr/core/src/test/org/apache/solr/search/join/BlockJoinFacetSimpleTest.java
index 5e610cf..c4d3a64 100644
--- a/solr/core/src/test/org/apache/solr/search/join/BlockJoinFacetSimpleTest.java
+++ b/solr/core/src/test/org/apache/solr/search/join/BlockJoinFacetSimpleTest.java
@@ -32,7 +32,7 @@ public class BlockJoinFacetSimpleTest extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeClass() throws Exception {
initCore("solrconfig-blockjoinfacetcomponent.xml", "schema-blockjoinfacetcomponent.xml");
- handler = random().nextBoolean() ? "blockJoinDocSetFacetRH":"blockJoinFacetRH";
+ handler = random().nextBoolean() ? "/blockJoinDocSetFacetRH":"/blockJoinFacetRH";
createIndex();
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test/org/apache/solr/spelling/DirectSolrSpellCheckerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/spelling/DirectSolrSpellCheckerTest.java b/solr/core/src/test/org/apache/solr/spelling/DirectSolrSpellCheckerTest.java
index cb5bba7..29551de 100644
--- a/solr/core/src/test/org/apache/solr/spelling/DirectSolrSpellCheckerTest.java
+++ b/solr/core/src/test/org/apache/solr/spelling/DirectSolrSpellCheckerTest.java
@@ -83,7 +83,7 @@ public class DirectSolrSpellCheckerTest extends SolrTestCaseJ4 {
@Test
public void testOnlyMorePopularWithExtendedResults() throws Exception {
- assertQ(req("q", "teststop:fox", "qt", "spellCheckCompRH", SpellCheckComponent.COMPONENT_NAME, "true", SpellingParams.SPELLCHECK_DICT, "direct", SpellingParams.SPELLCHECK_EXTENDED_RESULTS, "true", SpellingParams.SPELLCHECK_ONLY_MORE_POPULAR, "true"),
+ assertQ(req("q", "teststop:fox", "qt", "/spellCheckCompRH", SpellCheckComponent.COMPONENT_NAME, "true", SpellingParams.SPELLCHECK_DICT, "direct", SpellingParams.SPELLCHECK_EXTENDED_RESULTS, "true", SpellingParams.SPELLCHECK_ONLY_MORE_POPULAR, "true"),
"//lst[@name='spellcheck']/lst[@name='suggestions']/lst[@name='fox']/int[@name='origFreq']=1",
"//lst[@name='spellcheck']/lst[@name='suggestions']/lst[@name='fox']/arr[@name='suggestion']/lst/str[@name='word']='foo'",
"//lst[@name='spellcheck']/lst[@name='suggestions']/lst[@name='fox']/arr[@name='suggestion']/lst/int[@name='freq']=2",
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java b/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java
index 5428044..06f18fc 100644
--- a/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java
+++ b/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java
@@ -115,7 +115,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 {
params.add(SpellingParams.SPELLCHECK_ALTERNATIVE_TERM_COUNT, "10");
params.add(CommonParams.Q, "id:[1 TO 10] AND lowerfilt:lovw");
{
- SolrRequestHandler handler = core.getRequestHandler("spellCheckCompRH");
+ SolrRequestHandler handler = core.getRequestHandler("/spellCheckCompRH");
SolrQueryResponse rsp = new SolrQueryResponse();
rsp.addResponseHeader(new SimpleOrderedMap());
SolrQueryRequest req = new LocalSolrQueryRequest(core, params);
@@ -147,7 +147,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 {
params.add(CommonParams.Q, "lowerfilt:(hypenated-wotd)");
{
- SolrRequestHandler handler = core.getRequestHandler("spellCheckCompRH");
+ SolrRequestHandler handler = core.getRequestHandler("/spellCheckCompRH");
SolrQueryResponse rsp = new SolrQueryResponse();
rsp.addResponseHeader(new SimpleOrderedMap());
SolrQueryRequest req = new LocalSolrQueryRequest(core, params);
@@ -164,10 +164,10 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 {
params.remove(CommonParams.Q);
params.add("defType", "dismax");
- params.add("qf", "lowerfilt");
+ params.add("qf", "/lowerfilt");
params.add(CommonParams.Q, "hypenated-wotd");
{
- SolrRequestHandler handler = core.getRequestHandler("spellCheckCompRH");
+ SolrRequestHandler handler = core.getRequestHandler("/spellCheckCompRH");
SolrQueryResponse rsp = new SolrQueryResponse();
rsp.add("responseHeader", new SimpleOrderedMap());
SolrQueryRequest req = new LocalSolrQueryRequest(core, params);
@@ -194,7 +194,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 {
SpellingParams.SPELLCHECK_COLLATE, "true",
SpellingParams.SPELLCHECK_MAX_COLLATION_TRIES, "10",
SpellingParams.SPELLCHECK_MAX_COLLATIONS, "10",
- "qt", "spellCheckCompRH",
+ "qt", "/spellCheckCompRH",
"defType", "edismax",
"qf", "teststop",
"mm", "1",
@@ -210,7 +210,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 {
SpellingParams.SPELLCHECK_COLLATE, "true",
SpellingParams.SPELLCHECK_MAX_COLLATION_TRIES, "10",
SpellingParams.SPELLCHECK_MAX_COLLATIONS, "10",
- "qt", "spellCheckCompRH",
+ "qt", "/spellCheckCompRH",
"defType", "edismax",
"qf", "teststop",
"mm", "1",
@@ -241,7 +241,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 {
//Because a FilterQuery is applied which removes doc id#1 from possible hits, we would
//not want the collations to return us "lowerfilt:(+faith +hope +loaves)" as this only matches doc id#1.
- SolrRequestHandler handler = core.getRequestHandler("spellCheckCompRH");
+ SolrRequestHandler handler = core.getRequestHandler("/spellCheckCompRH");
SolrQueryResponse rsp = new SolrQueryResponse();
rsp.addResponseHeader(new SimpleOrderedMap());
SolrQueryRequest req = new LocalSolrQueryRequest(core, params);
@@ -276,7 +276,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 {
//SpellCheckCompRH has no "qf" defined. It will not find "peace" from "peac" despite it being in the dictionary
//because requrying against this Request Handler results in 0 hits.
- SolrRequestHandler handler = core.getRequestHandler("spellCheckCompRH");
+ SolrRequestHandler handler = core.getRequestHandler("/spellCheckCompRH");
SolrQueryResponse rsp = new SolrQueryResponse();
rsp.addResponseHeader(new SimpleOrderedMap());
SolrQueryRequest req = new LocalSolrQueryRequest(core, params);
@@ -291,7 +291,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 {
//SpellCheckCompRH1 has "lowerfilt1" defined in the "qf" param. It will find "peace" from "peac" because
//requrying field "lowerfilt1" returns the hit.
params.remove(SpellingParams.SPELLCHECK_BUILD);
- handler = core.getRequestHandler("spellCheckCompRH1");
+ handler = core.getRequestHandler("/spellCheckCompRH1");
rsp = new SolrQueryResponse();
rsp.addResponseHeader(new SimpleOrderedMap());
req = new LocalSolrQueryRequest(core, params);
@@ -323,7 +323,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 {
// Returns 1 collation as a single string.
// All words are "correct" per the dictionary, but this collation would
// return no results if tried.
- SolrRequestHandler handler = core.getRequestHandler("spellCheckCompRH");
+ SolrRequestHandler handler = core.getRequestHandler("/spellCheckCompRH");
SolrQueryResponse rsp = new SolrQueryResponse();
rsp.addResponseHeader(new SimpleOrderedMap());
SolrQueryRequest req = new LocalSolrQueryRequest(core, params);
@@ -340,7 +340,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 {
params.remove(SpellingParams.SPELLCHECK_BUILD);
params.add(SpellingParams.SPELLCHECK_MAX_COLLATION_TRIES, "5");
params.add(SpellingParams.SPELLCHECK_MAX_COLLATIONS, "1");
- handler = core.getRequestHandler("spellCheckCompRH");
+ handler = core.getRequestHandler("/spellCheckCompRH");
rsp = new SolrQueryResponse();
rsp.addResponseHeader(new SimpleOrderedMap());
req = new LocalSolrQueryRequest(core, params);
@@ -358,7 +358,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 {
params.remove(SpellingParams.SPELLCHECK_MAX_COLLATIONS);
params.add(SpellingParams.SPELLCHECK_MAX_COLLATION_TRIES, "10");
params.add(SpellingParams.SPELLCHECK_MAX_COLLATIONS, "2");
- handler = core.getRequestHandler("spellCheckCompRH");
+ handler = core.getRequestHandler("/spellCheckCompRH");
rsp = new SolrQueryResponse();
rsp.addResponseHeader(new SimpleOrderedMap());
req = new LocalSolrQueryRequest(core, params);
@@ -377,7 +377,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 {
// Testing return multiple collations with expanded collation response
// format.
params.add(SpellingParams.SPELLCHECK_COLLATE_EXTENDED_RESULTS, "true");
- handler = core.getRequestHandler("spellCheckCompRH");
+ handler = core.getRequestHandler("/spellCheckCompRH");
rsp = new SolrQueryResponse();
rsp.addResponseHeader(new SimpleOrderedMap());
req = new LocalSolrQueryRequest(core, params);
@@ -430,7 +430,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 {
//Because a FilterQuery is applied which removes doc id#1 from possible hits, we would
//not want the collations to return us "lowerfilt:(+faith +hope +loaves)" as this only matches doc id#1.
- SolrRequestHandler handler = core.getRequestHandler("spellCheckCompRH");
+ SolrRequestHandler handler = core.getRequestHandler("/spellCheckCompRH");
SolrQueryResponse rsp = new SolrQueryResponse();
rsp.addResponseHeader(new SimpleOrderedMap());
SolrQueryRequest req = new LocalSolrQueryRequest(core, params);
@@ -451,7 +451,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 {
assertQ(
req(
"q", "teststop:(flew AND form AND heathrow)",
- "qt", "spellCheckCompRH",
+ "qt", "/spellCheckCompRH",
"indent", "true",
SpellCheckComponent.COMPONENT_NAME, "true",
SpellCheckComponent.SPELLCHECK_BUILD, "true",
@@ -479,7 +479,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 {
assertQ(
req(
"q", "teststop:(june AND customs)",
- "qt", "spellCheckCompRH",
+ "qt", "/spellCheckCompRH",
"indent", "true",
SpellCheckComponent.COMPONENT_NAME, "true",
SpellCheckComponent.SPELLCHECK_DICT, dictionary[i],
@@ -500,8 +500,9 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 {
"//lst[@name='spellcheck']/lst[@name='collations']/lst[@name='collation']/lst[@name='misspellingsAndCorrections']/str[@name='june']='jane'"
);
//SOLR-5090, alternativeTermCount==0 was being evaluated, sometimes would throw NPE
- assertQ(req("q", "teststop:(june customs)", "mm", "2", "qt",
- "spellCheckCompRH", "indent", "true",
+ assertQ(req("q", "teststop:(june customs)", "mm", "2",
+ "qt", "/spellCheckCompRH",
+ "indent", "true",
SpellCheckComponent.COMPONENT_NAME, "true",
SpellCheckComponent.SPELLCHECK_DICT, dictionary[i],
SpellCheckComponent.SPELLCHECK_COUNT, "10",
@@ -522,7 +523,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 {
SpellingParams.SPELLCHECK_MAX_COLLATION_TRIES, "1",
SpellingParams.SPELLCHECK_MAX_COLLATIONS, "1",
SpellingParams.SPELLCHECK_COLLATE_EXTENDED_RESULTS, "true",
- "qt", "spellCheckCompRH");
+ "qt", "/spellCheckCompRH");
// default case, no SPELLCHECK_COLLATE_MAX_COLLECT_DOCS should be exact num hits
assertQ(req(reusedParams,
@@ -589,7 +590,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 {
params.add(SpellCheckComponent.SPELLCHECK_MAX_COLLATION_TRIES, "0");
params.add(SpellCheckComponent.SPELLCHECK_MAX_COLLATIONS, "2");
params.add(CommonParams.Q, "lowerfilt:(+fauth)");
- SolrRequestHandler handler = core.getRequestHandler("spellCheckCompRH");
+ SolrRequestHandler handler = core.getRequestHandler("/spellCheckCompRH");
SolrQueryResponse rsp = new SolrQueryResponse();
rsp.addResponseHeader(new SimpleOrderedMap());
SolrQueryRequest req = new LocalSolrQueryRequest(core, params);
@@ -618,7 +619,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 {
params.add(CommonParams.Q, "lowerfilt:(+fauth)");
params.add(CommonParams.SORT, "id asc");
params.add(CursorMarkParams.CURSOR_MARK_PARAM, CursorMarkParams.CURSOR_MARK_START);
- SolrRequestHandler handler = core.getRequestHandler("spellCheckCompRH");
+ SolrRequestHandler handler = core.getRequestHandler("/spellCheckCompRH");
SolrQueryResponse rsp = new SolrQueryResponse();
rsp.addResponseHeader(new SimpleOrderedMap());
SolrQueryRequest req = new LocalSolrQueryRequest(core, params);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82a44beb/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorWithCollapseTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorWithCollapseTest.java b/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorWithCollapseTest.java
index f985b41..fe8e787 100644
--- a/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorWithCollapseTest.java
+++ b/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorWithCollapseTest.java
@@ -57,7 +57,7 @@ public class SpellCheckCollatorWithCollapseTest extends SolrTestCaseJ4 {
SpellingParams.SPELLCHECK_MAX_COLLATION_TRIES, "5",
SpellingParams.SPELLCHECK_MAX_COLLATIONS, "1",
CommonParams.Q, "a_s:lpve",
- CommonParams.QT, "spellCheckCompRH_Direct",
+ CommonParams.QT, "/spellCheckCompRH_Direct",
SpellingParams.SPELLCHECK_COLLATE_MAX_COLLECT_DOCS, "5",
CommonParams.FQ, "{!collapse field=group_i}",
"expand", "true"),