refactoring

htroot/Bookmarks.java

@@ -40,9 +40,9 @@
 
 import net.yacy.cora.date.ISO8601Formatter;
 import net.yacy.cora.document.ASCII;
+import net.yacy.cora.federate.yacy.CacheStrategy;
 import net.yacy.cora.protocol.HeaderFramework;
 import net.yacy.cora.protocol.RequestHeader;
-import net.yacy.cora.services.federated.yacy.CacheStrategy;
 import net.yacy.data.BookmarkHelper;
 import net.yacy.data.BookmarksDB;
 import net.yacy.data.ListManager;

htroot/CrawlResults.java

@@ -34,8 +34,8 @@
 
 import net.yacy.cora.document.ASCII;
 import net.yacy.cora.document.UTF8;
+import net.yacy.cora.federate.solr.YaCySchema;
 import net.yacy.cora.protocol.RequestHeader;
-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;

htroot/CrawlStartExpert_p.java

@@ -24,8 +24,8 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+import net.yacy.cora.federate.solr.YaCySchema;
 import net.yacy.cora.protocol.RequestHeader;
-import net.yacy.cora.services.federated.solr.YaCySchema;
 import net.yacy.crawler.data.CrawlProfile;
 import net.yacy.search.Switchboard;
 import net.yacy.search.SwitchboardConstants;

htroot/Crawler_p.java

@@ -41,8 +41,8 @@
 
 import net.yacy.cora.document.ASCII;
 import net.yacy.cora.document.MultiProtocolURI;
+import net.yacy.cora.federate.yacy.CacheStrategy;
 import net.yacy.cora.protocol.RequestHeader;
-import net.yacy.cora.services.federated.yacy.CacheStrategy;
 import net.yacy.cora.util.SpaceExceededException;
 import net.yacy.crawler.data.CrawlProfile;
 import net.yacy.crawler.data.CrawlQueues;

htroot/DictionaryLoader_p.java

@@ -21,10 +21,10 @@
 import java.io.IOException;
 import java.net.MalformedURLException;
 
+import net.yacy.cora.federate.yacy.CacheStrategy;
 import net.yacy.cora.geo.GeonamesLocation;
 import net.yacy.cora.geo.OpenGeoDBLocation;
 import net.yacy.cora.protocol.RequestHeader;
-import net.yacy.cora.services.federated.yacy.CacheStrategy;
 import net.yacy.crawler.data.CrawlQueues;
 import net.yacy.crawler.retrieval.Response;
 import net.yacy.document.LibraryProvider;

htroot/IndexControlRWIs_p.java

@@ -37,10 +37,10 @@
 import net.yacy.cora.date.GenericFormatter;
 import net.yacy.cora.document.ASCII;
 import net.yacy.cora.document.UTF8;
+import net.yacy.cora.federate.yacy.CacheStrategy;
 import net.yacy.cora.lod.JenaTripleStore;
 import net.yacy.cora.order.Base64Order;
 import net.yacy.cora.protocol.RequestHeader;
-import net.yacy.cora.services.federated.yacy.CacheStrategy;
 import net.yacy.cora.storage.HandleSet;
 import net.yacy.cora.util.SpaceExceededException;
 import net.yacy.crawler.data.Cache;

htroot/IndexControlURLs_p.java

@@ -33,9 +33,9 @@
 
 import net.yacy.cora.date.GenericFormatter;
 import net.yacy.cora.document.ASCII;
+import net.yacy.cora.federate.yacy.CacheStrategy;
 import net.yacy.cora.order.Base64Order;
 import net.yacy.cora.protocol.RequestHeader;
-import net.yacy.cora.services.federated.yacy.CacheStrategy;
 import net.yacy.kelondro.data.meta.DigestURI;
 import net.yacy.kelondro.data.meta.URIMetadata;
 import net.yacy.kelondro.data.word.Word;

htroot/IndexFederated_p.java

@@ -29,13 +29,13 @@
 import java.util.Iterator;
 
 import net.yacy.cora.document.UTF8;
+import net.yacy.cora.federate.solr.YaCySchema;
+import net.yacy.cora.federate.solr.connector.RemoteSolrConnector;
+import net.yacy.cora.federate.solr.connector.ShardSelection;
+import net.yacy.cora.federate.solr.connector.ShardSolrConnector;
+import net.yacy.cora.federate.solr.connector.SolrConnector;
+import net.yacy.cora.federate.yacy.ConfigurationSet;
 import net.yacy.cora.protocol.RequestHeader;
