refactoring

pull/1/head
Michael Peter Christen 12 years ago
parent fb9460f0a8
commit 872f83ebe0

@ -35,7 +35,7 @@ import java.util.Map;
import net.yacy.cora.document.ASCII;
import net.yacy.cora.document.UTF8;
import net.yacy.cora.protocol.RequestHeader;
import net.yacy.cora.services.federated.yacy.YaCySchema;
import net.yacy.cora.services.federated.solr.YaCySchema;
import net.yacy.crawler.data.ResultURLs;
import net.yacy.crawler.data.ResultURLs.EventOrigin;
import net.yacy.crawler.data.ResultURLs.InitExecEntry;

@ -25,7 +25,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
import net.yacy.cora.protocol.RequestHeader;
import net.yacy.cora.services.federated.yacy.YaCySchema;
import net.yacy.cora.services.federated.solr.YaCySchema;
import net.yacy.crawler.data.CrawlProfile;
import net.yacy.search.Switchboard;
import net.yacy.search.SwitchboardConstants;

@ -30,12 +30,12 @@ import java.util.Iterator;
import net.yacy.cora.document.UTF8;
import net.yacy.cora.protocol.RequestHeader;
import net.yacy.cora.services.federated.solr.ShardSelection;
import net.yacy.cora.services.federated.solr.ShardSolrConnector;
import net.yacy.cora.services.federated.solr.RemoteSolrConnector;
import net.yacy.cora.services.federated.solr.SolrConnector;
import net.yacy.cora.services.federated.solr.YaCySchema;
import net.yacy.cora.services.federated.solr.connector.RemoteSolrConnector;
import net.yacy.cora.services.federated.solr.connector.ShardSelection;
import net.yacy.cora.services.federated.solr.connector.ShardSolrConnector;
import net.yacy.cora.services.federated.solr.connector.SolrConnector;
import net.yacy.cora.services.federated.yacy.ConfigurationSet;
import net.yacy.cora.services.federated.yacy.YaCySchema;
import net.yacy.kelondro.logging.Log;
import net.yacy.kelondro.util.OS;
import net.yacy.search.Switchboard;

@ -32,7 +32,7 @@ import java.util.Map;
import net.yacy.cora.protocol.Domains;
import net.yacy.cora.protocol.RequestHeader;
import net.yacy.cora.services.federated.solr.MirrorSolrConnector;
import net.yacy.cora.services.federated.solr.connector.MirrorSolrConnector;
import net.yacy.kelondro.index.Cache;
import net.yacy.kelondro.index.RAMIndex;
import net.yacy.kelondro.table.Table;

@ -23,7 +23,7 @@
*/
import net.yacy.cora.protocol.RequestHeader;
import net.yacy.cora.services.federated.yacy.YaCySchema;
import net.yacy.cora.services.federated.solr.YaCySchema;
import net.yacy.search.Switchboard;
import net.yacy.search.index.SolrConfiguration;
import net.yacy.server.serverObjects;

@ -29,9 +29,9 @@ import java.util.regex.Pattern;
import net.yacy.cora.document.UTF8;
import net.yacy.cora.protocol.HeaderFramework;
import net.yacy.cora.protocol.RequestHeader;
import net.yacy.cora.services.federated.solr.EmbeddedSolrConnector;
import net.yacy.cora.services.federated.solr.GSAResponseWriter;
import net.yacy.cora.services.federated.yacy.YaCySchema;
import net.yacy.cora.services.federated.solr.YaCySchema;
import net.yacy.cora.services.federated.solr.connector.EmbeddedSolrConnector;
import net.yacy.cora.services.federated.solr.responsewriter.GSAResponseWriter;
import net.yacy.kelondro.logging.Log;
import net.yacy.search.Switchboard;
import net.yacy.search.query.AccessTracker;

