Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-6807: requestDispatcher/@handleSelect now defaults to false; stop using it. 

Deprecated StandardRequestHandler; stop using it.
This commit is contained in:
David Smiley 2017-06-28 17:22:43 -04:00
parent d5963bebc4
commit 82a44beb3c
163 changed files with 483 additions and 1105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
solr/CHANGES.txt
View File

@ -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 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. 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 New Features
---------------------- ----------------------
* SOLR-9857, SOLR-9858: Collect aggregated metrics from nodes and shard leaders in overseer. (ab) * 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-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-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 ================== ================== 6.7.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release. Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.

2
solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig-icucollate.xml
View File

@ -22,6 +22,6 @@
<indexConfig> <indexConfig>
<useCompoundFile>${useCompoundFile:false}</useCompoundFile> <useCompoundFile>${useCompoundFile:false}</useCompoundFile>
</indexConfig> </indexConfig>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler> <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/> <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
</config> </config>

2
solr/contrib/analytics/src/test-files/solr/collection1/conf/solrconfig-analytics.xml
View File

@ -24,7 +24,7 @@
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/> <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<schemaFactory class="ClassicIndexSchemaFactory"/> <schemaFactory class="ClassicIndexSchemaFactory"/>
<requestHandler name="standard" class="solr.StandardRequestHandler"> <requestHandler name="/select" class="solr.SearchHandler">
<arr name="components"> <arr name="components">
<str>query</str> <str>query</str>
<str>facet</str> <str>facet</str>

18
solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xml
View File

@ -214,12 +214,7 @@
</query> </query>
<!-- <requestDispatcher>
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" >
<!--Make sure your system has some authentication before enabling remote streaming! <!--Make sure your system has some authentication before enabling remote streaming!
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" /> <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
--> -->
@ -261,16 +256,7 @@
</httpCaching> </httpCaching>
</requestDispatcher> </requestDispatcher>
<requestHandler name="/select" class="solr.SearchHandler">
<!-- 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">
<!-- default values for query parameters --> <!-- default values for query parameters -->
<lst name="defaults"> <lst name="defaults">
<str name="echoParams">explicit</str> <str name="echoParams">explicit</str>

2
solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentTest.java
View File