-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.kelondro.logging.Log;
 import net.yacy.kelondro.util.OS;
 import net.yacy.search.Switchboard;

htroot/Load_RSS_p.java

@@ -33,8 +33,8 @@
 import net.yacy.cora.document.RSSMessage;
 import net.yacy.cora.document.RSSReader;
 import net.yacy.cora.document.UTF8;
+import net.yacy.cora.federate.yacy.CacheStrategy;
 import net.yacy.cora.protocol.RequestHeader;
-import net.yacy.cora.services.federated.yacy.CacheStrategy;
 import net.yacy.cora.util.SpaceExceededException;
 import net.yacy.crawler.data.CrawlQueues;
 import net.yacy.crawler.retrieval.RSSLoader;

htroot/PerformanceMemory_p.java

@@ -30,9 +30,9 @@
 import java.util.Iterator;
 import java.util.Map;
 
+import net.yacy.cora.federate.solr.connector.MirrorSolrConnector;
 import net.yacy.cora.protocol.Domains;
 import net.yacy.cora.protocol.RequestHeader;
-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;

htroot/QuickCrawlLink_p.java

@@ -33,10 +33,10 @@
 import java.util.Date;
 
 import net.yacy.cora.document.UTF8;
+import net.yacy.cora.federate.yacy.CacheStrategy;
 import net.yacy.cora.protocol.Domains;
 import net.yacy.cora.protocol.HeaderFramework;
 import net.yacy.cora.protocol.RequestHeader;
-import net.yacy.cora.services.federated.yacy.CacheStrategy;
 import net.yacy.cora.util.NumberTools;
 import net.yacy.crawler.data.CrawlProfile;
 import net.yacy.crawler.retrieval.Request;

htroot/ViewFile.java

@@ -39,10 +39,10 @@
 import net.yacy.cora.document.ASCII;
 import net.yacy.cora.document.MultiProtocolURI;
 import net.yacy.cora.document.UTF8;
+import net.yacy.cora.federate.yacy.CacheStrategy;
 import net.yacy.cora.lod.JenaTripleStore;
 import net.yacy.cora.lod.vocabulary.YaCyMetadata;
 import net.yacy.cora.protocol.RequestHeader;
-import net.yacy.cora.services.federated.yacy.CacheStrategy;
 import net.yacy.crawler.data.Cache;
 import net.yacy.crawler.data.CrawlQueues;
 import net.yacy.crawler.retrieval.Response;

htroot/ViewImage.java

@@ -32,10 +32,10 @@
 import java.net.MalformedURLException;
 import java.util.Map;
 
+import net.yacy.cora.federate.yacy.CacheStrategy;
 import net.yacy.cora.protocol.Domains;
 import net.yacy.cora.protocol.HeaderFramework;
 import net.yacy.cora.protocol.RequestHeader;
-import net.yacy.cora.services.federated.yacy.CacheStrategy;
 import net.yacy.cora.storage.ConcurrentARC;
 import net.yacy.crawler.data.CrawlQueues;
 import net.yacy.document.ImageParser;

htroot/api/getpageinfo.java

@@ -33,8 +33,8 @@
 import javax.xml.parsers.ParserConfigurationException;
 
 import net.yacy.cora.document.MultiProtocolURI;
+import net.yacy.cora.federate.yacy.CacheStrategy;
 import net.yacy.cora.protocol.RequestHeader;
-import net.yacy.cora.services.federated.yacy.CacheStrategy;
 import net.yacy.crawler.data.CrawlQueues;
 import net.yacy.crawler.robots.RobotsTxtEntry;
 import net.yacy.kelondro.data.meta.DigestURI;

htroot/api/getpageinfo_p.java

@@ -33,8 +33,8 @@
 import javax.xml.parsers.ParserConfigurationException;
 
 import net.yacy.cora.document.MultiProtocolURI;
+import net.yacy.cora.federate.yacy.CacheStrategy;
 import net.yacy.cora.protocol.RequestHeader;
