You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2017/07/03 09:37:04 UTC
[24/59] [abbrv] lucene-solr:jira/solr-10878: SOLR-6807:
requestDispatcher/@handleSelect now defaults to false;
stop using it. Deprecated StandardRequestHandler; stop using it.
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/jira/solr-10878
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>