@ -66,7 +66,7 @@ public class ClusteringComponentTest extends AbstractClusteringTestCase {
params.add(ClusteringParams.USE_SEARCH_RESULTS, "true"); params.add(ClusteringParams.USE_SEARCH_RESULTS, "true");
SolrRequestHandler handler = core.getRequestHandler("standard"); SolrRequestHandler handler = core.getRequestHandler("/select");
SolrQueryResponse rsp; SolrQueryResponse rsp;
rsp = new SolrQueryResponse(); rsp = new SolrQueryResponse();
rsp.addResponseHeader(new SimpleOrderedMap<>()); rsp.addResponseHeader(new SimpleOrderedMap<>());

40
solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-solrconfig.xml
View File

@ -144,21 +144,21 @@
and there is a current searcher handling requests (aka registered). --> and there is a current searcher handling requests (aka registered). -->
<!-- QuerySenderListener takes an array of NamedList and executes a <!-- QuerySenderListener takes an array of NamedList and executes a
local query request for each NamedList in sequence. --> local query request for each NamedList in sequence. -->
<listener event="newSearcher" class="solr.QuerySenderListener"> <!--<listener event="newSearcher" class="solr.QuerySenderListener">-->
<arr name="queries"> <!--<arr name="queries">-->
<lst> <str name="q">solr</str> <str name="start">0</str> <str name="rows">10</str> </lst> <!--<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">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> <!--<lst><str name="q">static newSearcher warming query from solrconfig.xml</str></lst>-->
</arr> <!--</arr>-->
</listener> <!--</listener>-->
<!-- a firstSearcher event is fired whenever a new searcher is being <!-- a firstSearcher event is fired whenever a new searcher is being
prepared but there is no current registered searcher to handle prepared but there is no current registered searcher to handle
requests or to gain autowarming data from. --> requests or to gain autowarming data from. -->
<listener event="firstSearcher" class="solr.QuerySenderListener"> <!--<listener event="firstSearcher" class="solr.QuerySenderListener">-->
<arr name="queries"> <!--<arr name="queries">-->
</arr> <!--</arr>-->
</listener> <!--</listener>-->
<!-- If a search request comes in and there is no current registered searcher, <!-- If a search request comes in and there is no current registered searcher,
then immediately register the still warming searcher and use it. If then immediately register the still warming searcher and use it. If
@ -173,12 +173,7 @@
</query> </query>
<!-- <requestDispatcher>
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" >
<!--Make sure your system has some authentication before enabling remote streaming! <!--Make sure your system has some authentication before enabling remote streaming!
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" /> <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
--> -->
@ -220,16 +215,7 @@
</httpCaching> </httpCaching>
</requestDispatcher> </requestDispatcher>
<requestHandler name="/select" class="solr.SearchHandler">
<!-- 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">
<!-- default values for query parameters --> <!-- default values for query parameters -->
<lst name="defaults"> <lst name="defaults">
<str name="echoParams">explicit</str> <str name="echoParams">explicit</str>

40
solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/contentstream-solrconfig.xml
View File

@ -144,21 +144,21 @@
and there is a current searcher handling requests (aka registered). --> and there is a current searcher handling requests (aka registered). -->
<!-- QuerySenderListener takes an array of NamedList and executes a <!-- QuerySenderListener takes an array of NamedList and executes a
local query request for each NamedList in sequence. --> local query request for each NamedList in sequence. -->
<listener event="newSearcher" class="solr.QuerySenderListener"> <!--<listener event="newSearcher" class="solr.QuerySenderListener">-->
<arr name="queries"> <!--<arr name="queries">-->
<lst> <str name="q">solr</str> <str name="start">0</str> <str name="rows">10</str> </lst> <!--<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">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> <!--<lst><str name="q">static newSearcher warming query from solrconfig.xml</str></lst>-->
</arr> <!--</arr>-->
</listener> <!--</listener>-->
<!-- a firstSearcher event is fired whenever a new searcher is being <!-- a firstSearcher event is fired whenever a new searcher is being
prepared but there is no current registered searcher to handle prepared but there is no current registered searcher to handle
requests or to gain autowarming data from. --> requests or to gain autowarming data from. -->
<listener event="firstSearcher" class="solr.QuerySenderListener"> <!--<listener event="firstSearcher" class="solr.QuerySenderListener">-->
<arr name="queries"> <!--<arr name="queries">-->
</arr> <!--</arr>-->
</listener> <!--</listener>-->
<!-- If a search request comes in and there is no current registered searcher, <!-- If a search request comes in and there is no current registered searcher,
then immediately register the still warming searcher and use it. If then immediately register the still warming searcher and use it. If
@ -173,12 +173,7 @@
</query> </query>
<!-- <requestDispatcher>
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" >
<!--Make sure your system has some authentication before enabling remote streaming! <!--Make sure your system has some authentication before enabling remote streaming!
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" /> <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
--> -->
@ -220,16 +215,7 @@
</httpCaching> </httpCaching>
</requestDispatcher> </requestDispatcher>
<requestHandler name="/select" class="solr.SearchHandler">
<!-- 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">
<!-- default values for query parameters --> <!-- default values for query parameters -->
<lst name="defaults"> <lst name="defaults">
<str name="echoParams">explicit</str> <str name="echoParams">explicit</str>

40
solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-nodatasource-solrconfig.xml
View File

@ -146,21 +146,21 @@
and there is a current searcher handling requests (aka registered). --> and there is a current searcher handling requests (aka registered). -->
<!-- QuerySenderListener takes an array of NamedList and executes a <!-- QuerySenderListener takes an array of NamedList and executes a
local query request for each NamedList in sequence. --> local query request for each NamedList in sequence. -->
<listener event="newSearcher" class="solr.QuerySenderListener"> <!--<listener event="newSearcher" class="solr.QuerySenderListener">-->
<arr name="queries"> <!--<arr name="queries">-->
<lst> <str name="q">solr</str> <str name="start">0</str> <str name="rows">10</str> </lst> <!--<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">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> <!--<lst><str name="q">static newSearcher warming query from solrconfig.xml</str></lst>-->
</arr> <!--</arr>-->
</listener> <!--</listener>-->
<!-- a firstSearcher event is fired whenever a new searcher is being <!-- a firstSearcher event is fired whenever a new searcher is being
prepared but there is no current registered searcher to handle prepared but there is no current registered searcher to handle
requests or to gain autowarming data from. --> requests or to gain autowarming data from. -->
<listener event="firstSearcher" class="solr.QuerySenderListener"> <!--<listener event="firstSearcher" class="solr.QuerySenderListener">-->
<arr name="queries"> <!--<arr name="queries">-->
</arr> <!--</arr>-->
</listener> <!--</listener>-->
<!-- If a search request comes in and there is no current registered searcher, <!-- If a search request comes in and there is no current registered searcher,
then immediately register the still warming searcher and use it. If then immediately register the still warming searcher and use it. If
@ -175,12 +175,7 @@
</query> </query>
<!-- <requestDispatcher>
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" >
<!--Make sure your system has some authentication before enabling remote streaming! <!--Make sure your system has some authentication before enabling remote streaming!
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" /> <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
--> -->
@ -222,16 +217,7 @@
</httpCaching> </httpCaching>
</requestDispatcher> </requestDispatcher>
<requestHandler name="/select" class="solr.SearchHandler">
<!-- 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">
<!-- default values for query parameters --> <!-- default values for query parameters -->
<lst name="defaults"> <lst name="defaults">
<str name="echoParams">explicit</str> <str name="echoParams">explicit</str>

40
solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solrconfig.xml
View File

@ -144,21 +144,21 @@
and there is a current searcher handling requests (aka registered). --> and there is a current searcher handling requests (aka registered). -->
<!-- QuerySenderListener takes an array of NamedList and executes a <!-- QuerySenderListener takes an array of NamedList and executes a
local query request for each NamedList in sequence. --> local query request for each NamedList in sequence. -->
<listener event="newSearcher" class="solr.QuerySenderListener"> <!--<listener event="newSearcher" class="solr.QuerySenderListener">-->
<arr name="queries"> <!--<arr name="queries">-->
<lst> <str name="q">solr</str> <str name="start">0</str> <str name="rows">10</str> </lst> <!--<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">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> <!--<lst><str name="q">static newSearcher warming query from solrconfig.xml</str></lst>-->
</arr> <!--</arr>-->
</listener> <!--</listener>-->
<!-- a firstSearcher event is fired whenever a new searcher is being <!-- a firstSearcher event is fired whenever a new searcher is being
prepared but there is no current registered searcher to handle prepared but there is no current registered searcher to handle
requests or to gain autowarming data from. --> requests or to gain autowarming data from. -->
<listener event="firstSearcher" class="solr.QuerySenderListener"> <!--<listener event="firstSearcher" class="solr.QuerySenderListener">-->
<arr name="queries"> <!--<arr name="queries">-->
</arr> <!--</arr>-->
</listener> <!--</listener>-->
<!-- If a search request comes in and there is no current registered searcher, <!-- If a search request comes in and there is no current registered searcher,
then immediately register the still warming searcher and use it. If then immediately register the still warming searcher and use it. If
@ -173,12 +173,7 @@
</query> </query>
<!-- <requestDispatcher>
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" >
<!--Make sure your system has some authentication before enabling remote streaming! <!--Make sure your system has some authentication before enabling remote streaming!
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" /> <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
--> -->
@ -220,16 +215,7 @@
</httpCaching> </httpCaching>
</requestDispatcher> </requestDispatcher>
<requestHandler name="/select" class="solr.SearchHandler">
<!-- 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">
<!-- default values for query parameters --> <!-- default values for query parameters -->
<lst name="defaults"> <lst name="defaults">
<str name="echoParams">explicit</str> <str name="echoParams">explicit</str>

37
solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml
View File

@ -149,42 +149,9 @@
</query> </query>
<!-- An alternate set representation that uses an integer hash to store filters (sets of docids). <requestHandler name="/select" class="solr.SearchHandler">
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">
<bool name="httpCaching">true</bool> <bool name="httpCaching">true</bool>
</requestHandler> </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"> <requestHandler name="/update/extract" class="org.apache.solr.handler.extraction.ExtractingRequestHandler">
<str name="parseContext.config">parseContext.xml</str> <str name="parseContext.config">parseContext.xml</str>
@ -227,7 +194,7 @@
</highlighting> </highlighting>
<requestDispatcher handleSelect="true" > <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" /> <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false"> <httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl> <cacheControl>max-age=30, public</cacheControl>

2
solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/TestXLSXResponseWriter.java
View File

@ -228,7 +228,7 @@ public class TestXLSXResponseWriter extends SolrTestCaseJ4 {
// returns first worksheet as XLSXResponseWriter only returns one sheet // returns first worksheet as XLSXResponseWriter only returns one sheet
private XSSFSheet getWSResultForQuery(SolrQueryRequest req) throws IOException, Exception { private XSSFSheet getWSResultForQuery(SolrQueryRequest req) throws IOException, Exception {
SolrQueryResponse rsp = h.queryAndResponse("standard", req); SolrQueryResponse rsp = h.queryAndResponse("", req);
return getWSResultForQuery(req, rsp); return getWSResultForQuery(req, rsp);
} }

4
solr/contrib/langid/src/test-files/langid/solr/collection1/conf/solrconfig-languageidentifier.xml
View File

@ -44,11 +44,11 @@
</lst> </lst>
</requestHandler> </requestHandler>
<requestHandler name="standard" class="solr.StandardRequestHandler"> <requestHandler name="/select" class="solr.SearchHandler">
<bool name="httpCaching">true</bool> <bool name="httpCaching">true</bool>
</requestHandler> </requestHandler>
<requestDispatcher handleSelect="true" > <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" /> <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false"> <httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl> <cacheControl>max-age=30, public</cacheControl>

25
solr/contrib/uima/src/test-files/uima/solr/collection1/conf/solrconfig.xml
View File

@ -315,12 +315,7 @@
</query> </query>
<!-- <requestDispatcher>
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">
<!-- <!--
Make sure your system has some authentication before enabling Make sure your system has some authentication before enabling
remote streaming! remote streaming!
@ -360,17 +355,7 @@
</httpCaching> </httpCaching>
</requestDispatcher> </requestDispatcher>
<requestHandler name="/select" class="solr.SearchHandler">
<!--
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">
<!-- default values for query parameters --> <!-- default values for query parameters -->
<lst name="defaults"> <lst name="defaults">
<str name="echoParams">explicit</str> <str name="echoParams">explicit</str>
@ -387,7 +372,7 @@
standard SearchHandler with a default query parser of "dismax". see standard SearchHandler with a default query parser of "dismax". see
http://wiki.apache.org/solr/DisMaxRequestHandler http://wiki.apache.org/solr/DisMaxRequestHandler
--> -->
<requestHandler name="dismax" class="solr.SearchHandler"> <requestHandler name="/dismax" class="solr.SearchHandler">
<lst name="defaults"> <lst name="defaults">
<str name="defType">dismax</str> <str name="defType">dismax</str>
<str name="echoParams">explicit</str> <str name="echoParams">explicit</str>
@ -427,7 +412,7 @@
Note how you can register the same handler multiple times with Note how you can register the same handler multiple times with
different names (and different init parameters) different names (and different init parameters)
--> -->
<requestHandler name="partitioned" class="solr.SearchHandler"> <requestHandler name="/partitioned" class="solr.SearchHandler">
<lst name="defaults"> <lst name="defaults">
<str name="defType">dismax</str> <str name="defType">dismax</str>
<str name="echoParams">explicit</str> <str name="echoParams">explicit</str>
@ -568,7 +553,7 @@
example. You will likely want to add the component to your already example. You will likely want to add the component to your already
specified request handlers. specified request handlers.
--> -->
<requestHandler name="tvrh" <requestHandler name="/tvrh"
class="org.apache.solr.handler.component.SearchHandler"> class="org.apache.solr.handler.component.SearchHandler">
<lst name="defaults"> <lst name="defaults">
<bool name="tv">true</bool> <bool name="tv">true</bool>

15
solr/contrib/uima/src/test-files/uima/uima-tokenizers-solrconfig.xml
View File

@ -314,12 +314,7 @@
</query> </query>
<!-- <requestDispatcher>
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">
<!-- <!--
Make sure your system has some authentication before enabling Make sure your system has some authentication before enabling
remote streaming! remote streaming!
@ -368,7 +363,7 @@
http://host/app/select?qt=name If no qt is defined, the http://host/app/select?qt=name If no qt is defined, the
requestHandler that declares default="true" will be used. requestHandler that declares default="true" will be used.
--> -->
<requestHandler name="standard" class="solr.SearchHandler" <requestHandler name="/select" class="solr.SearchHandler"
default="true"> default="true">
<!-- default values for query parameters --> <!-- default values for query parameters -->
<lst name="defaults"> <lst name="defaults">
@ -386,7 +381,7 @@
standard SearchHandler with a default query parser of "dismax". see standard SearchHandler with a default query parser of "dismax". see
http://wiki.apache.org/solr/DisMaxRequestHandler http://wiki.apache.org/solr/DisMaxRequestHandler
--> -->
<requestHandler name="dismax" class="solr.SearchHandler"> <requestHandler name="/dismax" class="solr.SearchHandler">
<lst name="defaults"> <lst name="defaults">
<str name="defType">dismax</str> <str name="defType">dismax</str>
<str name="echoParams">explicit</str> <str name="echoParams">explicit</str>
@ -426,7 +421,7 @@
Note how you can register the same handler multiple times with Note how you can register the same handler multiple times with
different names (and different init parameters) different names (and different init parameters)
--> -->
<requestHandler name="partitioned" class="solr.SearchHandler"> <requestHandler name="/partitioned" class="solr.SearchHandler">
<lst name="defaults"> <lst name="defaults">
<str name="defType">dismax</str> <str name="defType">dismax</str>
<str name="echoParams">explicit</str> <str name="echoParams">explicit</str>
@ -567,7 +562,7 @@
example. You will likely want to add the component to your already example. You will likely want to add the component to your already
specified request handlers. specified request handlers.
--> -->
<requestHandler name="tvrh" <requestHandler name="/tvrh"
class="org.apache.solr.handler.component.SearchHandler"> class="org.apache.solr.handler.component.SearchHandler">
<lst name="defaults"> <lst name="defaults">
<bool name="tv">true</bool> <bool name="tv">true</bool>

3
solr/core/src/java/org/apache/solr/core/SolrConfig.java
View File

@ -308,9 +308,8 @@ public class SolrConfig extends Config implements MapSerializable {
enableRemoteStreams = getBool( enableRemoteStreams = getBool(
"requestDispatcher/requestParsers/@enableRemoteStreaming", false); "requestDispatcher/requestParsers/@enableRemoteStreaming", false);
// Let this filter take care of /select?xxx format
handleSelect = getBool( handleSelect = getBool(
"requestDispatcher/@handleSelect", true); "requestDispatcher/@handleSelect", !luceneMatchVersion.onOrAfter(Version.LUCENE_7_0_0));
addHttpRequestToContext = getBool( addHttpRequestToContext = getBool(
"requestDispatcher/requestParsers/@addHttpRequestToContext", false); "requestDispatcher/requestParsers/@addHttpRequestToContext", false);

2
solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
View File

@ -249,7 +249,7 @@ public class MoreLikeThisHandler extends RequestHandlerBase
dbgQuery = true; dbgQuery = true;
dbgResults = 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) { if (dbg == true) {
try { try {
NamedList<Object> dbgInfo = SolrPluginUtils.doStandardDebug(req, q, mlt.getRawMLTQuery(), mltDocs.docList, dbgQuery, dbgResults); NamedList<Object> dbgInfo = SolrPluginUtils.doStandardDebug(req, q, mlt.getRawMLTQuery(), mltDocs.docList, dbgQuery, dbgResults);

1
solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java
View File

@ -125,7 +125,6 @@ public abstract class RequestHandlerBase implements SolrRequestHandler, SolrInfo
public void init(NamedList args) { public void init(NamedList args) {
initArgs = args; initArgs = args;
// Copied from StandardRequestHandler
if( args != null ) { if( args != null ) {
defaults = getSolrParamsFromNamedList(args, "defaults"); defaults = getSolrParamsFromNamedList(args, "defaults");
appends = getSolrParamsFromNamedList(args, "appends"); appends = getSolrParamsFromNamedList(args, "appends");

19
solr/core/src/java/org/apache/solr/handler/StandardRequestHandler.java
View File

@ -18,24 +18,7 @@ package org.apache.solr.handler;
import org.apache.solr.handler.component.*; import org.apache.solr.handler.component.*;
/** @Deprecated
*
*
* 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>
*
*/
public class StandardRequestHandler extends SearchHandler public class StandardRequestHandler extends SearchHandler
{ {
//////////////////////// SolrInfoMBeans methods ////////////////////// //////////////////////// SolrInfoMBeans methods //////////////////////

12
solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java
View File

@ -88,17 +88,7 @@ import static org.apache.solr.core.PluginInfo.INVARIANTS;
import static org.apache.solr.core.RequestParams.USEPARAM; import static org.apache.solr.core.RequestParams.USEPARAM;
/** /**
* <p>Utilities that may be of use to RequestHandlers.</p> * Utilities that may be of use to RequestHandlers.
*
* <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.
*/ */
public class SolrPluginUtils { public class SolrPluginUtils {

2
solr/core/src/resources/SystemCollectionSolrConfig.xml
View File

@ -10,7 +10,7 @@
<maxDocs>1</maxDocs> <maxDocs>1</maxDocs>
<openSearcher>true</openSearcher> <openSearcher>true</openSearcher>
</autoCommit></updateHandler> </autoCommit></updateHandler>
<requestHandler name="standard" class="solr.StandardRequestHandler" default="true" /> <requestHandler name="/select" class="solr.SearchHandler" default="true" />
<requestHandler name="/blob" class="solr.BlobHandler"> <requestHandler name="/blob" class="solr.BlobHandler">
<lst name="invariants"> <lst name="invariants">
<str name="maxSize">${blob.max.size.mb:5}</str> <str name="maxSize">${blob.max.size.mb:5}</str>

2
solr/core/src/test-files/solr/collection1/conf/bad-error-solrconfig.xml
View File

@ -23,7 +23,7 @@
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion> <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"/> <schemaFactory class="ClassicIndexSchemaFactory"/>

2
solr/core/src/test-files/solr/collection1/conf/bad-mpf-solrconfig.xml
View File

@ -30,7 +30,7 @@
</indexConfig> </indexConfig>
<updateHandler class="solr.DirectUpdateHandler2"/> <updateHandler class="solr.DirectUpdateHandler2"/>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler> <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
<schemaFactory class="ClassicIndexSchemaFactory"/> <schemaFactory class="ClassicIndexSchemaFactory"/>

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-add-schema-fields-update-processor-chains.xml
View File

@ -23,7 +23,7 @@
--> -->
<config> <config>
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion> <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}"/> <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<schemaFactory class="ManagedIndexSchemaFactory"> <schemaFactory class="ManagedIndexSchemaFactory">

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-altdirectory.xml
View File

@ -20,7 +20,7 @@
<config> <config>
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion> <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <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> <directoryFactory name="DirectoryFactory" class="org.apache.solr.core.AlternateDirectoryTest$TestFSDirectoryFactory"></directoryFactory>
<indexReaderFactory name="IndexReaderFactory" class="org.apache.solr.core.AlternateDirectoryTest$TestIndexReaderFactory"></indexReaderFactory > <indexReaderFactory name="IndexReaderFactory" class="org.apache.solr.core.AlternateDirectoryTest$TestIndexReaderFactory"></indexReaderFactory >
<schemaFactory class="ClassicIndexSchemaFactory"/> <schemaFactory class="ClassicIndexSchemaFactory"/>

227
solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml
View File

@ -187,233 +187,12 @@
If the set cardinality <= maxSize elements, then HashDocSet will be used instead of the bitset If the set cardinality <= maxSize elements, then HashDocSet will be used instead of the bitset
based HashBitset. --> based HashBitset. -->
<!-- requestHandler plugins... incoming queries will be dispatched to the <!-- requestHandler plugins.
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> <bool name="httpCaching">true</bool>
</requestHandler> </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&lt;-1 5&lt;-2 6&lt;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"> <searchComponent class="solr.HighlightComponent" name="highlight">
<highlighting> <highlighting>
<!-- Configure the standard fragmenter --> <!-- Configure the standard fragmenter -->
@ -461,7 +240,7 @@ based HashBitset. -->
</highlighting> </highlighting>
</searchComponent> </searchComponent>
<requestDispatcher handleSelect="true" > <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" /> <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false"> <httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl> <cacheControl>max-age=30, public</cacheControl>

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-basic.xml
View File

@ -25,5 +25,5 @@
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/> <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<schemaFactory class="ClassicIndexSchemaFactory"/> <schemaFactory class="ClassicIndexSchemaFactory"/>
<requestHandler name="standard" class="solr.StandardRequestHandler" /> <requestHandler name="/select" class="solr.SearchHandler" />
</config> </config>

11
solr/core/src/test-files/solr/collection1/conf/solrconfig-blockjoinfacetcomponent.xml
View File

@ -24,8 +24,7 @@
<schemaFactory class="ClassicIndexSchemaFactory"/> <schemaFactory class="ClassicIndexSchemaFactory"/>
<dataDir>${solr.data.dir:}</dataDir> <dataDir>${solr.data.dir:}</dataDir>
<requestHandler name="standard" class="solr.StandardRequestHandler"> <requestHandler name="/select" class="solr.SearchHandler" />
</requestHandler>
<requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" /> <requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" />
@ -38,18 +37,18 @@
<searchComponent name="blockJoinFacet" class="org.apache.solr.search.join.BlockJoinFacetComponent"/> <searchComponent name="blockJoinFacet" class="org.apache.solr.search.join.BlockJoinFacetComponent"/>
<searchComponent name="blockJoinDocSetFacet" class="org.apache.solr.search.join.BlockJoinDocSetFacetComponent"/> <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"> <lst name="defaults">
<str name="shards.qt">blockJoinFacetRH</str> <str name="shards.qt">/blockJoinFacetRH</str>
</lst> </lst>
<arr name="last-components"> <arr name="last-components">
<str>blockJoinFacet</str> <str>blockJoinFacet</str>
</arr> </arr>
</requestHandler> </requestHandler>
<requestHandler name="blockJoinDocSetFacetRH" class="org.apache.solr.handler.component.SearchHandler"> <requestHandler name="/blockJoinDocSetFacetRH" class="org.apache.solr.handler.component.SearchHandler">
<lst name="defaults"> <lst name="defaults">
<str name="shards.qt">blockJoinDocSetFacetRH</str> <str name="shards.qt">/blockJoinDocSetFacetRH</str>
</lst> </lst>
<arr name="last-components"> <arr name="last-components">
<str>blockJoinDocSetFacet</str> <str>blockJoinDocSetFacet</str>

4
solr/core/src/test-files/solr/collection1/conf/solrconfig-cache-enable-disable.xml
View File

@ -23,7 +23,7 @@
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/> <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<schemaFactory class="ClassicIndexSchemaFactory"/> <schemaFactory class="ClassicIndexSchemaFactory"/>
<requestHandler name="standard" class="solr.StandardRequestHandler" /> <requestHandler name="/select" class="solr.SearchHandler" />
<query> <query>
<!-- Maximum number of clauses in a boolean query... can affect <!-- Maximum number of clauses in a boolean query... can affect
@ -74,7 +74,7 @@
</query> </query>
<initParams path="standard"> <initParams path="/select">
<lst name="defaults"> <lst name="defaults">
<str name="df">text</str> <str name="df">text</str>
</lst> </lst>

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-cdcr.xml
View File

@ -37,7 +37,7 @@
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <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>
<requestHandler name="/update" class="solr.UpdateRequestHandler"> <requestHandler name="/update" class="solr.UpdateRequestHandler">

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-cdcrupdatelog.xml
View File

@ -37,7 +37,7 @@
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <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>
<updateHandler class="solr.DirectUpdateHandler2"> <updateHandler class="solr.DirectUpdateHandler2">

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-classification.xml
View File

@ -23,7 +23,7 @@
<config> <config>
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion> <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="solrconfig.snippet.randomindexconfig.xml"/> <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}"/> <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<schemaFactory class="ClassicIndexSchemaFactory"/> <schemaFactory class="ClassicIndexSchemaFactory"/>

121
solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml
View File

@ -192,51 +192,10 @@ based HashBitset. -->
The "standard" request handler is the default and will be used if qt The "standard" request handler is the default and will be used if qt
is not specified in the request. is not specified in the request.
--> -->
<requestHandler name="standard" class="solr.StandardRequestHandler"> <requestHandler name="/select" class="solr.SearchHandler">
<bool name="httpCaching">true</bool> <bool name="httpCaching">true</bool>
</requestHandler> </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&lt;-1 5&lt;-2 6&lt;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"> <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 --> <!-- This is slightly different from the field value so we can test dealing with token offset changes -->
<str name="queryAnalyzerFieldType">a_s</str> <str name="queryAnalyzerFieldType">a_s</str>
@ -249,20 +208,13 @@ based HashBitset. -->
</lst> </lst>
</searchComponent> </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 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. 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"/> <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"> <lst name="defaults">
<str name="spellcheck.dictionary">direct</str> <str name="spellcheck.dictionary">direct</str>
<str name="spellcheck.onlyMorePopular">false</str> <str name="spellcheck.onlyMorePopular">false</str>
@ -274,21 +226,6 @@ based HashBitset. -->
</arr> </arr>
</requestHandler> </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 --> <!-- test elevation -->
<searchComponent name="elevate" class="org.apache.solr.handler.component.QueryElevationComponent" > <searchComponent name="elevate" class="org.apache.solr.handler.component.QueryElevationComponent" >
<str name="queryFieldType">string</str> <str name="queryFieldType">string</str>
@ -305,57 +242,7 @@ based HashBitset. -->
</arr> </arr>
</requestHandler> </requestHandler>
<requestHandler name="/mlt" class="solr.MoreLikeThisHandler"> <requestDispatcher>
</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">.,!? &#9;&#10;&#13;</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" >
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" /> <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false"> <httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl> <cacheControl>max-age=30, public</cacheControl>
@ -447,7 +334,7 @@ based HashBitset. -->
<processor class="solr.RunUpdateProcessorFactory" /> <processor class="solr.RunUpdateProcessorFactory" />
</updateRequestProcessorChain> </updateRequestProcessorChain>
<initParams path="/elevate,standard"> <initParams path="/elevate,/select">
<lst name="defaults"> <lst name="defaults">
<str name="df">text</str> <str name="df">text</str>
</lst> </lst>

4
solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml
View File

@ -42,7 +42,7 @@
<queryResponseWriter name="xml" default="true" <queryResponseWriter name="xml" default="true"
class="solr.XMLResponseWriter" /> class="solr.XMLResponseWriter" />
<requestHandler name="standard" class="solr.StandardRequestHandler"> <requestHandler name="/select" class="solr.SearchHandler">
<bool name="httpCaching">true</bool> <bool name="httpCaching">true</bool>
<arr name="first-components"> <arr name="first-components">
<str>component1</str> <str>component1</str>
@ -52,7 +52,7 @@
</arr> </arr>
</requestHandler> </requestHandler>
<requestDispatcher handleSelect="true" > <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" /> <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false"> <httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl> <cacheControl>max-age=30, public</cacheControl>

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-configurerecoverystrategy.xml
View File

@ -20,7 +20,7 @@
<config> <config>
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion> <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <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> <recoveryStrategy>
<int name="maxRetries">250</int> <int name="maxRetries">250</int>
</recoveryStrategy> </recoveryStrategy>

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-customrecoverystrategy.xml
View File

@ -20,7 +20,7 @@
<config> <config>
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion> <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <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 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. are not supported between versions in terms of API or back compat behaviour.

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-delaying-component.xml
View File

@ -34,7 +34,7 @@
</arr> </arr>
</requestHandler> </requestHandler>
<requestDispatcher handleSelect="true" > <requestDispatcher >
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" /> <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
<httpCaching never304="true" /> <httpCaching never304="true" />
</requestDispatcher> </requestDispatcher>

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy1.xml
View File

@ -23,7 +23,7 @@
<schemaFactory class="ClassicIndexSchemaFactory"/> <schemaFactory class="ClassicIndexSchemaFactory"/>
<updateHandler class="solr.DirectUpdateHandler2"/> <updateHandler class="solr.DirectUpdateHandler2"/>
<requestHandler name="standard" class="solr.StandardRequestHandler"/> <requestHandler name="/select" class="solr.SearchHandler"/>
<indexConfig> <indexConfig>
<!-- we can't include solrconfig.snippet.randomindexconfig.xml because we need <!-- we can't include solrconfig.snippet.randomindexconfig.xml because we need

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy2.xml
View File

@ -43,6 +43,6 @@
</deletionPolicy> </deletionPolicy>
</indexConfig> </indexConfig>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler> <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
</config> </config>

3
solr/core/src/test-files/solr/collection1/conf/solrconfig-distrib-update-processor-chains.xml
View File

@ -43,8 +43,7 @@
<processor class="solr.RunUpdateProcessorFactory" /> <processor class="solr.RunUpdateProcessorFactory" />
</updateRequestProcessorChain> </updateRequestProcessorChain>
<requestHandler name="standard" class="solr.StandardRequestHandler"> <requestHandler name="/select" class="solr.SearchHandler"/>
</requestHandler>
<requestHandler name="/get" class="solr.RealTimeGetHandler"> <requestHandler name="/get" class="solr.RealTimeGetHandler">
<lst name="defaults"> <lst name="defaults">

4
solr/core/src/test-files/solr/collection1/conf/solrconfig-doctransformers.xml
View File

@ -37,9 +37,9 @@
<transformer name="custom" class="org.apache.solr.response.TestCustomDocTransformer$CustomTransformerFactory" /> <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" /> <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
</requestDispatcher> </requestDispatcher>

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml
View File

@ -150,7 +150,7 @@
</arr> </arr>
</requestHandler>--> </requestHandler>-->
<requestDispatcher handleSelect="true" > <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" /> <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false"> <httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl> <cacheControl>max-age=30, public</cacheControl>

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-externalversionconstraint.xml
View File

@ -109,7 +109,7 @@
<processor class="solr.RunUpdateProcessorFactory" /> <processor class="solr.RunUpdateProcessorFactory" />
</updateRequestProcessorChain> </updateRequestProcessorChain>
<requestHandler name="standard" class="solr.StandardRequestHandler"> <requestHandler name="/select" class="solr.SearchHandler">
</requestHandler> </requestHandler>

4
solr/core/src/test-files/solr/collection1/conf/solrconfig-functionquery.xml
View File

@ -28,7 +28,7 @@
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/> <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<schemaFactory class="ClassicIndexSchemaFactory"/> <schemaFactory class="ClassicIndexSchemaFactory"/>
<requestHandler name="standard" class="solr.StandardRequestHandler"/> <requestHandler name="/select" class="solr.SearchHandler"/>
<updateHandler class="solr.DirectUpdateHandler2"/> <updateHandler class="solr.DirectUpdateHandler2"/>
@ -39,7 +39,7 @@
<valueSourceParser name="nvl" class="org.apache.solr.search.function.NvlValueSourceParser"> <valueSourceParser name="nvl" class="org.apache.solr.search.function.NvlValueSourceParser">
<float name="nvlFloatValue">0.0</float> <float name="nvlFloatValue">0.0</float>
</valueSourceParser> </valueSourceParser>
<initParams path="standard"> <initParams path="/select">
<lst name="defaults"> <lst name="defaults">
<str name="df">text</str> <str name="df">text</str>
</lst> </lst>

4
solr/core/src/test-files/solr/collection1/conf/solrconfig-hash.xml
View File

@ -46,11 +46,11 @@
</lst> </lst>
</requestHandler> </requestHandler>
<requestDispatcher handleSelect="true" > <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" /> <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
</requestDispatcher> </requestDispatcher>
<requestHandler name="standard" class="solr.StandardRequestHandler" default="true" /> <requestHandler name="/select" class="solr.SearchHandler" />
<!-- config for the admin interface --> <!-- config for the admin interface -->
<admin> <admin>

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-headers.xml
View File

@ -24,7 +24,7 @@
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/> <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<schemaFactory class="ClassicIndexSchemaFactory"/> <schemaFactory class="ClassicIndexSchemaFactory"/>
<searchComponent name="componentThatAddsHeader" class="org.apache.solr.servlet.ResponseHeaderTest$ComponentThatAddsHeader"/> <searchComponent name="componentThatAddsHeader" class="org.apache.solr.servlet.ResponseHeaderTest$ComponentThatAddsHeader"/>
<requestHandler name="/withHeaders" class="solr.StandardRequestHandler"> <requestHandler name="/withHeaders" class="solr.SearchHandler">
<arr name="first-components"> <arr name="first-components">
<str>componentThatAddsHeader</str> <str>componentThatAddsHeader</str>
</arr> </arr>

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-highlight.xml
View File

@ -31,7 +31,7 @@
<updateHandler class="solr.DirectUpdateHandler2"> <updateHandler class="solr.DirectUpdateHandler2">
</updateHandler> </updateHandler>
<requestHandler name="standard" class="solr.StandardRequestHandler"/> <requestHandler name="/select" class="solr.SearchHandler"/>
<searchComponent class="solr.HighlightComponent" name="highlight"> <searchComponent class="solr.HighlightComponent" name="highlight">
<highlighting class="org.apache.solr.highlight.DummyHighlighter"> <highlighting class="org.apache.solr.highlight.DummyHighlighter">

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-implicitproperties.xml
View File

@ -49,7 +49,7 @@
</query> </query>
<requestDispatcher handleSelect="false"> <requestDispatcher>
<httpCaching never304="true"/> <httpCaching never304="true"/>
</requestDispatcher> </requestDispatcher>

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-infixsuggesters.xml
View File

@ -25,7 +25,7 @@
<updateHandler class="solr.DirectUpdateHandler2"/> <updateHandler class="solr.DirectUpdateHandler2"/>
<requestHandler name="standard" class="solr.StandardRequestHandler" /> <requestHandler name="/select" class="solr.SearchHandler" />
<searchComponent class="solr.SuggestComponent" name="analyzing_infix_suggester_random_short_dictionary"> <searchComponent class="solr.SuggestComponent" name="analyzing_infix_suggester_random_short_dictionary">
<lst name="suggester"> <lst name="suggester">

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-logmergepolicyfactory.xml
View File

@ -32,6 +32,6 @@
</mergePolicyFactory> </mergePolicyFactory>
</indexConfig> </indexConfig>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler> <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
</config> </config>

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema-test.xml
View File

@ -23,5 +23,5 @@
<dataDir>${solr.data.dir:}</dataDir> <dataDir>${solr.data.dir:}</dataDir>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/> <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<requestHandler name="standard" class="solr.StandardRequestHandler" /> <requestHandler name="/select" class="solr.SearchHandler" />
</config> </config>

4
solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema.xml
View File

@ -60,7 +60,7 @@
</updateLog> </updateLog>
</updateHandler> </updateHandler>
<requestHandler name="standard" class="solr.StandardRequestHandler"> <requestHandler name="/select" class="solr.SearchHandler">
<bool name="httpCaching">true</bool> <bool name="httpCaching">true</bool>
</requestHandler> </requestHandler>
@ -72,7 +72,7 @@
</lst> </lst>
</requestHandler> </requestHandler>
<initParams path="standard"> <initParams path="/select">
<lst name="defaults"> <lst name="defaults">
<str name="df">text</str> <str name="df">text</str>
</lst> </lst>

8
solr/core/src/test-files/solr/collection1/conf/solrconfig-master-throttled.xml
View File

@ -28,7 +28,7 @@
<updateHandler class="solr.DirectUpdateHandler2"> <updateHandler class="solr.DirectUpdateHandler2">
</updateHandler> </updateHandler>
<requestHandler name="standard" class="solr.StandardRequestHandler"> <requestHandler name="/select" class="solr.SearchHandler">
<bool name="httpCaching">true</bool> <bool name="httpCaching">true</bool>
</requestHandler> </requestHandler>
@ -39,7 +39,7 @@
</requestHandler> </requestHandler>
<!-- test query parameter defaults --> <!-- test query parameter defaults -->
<requestHandler name="defaults" class="solr.StandardRequestHandler"> <requestHandler name="/defaults" class="solr.SearchHandler">
<lst name="defaults"> <lst name="defaults">
<int name="rows">4</int> <int name="rows">4</int>
<bool name="hl">true</bool> <bool name="hl">true</bool>
@ -48,7 +48,7 @@
</requestHandler> </requestHandler>
<!-- test query parameter defaults --> <!-- test query parameter defaults -->
<requestHandler name="lazy" class="solr.StandardRequestHandler" startup="lazy"> <requestHandler name="/lazy" class="solr.SearchHandler" startup="lazy">
<lst name="defaults"> <lst name="defaults">
<int name="rows">4</int> <int name="rows">4</int>
<bool name="hl">true</bool> <bool name="hl">true</bool>
@ -56,7 +56,7 @@
</lst> </lst>
</requestHandler> </requestHandler>
<requestDispatcher handleSelect="true"> <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1"/> <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1"/>
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false"> <httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl> <cacheControl>max-age=30, public</cacheControl>

8
solr/core/src/test-files/solr/collection1/conf/solrconfig-master.xml
View File

@ -28,7 +28,7 @@
<updateHandler class="solr.DirectUpdateHandler2"> <updateHandler class="solr.DirectUpdateHandler2">
</updateHandler> </updateHandler>
<requestHandler name="standard" class="solr.StandardRequestHandler"> <requestHandler name="/select" class="solr.SearchHandler">
<bool name="httpCaching">true</bool> <bool name="httpCaching">true</bool>
</requestHandler> </requestHandler>
@ -43,7 +43,7 @@
</requestHandler> </requestHandler>
<!-- test query parameter defaults --> <!-- test query parameter defaults -->
<requestHandler name="defaults" class="solr.StandardRequestHandler"> <requestHandler name="/defaults" class="solr.SearchHandler">
<lst name="defaults"> <lst name="defaults">
<int name="rows">4</int> <int name="rows">4</int>
<bool name="hl">true</bool> <bool name="hl">true</bool>
@ -52,7 +52,7 @@
</requestHandler> </requestHandler>
<!-- test query parameter defaults --> <!-- test query parameter defaults -->
<requestHandler name="lazy" class="solr.StandardRequestHandler" startup="lazy"> <requestHandler name="/lazy" class="solr.SearchHandler" startup="lazy">
<lst name="defaults"> <lst name="defaults">
<int name="rows">4</int> <int name="rows">4</int>
<bool name="hl">true</bool> <bool name="hl">true</bool>
@ -60,7 +60,7 @@
</lst> </lst>
</requestHandler> </requestHandler>
<requestDispatcher handleSelect="true"> <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1"/> <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1"/>
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false"> <httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl> <cacheControl>max-age=30, public</cacheControl>

4
solr/core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml
View File

@ -27,7 +27,7 @@
<updateHandler class="solr.DirectUpdateHandler2"> <updateHandler class="solr.DirectUpdateHandler2">
</updateHandler> </updateHandler>
<requestHandler name="standard" class="solr.StandardRequestHandler" /> <requestHandler name="/select" class="solr.SearchHandler" />
<requestHandler name="/replication" class="solr.ReplicationHandler"> <requestHandler name="/replication" class="solr.ReplicationHandler">
<lst name="master"> <lst name="master">
@ -39,7 +39,7 @@
</requestHandler> </requestHandler>
<requestDispatcher handleSelect="true"> <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1"/> <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1"/>
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false"> <httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl> <cacheControl>max-age=30, public</cacheControl>

8
solr/core/src/test-files/solr/collection1/conf/solrconfig-master1.xml
View File

@ -28,7 +28,7 @@
<updateHandler class="solr.DirectUpdateHandler2"> <updateHandler class="solr.DirectUpdateHandler2">
</updateHandler> </updateHandler>
<requestHandler name="standard" class="solr.StandardRequestHandler"> <requestHandler name="/select" class="solr.SearchHandler">
<bool name="httpCaching">true</bool> <bool name="httpCaching">true</bool>
</requestHandler> </requestHandler>
@ -41,7 +41,7 @@
</requestHandler> </requestHandler>
<!-- test query parameter defaults --> <!-- test query parameter defaults -->
<requestHandler name="defaults" class="solr.StandardRequestHandler"> <requestHandler name="/defaults" class="solr.SearchHandler">
<lst name="defaults"> <lst name="defaults">
<int name="rows">4</int> <int name="rows">4</int>
<bool name="hl">true</bool> <bool name="hl">true</bool>
@ -50,7 +50,7 @@
</requestHandler> </requestHandler>
<!-- test query parameter defaults --> <!-- test query parameter defaults -->
<requestHandler name="lazy" class="solr.StandardRequestHandler" startup="lazy"> <requestHandler name="/lazy" class="solr.SearchHandler" startup="lazy">
<lst name="defaults"> <lst name="defaults">
<int name="rows">4</int> <int name="rows">4</int>
<bool name="hl">true</bool> <bool name="hl">true</bool>
@ -58,7 +58,7 @@
</lst> </lst>
</requestHandler> </requestHandler>
<requestDispatcher handleSelect="true"> <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1"/> <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1"/>
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false"> <httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl> <cacheControl>max-age=30, public</cacheControl>

8
solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml
View File

@ -27,7 +27,7 @@
<updateHandler class="solr.DirectUpdateHandler2"> <updateHandler class="solr.DirectUpdateHandler2">
</updateHandler> </updateHandler>
<requestHandler name="standard" class="solr.StandardRequestHandler"> <requestHandler name="/select" class="solr.SearchHandler">
<bool name="httpCaching">true</bool> <bool name="httpCaching">true</bool>
</requestHandler> </requestHandler>
@ -39,7 +39,7 @@
</requestHandler> </requestHandler>
<!-- test query parameter defaults --> <!-- test query parameter defaults -->
<requestHandler name="defaults" class="solr.StandardRequestHandler"> <requestHandler name="/defaults" class="solr.SearchHandler">
<lst name="defaults"> <lst name="defaults">
<int name="rows">4</int> <int name="rows">4</int>
<bool name="hl">true</bool> <bool name="hl">true</bool>
@ -48,7 +48,7 @@
</requestHandler> </requestHandler>
<!-- test query parameter defaults --> <!-- test query parameter defaults -->
<requestHandler name="lazy" class="solr.StandardRequestHandler" startup="lazy"> <requestHandler name="/lazy" class="solr.SearchHandler" startup="lazy">
<lst name="defaults"> <lst name="defaults">
<int name="rows">4</int> <int name="rows">4</int>
<bool name="hl">true</bool> <bool name="hl">true</bool>
@ -56,7 +56,7 @@
</lst> </lst>
</requestHandler> </requestHandler>
<requestDispatcher handleSelect="true"> <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1"/> <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1"/>
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false"> <httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl> <cacheControl>max-age=30, public</cacheControl>

8
solr/core/src/test-files/solr/collection1/conf/solrconfig-master3.xml
View File

@ -27,7 +27,7 @@
<updateHandler class="solr.DirectUpdateHandler2"> <updateHandler class="solr.DirectUpdateHandler2">
</updateHandler> </updateHandler>
<requestHandler name="standard" class="solr.StandardRequestHandler"> <requestHandler name="/select" class="solr.SearchHandler">
<bool name="httpCaching">true</bool> <bool name="httpCaching">true</bool>
</requestHandler> </requestHandler>
@ -40,7 +40,7 @@
</requestHandler> </requestHandler>
<!-- test query parameter defaults --> <!-- test query parameter defaults -->
<requestHandler name="defaults" class="solr.StandardRequestHandler"> <requestHandler name="/defaults" class="solr.SearchHandler">
<lst name="defaults"> <lst name="defaults">
<int name="rows">4</int> <int name="rows">4</int>
<bool name="hl">true</bool> <bool name="hl">true</bool>
@ -49,7 +49,7 @@
</requestHandler> </requestHandler>
<!-- test query parameter defaults --> <!-- test query parameter defaults -->
<requestHandler name="lazy" class="solr.StandardRequestHandler" startup="lazy"> <requestHandler name="/lazy" class="solr.SearchHandler" startup="lazy">
<lst name="defaults"> <lst name="defaults">
<int name="rows">4</int> <int name="rows">4</int>
<bool name="hl">true</bool> <bool name="hl">true</bool>
@ -57,7 +57,7 @@
</lst> </lst>
</requestHandler> </requestHandler>
<requestDispatcher handleSelect="true"> <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1"/> <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1"/>
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false"> <httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl> <cacheControl>max-age=30, public</cacheControl>

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-defaults.xml
View File

@ -28,6 +28,6 @@
--> -->
</indexConfig> </indexConfig>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler> <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
</config> </config>

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-legacy.xml
View File

@ -26,6 +26,6 @@
<useCompoundFile>${useCompoundFile:false}</useCompoundFile> <useCompoundFile>${useCompoundFile:false}</useCompoundFile>
</indexConfig> </indexConfig>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler> <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
</config> </config>

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicyfactory-nocfs.xml
View File

@ -29,6 +29,6 @@
</mergePolicyFactory> </mergePolicyFactory>
</indexConfig> </indexConfig>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler> <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
</config> </config>

6
solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml
View File

@ -32,14 +32,14 @@
<updateHandler class="solr.DirectUpdateHandler2"> <updateHandler class="solr.DirectUpdateHandler2">
</updateHandler> </updateHandler>
<requestHandler name="standard" class="solr.StandardRequestHandler"/> <requestHandler name="/select" class="solr.SearchHandler" />
<requestDispatcher handleSelect="true" > <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" /> <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
<httpCaching never304="true" /> <httpCaching never304="true" />
</requestDispatcher> </requestDispatcher>
<initParams path="standard"> <initParams path="/select">
<lst name="defaults"> <lst name="defaults">
<str name="df">text</str> <str name="df">text</str>
</lst> </lst>

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-nomergepolicyfactory.xml
View File

@ -27,6 +27,6 @@
<mergePolicyFactory class="org.apache.solr.index.NoMergePolicyFactory" /> <mergePolicyFactory class="org.apache.solr.index.NoMergePolicyFactory" />
</indexConfig> </indexConfig>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler> <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
</config> </config>

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-noopregen.xml
View File

@ -24,7 +24,7 @@
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/> <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<schemaFactory class="ClassicIndexSchemaFactory"/> <schemaFactory class="ClassicIndexSchemaFactory"/>
<requestHandler name="standard" class="solr.StandardRequestHandler" /> <requestHandler name="/select" class="solr.SearchHandler" />
<query> <query>
<cache name="myPerSegmentCache" <cache name="myPerSegmentCache"
class="solr.LRUCache" class="solr.LRUCache"

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-paramset.xml
View File

@ -25,7 +25,7 @@
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/> <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<schemaFactory class="ClassicIndexSchemaFactory"/> <schemaFactory class="ClassicIndexSchemaFactory"/>
<requestHandler name="standard" class="solr.StandardRequestHandler"/> <requestHandler name="/select" class="solr.SearchHandler"/>
<initParams name="a" path="/dump3,/dump6,/root/*,/root1/**"> <initParams name="a" path="/dump3,/dump6,/root/*,/root1/**">
<lst name="defaults"> <lst name="defaults">
<str name="a">A</str> <str name="a">A</str>

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-parsing-update-processor-chains.xml
View File

@ -23,7 +23,7 @@
--> -->
<config> <config>
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion> <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}"/> <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<schemaFactory class="ClassicIndexSchemaFactory"/> <schemaFactory class="ClassicIndexSchemaFactory"/>

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-phrasesuggest.xml
View File

@ -24,7 +24,7 @@
<dataDir>${solr.data.dir:}</dataDir> <dataDir>${solr.data.dir:}</dataDir>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/> <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<schemaFactory class="ClassicIndexSchemaFactory"/> <schemaFactory class="ClassicIndexSchemaFactory"/>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler> <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
<!-- WFSTLookup suggest component --> <!-- WFSTLookup suggest component -->
<searchComponent class="solr.SpellCheckComponent" name="suggest_wfst"> <searchComponent class="solr.SpellCheckComponent" name="suggest_wfst">

28
solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml
View File

@ -190,12 +190,12 @@ based HashBitset. -->
The "standard" request handler is the default and will be used if qt The "standard" request handler is the default and will be used if qt
is not specified in the request. is not specified in the request.
--> -->
<requestHandler name="standard" class="solr.StandardRequestHandler"> <requestHandler name="/select" class="solr.SearchHandler">
<bool name="httpCaching">true</bool> <bool name="httpCaching">true</bool>
</requestHandler> </requestHandler>
<requestHandler name="dismax" class="solr.SearchHandler" > <requestHandler name="/dismax" class="solr.SearchHandler" >
<lst name="defaults"> <lst name="defaults">
<str name="defType">dismax</str> <str name="defType">dismax</str>
<str name="q.alt">*:*</str> <str name="q.alt">*:*</str>
@ -216,10 +216,10 @@ based HashBitset. -->
</lst> </lst>
</requestHandler> </requestHandler>
<requestHandler name="mock" class="org.apache.solr.core.MockQuerySenderListenerReqHandler"/> <requestHandler name="/mock" class="org.apache.solr.core.MockQuerySenderListenerReqHandler"/>
<!-- test query parameter defaults --> <!-- test query parameter defaults -->
<requestHandler name="defaults" class="solr.StandardRequestHandler"> <requestHandler name="/defaults" class="solr.SearchHandler">
<lst name="defaults"> <lst name="defaults">
<int name="rows">4</int> <int name="rows">4</int>
<bool name="hl">true</bool> <bool name="hl">true</bool>
@ -228,7 +228,7 @@ based HashBitset. -->
</requestHandler> </requestHandler>
<!-- test query parameter defaults --> <!-- test query parameter defaults -->
<requestHandler name="lazy" class="solr.StandardRequestHandler" startup="lazy"> <requestHandler name="/lazy" class="solr.SearchHandler" startup="lazy">
<lst name="defaults"> <lst name="defaults">
<int name="rows">4</int> <int name="rows">4</int>
<bool name="hl">true</bool> <bool name="hl">true</bool>
@ -322,7 +322,7 @@ based HashBitset. -->
--> -->
<queryConverter name="queryConverter" class="org.apache.solr.spelling.SpellingQueryConverter"/> <queryConverter name="queryConverter" class="org.apache.solr.spelling.SpellingQueryConverter"/>
<requestHandler name="spellCheckCompRH" class="org.apache.solr.handler.component.SearchHandler"> <requestHandler name="/spellCheckCompRH" class="org.apache.solr.handler.component.SearchHandler">
<lst name="defaults"> <lst name="defaults">
<!-- omp = Only More Popular --> <!-- omp = Only More Popular -->
<str name="spellcheck.onlyMorePopular">false</str> <str name="spellcheck.onlyMorePopular">false</str>
@ -335,7 +335,7 @@ based HashBitset. -->
<str>spellcheck</str> <str>spellcheck</str>
</arr> </arr>
</requestHandler> </requestHandler>
<requestHandler name="spellCheckCompRH_Direct" class="org.apache.solr.handler.component.SearchHandler"> <requestHandler name="/spellCheckCompRH_Direct" class="org.apache.solr.handler.component.SearchHandler">
<lst name="defaults"> <lst name="defaults">
<str name="spellcheck.dictionary">direct</str> <str name="spellcheck.dictionary">direct</str>
<str name="spellcheck.onlyMorePopular">false</str> <str name="spellcheck.onlyMorePopular">false</str>
@ -346,7 +346,7 @@ based HashBitset. -->
<str>spellcheck</str> <str>spellcheck</str>
</arr> </arr>
</requestHandler> </requestHandler>
<requestHandler name="spellCheckWithWordbreak" class="org.apache.solr.handler.component.SearchHandler"> <requestHandler name="/spellCheckWithWordbreak" class="org.apache.solr.handler.component.SearchHandler">
<lst name="defaults"> <lst name="defaults">
<str name="spellcheck.dictionary">default</str> <str name="spellcheck.dictionary">default</str>
<str name="spellcheck.dictionary">wordbreak</str> <str name="spellcheck.dictionary">wordbreak</str>
@ -356,7 +356,7 @@ based HashBitset. -->
<str>spellcheck</str> <str>spellcheck</str>
</arr> </arr>
</requestHandler> </requestHandler>
<requestHandler name="spellCheckWithWordbreak_Direct" class="org.apache.solr.handler.component.SearchHandler"> <requestHandler name="/spellCheckWithWordbreak_Direct" class="org.apache.solr.handler.component.SearchHandler">
<lst name="defaults"> <lst name="defaults">
<str name="spellcheck.dictionary">direct</str> <str name="spellcheck.dictionary">direct</str>
<str name="spellcheck.dictionary">wordbreak</str> <str name="spellcheck.dictionary">wordbreak</str>
@ -366,7 +366,7 @@ based HashBitset. -->
<str>spellcheck</str> <str>spellcheck</str>
</arr> </arr>
</requestHandler> </requestHandler>
<requestHandler name="spellCheckCompRH1" class="org.apache.solr.handler.component.SearchHandler"> <requestHandler name="/spellCheckCompRH1" class="org.apache.solr.handler.component.SearchHandler">
<lst name="defaults"> <lst name="defaults">
<str name="defType">dismax</str> <str name="defType">dismax</str>
<str name="qf">lowerfilt1^1</str> <str name="qf">lowerfilt1^1</str>
@ -376,13 +376,13 @@ based HashBitset. -->
</arr> </arr>
</requestHandler> </requestHandler>
<requestHandler name="mltrh" class="org.apache.solr.handler.component.SearchHandler"> <requestHandler name="/mltrh" class="org.apache.solr.handler.component.SearchHandler">
</requestHandler> </requestHandler>
<searchComponent name="tvComponent" class="org.apache.solr.handler.component.TermVectorComponent"/> <searchComponent name="tvComponent" class="org.apache.solr.handler.component.TermVectorComponent"/>
<requestHandler name="tvrh" class="org.apache.solr.handler.component.SearchHandler"> <requestHandler name="/tvrh" class="org.apache.solr.handler.component.SearchHandler">
<lst name="defaults"> <lst name="defaults">
</lst> </lst>
@ -458,7 +458,7 @@ based HashBitset. -->
</highlighting> </highlighting>
</searchComponent> </searchComponent>
<requestDispatcher handleSelect="true" > <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" /> <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false"> <httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl> <cacheControl>max-age=30, public</cacheControl>
@ -549,7 +549,7 @@ based HashBitset. -->
<processor class="solr.RunUpdateProcessorFactory" /> <processor class="solr.RunUpdateProcessorFactory" />
</updateRequestProcessorChain> </updateRequestProcessorChain>
<initParams path="standard,dismax,defaults,lazy,spellCheckCompRH,spellCheckWithWordbreak,spellCheckCompRH_Direct,spellCheckCompRH1,mltrh,tvrh,/terms"> <initParams path="/select,/dismax,/defaults,/lazy,/spellCheckCompRH,/spellCheckWithWordbreak,/spellCheckCompRH_Direct,/spellCheckCompRH1,/mltrh,/tvrh,/terms">
<lst name="defaults"> <lst name="defaults">
<str name="df">text</str> <str name="df">text</str>
</lst> </lst>

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-postingshighlight.xml
View File

@ -24,7 +24,7 @@
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/> <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<schemaFactory class="ClassicIndexSchemaFactory"/> <schemaFactory class="ClassicIndexSchemaFactory"/>
<requestHandler name="standard" class="solr.StandardRequestHandler"> <requestHandler name="/select" class="solr.SearchHandler">
<lst name="defaults"> <lst name="defaults">
<bool name="hl.defaultSummary">false</bool> <bool name="hl.defaultSummary">false</bool>
<str name="df">text</str> <str name="df">text</str>

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-query-parser-init.xml
View File

@ -23,7 +23,7 @@
<config> <config>
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion> <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler> <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/> <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<schemaFactory class="ClassicIndexSchemaFactory"/> <schemaFactory class="ClassicIndexSchemaFactory"/>
<!-- query parser without final NAME field lead to NPE during query parser initialization--> <!-- query parser without final NAME field lead to NPE during query parser initialization-->

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender-noquery.xml
View File

@ -68,7 +68,7 @@
</query> </query>
<requestHandler name="mock" class="org.apache.solr.core.MockQuerySenderListenerReqHandler" default="true"> <requestHandler name="/mock" class="org.apache.solr.core.MockQuerySenderListenerReqHandler" default="true">
<!-- default values for query parameters --> <!-- default values for query parameters -->
</requestHandler> </requestHandler>

8
solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender.xml
View File

@ -42,8 +42,8 @@
local query request for each NamedList in sequence. --> local query request for each NamedList in sequence. -->
<listener event="newSearcher" class="solr.QuerySenderListener"> <listener event="newSearcher" class="solr.QuerySenderListener">
<arr name="queries"> <arr name="queries">
<lst> <str name="q">solr</str> <str name="start">0</str> <str name="rows">10</str> <str name="qt">mock</str></lst> <lst> <str name="q">solr</str> <str name="start">0</str> <str name="rows">10</str> <str name="qt">/mock</str></lst>
<lst> <str name="q">rocks</str> <str name="start">0</str> <str name="rows">10</str> <str name="qt">mock</str></lst> <lst> <str name="q">rocks</str> <str name="start">0</str> <str name="rows">10</str> <str name="qt">/mock</str></lst>
</arr> </arr>
</listener> </listener>
<listener event="newSearcher" <listener event="newSearcher"
@ -55,7 +55,7 @@
<listener event="firstSearcher" class="solr.QuerySenderListener"> <listener event="firstSearcher" class="solr.QuerySenderListener">
<arr name="queries"> <arr name="queries">
<lst> <str name="q">fast_warm</str> <str name="start">0</str> <str name="rows">10</str> <lst> <str name="q">fast_warm</str> <str name="start">0</str> <str name="rows">10</str>
<str name="qt">mock</str> <str name="qt">/mock</str>
</lst> </lst>
</arr> </arr>
</listener> </listener>
@ -64,7 +64,7 @@
</query> </query>
<requestHandler name="mock" class="org.apache.solr.core.MockQuerySenderListenerReqHandler" default="true"> <requestHandler name="/mock" class="org.apache.solr.core.MockQuerySenderListenerReqHandler" default="true">
<!-- default values for query parameters --> <!-- default values for query parameters -->
</requestHandler> </requestHandler>

8
solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml
View File

@ -28,17 +28,17 @@
<updateHandler class="solr.DirectUpdateHandler2"> <updateHandler class="solr.DirectUpdateHandler2">
</updateHandler> </updateHandler>
<requestHandler name="standard" class="solr.StandardRequestHandler"> <requestHandler name="/select" class="solr.SearchHandler">
<bool name="httpCaching">true</bool> <bool name="httpCaching">true</bool>
</requestHandler> </requestHandler>
<!-- test query parameter defaults --> <!-- test query parameter defaults -->
<requestHandler name="defaults" class="solr.StandardRequestHandler"> <requestHandler name="/defaults" class="solr.SearchHandler">
</requestHandler> </requestHandler>
<!-- test query parameter defaults --> <!-- test query parameter defaults -->
<requestHandler name="lazy" class="solr.StandardRequestHandler" startup="lazy"> <requestHandler name="/lazy" class="solr.SearchHandler" startup="lazy">
</requestHandler> </requestHandler>
<requestHandler name="/replication" class="solr.ReplicationHandler"> <requestHandler name="/replication" class="solr.ReplicationHandler">
@ -51,7 +51,7 @@
</lst> </lst>
</requestHandler> </requestHandler>
<requestDispatcher handleSelect="true"> <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1"/> <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1"/>
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false"> <httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl> <cacheControl>max-age=30, public</cacheControl>

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-reqHandler.incl
View File

@ -1,5 +1,5 @@
<requestHandler name="includedHandler" <requestHandler name="/includedHandler"
class="solr.SearchHandler" > class="solr.SearchHandler" >
</requestHandler> </requestHandler>

10
solr/core/src/test-files/solr/collection1/conf/solrconfig-response-log-component.xml
View File

@ -20,8 +20,8 @@
<config> <config>
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion> <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<requestHandler name="standard" <requestHandler name="/select"
class="solr.StandardRequestHandler"></requestHandler> class="solr.SearchHandler"></requestHandler>
<!-- Used to specify an alternate directory to hold all index data. <!-- Used to specify an alternate directory to hold all index data.
It defaults to "index" if not present, and should probably It defaults to "index" if not present, and should probably
@ -37,7 +37,7 @@
<searchComponent name="responselog" class="org.apache.solr.handler.component.ResponseLogComponent" /> <searchComponent name="responselog" class="org.apache.solr.handler.component.ResponseLogComponent" />
<!-- Log retrievedDocs --> <!-- Log retrievedDocs -->
<requestHandler name="withlog" class="org.apache.solr.handler.component.SearchHandler"> <requestHandler name="/withlog" class="org.apache.solr.handler.component.SearchHandler">
<lst name="defaults"> <lst name="defaults">
<str name="defType">dismax</str> <str name="defType">dismax</str>
</lst> </lst>
@ -46,13 +46,13 @@
</arr> </arr>
</requestHandler> </requestHandler>
<requestHandler name="nolog" class="org.apache.solr.handler.component.SearchHandler"> <requestHandler name="/nolog" class="org.apache.solr.handler.component.SearchHandler">
<lst name="defaults"> <lst name="defaults">
<str name="defType">dismax</str> <str name="defType">dismax</str>
</lst> </lst>
</requestHandler> </requestHandler>
<initParams path="withlog,nolog"> <initParams path="/withlog,/nolog">
<lst name="defaults"> <lst name="defaults">
<str name="df">text</str> <str name="df">text</str>
</lst> </lst>

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml
View File

@ -35,7 +35,7 @@
</updateLog> </updateLog>
</updateHandler> </updateHandler>
<requestHandler name="standard" class="solr.StandardRequestHandler"> <requestHandler name="/select" class="solr.SearchHandler">
<bool name="httpCaching">true</bool> <bool name="httpCaching">true</bool>
</requestHandler> </requestHandler>

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-script-updateprocessor.xml
View File

@ -24,7 +24,7 @@
<config> <config>
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion> <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler> <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/> <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<schemaFactory class="ClassicIndexSchemaFactory"/> <schemaFactory class="ClassicIndexSchemaFactory"/>

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-searcher-listeners1.xml
View File

@ -41,7 +41,7 @@
<queryResponseWriter name="xml" default="true" <queryResponseWriter name="xml" default="true"
class="solr.XMLResponseWriter" /> class="solr.XMLResponseWriter" />
<requestHandler name="standard" class="solr.StandardRequestHandler"/> <requestHandler name="/select" class="solr.SearchHandler"/>
<searchComponent name="mock" class="org.apache.solr.search.TestIndexSearcher$MockSearchComponent"/> <searchComponent name="mock" class="org.apache.solr.search.TestIndexSearcher$MockSearchComponent"/>

8
solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml
View File

@ -28,17 +28,17 @@
<updateHandler class="solr.DirectUpdateHandler2"> <updateHandler class="solr.DirectUpdateHandler2">
</updateHandler> </updateHandler>
<requestHandler name="standard" class="solr.StandardRequestHandler"> <requestHandler name="/select" class="solr.SearchHandler">
<bool name="httpCaching">true</bool> <bool name="httpCaching">true</bool>
</requestHandler> </requestHandler>
<!-- test query parameter defaults --> <!-- test query parameter defaults -->
<requestHandler name="defaults" class="solr.StandardRequestHandler"> <requestHandler name="/defaults" class="solr.SearchHandler">
</requestHandler> </requestHandler>
<!-- test query parameter defaults --> <!-- test query parameter defaults -->
<requestHandler name="lazy" class="solr.StandardRequestHandler" startup="lazy"> <requestHandler name="/lazy" class="solr.SearchHandler" startup="lazy">
</requestHandler> </requestHandler>
<requestHandler name="/replication" class="solr.ReplicationHandler"> <requestHandler name="/replication" class="solr.ReplicationHandler">
@ -49,7 +49,7 @@
</lst> </lst>
</requestHandler> </requestHandler>
<requestDispatcher handleSelect="true"> <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1"/> <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1"/>
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false"> <httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl> <cacheControl>max-age=30, public</cacheControl>

8
solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml
View File

@ -28,21 +28,21 @@
<updateHandler class="solr.DirectUpdateHandler2"> <updateHandler class="solr.DirectUpdateHandler2">
</updateHandler> </updateHandler>
<requestHandler name="standard" class="solr.StandardRequestHandler"> <requestHandler name="/select" class="solr.SearchHandler">
<bool name="httpCaching">true</bool> <bool name="httpCaching">true</bool>
</requestHandler> </requestHandler>
<!-- test query parameter defaults --> <!-- test query parameter defaults -->
<requestHandler name="defaults" class="solr.StandardRequestHandler"> <requestHandler name="/defaults" class="solr.SearchHandler">
</requestHandler> </requestHandler>
<!-- test query parameter defaults --> <!-- test query parameter defaults -->
<requestHandler name="lazy" class="solr.StandardRequestHandler" startup="lazy"> <requestHandler name="/lazy" class="solr.SearchHandler" startup="lazy">
</requestHandler> </requestHandler>
<requestDispatcher handleSelect="true"> <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1"/> <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1"/>
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false"> <httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl> <cacheControl>max-age=30, public</cacheControl>

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-solcoreproperties.xml
View File

@ -26,7 +26,7 @@
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<requestHandler name="/select" class="solr.StandardRequestHandler"> <requestHandler name="/select" class="solr.SearchHandler">
<lst name="defaults"> <lst name="defaults">
<str name="p1">${foo.foo1}</str> <str name="p1">${foo.foo1}</str>
<str name="p2">${foo.foo2}</str> <str name="p2">${foo.foo2}</str>

4
solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingmergepolicyfactory.xml
View File

@ -31,7 +31,7 @@
<lockType>${solr.tests.lockType:single}</lockType> <lockType>${solr.tests.lockType:single}</lockType>
</indexConfig> </indexConfig>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler> <requestHandler name="/select" class="solr.SearchHandler" />
<updateHandler class="solr.DirectUpdateHandler2"> <updateHandler class="solr.DirectUpdateHandler2">
<updateLog> <updateLog>
@ -47,7 +47,7 @@
<maxTime>${solr.autoSoftCommit.maxTime:-1}</maxTime> <maxTime>${solr.autoSoftCommit.maxTime:-1}</maxTime>
</autoSoftCommit> </autoSoftCommit>
</updateHandler> </updateHandler>
<initParams path="standard"> <initParams path="/select">
<lst name="defaults"> <lst name="defaults">
<str name="df">text</str> <str name="df">text</str>
</lst> </lst>

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingresponse.xml
View File

@ -25,7 +25,7 @@
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/> <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<schemaFactory class="ClassicIndexSchemaFactory"/> <schemaFactory class="ClassicIndexSchemaFactory"/>
<requestHandler name="standard" class="solr.StandardRequestHandler" /> <requestHandler name="/select" class="solr.SearchHandler" />
<query> <query>

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-spatial.xml
View File

@ -24,7 +24,7 @@
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/> <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<schemaFactory class="ClassicIndexSchemaFactory"/> <schemaFactory class="ClassicIndexSchemaFactory"/>
<requestHandler name="standard" class="solr.StandardRequestHandler" /> <requestHandler name="/select" class="solr.SearchHandler" />
<query> <query>
<cache name="perSegSpatialFieldCache_srptgeom" <cache name="perSegSpatialFieldCache_srptgeom"
class="solr.LRUCache" class="solr.LRUCache"

12
solr/core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml
View File

@ -33,8 +33,8 @@
<maxWarmingSearchers>1</maxWarmingSearchers> <maxWarmingSearchers>1</maxWarmingSearchers>
</query> </query>
</indexConfig> </indexConfig>
<requestHandler name="standard" <requestHandler name="/select"
class="solr.StandardRequestHandler"></requestHandler> class="solr.SearchHandler"></requestHandler>
<!-- Used to specify an alternate directory to hold all index data. <!-- Used to specify an alternate directory to hold all index data.
It defaults to "index" if not present, and should probably It defaults to "index" if not present, and should probably
@ -156,7 +156,7 @@
--> -->
<queryConverter name="queryConverter" class="org.apache.solr.spelling.SpellingQueryConverter"/> <queryConverter name="queryConverter" class="org.apache.solr.spelling.SpellingQueryConverter"/>
<requestHandler name="spellCheckCompRH" class="org.apache.solr.handler.component.SearchHandler"> <requestHandler name="/spellCheckCompRH" class="org.apache.solr.handler.component.SearchHandler">
<lst name="defaults"> <lst name="defaults">
<!-- omp = Only More Popular --> <!-- omp = Only More Popular -->
<str name="spellcheck.onlyMorePopular">false</str> <str name="spellcheck.onlyMorePopular">false</str>
@ -169,7 +169,7 @@
<str>spellcheck</str> <str>spellcheck</str>
</arr> </arr>
</requestHandler> </requestHandler>
<requestHandler name="spellCheckCompRH1" class="org.apache.solr.handler.component.SearchHandler"> <requestHandler name="/spellCheckCompRH1" class="org.apache.solr.handler.component.SearchHandler">
<lst name="defaults"> <lst name="defaults">
<str name="defType">dismax</str> <str name="defType">dismax</str>
<str name="qf">lowerfilt1^1</str> <str name="qf">lowerfilt1^1</str>
@ -178,7 +178,7 @@
<str>spellcheck</str> <str>spellcheck</str>
</arr> </arr>
</requestHandler> </requestHandler>
<requestHandler name="spellCheckWithWordbreak" class="org.apache.solr.handler.component.SearchHandler"> <requestHandler name="/spellCheckWithWordbreak" class="org.apache.solr.handler.component.SearchHandler">
<lst name="defaults"> <lst name="defaults">
<str name="spellcheck.dictionary">default</str> <str name="spellcheck.dictionary">default</str>
<str name="spellcheck.dictionary">wordbreak</str> <str name="spellcheck.dictionary">wordbreak</str>
@ -188,7 +188,7 @@
<str>spellcheck</str> <str>spellcheck</str>
</arr> </arr>
</requestHandler> </requestHandler>
<initParams path="spellCheckCompRH,spellCheckCompRH1,spellCheckWithWordbreak"> <initParams path="/spellCheckCompRH,/spellCheckCompRH1,/spellCheckWithWordbreak">
<lst name="defaults"> <lst name="defaults">
<str name="df">text</str> <str name="df">text</str>
</lst> </lst>

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-spellchecker.xml
View File

@ -29,7 +29,7 @@
<updateHandler class="solr.DirectUpdateHandler2"> <updateHandler class="solr.DirectUpdateHandler2">
</updateHandler> </updateHandler>
<requestHandler name="standard" class="solr.StandardRequestHandler" /> <requestHandler name="/select" class="solr.SearchHandler" />
<!-- Suggest component --> <!-- Suggest component -->
<searchComponent class="solr.SpellCheckComponent" name="suggest_jaspell"> <searchComponent class="solr.SpellCheckComponent" name="suggest_jaspell">

4
solr/core/src/test-files/solr/collection1/conf/solrconfig-sql.xml
View File

@ -44,13 +44,13 @@
</lst> </lst>
</requestHandler> </requestHandler>
<requestDispatcher handleSelect="true" > <requestDispatcher>
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" /> <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
</requestDispatcher> </requestDispatcher>
<requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" /> <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="/update" class="solr.UpdateRequestHandler" />
<requestHandler name="/admin/ping" class="solr.PingRequestHandler"> <requestHandler name="/admin/ping" class="solr.PingRequestHandler">

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-suggestercomponent-context-filter-query.xml
View File

@ -27,7 +27,7 @@
<updateHandler class="solr.DirectUpdateHandler2"/> <updateHandler class="solr.DirectUpdateHandler2"/>
<requestHandler name="standard" class="solr.StandardRequestHandler" /> <requestHandler name="/select" class="solr.SearchHandler" />
<searchComponent class="solr.SuggestComponent" name="suggest"> <searchComponent class="solr.SuggestComponent" name="suggest">
<!--Suggest Component for context filtering test --> <!--Suggest Component for context filtering test -->

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-suggestercomponent.xml
View File

@ -28,7 +28,7 @@
<updateHandler class="solr.DirectUpdateHandler2"/> <updateHandler class="solr.DirectUpdateHandler2"/>
<requestHandler name="standard" class="solr.StandardRequestHandler" /> <requestHandler name="/select" class="solr.SearchHandler" />
<searchComponent class="solr.SuggestComponent" name="suggest"> <searchComponent class="solr.SuggestComponent" name="suggest">

4
solr/core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml
View File

@ -45,8 +45,8 @@
attr2="${non.existent.sys.prop:default-from-config}">prefix-${solr.test.sys.prop2}-suffix</propTest> attr2="${non.existent.sys.prop:default-from-config}">prefix-${solr.test.sys.prop2}-suffix</propTest>
<!-- see TestConfig.testDisableRequetsHandler --> <!-- see TestConfig.testDisableRequetsHandler -->
<requestHandler name="disabled" class="solr.StandardRequestHandler" enable="false"/> <requestHandler name="/disabled" class="solr.SearchHandler" enable="false"/>
<requestHandler name="enabled" class="solr.StandardRequestHandler" enable="true"/> <requestHandler name="/enabled" class="solr.SearchHandler" enable="true"/>

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-testxmlparser.xml
View File

@ -24,7 +24,7 @@
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/> <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<schemaFactory class="ClassicIndexSchemaFactory"/> <schemaFactory class="ClassicIndexSchemaFactory"/>
<requestHandler name="standard" class="solr.StandardRequestHandler" /> <requestHandler name="/select" class="solr.SearchHandler" />
<queryParser name="testxmlparser" class="XmlQParserPlugin"> <queryParser name="testxmlparser" class="XmlQParserPlugin">
<str name="HandyQuery">org.apache.solr.search.HandyQueryBuilder</str> <str name="HandyQuery">org.apache.solr.search.HandyQueryBuilder</str>
<str name="HelloQuery">org.apache.solr.search.HelloQueryBuilder</str> <str name="HelloQuery">org.apache.solr.search.HelloQueryBuilder</str>

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-tieredmergepolicyfactory.xml
View File

@ -36,6 +36,6 @@
</mergeScheduler> </mergeScheduler>
</indexConfig> </indexConfig>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler> <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
</config> </config>

5
solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml
View File

@ -44,8 +44,7 @@
<processor class="solr.RunUpdateProcessorFactory" /> <processor class="solr.RunUpdateProcessorFactory" />
</updateRequestProcessorChain> </updateRequestProcessorChain>
<requestHandler name="standard" class="solr.StandardRequestHandler"> <requestHandler name="/select" class="solr.SearchHandler" />
</requestHandler>
<peerSync> <peerSync>
<useRangeVersions>${solr.peerSync.useRangeVersions:true}</useRangeVersions> <useRangeVersions>${solr.peerSync.useRangeVersions:true}</useRangeVersions>
@ -158,7 +157,7 @@
</query> </query>
<initParams path="standard"> <initParams path="/select">
<lst name="defaults"> <lst name="defaults">
<str name="df">text</str> <str name="df">text</str>
</lst> </lst>

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-uninvertdocvaluesmergepolicyfactory.xml
View File

@ -33,6 +33,6 @@
<mergeScheduler class="org.apache.lucene.index.ConcurrentMergeScheduler"/> <mergeScheduler class="org.apache.lucene.index.ConcurrentMergeScheduler"/>
</indexConfig> </indexConfig>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler> <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
</config> </config>

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-update-processor-chains.xml
View File

@ -25,7 +25,7 @@
<config> <config>
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion> <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler> <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
<requestHandler name="/update" class="solr.UpdateRequestHandler" /> <requestHandler name="/update" class="solr.UpdateRequestHandler" />
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/> <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<schemaFactory class="ClassicIndexSchemaFactory"/> <schemaFactory class="ClassicIndexSchemaFactory"/>

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-warmer-randommergepolicyfactory.xml
View File

@ -24,7 +24,7 @@
<dataDir>${solr.data.dir:}</dataDir> <dataDir>${solr.data.dir:}</dataDir>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/> <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<schemaFactory class="ClassicIndexSchemaFactory"/> <schemaFactory class="ClassicIndexSchemaFactory"/>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler> <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
<indexConfig> <indexConfig>
<!-- we don't use solrconfig.snippet.randomindexconfig.xml here <!-- we don't use solrconfig.snippet.randomindexconfig.xml here

35
solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
View File

@ -200,17 +200,13 @@
If the set cardinality <= maxSize elements, then HashDocSet will be used instead of the bitset If the set cardinality <= maxSize elements, then HashDocSet will be used instead of the bitset
based HashBitset. --> based HashBitset. -->
<!-- requestHandler plugins... incoming queries will be dispatched to the <!-- requestHandler plugins
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> <bool name="httpCaching">true</bool>
</requestHandler> </requestHandler>
<requestHandler name="dismax" class="solr.SearchHandler" > <requestHandler name="/dismax" class="solr.SearchHandler" >
<lst name="defaults"> <lst name="defaults">
<str name="defType">dismax</str> <str name="defType">dismax</str>
<str name="q.alt">*:*</str> <str name="q.alt">*:*</str>
@ -231,10 +227,10 @@
</lst> </lst>
</requestHandler> </requestHandler>
<requestHandler name="mock" class="org.apache.solr.core.MockQuerySenderListenerReqHandler"/> <requestHandler name="/mock" class="org.apache.solr.core.MockQuerySenderListenerReqHandler"/>
<!-- test query parameter defaults --> <!-- test query parameter defaults -->
<requestHandler name="defaults" class="solr.StandardRequestHandler"> <requestHandler name="/defaults" class="solr.SearchHandler">
<lst name="defaults"> <lst name="defaults">
<int name="rows">4</int> <int name="rows">4</int>
<bool name="hl">true</bool> <bool name="hl">true</bool>
@ -243,7 +239,7 @@
</requestHandler> </requestHandler>
<!-- test query parameter defaults --> <!-- test query parameter defaults -->
<requestHandler name="lazy" class="solr.StandardRequestHandler" startup="lazy"> <requestHandler name="/lazy" class="solr.SearchHandler" startup="lazy">
<lst name="defaults"> <lst name="defaults">
<int name="rows">4</int> <int name="rows">4</int>
<bool name="hl">true</bool> <bool name="hl">true</bool>
@ -341,7 +337,7 @@
--> -->
<queryConverter name="queryConverter" class="org.apache.solr.spelling.SpellingQueryConverter"/> <queryConverter name="queryConverter" class="org.apache.solr.spelling.SpellingQueryConverter"/>
<requestHandler name="spellCheckCompRH" class="org.apache.solr.handler.component.SearchHandler"> <requestHandler name="/spellCheckCompRH" class="org.apache.solr.handler.component.SearchHandler">
<lst name="defaults"> <lst name="defaults">
<!-- omp = Only More Popular --> <!-- omp = Only More Popular -->
<str name="spellcheck.onlyMorePopular">false</str> <str name="spellcheck.onlyMorePopular">false</str>
@ -354,7 +350,7 @@
<str>spellcheck</str> <str>spellcheck</str>
</arr> </arr>
</requestHandler> </requestHandler>
<requestHandler name="spellCheckCompRH_Direct" class="org.apache.solr.handler.component.SearchHandler"> <requestHandler name="/spellCheckCompRH_Direct" class="org.apache.solr.handler.component.SearchHandler">
<lst name="defaults"> <lst name="defaults">
<str name="spellcheck.dictionary">direct</str> <str name="spellcheck.dictionary">direct</str>
<str name="spellcheck.onlyMorePopular">false</str> <str name="spellcheck.onlyMorePopular">false</str>
@ -365,7 +361,7 @@
<str>spellcheck</str> <str>spellcheck</str>
</arr> </arr>
</requestHandler> </requestHandler>
<requestHandler name="spellCheckWithWordbreak" class="org.apache.solr.handler.component.SearchHandler"> <requestHandler name="/spellCheckWithWordbreak" class="org.apache.solr.handler.component.SearchHandler">
<lst name="defaults"> <lst name="defaults">
<str name="spellcheck.dictionary">default</str> <str name="spellcheck.dictionary">default</str>
<str name="spellcheck.dictionary">wordbreak</str> <str name="spellcheck.dictionary">wordbreak</str>
@ -375,7 +371,7 @@
<str>spellcheck</str> <str>spellcheck</str>
</arr> </arr>
</requestHandler> </requestHandler>
<requestHandler name="spellCheckWithWordbreak_Direct" class="org.apache.solr.handler.component.SearchHandler"> <requestHandler name="/spellCheckWithWordbreak_Direct" class="org.apache.solr.handler.component.SearchHandler">
<lst name="defaults"> <lst name="defaults">
<str name="spellcheck.dictionary">direct</str> <str name="spellcheck.dictionary">direct</str>
<str name="spellcheck.dictionary">wordbreak</str> <str name="spellcheck.dictionary">wordbreak</str>
@ -385,7 +381,7 @@
<str>spellcheck</str> <str>spellcheck</str>
</arr> </arr>
</requestHandler> </requestHandler>
<requestHandler name="spellCheckCompRH1" class="org.apache.solr.handler.component.SearchHandler"> <requestHandler name="/spellCheckCompRH1" class="org.apache.solr.handler.component.SearchHandler">
<lst name="defaults"> <lst name="defaults">
<str name="defType">dismax</str> <str name="defType">dismax</str>
<str name="qf">lowerfilt1^1</str> <str name="qf">lowerfilt1^1</str>
@ -395,13 +391,13 @@
</arr> </arr>
</requestHandler> </requestHandler>
<requestHandler name="mltrh" class="org.apache.solr.handler.component.SearchHandler"> <requestHandler name="/mltrh" class="org.apache.solr.handler.component.SearchHandler">
</requestHandler> </requestHandler>
<searchComponent name="tvComponent" class="org.apache.solr.handler.component.TermVectorComponent"/> <searchComponent name="tvComponent" class="org.apache.solr.handler.component.TermVectorComponent"/>
<requestHandler name="tvrh" class="org.apache.solr.handler.component.SearchHandler"> <requestHandler name="/tvrh" class="org.apache.solr.handler.component.SearchHandler">
<lst name="defaults"> <lst name="defaults">
</lst> </lst>
@ -460,7 +456,7 @@
</highlighting> </highlighting>
</searchComponent> </searchComponent>
<requestDispatcher handleSelect="true" > <requestDispatcher>
<requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="-1" /> <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="-1" />
<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false"> <httpCaching lastModifiedFrom="openTime" etagSeed="Solr" never304="false">
<cacheControl>max-age=30, public</cacheControl> <cacheControl>max-age=30, public</cacheControl>
@ -578,7 +574,8 @@
<str name="storageIO">org.apache.solr.rest.ManagedResourceStorage$InMemoryStorageIO</str> <str name="storageIO">org.apache.solr.rest.ManagedResourceStorage$InMemoryStorageIO</str>
</restManager> </restManager>
<initParams path="standard,dismax,defaults,lazy,spellCheckCompRH,spellCheckWithWordbreak,spellCheckCompRH_Direct,spellCheckCompRH1,mltrh,tvrh,/search-facet-def,/search-facet-invariants,/terms"> <!-- warning: not a best practice; requests generally ought to be explicit to thus not require this -->
<initParams path="/select,/dismax,/defaults,/lazy,/spellCheckCompRH,/spellCheckWithWordbreak,/spellCheckCompRH_Direct,/spellCheckCompRH1,/mltrh,/tvrh,/search-facet-def,/search-facet-invariants,/terms">
<lst name="defaults"> <lst name="defaults">
<str name="df">text</str> <str name="df">text</str>
</lst> </lst>

2
solr/core/src/test-files/solr/collection1/conf/solrconfig_SimpleTextCodec.xml
View File

@ -21,6 +21,6 @@
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/> <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<schemaFactory class="ClassicIndexSchemaFactory"/> <schemaFactory class="ClassicIndexSchemaFactory"/>
<requestHandler name="standard" class="solr.StandardRequestHandler"/> <requestHandler name="/select" class="solr.SearchHandler"/>
<codecFactory class="solr.SimpleTextCodecFactory"/> <codecFactory class="solr.SimpleTextCodecFactory"/>
</config> </config>

2
solr/core/src/test-files/solr/collection1/conf/solrconfig_codec.xml
View File

@ -21,7 +21,7 @@
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/> <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<schemaFactory class="ClassicIndexSchemaFactory"/> <schemaFactory class="ClassicIndexSchemaFactory"/>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler> <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
<codecFactory class="solr.SchemaCodecFactory"> <codecFactory class="solr.SchemaCodecFactory">
<str name="compressionMode">${tests.COMPRESSION_MODE:BEST_COMPRESSION}</str> <str name="compressionMode">${tests.COMPRESSION_MODE:BEST_COMPRESSION}</str>
</codecFactory> </codecFactory>

2
solr/core/src/test-files/solr/collection1/conf/solrconfig_codec2.xml
View File

@ -20,7 +20,7 @@
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion> <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/> <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler> <requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
<schemaFactory class="ClassicIndexSchemaFactory"/> <schemaFactory class="ClassicIndexSchemaFactory"/>
<codecFactory class="solr.SchemaCodecFactory"/> <codecFactory class="solr.SchemaCodecFactory"/>
</config> </config>

5
solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml
View File

@ -60,7 +60,7 @@
</query> </query>
<requestDispatcher handleSelect="true" > <requestDispatcher>
<!--Make sure your system has some authentication before enabling remote streaming! --> <!--Make sure your system has some authentication before enabling remote streaming! -->
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" /> <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
<httpCaching lastModifiedFrom="openTime" <httpCaching lastModifiedFrom="openTime"
@ -68,7 +68,6 @@
</httpCaching> </httpCaching>
</requestDispatcher> </requestDispatcher>
<requestHandler name="standard" class="solr.SearchHandler" default="true"> <requestHandler name="/select" class="solr.SearchHandler" />
</requestHandler>
</config> </config>

Some files were not shown because too many files have changed in this diff Show More