@ -30,12 +30,12 @@ import javax.servlet.ServletException;
import net.yacy.cora.document.UTF8;
import net.yacy.cora.protocol.HeaderFramework;
import net.yacy.cora.protocol.RequestHeader;
import net.yacy.cora.services.federated.solr.EmbeddedSolrConnector;
import net.yacy.cora.services.federated.solr.EnhancedXMLResponseWriter;
import net.yacy.cora.services.federated.solr.JsonResponseWriter;
import net.yacy.cora.services.federated.solr.OpensearchResponseWriter;
import net.yacy.cora.services.federated.solr.SolrServlet;
import net.yacy.cora.services.federated.yacy.YaCySchema;
import net.yacy.cora.services.federated.solr.YaCySchema;
import net.yacy.cora.services.federated.solr.connector.EmbeddedSolrConnector;
import net.yacy.cora.services.federated.solr.responsewriter.EnhancedXMLResponseWriter;
import net.yacy.cora.services.federated.solr.responsewriter.JsonResponseWriter;
import net.yacy.cora.services.federated.solr.responsewriter.OpensearchResponseWriter;
import net.yacy.kelondro.logging.Log;
import net.yacy.search.Switchboard;
import net.yacy.search.SwitchboardConstants;

@ -3,10 +3,6 @@
* Copyright 2011 by Michael Peter Christen
* First released 14.04.2011 at http://yacy.net
*
* $LastChangedDate: 2011-04-14 22:05:04 +0200 (Do, 14 Apr 2011) $
* $LastChangedRevision: 7654 $
* $LastChangedBy: orbiter $
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either

@ -1,3 +1,23 @@
/**
* SolrServlet
* Copyright 2012 by Michael Peter Christen
* First released 23.08.2012 at http://yacy.net
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program in the file lgpl21.txt
* If not, see <http://www.gnu.org/licenses/>.
*/
package net.yacy.cora.services.federated.solr;
import java.io.IOException;
@ -21,6 +41,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import net.yacy.cora.document.UTF8;
import net.yacy.cora.services.federated.solr.connector.EmbeddedSolrConnector;
import org.apache.lucene.document.Document;
import org.apache.solr.common.SolrException;

@ -3,10 +3,6 @@
* Copyright 2011 by Michael Peter Christen
* First released 14.04.2011 at http://yacy.net
*
* $LastChangedDate: 2011-04-14 22:05:04 +0200 (Do, 14 Apr 2011) $
* $LastChangedRevision: 7654 $
* $LastChangedBy: orbiter $
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either

@ -18,13 +18,11 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
package net.yacy.cora.services.federated.yacy;
package net.yacy.cora.services.federated.solr;
import java.util.Date;
import java.util.List;
import net.yacy.cora.services.federated.solr.Schema;
import net.yacy.cora.services.federated.solr.SolrType;
import org.apache.solr.common.SolrInputDocument;

@ -18,7 +18,7 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
package net.yacy.cora.services.federated.solr;
package net.yacy.cora.services.federated.solr.connector;
import java.io.IOException;
import java.util.Iterator;
@ -26,7 +26,7 @@ import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
import net.yacy.cora.services.federated.yacy.YaCySchema;
import net.yacy.cora.services.federated.solr.YaCySchema;
import net.yacy.cora.util.LookAheadIterator;
import org.apache.log4j.Logger;

@ -19,13 +19,15 @@
*/
package net.yacy.cora.services.federated.solr;
package net.yacy.cora.services.federated.solr.connector;
import java.io.File;
import java.io.IOException;
import javax.xml.parsers.ParserConfigurationException;
import net.yacy.cora.services.federated.solr.SolrServlet;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;
import org.apache.solr.client.solrj.response.QueryResponse;

