refactoring: moving all servlets to the same package (the solr servlet

is currently actually a filter which should be changed somehow)

htroot/solr/select.java

@@ -25,13 +25,13 @@ import java.io.Writer;
 
 import net.yacy.cora.document.encoding.UTF8;
 import net.yacy.cora.federate.solr.Ranking;
-import net.yacy.cora.federate.solr.SolrServlet;
 import net.yacy.cora.federate.solr.connector.EmbeddedSolrConnector;
 import net.yacy.cora.federate.solr.responsewriter.YJsonResponseWriter;
 import net.yacy.cora.federate.solr.responsewriter.OpensearchResponseWriter;
 import net.yacy.cora.protocol.HeaderFramework;
 import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.cora.util.ConcurrentLog;
+import net.yacy.http.servlets.SolrServlet;
 import net.yacy.search.Switchboard;
 import net.yacy.search.SwitchboardConstants;
 import net.yacy.search.query.AccessTracker;

source/net/yacy/http/Jetty8HttpServerImpl.java

@@ -31,13 +31,18 @@ import java.net.NetworkInterface;
 import java.net.SocketException;
 import java.util.EnumSet;
 import java.util.Enumeration;
+
 import javax.servlet.DispatcherType;
-import net.yacy.cora.federate.solr.SolrServlet;
-import net.yacy.cora.federate.solr.SolrServlet.Servlet404;
+
 import net.yacy.cora.util.ConcurrentLog;
+import net.yacy.http.servlets.GSAsearchServlet;
+import net.yacy.http.servlets.SolrServlet;
+import net.yacy.http.servlets.YaCyDefaultServlet;
+import net.yacy.http.servlets.YaCyProxyServlet;
+import net.yacy.http.servlets.SolrServlet.Servlet404;
 import net.yacy.search.Switchboard;
-import org.eclipse.jetty.server.Connector;
 
+import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.handler.ContextHandler;

source/net/yacy/http/ProxyHandler.java

@@ -59,7 +59,7 @@ import net.yacy.server.http.MultiOutputStream;
  */
 public class ProxyHandler extends AbstractRemoteHandler implements Handler {
 	
-	static RequestHeader convertHeaderFromJetty(HttpServletRequest request) {
+	public static RequestHeader convertHeaderFromJetty(HttpServletRequest request) {
 		RequestHeader result = new RequestHeader();
 		Enumeration<String> headerNames = request.getHeaderNames();
 		while(headerNames.hasMoreElements()) {

source/net/yacy/http/servlets/GSAsearchServlet.java

@@ -17,7 +17,7 @@
  *  along with this program in the file lgpl21.txt
  *  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.yacy.http;
+package net.yacy.http.servlets;
 
 import java.io.IOException;
 import java.io.OutputStream;

source/net/yacy/http/servlets/SolrServlet.java

@@ -18,7 +18,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package net.yacy.cora.federate.solr;
+package net.yacy.http.servlets;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -41,6 +41,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import net.yacy.cora.document.encoding.UTF8;
+import net.yacy.cora.federate.solr.Ranking;
 import net.yacy.cora.federate.solr.connector.EmbeddedSolrConnector;
 import net.yacy.cora.federate.solr.responsewriter.EnhancedXMLResponseWriter;
 import net.yacy.cora.federate.solr.responsewriter.GSAResponseWriter;

source/net/yacy/http/servlets/YaCyDefaultServlet.java

@@ -16,7 +16,7 @@
 //  along with this program in the file lgpl21.txt
 //  If not, see <http://www.gnu.org/licenses/>.
 //
-package net.yacy.http;
+package net.yacy.http.servlets;
 
 import java.awt.Image;
 import java.awt.image.BufferedImage;
@@ -51,6 +51,7 @@ import net.yacy.cora.document.analysis.Classification;
 import net.yacy.cora.protocol.HeaderFramework;
 import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.cora.util.ConcurrentLog;
+import net.yacy.http.ProxyHandler;
 import net.yacy.kelondro.util.FileUtils;
 import net.yacy.kelondro.util.MemoryControl;
 import net.yacy.peers.Seed;

source/net/yacy/http/servlets/YaCyProxyServlet.java

@@ -1,4 +1,4 @@
-package net.yacy.http;
+package net.yacy.http.servlets;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -19,6 +19,7 @@ import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import net.yacy.cora.document.encoding.UTF8;
 import net.yacy.cora.document.id.DigestURL;
 import net.yacy.cora.document.id.MultiProtocolURL;
@@ -27,10 +28,12 @@ import net.yacy.cora.protocol.HeaderFramework;
 import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.cora.protocol.ResponseHeader;
 import net.yacy.cora.util.ConcurrentLog;
+import net.yacy.http.ProxyHandler;
 import net.yacy.kelondro.util.FileUtils;
 import net.yacy.search.Switchboard;
 import net.yacy.server.http.ChunkedInputStream;
 import net.yacy.server.http.HTTPDProxyHandler;
+
 import org.eclipse.jetty.continuation.Continuation;
 import org.eclipse.jetty.continuation.ContinuationSupport;
 import org.eclipse.jetty.http.HttpURI;