-import net.yacy.cora.services.federated.yacy.CacheStrategy;
 import net.yacy.crawler.data.CrawlQueues;
 import net.yacy.crawler.robots.RobotsTxtEntry;
 import net.yacy.kelondro.data.meta.DigestURI;

htroot/api/schema_p.java

@@ -22,8 +22,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import net.yacy.cora.federate.solr.YaCySchema;
 import net.yacy.cora.protocol.RequestHeader;
-import net.yacy.cora.services.federated.solr.YaCySchema;
 import net.yacy.search.Switchboard;
 import net.yacy.search.index.SolrConfiguration;
 import net.yacy.server.serverObjects;

htroot/api/webstructure.java

@@ -31,9 +31,9 @@
 import net.yacy.cora.date.GenericFormatter;
 import net.yacy.cora.document.ASCII;
 import net.yacy.cora.document.MultiProtocolURI;
+import net.yacy.cora.federate.yacy.CacheStrategy;
 import net.yacy.cora.order.Base64Order;
 import net.yacy.cora.protocol.RequestHeader;
-import net.yacy.cora.services.federated.yacy.CacheStrategy;
 import net.yacy.crawler.data.CrawlQueues;
 import net.yacy.kelondro.data.citation.CitationReference;
 import net.yacy.kelondro.data.meta.DigestURI;

htroot/gsa/searchresult.java

@@ -27,11 +27,11 @@
 import java.util.regex.Pattern;
 
 import net.yacy.cora.document.UTF8;
+import net.yacy.cora.federate.solr.YaCySchema;
+import net.yacy.cora.federate.solr.connector.EmbeddedSolrConnector;
+import net.yacy.cora.federate.solr.responsewriter.GSAResponseWriter;
 import net.yacy.cora.protocol.HeaderFramework;
 import net.yacy.cora.protocol.RequestHeader;
-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;

htroot/solr/select.java

@@ -28,14 +28,14 @@
 import javax.servlet.ServletException;
 
 import net.yacy.cora.document.UTF8;
+import net.yacy.cora.federate.solr.SolrServlet;
+import net.yacy.cora.federate.solr.YaCySchema;
+import net.yacy.cora.federate.solr.connector.EmbeddedSolrConnector;
+import net.yacy.cora.federate.solr.responsewriter.EnhancedXMLResponseWriter;
+import net.yacy.cora.federate.solr.responsewriter.JsonResponseWriter;
+import net.yacy.cora.federate.solr.responsewriter.OpensearchResponseWriter;
 import net.yacy.cora.protocol.HeaderFramework;
 import net.yacy.cora.protocol.RequestHeader;
-import net.yacy.cora.services.federated.solr.SolrServlet;
-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;

htroot/yacy/transferRWI.java

@@ -33,9 +33,9 @@
 import net.yacy.cora.document.ASCII;
 import net.yacy.cora.document.RSSMessage;
 import net.yacy.cora.document.UTF8;
+import net.yacy.cora.federate.yacy.Distribution;
 import net.yacy.cora.protocol.HeaderFramework;
 import net.yacy.cora.protocol.RequestHeader;
-import net.yacy.cora.services.federated.yacy.Distribution;
 import net.yacy.cora.storage.HandleSet;
 import net.yacy.kelondro.data.meta.URIMetadataRow;
 import net.yacy.kelondro.data.word.WordReferenceRow;

htroot/yacysearch.java

@@ -45,13 +45,13 @@
 import net.yacy.cora.document.Classification.ContentDomain;
 import net.yacy.cora.document.RSSMessage;
 import net.yacy.cora.document.UTF8;
+import net.yacy.cora.federate.yacy.CacheStrategy;
 import net.yacy.cora.geo.GeoLocation;
 import net.yacy.cora.lod.vocabulary.Tagging;
 import net.yacy.cora.protocol.Domains;
 import net.yacy.cora.protocol.HeaderFramework;
 import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.cora.protocol.ResponseHeader;
-import net.yacy.cora.services.federated.yacy.CacheStrategy;
 import net.yacy.data.DidYouMean;
 import net.yacy.data.UserDB;
 import net.yacy.data.ymark.YMarkTables;

htroot/yacysearch_location.java

@@ -24,11 +24,11 @@
 import java.util.concurrent.TimeUnit;
 
 import net.yacy.cora.document.RSSMessage;