@ -18,14 +18,14 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
package net.yacy.cora.services.federated.solr;
package net.yacy.cora.services.federated.solr.connector;
import java.io.IOException;
import java.util.Collection;
import java.util.List;
import java.util.concurrent.atomic.AtomicLong;
import net.yacy.cora.services.federated.yacy.YaCySchema;
import net.yacy.cora.services.federated.solr.YaCySchema;
import net.yacy.cora.storage.ARC;
import net.yacy.cora.storage.ConcurrentARC;
import net.yacy.kelondro.util.MemoryControl;

@ -18,7 +18,7 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
package net.yacy.cora.services.federated.solr;
package net.yacy.cora.services.federated.solr.connector;
import java.io.IOException;
import java.util.Collection;

@ -22,7 +22,7 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
package net.yacy.cora.services.federated.solr;
package net.yacy.cora.services.federated.solr.connector;
import java.io.File;
import java.io.IOException;

@ -18,7 +18,7 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
package net.yacy.cora.services.federated.solr;
package net.yacy.cora.services.federated.solr.connector;
import java.io.IOException;
import java.util.Collection;

@ -3,10 +3,6 @@
* Copyright 2011 by Michael Peter Christen
* First released 25.05.2011 at http://yacy.net
*
* $LastChangedDate: 2011-04-14 22:05:04 +0200 (Do, 14 Apr 2011) $
* $LastChangedRevision: 7654 $
* $LastChangedBy: orbiter $
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
@ -22,7 +18,7 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
package net.yacy.cora.services.federated.solr;
package net.yacy.cora.services.federated.solr.connector;
import java.io.IOException;
import java.net.MalformedURLException;
@ -32,7 +28,7 @@ import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.concurrent.atomic.AtomicLong;
import net.yacy.cora.services.federated.yacy.YaCySchema;
import net.yacy.cora.services.federated.solr.YaCySchema;
import org.apache.solr.common.SolrInputDocument;

@ -22,7 +22,7 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
package net.yacy.cora.services.federated.solr;
package net.yacy.cora.services.federated.solr.connector;
import java.io.IOException;
import java.net.InetAddress;
@ -32,6 +32,7 @@ import java.util.List;
import java.util.concurrent.atomic.AtomicLong;
import net.yacy.cora.protocol.Domains;
import net.yacy.cora.services.federated.solr.connector.ShardSelection.Method;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrDocumentList;

@ -22,7 +22,7 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
package net.yacy.cora.services.federated.solr;
package net.yacy.cora.services.federated.solr.connector;
import java.io.IOException;
import java.util.Collection;

@ -18,7 +18,7 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
package net.yacy.cora.services.federated.solr;
package net.yacy.cora.services.federated.solr.connector;
import java.io.File;
import java.io.IOException;

@ -18,7 +18,7 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
package net.yacy.cora.services.federated.solr;
package net.yacy.cora.services.federated.solr.responsewriter;
import java.io.IOException;
import java.io.Writer;
@ -26,6 +26,8 @@ import java.util.Date;
import java.util.List;
import java.util.Set;
import net.yacy.cora.services.federated.solr.SolrType;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Fieldable;
import org.apache.solr.common.util.NamedList;

@ -18,7 +18,7 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
package net.yacy.cora.services.federated.solr;
package net.yacy.cora.services.federated.solr.responsewriter;
import java.io.IOException;
import java.io.Writer;
@ -32,7 +32,7 @@ import java.util.Set;
import java.util.regex.Pattern;
import net.yacy.cora.protocol.HeaderFramework;
import net.yacy.cora.services.federated.yacy.YaCySchema;
import net.yacy.cora.services.federated.solr.YaCySchema;
import net.yacy.peers.operation.yacyVersion;
import net.yacy.search.Switchboard;

