lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject [21/59] [abbrv] lucene-solr:jira/solr-10878: SOLR-6807: requestDispatcher/@handleSelect now defaults to false; stop using it. Deprecated StandardRequestHandler; stop using it.
Date Mon, 03 Jul 2017 09:37:01 GMT
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();
   }
 


Mime
View raw message