+import net.yacy.cora.federate.opensearch.SRURSSConnector;
 import net.yacy.cora.geo.GeoLocation;
 import net.yacy.cora.protocol.Domains;
 import net.yacy.cora.protocol.HeaderFramework;
 import net.yacy.cora.protocol.RequestHeader;
-import net.yacy.cora.services.federated.opensearch.SRURSSConnector;
 import net.yacy.document.LibraryProvider;
 import net.yacy.search.Switchboard;
 import net.yacy.search.SwitchboardConstants;

source/net/yacy/cora/services/federated/SearchAccumulator.java → source/net/yacy/cora/federate/SearchAccumulator.java

@@ -3,10 +3,6 @@
  *  Copyright 2010 by Michael Peter Christen
  *  First released 07.01.2011 at http://yacy.net
  *
- *  $LastChangedDate$
- *  $LastChangedRevision$
- *  $LastChangedBy$
- *
  *  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;
+package net.yacy.cora.federate;
 
 /**
  * place-holder class to provide a object declaration for threads in Search object

source/net/yacy/cora/services/federated/SearchHub.java → source/net/yacy/cora/federate/SearchHub.java

@@ -3,10 +3,6 @@
  *  Copyright 2010 by Michael Peter Christen
  *  First released 25.05.2010 at http://yacy.net
  *
- *  $LastChangedDate$
- *  $LastChangedRevision$
- *  $LastChangedBy$
- *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General private
  *  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;
+package net.yacy.cora.federate;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -31,9 +27,9 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 import net.yacy.cora.document.RSSMessage;
+import net.yacy.cora.federate.opensearch.SRURSSConnector;
+import net.yacy.cora.federate.yacy.CacheStrategy;
 import net.yacy.cora.protocol.http.HTTPClient;
-import net.yacy.cora.services.federated.opensearch.SRURSSConnector;
-import net.yacy.cora.services.federated.yacy.CacheStrategy;
 import net.yacy.cora.sorting.ConcurrentScoreMap;
 import net.yacy.cora.sorting.ScoreMap;
 

source/net/yacy/cora/services/federated/SearchResult.java → source/net/yacy/cora/federate/SearchResult.java

@@ -3,10 +3,6 @@
  *  Copyright 2011 by Michael Peter Christen
  *  First released 13.4.2011 at http://yacy.net
  *
- *  $LastChangedDate: 2011-03-08 02:51:51 +0100 (Di, 08 Mrz 2011) $
- *  $LastChangedRevision: 7567 $
- *  $LastChangedBy: low012 $
- *
  *  This file is part of YaCy Content Integration
  *
  *  This library is free software; you can redistribute it and/or
@@ -24,7 +20,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package net.yacy.cora.services.federated;
+package net.yacy.cora.federate;
 
 import net.yacy.cora.sorting.WeakPriorityBlockingQueue;
 

source/net/yacy/cora/services/federated/opensearch/SRURSSConnector.java → source/net/yacy/cora/federate/opensearch/SRURSSConnector.java

@@ -3,10 +3,6 @@
  *  Copyright 2010 by Michael Peter Christen
  *  First released 06.01.2011 at http://yacy.net
  *
- *  $LastChangedDate$
- *  $LastChangedRevision$
- *  $LastChangedBy$
- *
  *  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.opensearch;
+package net.yacy.cora.federate.opensearch;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -39,11 +35,11 @@
 import net.yacy.cora.document.RSSMessage;
 import net.yacy.cora.document.RSSReader;
 import net.yacy.cora.document.UTF8;
+import net.yacy.cora.federate.SearchAccumulator;
+import net.yacy.cora.federate.SearchHub;
+import net.yacy.cora.federate.yacy.CacheStrategy;
 import net.yacy.cora.protocol.ClientIdentification;
 import net.yacy.cora.protocol.http.HTTPClient;
-import net.yacy.cora.services.federated.SearchAccumulator;
-import net.yacy.cora.services.federated.SearchHub;
-import net.yacy.cora.services.federated.yacy.CacheStrategy;
 
 import org.apache.http.entity.mime.content.ContentBody;
 

source/net/yacy/cora/services/federated/solr/Schema.java → source/net/yacy/cora/federate/solr/Schema.java

@@ -18,7 +18,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package net.yacy.cora.services.federated.solr;
+package net.yacy.cora.federate.solr;
 
 
 public interface Schema {