@ -18,7 +18,7 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
package net.yacy.cora.services.federated.solr;
package net.yacy.cora.services.federated.solr.responsewriter;
import java.io.IOException;
import java.io.Writer;
@ -31,8 +31,8 @@ import java.util.Map;
import net.yacy.cora.document.MultiProtocolURI;
import net.yacy.cora.protocol.HeaderFramework;
import net.yacy.cora.services.federated.solr.OpensearchResponseWriter.ResHead;
import net.yacy.cora.services.federated.yacy.YaCySchema;
import net.yacy.cora.services.federated.solr.YaCySchema;
import net.yacy.cora.services.federated.solr.responsewriter.OpensearchResponseWriter.ResHead;
import net.yacy.server.serverObjects;
import org.apache.lucene.document.Document;

@ -18,7 +18,7 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
package net.yacy.cora.services.federated.solr;
package net.yacy.cora.services.federated.solr.responsewriter;
import java.io.IOException;
import java.io.Writer;
@ -33,7 +33,7 @@ import java.util.Set;
import net.yacy.cora.document.RSSMessage;
import net.yacy.cora.lod.vocabulary.DublinCore;
import net.yacy.cora.protocol.HeaderFramework;
import net.yacy.cora.services.federated.yacy.YaCySchema;
import net.yacy.cora.services.federated.solr.YaCySchema;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Fieldable;

@ -37,6 +37,7 @@ import java.util.TreeMap;
import org.apache.log4j.Logger;
import net.yacy.cora.services.federated.solr.YaCySchema;
import net.yacy.cora.services.federated.yacy.ConfigurationSet.Entry;
import net.yacy.cora.storage.Files;

@ -39,8 +39,8 @@ import org.apache.solr.common.SolrInputDocument;
import net.yacy.cora.document.ASCII;
import net.yacy.cora.document.UTF8;
import net.yacy.cora.order.Base64Order;
import net.yacy.cora.services.federated.solr.ShardSolrConnector;
import net.yacy.cora.services.federated.solr.SolrConnector;
import net.yacy.cora.services.federated.solr.connector.ShardSolrConnector;
import net.yacy.cora.services.federated.solr.connector.SolrConnector;
import net.yacy.cora.util.SpaceExceededException;
import net.yacy.crawler.retrieval.Request;
import net.yacy.kelondro.data.meta.DigestURI;

@ -33,7 +33,7 @@ import net.yacy.cora.document.UTF8;
import net.yacy.cora.lod.vocabulary.Tagging;
import net.yacy.cora.order.Base64Order;
import net.yacy.cora.services.federated.solr.SolrType;
import net.yacy.cora.services.federated.yacy.YaCySchema;
import net.yacy.cora.services.federated.solr.YaCySchema;
import net.yacy.crawler.retrieval.Request;
import net.yacy.crawler.retrieval.Response;
import net.yacy.document.Condenser;

@ -75,8 +75,8 @@ import net.yacy.cora.protocol.ClientIdentification;
import net.yacy.cora.protocol.Domains;
import net.yacy.cora.protocol.http.HTTPClient;
import net.yacy.cora.services.federated.opensearch.SRURSSConnector;
import net.yacy.cora.services.federated.solr.RemoteSolrConnector;
import net.yacy.cora.services.federated.solr.SolrConnector;
import net.yacy.cora.services.federated.solr.connector.RemoteSolrConnector;
import net.yacy.cora.services.federated.solr.connector.SolrConnector;
import net.yacy.cora.services.federated.yacy.CacheStrategy;
import net.yacy.cora.storage.HandleSet;
import net.yacy.cora.util.SpaceExceededException;

@ -98,9 +98,9 @@ import net.yacy.cora.protocol.ResponseHeader;
import net.yacy.cora.protocol.TimeoutRequest;
import net.yacy.cora.protocol.http.HTTPClient;
import net.yacy.cora.protocol.http.ProxySettings;
import net.yacy.cora.services.federated.solr.ShardSelection;
import net.yacy.cora.services.federated.solr.ShardSolrConnector;
import net.yacy.cora.services.federated.solr.SolrConnector;
import net.yacy.cora.services.federated.solr.connector.ShardSelection;
import net.yacy.cora.services.federated.solr.connector.ShardSolrConnector;
import net.yacy.cora.services.federated.solr.connector.SolrConnector;
import net.yacy.cora.services.federated.yacy.CacheStrategy;
import net.yacy.cora.storage.HandleSet;
import net.yacy.cora.util.SpaceExceededException;

