From d29d258ceedc1b569f355a2589524f11ad66c32d Mon Sep 17 00:00:00 2001
From: Dawid Weiss <dweiss@apache.org>
Date: Sun, 22 Apr 2012 08:57:11 +0000
Subject: [PATCH] Revert "SOLR-3161 handleSelect=false by default now, and
 update solrconfig to not use it."

This reverts commit c53e23d2e7e1e566f30c757dbc64f40559307ecb.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1328821 13f79535-47bb-0310-9956-ffa450edef68
---
 .../solr/servlet/SolrRequestParsers.java      |  2 +-
 solr/example/solr/conf/solrconfig.xml         | 32 +++++++++++++------
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java b/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
index 41a9c93cf35..a046633c03d 100644
--- a/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
+++ b/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
@@ -63,7 +63,7 @@ public class SolrRequestParsers
   
   private HashMap<String, SolrRequestParser> parsers;
   private boolean enableRemoteStreams = false;
-  private boolean handleSelect = false;
+  private boolean handleSelect = true;
   private StandardRequestParser standard;
   
   /**
diff --git a/solr/example/solr/conf/solrconfig.xml b/solr/example/solr/conf/solrconfig.xml
index d5167d6e4c8..a202ac6c367 100755
--- a/solr/example/solr/conf/solrconfig.xml
+++ b/solr/example/solr/conf/solrconfig.xml
@@ -617,13 +617,17 @@
        This section contains instructions for how the SolrDispatchFilter
        should behave when processing requests for this SolrCore.
 
-       If you wish to regain use of /select?qt=... style request handler
-       dispatching, then first add handleSelect="true" to
-       <requestDispatcher>. Then change the name of the request handler
-       named "/select" to something else without a leading "/", such as
-       simply "select" and add default="true" to it.
+       handleSelect affects the behavior of requests such as /select?qt=XXX
+
+       handleSelect="true" will cause the SolrDispatchFilter to process
+       the request and dispatch the query to a handler specified by the 
+       "qt" param
+
+       handleSelect="false" will cause the SolrDispatchFilter to
+       ignore "/select" requests, resulting in a 404 unless a handler
+       is explicitly registered with the name "/select"
     -->
-  <requestDispatcher>
+  <requestDispatcher handleSelect="true" >
     <!-- Request Parsing
 
          These settings indicate how Solr Requests may be parsed, and
@@ -704,8 +708,16 @@
 
        http://wiki.apache.org/solr/SolrRequestHandler
 
-       Incoming requests will be dispatched to the handler with a name
-       equal to the remainder of the URL path, starting with a '/'.
+       incoming queries will be dispatched to the correct handler
+       based on the path or the qt (query type) 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/[core/]select?qt=name
+
+       If a /select request is processed with out a qt param
+       specified, the requestHandler that declares default="true" will
+       be used.
        
        If a Request Handler is declared with startup="lazy", then it will
        not be initialized until the first request that uses it.
@@ -720,7 +732,7 @@
        of SearchComponents (see below) and supports distributed
        queries across multiple shards
     -->
-  <requestHandler name="/select" class="solr.SearchHandler">
+  <requestHandler name="search" class="solr.SearchHandler" default="true">
     <!-- default values for query parameters can be specified, these
          will be overridden by parameters in the request
       -->
@@ -1252,7 +1264,7 @@
        In reality you will likely want to add the component to your 
        already specified request handlers. 
     -->
-  <requestHandler name="/tvrh" class="solr.SearchHandler" startup="lazy">
+  <requestHandler name="tvrh" class="solr.SearchHandler" startup="lazy">
     <lst name="defaults">
       <bool name="tv">true</bool>
     </lst>