From 4cb7e2a2ca5462792c82bbb6c16fe7527793e46c Mon Sep 17 00:00:00 2001
From: Michael Peter Christen <mc@yacy.net>
Date: Thu, 23 Jan 2014 17:20:49 +0100
Subject: [PATCH] refactoring: renamed the SolrServlet to SolrSelectServlet for
 better naming of more Solr Servlets

---
 source/net/yacy/http/Jetty8HttpServerImpl.java            | 8 ++++----
 .../servlets/{SolrServlet.java => SolrSelectServlet.java} | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename source/net/yacy/http/servlets/{SolrServlet.java => SolrSelectServlet.java} (99%)

diff --git a/source/net/yacy/http/Jetty8HttpServerImpl.java b/source/net/yacy/http/Jetty8HttpServerImpl.java
index bd6752d07..c2ba352c1 100644
--- a/source/net/yacy/http/Jetty8HttpServerImpl.java
+++ b/source/net/yacy/http/Jetty8HttpServerImpl.java
@@ -41,7 +41,7 @@ import javax.net.ssl.SSLContext;
 
 import net.yacy.cora.util.ConcurrentLog;
 import net.yacy.http.servlets.GSAsearchServlet;
-import net.yacy.http.servlets.SolrServlet;
+import net.yacy.http.servlets.SolrSelectServlet;
 import net.yacy.http.servlets.YaCyDefaultServlet;
 import net.yacy.http.servlets.YaCyProxyServlet;
 import net.yacy.search.Switchboard;
@@ -134,9 +134,9 @@ public class Jetty8HttpServerImpl implements YaCyHttpServer {
         htrootContext.addServlet(sholder,"/*");    
         
         //add SolrServlet
-        htrootContext.addServlet(SolrServlet.class, "/solr/select"); // uses the default core, collection1
-        htrootContext.addServlet(SolrServlet.class, "/solr/collection1/select"); // the same servlet, identifies the collection1 core using the path
-        htrootContext.addServlet(SolrServlet.class, "/solr/webgraph/select"); // the same servlet, identifies the webgraph core using the path
+        htrootContext.addServlet(SolrSelectServlet.class, "/solr/select"); // uses the default core, collection1
+        htrootContext.addServlet(SolrSelectServlet.class, "/solr/collection1/select"); // the same servlet, identifies the collection1 core using the path
+        htrootContext.addServlet(SolrSelectServlet.class, "/solr/webgraph/select"); // the same servlet, identifies the webgraph core using the path
 
         // add proxy?url= servlet
         htrootContext.addServlet(YaCyProxyServlet.class,"/proxy.html");
diff --git a/source/net/yacy/http/servlets/SolrServlet.java b/source/net/yacy/http/servlets/SolrSelectServlet.java
similarity index 99%
rename from source/net/yacy/http/servlets/SolrServlet.java
rename to source/net/yacy/http/servlets/SolrSelectServlet.java
index 75d8017ae..311674764 100644
--- a/source/net/yacy/http/servlets/SolrServlet.java
+++ b/source/net/yacy/http/servlets/SolrSelectServlet.java
@@ -80,7 +80,7 @@ import org.apache.solr.util.FastWriter;
  * this is now done in Solr 4.x.x with org.apache.solr.servlet.SolrDispatchFilter
  * implemented as servlet (we don't use multicore)
  */
-public class SolrServlet extends HttpServlet {
+public class SolrSelectServlet extends HttpServlet {
     private static final long serialVersionUID = 1L;
     
     public final static Map<String, QueryResponseWriter> RESPONSE_WRITER = new HashMap<String, QueryResponseWriter>();