@ -38,10 +38,10 @@ import net.yacy.cora.date.GenericFormatter;
import net.yacy.cora.document.ASCII;
import net.yacy.cora.document.MultiProtocolURI;
import net.yacy.cora.order.CloneableIterator;
import net.yacy.cora.services.federated.solr.EmbeddedSolrConnector;
import net.yacy.cora.services.federated.solr.MirrorSolrConnector;
import net.yacy.cora.services.federated.solr.SolrConnector;
import net.yacy.cora.services.federated.yacy.YaCySchema;
import net.yacy.cora.services.federated.solr.YaCySchema;
import net.yacy.cora.services.federated.solr.connector.EmbeddedSolrConnector;
import net.yacy.cora.services.federated.solr.connector.MirrorSolrConnector;
import net.yacy.cora.services.federated.solr.connector.SolrConnector;
import net.yacy.cora.sorting.ConcurrentScoreMap;
import net.yacy.cora.sorting.ScoreMap;
import net.yacy.cora.storage.HandleSet;

@ -41,9 +41,9 @@ import net.yacy.cora.document.UTF8;
import net.yacy.cora.order.Base64Order;
import net.yacy.cora.order.ByteOrder;
import net.yacy.cora.protocol.ResponseHeader;
import net.yacy.cora.services.federated.solr.AbstractSolrConnector;
import net.yacy.cora.services.federated.solr.YaCySchema;
import net.yacy.cora.services.federated.solr.connector.AbstractSolrConnector;
import net.yacy.cora.services.federated.yacy.CacheStrategy;
import net.yacy.cora.services.federated.yacy.YaCySchema;
import net.yacy.cora.storage.HandleSet;
import net.yacy.cora.util.LookAheadIterator;
import net.yacy.cora.util.SpaceExceededException;

@ -45,8 +45,8 @@ import net.yacy.cora.document.UTF8;
import net.yacy.cora.protocol.Domains;
import net.yacy.cora.protocol.HeaderFramework;
import net.yacy.cora.protocol.ResponseHeader;
import net.yacy.cora.services.federated.solr.YaCySchema;
import net.yacy.cora.services.federated.yacy.ConfigurationSet;
import net.yacy.cora.services.federated.yacy.YaCySchema;
import net.yacy.crawler.data.CrawlProfile;
import net.yacy.crawler.retrieval.Response;
import net.yacy.document.Condenser;

@ -46,8 +46,8 @@ import net.yacy.cora.document.UTF8;
import net.yacy.cora.geo.GeoLocation;
import net.yacy.cora.lod.vocabulary.Tagging;
import net.yacy.cora.order.Base64Order;
import net.yacy.cora.services.federated.solr.YaCySchema;
import net.yacy.cora.services.federated.yacy.CacheStrategy;
import net.yacy.cora.services.federated.yacy.YaCySchema;
import net.yacy.cora.storage.HandleSet;
import net.yacy.cora.util.SpaceExceededException;
import net.yacy.document.Condenser;

@ -59,7 +59,7 @@ import net.yacy.cora.document.MultiProtocolURI;
import net.yacy.cora.document.UTF8;
import net.yacy.cora.protocol.RequestHeader;
import net.yacy.cora.protocol.RequestHeader.FileType;
import net.yacy.cora.services.federated.yacy.YaCySchema;
import net.yacy.cora.services.federated.solr.YaCySchema;
import net.yacy.document.parser.html.CharacterCoding;
import net.yacy.kelondro.util.Formatter;
import net.yacy.search.Switchboard;

Loading…
Cancel
Save