diff --git a/build.xml b/build.xml index d8c625f35..d8b1eda47 100644 --- a/build.xml +++ b/build.xml @@ -119,20 +119,6 @@ - - - - - - - - - - - - - - @@ -154,8 +140,8 @@ - - + + @@ -224,7 +210,7 @@ @@ -234,7 +220,7 @@ @@ -491,7 +477,7 @@ - + diff --git a/htroot/AccessPicture_p.java b/htroot/AccessPicture_p.java index 282e25faf..0c8bfcb79 100644 --- a/htroot/AccessPicture_p.java +++ b/htroot/AccessPicture_p.java @@ -29,10 +29,10 @@ import java.util.Set; import net.yacy.cora.protocol.ConnectionInfo; import net.yacy.cora.protocol.RequestHeader; +import net.yacy.search.Switchboard; import net.yacy.visualization.HexGridPlotter; import net.yacy.visualization.PrintTool; import net.yacy.visualization.RasterPlotter; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/AccessTracker_p.java b/htroot/AccessTracker_p.java index e8a522207..1b536c773 100644 --- a/htroot/AccessTracker_p.java +++ b/htroot/AccessTracker_p.java @@ -38,15 +38,15 @@ import java.text.SimpleDateFormat; import net.yacy.cora.protocol.Domains; import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.RequestHeader; +import net.yacy.peers.yacySeed; +import net.yacy.search.Switchboard; +import net.yacy.search.query.AccessTracker; +import net.yacy.search.query.QueryParams; -import de.anomic.search.AccessTracker; -import de.anomic.search.QueryParams; -import de.anomic.search.Switchboard; import de.anomic.server.serverCore; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; import de.anomic.server.serverAccessTracker.Track; -import de.anomic.yacy.yacySeed; public class AccessTracker_p { diff --git a/htroot/Banner.java b/htroot/Banner.java index 7b629c0b5..ab2ed2b6a 100644 --- a/htroot/Banner.java +++ b/htroot/Banner.java @@ -32,13 +32,13 @@ import java.io.IOException; import javax.imageio.ImageIO; import net.yacy.cora.protocol.RequestHeader; +import net.yacy.peers.yacySeed; +import net.yacy.peers.graphics.NetworkGraph; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; import net.yacy.visualization.RasterPlotter; -import de.anomic.search.Switchboard; -import de.anomic.search.SwitchboardConstants; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacySeed; -import de.anomic.yacy.graphics.NetworkGraph; /** draw a banner with information about the peer */ public class Banner { diff --git a/htroot/BlacklistCleaner_p.java b/htroot/BlacklistCleaner_p.java index fb450e9fc..af3383c60 100644 --- a/htroot/BlacklistCleaner_p.java +++ b/htroot/BlacklistCleaner_p.java @@ -44,8 +44,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import de.anomic.data.ListManager; -import de.anomic.search.SearchEventCache; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; import java.util.Set; @@ -55,6 +53,8 @@ import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.util.FileUtils; import net.yacy.repository.Blacklist; import net.yacy.repository.Blacklist.BlacklistError; +import net.yacy.search.Switchboard; +import net.yacy.search.query.SearchEventCache; public class BlacklistCleaner_p { diff --git a/htroot/BlacklistImpExp_p.java b/htroot/BlacklistImpExp_p.java index c24a7cc5d..bc6e7d985 100644 --- a/htroot/BlacklistImpExp_p.java +++ b/htroot/BlacklistImpExp_p.java @@ -34,14 +34,14 @@ import java.util.Iterator; import java.util.TreeMap; import de.anomic.data.ListManager; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacySeed; import java.util.List; import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.util.FileUtils; +import net.yacy.peers.yacySeed; +import net.yacy.search.Switchboard; public class BlacklistImpExp_p { private final static String DISABLED = "disabled_"; diff --git a/htroot/BlacklistTest_p.java b/htroot/BlacklistTest_p.java index c53b436da..584754b78 100644 --- a/htroot/BlacklistTest_p.java +++ b/htroot/BlacklistTest_p.java @@ -35,9 +35,9 @@ import java.net.MalformedURLException; import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.repository.Blacklist; +import net.yacy.search.Switchboard; import de.anomic.data.ListManager; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/Blacklist_p.java b/htroot/Blacklist_p.java index aeb9430a0..4a478e17f 100644 --- a/htroot/Blacklist_p.java +++ b/htroot/Blacklist_p.java @@ -43,11 +43,11 @@ import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.util.FileUtils; import net.yacy.repository.Blacklist; +import net.yacy.search.Switchboard; +import net.yacy.search.query.SearchEventCache; import de.anomic.data.WorkTables; import de.anomic.data.ListManager; -import de.anomic.search.SearchEventCache; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/Blog.java b/htroot/Blog.java index cf7a667f2..7c6a5c3d0 100644 --- a/htroot/Blog.java +++ b/htroot/Blog.java @@ -39,13 +39,13 @@ import java.util.Locale; import net.yacy.cora.document.UTF8; import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.RequestHeader; +import net.yacy.peers.yacyNewsPool; +import net.yacy.search.Switchboard; import de.anomic.data.BlogBoard; import de.anomic.data.UserDB; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacyNewsPool; import java.util.List; import java.util.Map; diff --git a/htroot/BlogComments.java b/htroot/BlogComments.java index 592bf3772..fa0706c77 100644 --- a/htroot/BlogComments.java +++ b/htroot/BlogComments.java @@ -42,16 +42,16 @@ import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.util.FileUtils; +import net.yacy.peers.yacyCore; +import net.yacy.search.Switchboard; import de.anomic.data.BlogBoard; import de.anomic.data.BlogBoardComments; import de.anomic.data.MessageBoard; import de.anomic.data.UserDB; import de.anomic.data.BlogBoard.BlogEntry; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacyCore; public class BlogComments { diff --git a/htroot/Bookmarks.java b/htroot/Bookmarks.java index bb4fc345b..4e03d8625 100644 --- a/htroot/Bookmarks.java +++ b/htroot/Bookmarks.java @@ -48,17 +48,17 @@ import net.yacy.document.Parser; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.data.meta.URIMetadataRow; import net.yacy.kelondro.logging.Log; +import net.yacy.peers.yacyNewsPool; +import net.yacy.search.Switchboard; +import net.yacy.search.index.Segments; import de.anomic.data.BookmarkHelper; import de.anomic.data.BookmarksDB; import de.anomic.data.BookmarksDB.Bookmark; import de.anomic.data.BookmarksDB.Tag; import de.anomic.data.ListManager; import de.anomic.data.UserDB; -import de.anomic.search.Segments; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacyNewsPool; public class Bookmarks { diff --git a/htroot/Collage.java b/htroot/Collage.java index c6016de01..c3c902cb1 100755 --- a/htroot/Collage.java +++ b/htroot/Collage.java @@ -27,9 +27,9 @@ import java.util.Random; import net.yacy.cora.document.MultiProtocolURI; import net.yacy.cora.protocol.Domains; import net.yacy.cora.protocol.RequestHeader; +import net.yacy.search.Switchboard; import de.anomic.crawler.ResultImages; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/ConfigAccounts_p.java b/htroot/ConfigAccounts_p.java index 8255421e4..3afa0611d 100644 --- a/htroot/ConfigAccounts_p.java +++ b/htroot/ConfigAccounts_p.java @@ -36,11 +36,11 @@ import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.order.Digest; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; import de.anomic.data.UserDB; import de.anomic.data.UserDB.AccessRight; -import de.anomic.search.Switchboard; -import de.anomic.search.SwitchboardConstants; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; import java.util.EnumMap; diff --git a/htroot/ConfigAppearance_p.java b/htroot/ConfigAppearance_p.java index 68a939952..1bddfa01b 100644 --- a/htroot/ConfigAppearance_p.java +++ b/htroot/ConfigAppearance_p.java @@ -42,8 +42,8 @@ import net.yacy.cora.protocol.ClientIdentification; import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.util.FileUtils; +import net.yacy.search.Switchboard; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; import java.util.Collections; diff --git a/htroot/ConfigBasic.java b/htroot/ConfigBasic.java index 6997abd13..c0772dcc3 100644 --- a/htroot/ConfigBasic.java +++ b/htroot/ConfigBasic.java @@ -37,17 +37,17 @@ import net.yacy.cora.protocol.Domains; import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.workflow.InstantBusyThread; +import net.yacy.peers.yacySeed; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; import de.anomic.data.WorkTables; import de.anomic.data.Translator; import de.anomic.http.server.HTTPDFileHandler; -import de.anomic.net.UPnP; -import de.anomic.search.Switchboard; -import de.anomic.search.SwitchboardConstants; import de.anomic.server.serverCore; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacySeed; +import de.anomic.tools.UPnP; public class ConfigBasic { diff --git a/htroot/ConfigHTCache_p.java b/htroot/ConfigHTCache_p.java index 331d8856d..010b0dd0e 100644 --- a/htroot/ConfigHTCache_p.java +++ b/htroot/ConfigHTCache_p.java @@ -30,11 +30,11 @@ import java.io.File; import java.io.IOException; import net.yacy.cora.protocol.RequestHeader; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; import de.anomic.data.WorkTables; import de.anomic.http.client.Cache; -import de.anomic.search.Switchboard; -import de.anomic.search.SwitchboardConstants; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/ConfigHeuristics_p.java b/htroot/ConfigHeuristics_p.java index 7d62fec95..f60abe374 100644 --- a/htroot/ConfigHeuristics_p.java +++ b/htroot/ConfigHeuristics_p.java @@ -26,8 +26,8 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA import net.yacy.cora.protocol.RequestHeader; +import net.yacy.search.Switchboard; import de.anomic.data.WorkTables; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/ConfigLanguage_p.java b/htroot/ConfigLanguage_p.java index 01e8143c6..757bf44d2 100644 --- a/htroot/ConfigLanguage_p.java +++ b/htroot/ConfigLanguage_p.java @@ -41,10 +41,10 @@ import net.yacy.cora.protocol.ClientIdentification; import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.util.FileUtils; +import net.yacy.search.Switchboard; import de.anomic.data.WorkTables; import de.anomic.data.Translator; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; import java.util.Collections; diff --git a/htroot/ConfigLiveSearch.java b/htroot/ConfigLiveSearch.java index 00d84c292..b60eb5243 100644 --- a/htroot/ConfigLiveSearch.java +++ b/htroot/ConfigLiveSearch.java @@ -26,7 +26,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA import net.yacy.cora.protocol.RequestHeader; -import de.anomic.search.Switchboard; +import net.yacy.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/ConfigNetwork_p.java b/htroot/ConfigNetwork_p.java index 42e239a71..e934bb682 100644 --- a/htroot/ConfigNetwork_p.java +++ b/htroot/ConfigNetwork_p.java @@ -34,10 +34,10 @@ import net.yacy.cora.document.ASCII; import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.util.FileUtils; import net.yacy.kelondro.util.MapTools; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; import de.anomic.data.WorkTables; -import de.anomic.search.Switchboard; -import de.anomic.search.SwitchboardConstants; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/ConfigParser.java b/htroot/ConfigParser.java index 0f824a8b4..4b41d621d 100644 --- a/htroot/ConfigParser.java +++ b/htroot/ConfigParser.java @@ -28,8 +28,8 @@ import net.yacy.cora.protocol.RequestHeader; import net.yacy.document.Parser; import net.yacy.document.TextParser; -import de.anomic.search.Switchboard; -import de.anomic.search.SwitchboardConstants; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/ConfigPortal.java b/htroot/ConfigPortal.java index 022b47548..ee91eca04 100644 --- a/htroot/ConfigPortal.java +++ b/htroot/ConfigPortal.java @@ -26,10 +26,10 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA import net.yacy.cora.protocol.RequestHeader; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; import de.anomic.data.WorkTables; import de.anomic.http.server.HTTPDFileHandler; -import de.anomic.search.Switchboard; -import de.anomic.search.SwitchboardConstants; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/ConfigProfile_p.java b/htroot/ConfigProfile_p.java index 1e7acbc32..a9e134156 100644 --- a/htroot/ConfigProfile_p.java +++ b/htroot/ConfigProfile_p.java @@ -36,11 +36,11 @@ import java.io.IOException; import java.util.Properties; import net.yacy.cora.protocol.RequestHeader; +import net.yacy.peers.yacyNewsPool; +import net.yacy.search.Switchboard; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacyNewsPool; public class ConfigProfile_p { diff --git a/htroot/ConfigRobotsTxt_p.java b/htroot/ConfigRobotsTxt_p.java index 54ec8a6a8..0a5a17511 100644 --- a/htroot/ConfigRobotsTxt_p.java +++ b/htroot/ConfigRobotsTxt_p.java @@ -30,9 +30,9 @@ // if the shell's current path is HTROOT import net.yacy.cora.protocol.RequestHeader; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; import de.anomic.http.server.RobotsTxtConfig; -import de.anomic.search.Switchboard; -import de.anomic.search.SwitchboardConstants; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; import de.anomic.server.servletProperties; diff --git a/htroot/ConfigSearchBox.java b/htroot/ConfigSearchBox.java index cf92de73b..775b084bf 100644 --- a/htroot/ConfigSearchBox.java +++ b/htroot/ConfigSearchBox.java @@ -24,7 +24,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA import net.yacy.cora.protocol.RequestHeader; -import de.anomic.search.Switchboard; +import net.yacy.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/ConfigUpdate_p.java b/htroot/ConfigUpdate_p.java index dc60a8365..c7c448ae4 100644 --- a/htroot/ConfigUpdate_p.java +++ b/htroot/ConfigUpdate_p.java @@ -36,13 +36,13 @@ import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.util.FileUtils; import net.yacy.kelondro.util.OS; +import net.yacy.peers.operation.yacyBuildProperties; +import net.yacy.peers.operation.yacyRelease; +import net.yacy.peers.operation.yacyVersion; +import net.yacy.search.Switchboard; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacyBuildProperties; -import de.anomic.yacy.yacyRelease; -import de.anomic.yacy.yacyVersion; public class ConfigUpdate_p { diff --git a/htroot/Connections_p.java b/htroot/Connections_p.java index 3855c8e3a..0be61ccc0 100644 --- a/htroot/Connections_p.java +++ b/htroot/Connections_p.java @@ -36,16 +36,16 @@ import net.yacy.cora.protocol.ConnectionInfo; import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.workflow.WorkflowThread; +import net.yacy.peers.yacyPeerActions; +import net.yacy.peers.yacySeed; +import net.yacy.search.Switchboard; //import de.anomic.http.client.ConnectionInfo; //import de.anomic.http.client.Client; -import de.anomic.search.Switchboard; import de.anomic.server.serverCore; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; import de.anomic.server.serverCore.Session; -import de.anomic.yacy.yacyPeerActions; -import de.anomic.yacy.yacySeed; public final class Connections_p { diff --git a/htroot/ContentIntegrationPHPBB3_p.java b/htroot/ContentIntegrationPHPBB3_p.java index e0ca50f15..8a812e97c 100644 --- a/htroot/ContentIntegrationPHPBB3_p.java +++ b/htroot/ContentIntegrationPHPBB3_p.java @@ -29,7 +29,7 @@ import net.yacy.document.content.dao.Dao; import net.yacy.document.content.dao.ImportDump; import net.yacy.document.content.dao.PhpBB3Dao; import net.yacy.kelondro.logging.Log; -import de.anomic.search.Switchboard; +import net.yacy.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/CookieMonitorIncoming_p.java b/htroot/CookieMonitorIncoming_p.java index bcd0c334d..9341f9175 100644 --- a/htroot/CookieMonitorIncoming_p.java +++ b/htroot/CookieMonitorIncoming_p.java @@ -33,8 +33,8 @@ import java.util.Map; import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.RequestHeader; +import net.yacy.search.Switchboard; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/CookieMonitorOutgoing_p.java b/htroot/CookieMonitorOutgoing_p.java index 5e92cbbfc..086fe9259 100644 --- a/htroot/CookieMonitorOutgoing_p.java +++ b/htroot/CookieMonitorOutgoing_p.java @@ -33,7 +33,7 @@ import java.util.Map; import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.RequestHeader; -import de.anomic.search.Switchboard; +import net.yacy.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/CrawlMonitorRemoteStart.java b/htroot/CrawlMonitorRemoteStart.java index 3f9506975..dc48cc84b 100644 --- a/htroot/CrawlMonitorRemoteStart.java +++ b/htroot/CrawlMonitorRemoteStart.java @@ -27,13 +27,13 @@ import java.util.Iterator; import net.yacy.cora.protocol.RequestHeader; +import net.yacy.peers.yacyNewsDB; +import net.yacy.peers.yacyNewsPool; +import net.yacy.peers.yacySeed; +import net.yacy.search.Switchboard; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacyNewsDB; -import de.anomic.yacy.yacyNewsPool; -import de.anomic.yacy.yacySeed; public class CrawlMonitorRemoteStart { diff --git a/htroot/CrawlProfileEditor_p.java b/htroot/CrawlProfileEditor_p.java index 06cce4ad0..3f229bbcd 100644 --- a/htroot/CrawlProfileEditor_p.java +++ b/htroot/CrawlProfileEditor_p.java @@ -37,11 +37,11 @@ import java.util.regex.Pattern; import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.index.RowSpaceExceededException; import net.yacy.kelondro.logging.Log; +import net.yacy.search.Switchboard; import de.anomic.crawler.CrawlStacker; import de.anomic.crawler.CrawlSwitchboard; import de.anomic.crawler.CrawlProfile; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; import de.anomic.server.servletProperties; diff --git a/htroot/CrawlResults.java b/htroot/CrawlResults.java index d5e24eea1..7e21cb229 100644 --- a/htroot/CrawlResults.java +++ b/htroot/CrawlResults.java @@ -37,16 +37,16 @@ import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.data.meta.URIMetadataRow; import net.yacy.kelondro.logging.Log; +import net.yacy.peers.yacySeed; +import net.yacy.search.Switchboard; +import net.yacy.search.index.Segments; import de.anomic.crawler.ResultURLs; import de.anomic.crawler.ResultURLs.EventOrigin; import de.anomic.crawler.ResultURLs.InitExecEntry; -import de.anomic.search.Segments; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; import de.anomic.tools.nxTools; -import de.anomic.yacy.yacySeed; public class CrawlResults { diff --git a/htroot/CrawlStartExpert_p.java b/htroot/CrawlStartExpert_p.java index e2c267160..4bca093ca 100644 --- a/htroot/CrawlStartExpert_p.java +++ b/htroot/CrawlStartExpert_p.java @@ -25,8 +25,8 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA import net.yacy.cora.protocol.RequestHeader; +import net.yacy.search.SwitchboardConstants; import de.anomic.crawler.CrawlProfile; -import de.anomic.search.SwitchboardConstants; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/CrawlStartScanner_p.java b/htroot/CrawlStartScanner_p.java index d33cca791..4be502c08 100644 --- a/htroot/CrawlStartScanner_p.java +++ b/htroot/CrawlStartScanner_p.java @@ -35,11 +35,11 @@ import net.yacy.cora.protocol.Scanner.Access; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.Base64Order; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; +import net.yacy.search.query.SearchEventCache; import de.anomic.data.WorkTables; -import de.anomic.search.SearchEventCache; -import de.anomic.search.Switchboard; -import de.anomic.search.SwitchboardConstants; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/Crawler_p.java b/htroot/Crawler_p.java index 1253400da..d703ad38a 100644 --- a/htroot/Crawler_p.java +++ b/htroot/Crawler_p.java @@ -47,6 +47,11 @@ import net.yacy.document.parser.html.TransformerWriter; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.util.FileUtils; +import net.yacy.peers.yacyNewsPool; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; +import net.yacy.search.index.Segment; +import net.yacy.search.index.Segments; import de.anomic.crawler.CrawlProfile; import de.anomic.crawler.SitemapImporter; import de.anomic.crawler.ZURL.FailCategory; @@ -55,13 +60,8 @@ import de.anomic.data.BookmarkHelper; import de.anomic.data.BookmarksDB; import de.anomic.data.ListManager; import de.anomic.data.WorkTables; -import de.anomic.search.Segment; -import de.anomic.search.Segments; -import de.anomic.search.Switchboard; -import de.anomic.search.SwitchboardConstants; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacyNewsPool; public class Crawler_p { diff --git a/htroot/DictionaryLoader_p.java b/htroot/DictionaryLoader_p.java index b64484979..4350d5655 100644 --- a/htroot/DictionaryLoader_p.java +++ b/htroot/DictionaryLoader_p.java @@ -29,8 +29,8 @@ import net.yacy.document.geolocalization.OpenGeoDBLocalization; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.util.FileUtils; +import net.yacy.search.Switchboard; import de.anomic.crawler.retrieval.Response; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/IndexCleaner_p.java b/htroot/IndexCleaner_p.java index 62c2c148f..a7e0e990a 100755 --- a/htroot/IndexCleaner_p.java +++ b/htroot/IndexCleaner_p.java @@ -26,10 +26,10 @@ import net.yacy.cora.document.ASCII; import net.yacy.cora.protocol.RequestHeader; -import de.anomic.search.MetadataRepository; -import de.anomic.search.Segment; -import de.anomic.search.Segments; -import de.anomic.search.Switchboard; +import net.yacy.search.Switchboard; +import net.yacy.search.index.MetadataRepository; +import net.yacy.search.index.Segment; +import net.yacy.search.index.Segments; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/IndexControlRWIs_p.java b/htroot/IndexControlRWIs_p.java index 5339a6775..f7a6c1331 100644 --- a/htroot/IndexControlRWIs_p.java +++ b/htroot/IndexControlRWIs_p.java @@ -55,25 +55,25 @@ import net.yacy.kelondro.rwi.ReferenceContainer; import net.yacy.kelondro.rwi.ReferenceContainerCache; import net.yacy.kelondro.util.ByteBuffer; import net.yacy.kelondro.util.FileUtils; +import net.yacy.peers.yacyClient; +import net.yacy.peers.yacySeed; +import net.yacy.peers.dht.PeerSelection; import net.yacy.repository.Blacklist; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; +import net.yacy.search.index.Segment; +import net.yacy.search.index.Segments; +import net.yacy.search.query.QueryParams; +import net.yacy.search.query.SearchEventCache; +import net.yacy.search.ranking.BlockRank; +import net.yacy.search.ranking.RankingProcess; +import net.yacy.search.ranking.ReferenceOrder; import de.anomic.crawler.ResultURLs; import de.anomic.data.ListManager; import de.anomic.data.WorkTables; import de.anomic.http.client.Cache; -import de.anomic.search.BlockRank; -import de.anomic.search.QueryParams; -import de.anomic.search.RankingProcess; -import de.anomic.search.ReferenceOrder; -import de.anomic.search.SearchEventCache; -import de.anomic.search.Segment; -import de.anomic.search.Segments; -import de.anomic.search.Switchboard; -import de.anomic.search.SwitchboardConstants; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacyClient; -import de.anomic.yacy.yacySeed; -import de.anomic.yacy.dht.PeerSelection; public class IndexControlRWIs_p { diff --git a/htroot/IndexControlURLs_p.java b/htroot/IndexControlURLs_p.java index bd002dc17..8051f2beb 100644 --- a/htroot/IndexControlURLs_p.java +++ b/htroot/IndexControlURLs_p.java @@ -40,10 +40,10 @@ import net.yacy.kelondro.data.word.Word; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.order.RotateIterator; -import de.anomic.search.MetadataRepository; -import de.anomic.search.Segment; -import de.anomic.search.Switchboard; -import de.anomic.search.SwitchboardConstants; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; +import net.yacy.search.index.MetadataRepository; +import net.yacy.search.index.Segment; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/IndexCreateDomainCrawl_p.java b/htroot/IndexCreateDomainCrawl_p.java index 6b32bae86..3572c2a4f 100644 --- a/htroot/IndexCreateDomainCrawl_p.java +++ b/htroot/IndexCreateDomainCrawl_p.java @@ -25,7 +25,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA import net.yacy.cora.protocol.RequestHeader; -import de.anomic.search.SwitchboardConstants; +import net.yacy.search.SwitchboardConstants; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/IndexCreateLoaderQueue_p.java b/htroot/IndexCreateLoaderQueue_p.java index 4adb7d823..46adb3fe4 100644 --- a/htroot/IndexCreateLoaderQueue_p.java +++ b/htroot/IndexCreateLoaderQueue_p.java @@ -29,11 +29,11 @@ import net.yacy.cora.document.ASCII; import net.yacy.cora.protocol.RequestHeader; +import net.yacy.peers.yacySeed; +import net.yacy.search.Switchboard; import de.anomic.crawler.retrieval.Request; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacySeed; public class IndexCreateLoaderQueue_p { diff --git a/htroot/IndexCreateParserErrors_p.java b/htroot/IndexCreateParserErrors_p.java index 9694a56d8..cb6e983fd 100644 --- a/htroot/IndexCreateParserErrors_p.java +++ b/htroot/IndexCreateParserErrors_p.java @@ -28,11 +28,11 @@ import java.util.ArrayList; import net.yacy.cora.document.ASCII; import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.data.meta.DigestURI; +import net.yacy.peers.yacySeed; +import net.yacy.search.Switchboard; import de.anomic.crawler.ZURL; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacySeed; public class IndexCreateParserErrors_p { diff --git a/htroot/IndexCreateWWWGlobalQueue_p.java b/htroot/IndexCreateWWWGlobalQueue_p.java index eb9a18703..86e6d1074 100644 --- a/htroot/IndexCreateWWWGlobalQueue_p.java +++ b/htroot/IndexCreateWWWGlobalQueue_p.java @@ -34,14 +34,14 @@ import java.util.Locale; import net.yacy.cora.document.ASCII; import net.yacy.cora.protocol.RequestHeader; +import net.yacy.peers.yacySeed; +import net.yacy.search.Switchboard; import de.anomic.crawler.CrawlProfile; import de.anomic.crawler.NoticedURL; import de.anomic.crawler.retrieval.Request; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacySeed; public class IndexCreateWWWGlobalQueue_p { diff --git a/htroot/IndexCreateWWWLocalQueue_p.java b/htroot/IndexCreateWWWLocalQueue_p.java index 7e5f5b8f2..873006f43 100644 --- a/htroot/IndexCreateWWWLocalQueue_p.java +++ b/htroot/IndexCreateWWWLocalQueue_p.java @@ -39,15 +39,15 @@ import java.util.regex.PatternSyntaxException; import net.yacy.cora.document.ASCII; import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.logging.Log; +import net.yacy.peers.yacySeed; +import net.yacy.search.Switchboard; import de.anomic.crawler.CrawlProfile; import de.anomic.crawler.NoticedURL; import de.anomic.crawler.CrawlSwitchboard; import de.anomic.crawler.retrieval.Request; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacySeed; public class IndexCreateWWWLocalQueue_p { diff --git a/htroot/IndexCreateWWWRemoteQueue_p.java b/htroot/IndexCreateWWWRemoteQueue_p.java index 5b79f7863..0eb43a667 100644 --- a/htroot/IndexCreateWWWRemoteQueue_p.java +++ b/htroot/IndexCreateWWWRemoteQueue_p.java @@ -31,15 +31,15 @@ import java.util.Locale; import net.yacy.cora.document.ASCII; import net.yacy.cora.protocol.RequestHeader; +import net.yacy.peers.yacySeed; +import net.yacy.search.Switchboard; import de.anomic.crawler.CrawlProfile; import de.anomic.crawler.NoticedURL; import de.anomic.crawler.retrieval.Request; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; import de.anomic.server.servletProperties; -import de.anomic.yacy.yacySeed; public class IndexCreateWWWRemoteQueue_p { diff --git a/htroot/IndexFederated_p.java b/htroot/IndexFederated_p.java index 9777cf341..0d8a48452 100644 --- a/htroot/IndexFederated_p.java +++ b/htroot/IndexFederated_p.java @@ -38,8 +38,8 @@ import net.yacy.cora.services.federated.solr.SolrScheme; import net.yacy.cora.services.federated.solr.SolrSingleConnector; import net.yacy.cora.storage.ConfigurationSet; import net.yacy.kelondro.logging.Log; -import de.anomic.search.Segments; -import de.anomic.search.Switchboard; +import net.yacy.search.Switchboard; +import net.yacy.search.index.Segments; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/IndexImportMediawiki_p.java b/htroot/IndexImportMediawiki_p.java index 867a290c0..7e4c61bee 100644 --- a/htroot/IndexImportMediawiki_p.java +++ b/htroot/IndexImportMediawiki_p.java @@ -26,8 +26,8 @@ import java.io.File; import net.yacy.cora.protocol.RequestHeader; import net.yacy.document.importer.MediawikiImporter; +import net.yacy.search.Switchboard; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/IndexImportOAIPMHList_p.java b/htroot/IndexImportOAIPMHList_p.java index 42ff2b4ff..3f8151473 100644 --- a/htroot/IndexImportOAIPMHList_p.java +++ b/htroot/IndexImportOAIPMHList_p.java @@ -30,8 +30,8 @@ import net.yacy.cora.protocol.RequestHeader; import net.yacy.document.parser.html.CharacterCoding; import net.yacy.document.importer.OAIListFriendsLoader; import net.yacy.document.importer.OAIPMHImporter; +import net.yacy.search.Switchboard; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/IndexImportOAIPMH_p.java b/htroot/IndexImportOAIPMH_p.java index 8e332a851..bc3440fca 100644 --- a/htroot/IndexImportOAIPMH_p.java +++ b/htroot/IndexImportOAIPMH_p.java @@ -37,9 +37,9 @@ import net.yacy.document.importer.OAIPMHLoader; import net.yacy.document.importer.ResumptionToken; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.logging.Log; +import net.yacy.search.Switchboard; import de.anomic.data.WorkTables; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/IndexShare_p.java b/htroot/IndexShare_p.java index 3ae8548f5..bcbb94774 100644 --- a/htroot/IndexShare_p.java +++ b/htroot/IndexShare_p.java @@ -29,10 +29,10 @@ //import java.io.*; //import de.anomic.tools.*; import net.yacy.cora.protocol.RequestHeader; -import de.anomic.search.Segment; -import de.anomic.search.Segments; -import de.anomic.search.Switchboard; -import de.anomic.search.SwitchboardConstants; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; +import net.yacy.search.index.Segment; +import net.yacy.search.index.Segments; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/Load_MediawikiWiki.java b/htroot/Load_MediawikiWiki.java index e33e13bda..3480168e5 100644 --- a/htroot/Load_MediawikiWiki.java +++ b/htroot/Load_MediawikiWiki.java @@ -25,8 +25,8 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA import net.yacy.cora.protocol.RequestHeader; -import de.anomic.search.Switchboard; -import de.anomic.search.SwitchboardConstants; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/Load_PHPBB3.java b/htroot/Load_PHPBB3.java index 34cd08de1..841f70823 100644 --- a/htroot/Load_PHPBB3.java +++ b/htroot/Load_PHPBB3.java @@ -25,8 +25,8 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA import net.yacy.cora.protocol.RequestHeader; -import de.anomic.search.Switchboard; -import de.anomic.search.SwitchboardConstants; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/Load_RSS_p.java b/htroot/Load_RSS_p.java index 2d6afcc60..8f9511765 100644 --- a/htroot/Load_RSS_p.java +++ b/htroot/Load_RSS_p.java @@ -40,11 +40,11 @@ import net.yacy.kelondro.blob.Tables.Row; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.index.RowSpaceExceededException; import net.yacy.kelondro.logging.Log; +import net.yacy.search.Switchboard; +import net.yacy.search.index.Segments; import de.anomic.crawler.RSSLoader; import de.anomic.crawler.retrieval.Response; import de.anomic.data.WorkTables; -import de.anomic.search.Segments; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/MessageSend_p.java b/htroot/MessageSend_p.java index 8ac9615f6..59d04179f 100644 --- a/htroot/MessageSend_p.java +++ b/htroot/MessageSend_p.java @@ -32,12 +32,12 @@ import java.util.Map; import net.yacy.cora.document.UTF8; import net.yacy.cora.protocol.RequestHeader; +import net.yacy.peers.yacyClient; +import net.yacy.peers.yacySeed; +import net.yacy.search.Switchboard; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacyClient; -import de.anomic.yacy.yacySeed; public class MessageSend_p { diff --git a/htroot/Messages_p.java b/htroot/Messages_p.java index 61193d2ca..a499700f8 100644 --- a/htroot/Messages_p.java +++ b/htroot/Messages_p.java @@ -36,12 +36,12 @@ import net.yacy.cora.document.UTF8; import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.util.FileUtils; +import net.yacy.peers.yacySeed; +import net.yacy.search.Switchboard; import de.anomic.data.MessageBoard; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacySeed; public class Messages_p { diff --git a/htroot/Network.java b/htroot/Network.java index b2902ae61..6a1b8d925 100644 --- a/htroot/Network.java +++ b/htroot/Network.java @@ -41,16 +41,16 @@ import net.yacy.cora.protocol.ClientIdentification; import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.util.MapTools; -import de.anomic.search.Switchboard; -import de.anomic.search.SwitchboardConstants; +import net.yacy.peers.yacyClient; +import net.yacy.peers.yacyNewsDB; +import net.yacy.peers.yacyNewsPool; +import net.yacy.peers.yacyPeerActions; +import net.yacy.peers.yacySeed; +import net.yacy.peers.operation.yacyVersion; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacyClient; -import de.anomic.yacy.yacyNewsDB; -import de.anomic.yacy.yacyNewsPool; -import de.anomic.yacy.yacyPeerActions; -import de.anomic.yacy.yacySeed; -import de.anomic.yacy.yacyVersion; public class Network { diff --git a/htroot/NetworkPicture.java b/htroot/NetworkPicture.java index f5d1335ac..ba027a755 100644 --- a/htroot/NetworkPicture.java +++ b/htroot/NetworkPicture.java @@ -28,12 +28,12 @@ import java.util.concurrent.Semaphore; import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.logging.Log; -import de.anomic.search.Switchboard; -import de.anomic.search.SwitchboardConstants; +import net.yacy.peers.graphics.EncodedImage; +import net.yacy.peers.graphics.NetworkGraph; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.graphics.EncodedImage; -import de.anomic.yacy.graphics.NetworkGraph; /** draw a picture of the yacy network */ public class NetworkPicture { diff --git a/htroot/News.java b/htroot/News.java index 20d6a95e7..d3402d293 100644 --- a/htroot/News.java +++ b/htroot/News.java @@ -32,12 +32,12 @@ import net.yacy.cora.date.GenericFormatter; import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.logging.Log; -import de.anomic.search.Switchboard; +import net.yacy.peers.yacyNewsDB; +import net.yacy.peers.yacyNewsPool; +import net.yacy.peers.yacySeed; +import net.yacy.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacyNewsDB; -import de.anomic.yacy.yacyNewsPool; -import de.anomic.yacy.yacySeed; public class News { diff --git a/htroot/PeerLoadPicture.java b/htroot/PeerLoadPicture.java index c7db7ff63..b97a36f0f 100644 --- a/htroot/PeerLoadPicture.java +++ b/htroot/PeerLoadPicture.java @@ -5,12 +5,12 @@ import java.util.Iterator; import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.workflow.BusyThread; +import net.yacy.peers.graphics.NetworkGraph; +import net.yacy.peers.graphics.NetworkGraph.CircleThreadPiece; +import net.yacy.search.SwitchboardConstants; -import de.anomic.search.SwitchboardConstants; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.graphics.NetworkGraph; -import de.anomic.yacy.graphics.NetworkGraph.CircleThreadPiece; public class PeerLoadPicture { diff --git a/htroot/PerformanceGraph.java b/htroot/PerformanceGraph.java index 2db06db4c..9b8ae6a27 100644 --- a/htroot/PerformanceGraph.java +++ b/htroot/PerformanceGraph.java @@ -25,11 +25,11 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA import net.yacy.cora.protocol.RequestHeader; +import net.yacy.peers.graphics.ProfilingGraph; +import net.yacy.search.Switchboard; import net.yacy.visualization.RasterPlotter; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.graphics.ProfilingGraph; public class PerformanceGraph { diff --git a/htroot/PerformanceMemory_p.java b/htroot/PerformanceMemory_p.java index bc7ced24d..bf9f10bb6 100644 --- a/htroot/PerformanceMemory_p.java +++ b/htroot/PerformanceMemory_p.java @@ -38,8 +38,8 @@ import net.yacy.kelondro.table.Table; import net.yacy.kelondro.util.FileUtils; import net.yacy.kelondro.util.Formatter; import net.yacy.kelondro.util.MemoryControl; -import de.anomic.search.SearchEventCache; -import de.anomic.search.Switchboard; +import net.yacy.search.Switchboard; +import net.yacy.search.query.SearchEventCache; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/PerformanceQueues_p.java b/htroot/PerformanceQueues_p.java index 7aaf98ebe..f8d2fe607 100644 --- a/htroot/PerformanceQueues_p.java +++ b/htroot/PerformanceQueues_p.java @@ -37,10 +37,10 @@ import net.yacy.kelondro.util.MemoryControl; import net.yacy.kelondro.util.OS; import net.yacy.kelondro.workflow.BusyThread; import net.yacy.kelondro.workflow.WorkflowThread; -import de.anomic.search.Segment; -import de.anomic.search.Segments; -import de.anomic.search.Switchboard; -import de.anomic.search.SwitchboardConstants; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; +import net.yacy.search.index.Segment; +import net.yacy.search.index.Segments; import de.anomic.server.serverCore; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/PerformanceSearch_p.java b/htroot/PerformanceSearch_p.java index 594b95860..80a74a6cd 100644 --- a/htroot/PerformanceSearch_p.java +++ b/htroot/PerformanceSearch_p.java @@ -29,10 +29,10 @@ import java.util.Iterator; import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.util.EventTracker; +import net.yacy.peers.graphics.ProfilingGraph; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.graphics.ProfilingGraph; public class PerformanceSearch_p { diff --git a/htroot/ProxyIndexingMonitor_p.java b/htroot/ProxyIndexingMonitor_p.java index 1f2d41bb5..05b682b9e 100644 --- a/htroot/ProxyIndexingMonitor_p.java +++ b/htroot/ProxyIndexingMonitor_p.java @@ -31,10 +31,10 @@ import java.io.File; import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.logging.Log; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; import de.anomic.http.client.Cache; -import de.anomic.search.Switchboard; -import de.anomic.search.SwitchboardConstants; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/QuickCrawlLink_p.java b/htroot/QuickCrawlLink_p.java index 6e65bd551..d1ca69db6 100644 --- a/htroot/QuickCrawlLink_p.java +++ b/htroot/QuickCrawlLink_p.java @@ -39,11 +39,11 @@ 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.logging.Log; +import net.yacy.search.Switchboard; +import net.yacy.search.index.Segment; +import net.yacy.search.index.Segments; import de.anomic.crawler.CrawlProfile; import de.anomic.crawler.retrieval.Request; -import de.anomic.search.Segment; -import de.anomic.search.Segments; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/Ranking_p.java b/htroot/Ranking_p.java index c2afd223d..dd1f55694 100644 --- a/htroot/Ranking_p.java +++ b/htroot/Ranking_p.java @@ -30,11 +30,11 @@ import java.util.Map; import java.util.Map.Entry; import net.yacy.cora.protocol.RequestHeader; +import net.yacy.search.Switchboard; +import net.yacy.search.query.SearchEventCache; +import net.yacy.search.ranking.RankingProfile; +import net.yacy.search.snippet.ContentDomain; -import de.anomic.search.ContentDomain; -import de.anomic.search.RankingProfile; -import de.anomic.search.SearchEventCache; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; import de.anomic.tools.crypt; diff --git a/htroot/RemoteCrawl_p.java b/htroot/RemoteCrawl_p.java index 59e96e0fd..ce93880dc 100644 --- a/htroot/RemoteCrawl_p.java +++ b/htroot/RemoteCrawl_p.java @@ -31,15 +31,15 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import net.yacy.cora.protocol.RequestHeader; +import net.yacy.peers.yacyPeerActions; +import net.yacy.peers.yacySeed; +import net.yacy.peers.operation.yacyVersion; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; import de.anomic.data.WorkTables; -import de.anomic.search.Switchboard; -import de.anomic.search.SwitchboardConstants; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacyPeerActions; -import de.anomic.yacy.yacySeed; -import de.anomic.yacy.yacyVersion; public class RemoteCrawl_p { diff --git a/htroot/SearchEventPicture.java b/htroot/SearchEventPicture.java index 30e8725e7..2ac01db7b 100644 --- a/htroot/SearchEventPicture.java +++ b/htroot/SearchEventPicture.java @@ -25,12 +25,12 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA import net.yacy.cora.protocol.RequestHeader; +import net.yacy.peers.graphics.NetworkGraph; +import net.yacy.search.Switchboard; +import net.yacy.search.query.SearchEventCache; import net.yacy.visualization.RasterPlotter; -import de.anomic.search.SearchEventCache; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.graphics.NetworkGraph; // draw a picture of the yacy network diff --git a/htroot/ServerScannerList.java b/htroot/ServerScannerList.java index 801975986..ae88339a8 100644 --- a/htroot/ServerScannerList.java +++ b/htroot/ServerScannerList.java @@ -29,9 +29,9 @@ import net.yacy.cora.protocol.Scanner; import net.yacy.cora.protocol.Scanner.Access; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.logging.Log; +import net.yacy.search.Switchboard; import de.anomic.data.WorkTables; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/SettingsAck_p.java b/htroot/SettingsAck_p.java index 7d6fd0277..c98fc7134 100644 --- a/htroot/SettingsAck_p.java +++ b/htroot/SettingsAck_p.java @@ -41,17 +41,17 @@ import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.order.Digest; import net.yacy.kelondro.util.Formatter; +import net.yacy.peers.yacyCore; +import net.yacy.peers.yacyPeerActions; +import net.yacy.peers.yacySeed; +import net.yacy.peers.operation.yacySeedUploader; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; import de.anomic.http.server.HTTPDProxyHandler; import de.anomic.http.server.HTTPDemon; -import de.anomic.search.Switchboard; -import de.anomic.search.SwitchboardConstants; import de.anomic.server.serverCore; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacyCore; -import de.anomic.yacy.yacyPeerActions; -import de.anomic.yacy.yacySeed; -import de.anomic.yacy.yacySeedUploader; public class SettingsAck_p { diff --git a/htroot/Settings_p.java b/htroot/Settings_p.java index e93263f06..49235e2dc 100644 --- a/htroot/Settings_p.java +++ b/htroot/Settings_p.java @@ -27,13 +27,13 @@ import java.util.Iterator; import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.RequestHeader; +import net.yacy.peers.yacyCore; +import net.yacy.peers.yacySeed; +import net.yacy.peers.operation.yacySeedUploader; +import net.yacy.search.Switchboard; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacyCore; -import de.anomic.yacy.yacySeed; -import de.anomic.yacy.yacySeedUploader; public final class Settings_p { diff --git a/htroot/Status.java b/htroot/Status.java index 0d43eade5..36ee096cf 100644 --- a/htroot/Status.java +++ b/htroot/Status.java @@ -37,15 +37,15 @@ import net.yacy.kelondro.util.Formatter; import net.yacy.kelondro.util.MemoryControl; import net.yacy.kelondro.util.OS; import net.yacy.kelondro.workflow.WorkflowProcessor; +import net.yacy.peers.yacyPeerActions; +import net.yacy.peers.yacySeed; +import net.yacy.peers.operation.yacyBuildProperties; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; -import de.anomic.search.Switchboard; -import de.anomic.search.SwitchboardConstants; import de.anomic.server.serverCore; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacyBuildProperties; -import de.anomic.yacy.yacyPeerActions; -import de.anomic.yacy.yacySeed; public class Status { diff --git a/htroot/Steering.java b/htroot/Steering.java index 548825d59..825cd1272 100644 --- a/htroot/Steering.java +++ b/htroot/Steering.java @@ -32,11 +32,11 @@ import java.io.File; import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.logging.Log; +import net.yacy.peers.operation.yacyRelease; +import net.yacy.search.Switchboard; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacyRelease; public class Steering { diff --git a/htroot/Supporter.java b/htroot/Supporter.java index a81396f51..60ac7ca5f 100644 --- a/htroot/Supporter.java +++ b/htroot/Supporter.java @@ -40,16 +40,16 @@ import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.index.Row; import net.yacy.kelondro.index.Row.Entry; import net.yacy.kelondro.order.NaturalOrder; +import net.yacy.peers.yacyNewsDB; +import net.yacy.peers.yacyNewsPool; +import net.yacy.peers.yacySeed; import net.yacy.repository.Blacklist; +import net.yacy.search.Switchboard; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; import de.anomic.tools.crypt; import de.anomic.tools.nxTools; -import de.anomic.yacy.yacyNewsDB; -import de.anomic.yacy.yacyNewsPool; -import de.anomic.yacy.yacySeed; public class Supporter { diff --git a/htroot/Surftips.java b/htroot/Surftips.java index 246643aa8..4188b5c43 100644 --- a/htroot/Surftips.java +++ b/htroot/Surftips.java @@ -39,16 +39,16 @@ import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.index.Row; import net.yacy.kelondro.index.Row.Entry; import net.yacy.kelondro.order.NaturalOrder; +import net.yacy.peers.yacyNewsDB; +import net.yacy.peers.yacyNewsPool; +import net.yacy.peers.yacySeed; import net.yacy.repository.Blacklist; +import net.yacy.search.Switchboard; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; import de.anomic.tools.crypt; import de.anomic.tools.nxTools; -import de.anomic.yacy.yacyNewsDB; -import de.anomic.yacy.yacyNewsPool; -import de.anomic.yacy.yacySeed; public class Surftips { diff --git a/htroot/Table_API_p.java b/htroot/Table_API_p.java index 13c160895..737befaed 100644 --- a/htroot/Table_API_p.java +++ b/htroot/Table_API_p.java @@ -33,11 +33,11 @@ import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.blob.Tables; import net.yacy.kelondro.index.RowSpaceExceededException; import net.yacy.kelondro.logging.Log; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; +import net.yacy.search.query.QueryParams; import de.anomic.data.WorkTables; -import de.anomic.search.QueryParams; -import de.anomic.search.Switchboard; -import de.anomic.search.SwitchboardConstants; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/Table_YMark_p.java b/htroot/Table_YMark_p.java index da1c7bc73..4de94bccd 100644 --- a/htroot/Table_YMark_p.java +++ b/htroot/Table_YMark_p.java @@ -10,10 +10,10 @@ import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.blob.Tables; import net.yacy.kelondro.index.RowSpaceExceededException; import net.yacy.kelondro.logging.Log; +import net.yacy.search.Switchboard; import de.anomic.data.ymark.YMarkEntry; import de.anomic.data.ymark.YMarkTables; import de.anomic.data.ymark.YMarkUtil; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/Tables_p.java b/htroot/Tables_p.java index 6d67559a3..2eeb71cf7 100644 --- a/htroot/Tables_p.java +++ b/htroot/Tables_p.java @@ -30,8 +30,8 @@ import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.blob.Tables; import net.yacy.kelondro.index.RowSpaceExceededException; import net.yacy.kelondro.logging.Log; +import net.yacy.search.Switchboard; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/Threaddump_p.java b/htroot/Threaddump_p.java index 4ac71f24a..16191fee1 100644 --- a/htroot/Threaddump_p.java +++ b/htroot/Threaddump_p.java @@ -35,11 +35,11 @@ import java.util.ArrayList; import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.logging.ThreadDump; import net.yacy.kelondro.util.OS; +import net.yacy.peers.operation.yacyBuildProperties; +import net.yacy.search.Switchboard; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacyBuildProperties; public class Threaddump_p { diff --git a/htroot/User.java b/htroot/User.java index d26596651..9c4dfeb42 100644 --- a/htroot/User.java +++ b/htroot/User.java @@ -33,10 +33,10 @@ import net.yacy.cora.protocol.ResponseHeader; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.order.Digest; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; import de.anomic.data.UserDB; -import de.anomic.search.Switchboard; -import de.anomic.search.SwitchboardConstants; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; import de.anomic.server.servletProperties; diff --git a/htroot/ViewFile.java b/htroot/ViewFile.java index 3acea1a02..a25fc4fda 100644 --- a/htroot/ViewFile.java +++ b/htroot/ViewFile.java @@ -52,11 +52,11 @@ import net.yacy.document.parser.html.CharacterCoding; import net.yacy.document.parser.html.ImageEntry; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.data.meta.URIMetadataRow; +import net.yacy.search.Switchboard; +import net.yacy.search.index.Segment; +import net.yacy.search.index.Segments; import de.anomic.crawler.retrieval.Response; import de.anomic.http.client.Cache; -import de.anomic.search.Segment; -import de.anomic.search.Segments; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/ViewImage.java b/htroot/ViewImage.java index d4251d55f..363358d3b 100644 --- a/htroot/ViewImage.java +++ b/htroot/ViewImage.java @@ -41,7 +41,7 @@ import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.util.FileUtils; import net.yacy.kelondro.util.MemoryControl; -import de.anomic.search.Switchboard; +import net.yacy.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/ViewProfile.java b/htroot/ViewProfile.java index 022fa40dc..bb81df8c1 100644 --- a/htroot/ViewProfile.java +++ b/htroot/ViewProfile.java @@ -43,15 +43,15 @@ import java.util.Properties; import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.Base64Order; +import net.yacy.peers.yacyClient; +import net.yacy.peers.yacyCore; +import net.yacy.peers.yacyNewsDB; +import net.yacy.peers.yacyNewsPool; +import net.yacy.peers.yacySeed; +import net.yacy.search.Switchboard; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacyClient; -import de.anomic.yacy.yacyCore; -import de.anomic.yacy.yacyNewsDB; -import de.anomic.yacy.yacyNewsPool; -import de.anomic.yacy.yacySeed; public class ViewProfile { diff --git a/htroot/WatchWebStructure_p.java b/htroot/WatchWebStructure_p.java index 715dd2418..d9db7eed1 100644 --- a/htroot/WatchWebStructure_p.java +++ b/htroot/WatchWebStructure_p.java @@ -6,10 +6,10 @@ import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.data.meta.DigestURI; +import net.yacy.search.Switchboard; import de.anomic.crawler.CrawlProfile; import de.anomic.crawler.CrawlSwitchboard; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/WebStructurePicture_p.java b/htroot/WebStructurePicture_p.java index 7609c895b..6579a3865 100644 --- a/htroot/WebStructurePicture_p.java +++ b/htroot/WebStructurePicture_p.java @@ -37,13 +37,13 @@ import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.Base64Order; +import net.yacy.peers.graphics.WebStructureGraph; +import net.yacy.search.Switchboard; import net.yacy.visualization.GraphPlotter; import net.yacy.visualization.PrintTool; import net.yacy.visualization.RasterPlotter; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.graphics.WebStructureGraph; public class WebStructurePicture_p { diff --git a/htroot/Wiki.java b/htroot/Wiki.java index 24bb64857..3da502dd5 100644 --- a/htroot/Wiki.java +++ b/htroot/Wiki.java @@ -41,13 +41,13 @@ import net.yacy.cora.document.UTF8; import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.util.ByteBuffer; +import net.yacy.peers.yacyNewsPool; +import net.yacy.search.Switchboard; import de.anomic.data.Diff; import de.anomic.data.wiki.WikiBoard; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacyNewsPool; import java.util.Map; public class Wiki { diff --git a/htroot/YMarks.java b/htroot/YMarks.java index 872b58f98..ecc8a3339 100644 --- a/htroot/YMarks.java +++ b/htroot/YMarks.java @@ -1,7 +1,7 @@ import net.yacy.cora.protocol.RequestHeader; +import net.yacy.search.Switchboard; import de.anomic.data.UserDB; import de.anomic.data.ymark.YMarkTables; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/YaCySearchPluginFF.java b/htroot/YaCySearchPluginFF.java index 0b272c233..1ff03ce6d 100644 --- a/htroot/YaCySearchPluginFF.java +++ b/htroot/YaCySearchPluginFF.java @@ -29,7 +29,7 @@ import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.RequestHeader; -import de.anomic.search.Switchboard; +import net.yacy.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/api/bookmarks/get_bookmarks.java b/htroot/api/bookmarks/get_bookmarks.java index 334f16265..900ed2b80 100644 --- a/htroot/api/bookmarks/get_bookmarks.java +++ b/htroot/api/bookmarks/get_bookmarks.java @@ -7,11 +7,11 @@ import net.yacy.cora.date.ISO8601Formatter; import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.RequestHeader; import net.yacy.document.parser.html.CharacterCoding; +import net.yacy.search.Switchboard; import de.anomic.data.BookmarkHelper; import de.anomic.data.BookmarksDB; import de.anomic.data.UserDB; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/api/bookmarks/get_folders.java b/htroot/api/bookmarks/get_folders.java index 190df2eeb..688d48ed5 100644 --- a/htroot/api/bookmarks/get_folders.java +++ b/htroot/api/bookmarks/get_folders.java @@ -3,11 +3,11 @@ import java.util.Iterator; import net.yacy.cora.protocol.RequestHeader; +import net.yacy.search.Switchboard; import de.anomic.data.BookmarkHelper; import de.anomic.data.BookmarksDB; import de.anomic.data.UserDB; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/api/bookmarks/posts/add_p.java b/htroot/api/bookmarks/posts/add_p.java index 96853a857..cb49dcd02 100755 --- a/htroot/api/bookmarks/posts/add_p.java +++ b/htroot/api/bookmarks/posts/add_p.java @@ -4,15 +4,15 @@ import java.util.Map; import java.util.Set; import net.yacy.cora.protocol.RequestHeader; +import net.yacy.peers.yacyNewsPool; +import net.yacy.search.Switchboard; import de.anomic.data.BookmarkHelper; import de.anomic.data.BookmarksDB; import de.anomic.data.ListManager; import de.anomic.data.UserDB; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacyNewsPool; public class add_p { diff --git a/htroot/api/bookmarks/posts/all.java b/htroot/api/bookmarks/posts/all.java index 12bb2038b..439b86e70 100755 --- a/htroot/api/bookmarks/posts/all.java +++ b/htroot/api/bookmarks/posts/all.java @@ -5,9 +5,9 @@ import java.util.Iterator; import net.yacy.cora.date.ISO8601Formatter; import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.order.Digest; +import net.yacy.search.Switchboard; import de.anomic.data.BookmarksDB; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/api/bookmarks/posts/delete_p.java b/htroot/api/bookmarks/posts/delete_p.java index 8adcb20a0..fcfae1a5a 100755 --- a/htroot/api/bookmarks/posts/delete_p.java +++ b/htroot/api/bookmarks/posts/delete_p.java @@ -4,8 +4,8 @@ import java.net.MalformedURLException; import net.yacy.cora.document.ASCII; import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.data.meta.DigestURI; +import net.yacy.search.Switchboard; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/api/bookmarks/posts/get.java b/htroot/api/bookmarks/posts/get.java index 637c9deda..db221b591 100755 --- a/htroot/api/bookmarks/posts/get.java +++ b/htroot/api/bookmarks/posts/get.java @@ -7,8 +7,8 @@ import java.util.List; import net.yacy.cora.date.ISO8601Formatter; import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.order.Digest; +import net.yacy.search.Switchboard; import de.anomic.data.BookmarksDB; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/api/bookmarks/tags/addTag_p.java b/htroot/api/bookmarks/tags/addTag_p.java index 189e0ff12..057b7c5e1 100644 --- a/htroot/api/bookmarks/tags/addTag_p.java +++ b/htroot/api/bookmarks/tags/addTag_p.java @@ -1,6 +1,6 @@ import net.yacy.cora.protocol.RequestHeader; -import de.anomic.search.Switchboard; +import net.yacy.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; import de.anomic.data.BookmarksDB.Bookmark; diff --git a/htroot/api/bookmarks/tags/editTag_p.java b/htroot/api/bookmarks/tags/editTag_p.java index 56884247f..d3aa932b1 100755 --- a/htroot/api/bookmarks/tags/editTag_p.java +++ b/htroot/api/bookmarks/tags/editTag_p.java @@ -1,6 +1,6 @@ import net.yacy.cora.protocol.RequestHeader; -import de.anomic.search.Switchboard; +import net.yacy.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/api/bookmarks/tags/getTag.java b/htroot/api/bookmarks/tags/getTag.java index c25e9a5d0..c4bb49dfe 100755 --- a/htroot/api/bookmarks/tags/getTag.java +++ b/htroot/api/bookmarks/tags/getTag.java @@ -2,9 +2,9 @@ import java.util.Iterator; import net.yacy.cora.protocol.RequestHeader; +import net.yacy.search.Switchboard; import de.anomic.data.BookmarksDB; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/api/bookmarks/xbel/xbel.java b/htroot/api/bookmarks/xbel/xbel.java index 12c23d44b..bdea87e9b 100755 --- a/htroot/api/bookmarks/xbel/xbel.java +++ b/htroot/api/bookmarks/xbel/xbel.java @@ -6,9 +6,9 @@ import java.util.Iterator; import net.yacy.cora.date.ISO8601Formatter; import net.yacy.cora.protocol.RequestHeader; import net.yacy.document.parser.html.CharacterCoding; +import net.yacy.search.Switchboard; import de.anomic.data.BookmarkHelper; import de.anomic.data.BookmarksDB; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/api/feed.java b/htroot/api/feed.java index 6ffd95138..5588c66ed 100755 --- a/htroot/api/feed.java +++ b/htroot/api/feed.java @@ -5,10 +5,10 @@ import java.util.Date; import net.yacy.cora.document.RSSFeed; import net.yacy.cora.document.RSSMessage; import net.yacy.cora.protocol.RequestHeader; -import de.anomic.search.Switchboard; +import net.yacy.peers.yacyChannel; +import net.yacy.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacyChannel; public class feed { diff --git a/htroot/api/queues_p.java b/htroot/api/queues_p.java index 6d1116fa5..23c51feb2 100755 --- a/htroot/api/queues_p.java +++ b/htroot/api/queues_p.java @@ -6,16 +6,16 @@ import java.util.Locale; import net.yacy.cora.document.ASCII; import net.yacy.cora.document.UTF8; import net.yacy.cora.protocol.RequestHeader; +import net.yacy.peers.yacySeed; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; +import net.yacy.search.index.Segment; +import net.yacy.search.index.Segments; import de.anomic.crawler.NoticedURL; import de.anomic.crawler.retrieval.Request; -import de.anomic.search.Segment; -import de.anomic.search.Segments; -import de.anomic.search.Switchboard; -import de.anomic.search.SwitchboardConstants; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacySeed; public class queues_p { diff --git a/htroot/api/status_p.java b/htroot/api/status_p.java index 262a35f2f..cd42560eb 100644 --- a/htroot/api/status_p.java +++ b/htroot/api/status_p.java @@ -6,10 +6,10 @@ import net.yacy.kelondro.io.ByteCount; //import net.yacy.kelondro.io.ByteCountOutputStream; import net.yacy.kelondro.util.MemoryControl; import net.yacy.kelondro.workflow.WorkflowProcessor; -import de.anomic.search.Segment; -import de.anomic.search.Segments; -import de.anomic.search.Switchboard; -import de.anomic.search.SwitchboardConstants; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; +import net.yacy.search.index.Segment; +import net.yacy.search.index.Segments; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/api/table_p.java b/htroot/api/table_p.java index 0909aae9a..e058bf8de 100644 --- a/htroot/api/table_p.java +++ b/htroot/api/table_p.java @@ -25,8 +25,8 @@ import net.yacy.cora.document.UTF8; import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.blob.Tables; import net.yacy.kelondro.logging.Log; +import net.yacy.search.Switchboard; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/api/termlist_p.java b/htroot/api/termlist_p.java index 8d8e1d965..3b1e3b40e 100644 --- a/htroot/api/termlist_p.java +++ b/htroot/api/termlist_p.java @@ -30,9 +30,9 @@ import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.ranking.Rating; import net.yacy.kelondro.index.Row; import net.yacy.kelondro.logging.Log; -import de.anomic.search.Segment; -import de.anomic.search.Segments; -import de.anomic.search.Switchboard; +import net.yacy.search.Switchboard; +import net.yacy.search.index.Segment; +import net.yacy.search.index.Segments; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/api/timeline.java b/htroot/api/timeline.java index c02441f1e..ba461c608 100644 --- a/htroot/api/timeline.java +++ b/htroot/api/timeline.java @@ -38,14 +38,14 @@ import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.rwi.ReferenceContainer; import net.yacy.kelondro.rwi.TermSearch; import net.yacy.kelondro.util.ISO639; +import net.yacy.peers.yacyCore; +import net.yacy.search.Switchboard; +import net.yacy.search.index.Segment; +import net.yacy.search.index.Segments; +import net.yacy.search.query.QueryParams; -import de.anomic.search.QueryParams; -import de.anomic.search.Segment; -import de.anomic.search.Segments; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacyCore; public final class timeline { diff --git a/htroot/api/trail_p.java b/htroot/api/trail_p.java index 2e3756773..0f6fb21e6 100644 --- a/htroot/api/trail_p.java +++ b/htroot/api/trail_p.java @@ -26,7 +26,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA import net.yacy.cora.protocol.RequestHeader; -import de.anomic.search.Switchboard; +import net.yacy.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/api/util/getpageinfo_p.java b/htroot/api/util/getpageinfo_p.java index 53b4aa5c1..5a101c611 100755 --- a/htroot/api/util/getpageinfo_p.java +++ b/htroot/api/util/getpageinfo_p.java @@ -8,8 +8,8 @@ import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.services.federated.yacy.CacheStrategy; import net.yacy.document.parser.html.ContentScraper; import net.yacy.kelondro.data.meta.DigestURI; +import net.yacy.search.Switchboard; import de.anomic.crawler.RobotsTxtEntry; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/api/util/ynetSearch.java b/htroot/api/util/ynetSearch.java index a4c1b7298..4884d5ae9 100755 --- a/htroot/api/util/ynetSearch.java +++ b/htroot/api/util/ynetSearch.java @@ -8,8 +8,8 @@ import java.util.Map; import java.util.Scanner; import net.yacy.cora.protocol.RequestHeader; +import net.yacy.search.Switchboard; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/api/version.java b/htroot/api/version.java index c4c21c2c3..443d5277a 100644 --- a/htroot/api/version.java +++ b/htroot/api/version.java @@ -1,9 +1,9 @@ import net.yacy.cora.protocol.RequestHeader; +import net.yacy.peers.operation.yacyBuildProperties; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacyBuildProperties; public class version { diff --git a/htroot/api/webstructure.java b/htroot/api/webstructure.java index 6f36ab6c1..776306c41 100644 --- a/htroot/api/webstructure.java +++ b/htroot/api/webstructure.java @@ -29,11 +29,11 @@ import java.util.Map; import net.yacy.cora.document.ASCII; import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.data.meta.DigestURI; +import net.yacy.peers.graphics.WebStructureGraph; +import net.yacy.search.Switchboard; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.graphics.WebStructureGraph; public class webstructure { diff --git a/htroot/api/yacydoc.java b/htroot/api/yacydoc.java index de07ec0ab..9172d3b73 100644 --- a/htroot/api/yacydoc.java +++ b/htroot/api/yacydoc.java @@ -35,10 +35,10 @@ import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.data.meta.URIMetadataRow; import net.yacy.kelondro.data.word.Word; import net.yacy.kelondro.logging.Log; +import net.yacy.search.Switchboard; +import net.yacy.search.index.Segment; +import net.yacy.search.index.Segments; -import de.anomic.search.Segment; -import de.anomic.search.Segments; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/api/ymarks/add_ymark.java b/htroot/api/ymarks/add_ymark.java index 7edea60ea..a8311985c 100644 --- a/htroot/api/ymarks/add_ymark.java +++ b/htroot/api/ymarks/add_ymark.java @@ -2,11 +2,11 @@ import java.io.IOException; import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.index.RowSpaceExceededException; import net.yacy.kelondro.logging.Log; +import net.yacy.search.Switchboard; import de.anomic.data.UserDB; import de.anomic.data.ymark.YMarkEntry; import de.anomic.data.ymark.YMarkTables; import de.anomic.data.ymark.YMarkUtil; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/api/ymarks/delete_ymark.java b/htroot/api/ymarks/delete_ymark.java index cc2217685..bf8d74c14 100644 --- a/htroot/api/ymarks/delete_ymark.java +++ b/htroot/api/ymarks/delete_ymark.java @@ -3,11 +3,11 @@ import java.io.IOException; import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.index.RowSpaceExceededException; import net.yacy.kelondro.logging.Log; +import net.yacy.search.Switchboard; import de.anomic.data.UserDB; import de.anomic.data.ymark.YMarkEntry; import de.anomic.data.ymark.YMarkTables; import de.anomic.data.ymark.YMarkUtil; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/api/ymarks/get_tags.java b/htroot/api/ymarks/get_tags.java index 016ba368b..64d05d118 100644 --- a/htroot/api/ymarks/get_tags.java +++ b/htroot/api/ymarks/get_tags.java @@ -7,12 +7,12 @@ import java.util.TreeMap; import java.util.TreeSet; import net.yacy.cora.protocol.RequestHeader; +import net.yacy.search.Switchboard; import de.anomic.data.UserDB; import de.anomic.data.ymark.YMarkEntry; import de.anomic.data.ymark.YMarkTables; import de.anomic.data.ymark.YMarkTag; import de.anomic.data.ymark.YMarkUtil; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/api/ymarks/get_treeview.java b/htroot/api/ymarks/get_treeview.java index 6088f5b93..1bb453e4d 100644 --- a/htroot/api/ymarks/get_treeview.java +++ b/htroot/api/ymarks/get_treeview.java @@ -15,13 +15,13 @@ import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.data.word.Word; import net.yacy.kelondro.index.RowSpaceExceededException; import net.yacy.kelondro.logging.Log; +import net.yacy.search.Switchboard; import de.anomic.data.UserDB; import de.anomic.data.ymark.YMarkCrawlStart; import de.anomic.data.ymark.YMarkEntry; import de.anomic.data.ymark.YMarkMetadata; import de.anomic.data.ymark.YMarkTables; import de.anomic.data.ymark.YMarkUtil; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/api/ymarks/get_xbel.java b/htroot/api/ymarks/get_xbel.java index ff095920a..ecef73349 100644 --- a/htroot/api/ymarks/get_xbel.java +++ b/htroot/api/ymarks/get_xbel.java @@ -7,13 +7,13 @@ import net.yacy.cora.protocol.RequestHeader; import net.yacy.document.parser.html.CharacterCoding; import net.yacy.kelondro.blob.Tables; import net.yacy.kelondro.logging.Log; +import net.yacy.search.Switchboard; import de.anomic.data.UserDB; import de.anomic.data.ymark.YMarkDate; import de.anomic.data.ymark.YMarkEntry; import de.anomic.data.ymark.YMarkTables; import de.anomic.data.ymark.YMarkUtil; import de.anomic.data.ymark.YMarkXBELImporter; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/api/ymarks/get_ymark.java b/htroot/api/ymarks/get_ymark.java index 981afcb53..175b0361b 100644 --- a/htroot/api/ymarks/get_ymark.java +++ b/htroot/api/ymarks/get_ymark.java @@ -8,13 +8,13 @@ import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.blob.Tables; import net.yacy.kelondro.blob.Tables.Row; import net.yacy.kelondro.logging.Log; +import net.yacy.search.Switchboard; import de.anomic.data.UserDB; import de.anomic.data.ymark.YMarkDate; import de.anomic.data.ymark.YMarkEntry; import de.anomic.data.ymark.YMarkTables; import de.anomic.data.ymark.YMarkUtil; import de.anomic.data.ymark.YMarkTables.TABLES; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/api/ymarks/import_ymark.java b/htroot/api/ymarks/import_ymark.java index 8bebe3962..dc358a152 100644 --- a/htroot/api/ymarks/import_ymark.java +++ b/htroot/api/ymarks/import_ymark.java @@ -9,6 +9,7 @@ import net.yacy.cora.protocol.RequestHeader; import net.yacy.document.content.SurrogateReader; import net.yacy.kelondro.index.RowSpaceExceededException; import net.yacy.kelondro.logging.Log; +import net.yacy.search.Switchboard; import org.xml.sax.SAXException; @@ -19,7 +20,6 @@ import de.anomic.data.ymark.YMarkHTMLImporter; import de.anomic.data.ymark.YMarkJSONImporter; import de.anomic.data.ymark.YMarkTables; import de.anomic.data.ymark.YMarkXBELImporter; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/autoconfig.java b/htroot/autoconfig.java index 732beb964..a657cfe36 100644 --- a/htroot/autoconfig.java +++ b/htroot/autoconfig.java @@ -29,7 +29,7 @@ import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.RequestHeader; -import de.anomic.search.SwitchboardConstants; +import net.yacy.search.SwitchboardConstants; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/compare_yacy.java b/htroot/compare_yacy.java index 69dc462f2..d11c26ed3 100755 --- a/htroot/compare_yacy.java +++ b/htroot/compare_yacy.java @@ -24,7 +24,6 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; import de.anomic.server.servletProperties; @@ -33,6 +32,7 @@ import java.util.HashMap; import java.util.Map; import net.yacy.cora.protocol.RequestHeader; +import net.yacy.search.Switchboard; public class compare_yacy { diff --git a/htroot/cytag.java b/htroot/cytag.java index db5cb9c48..ba0d87c56 100644 --- a/htroot/cytag.java +++ b/htroot/cytag.java @@ -35,8 +35,8 @@ import net.yacy.cora.protocol.RequestHeader; import net.yacy.document.ImageParser; import net.yacy.document.parser.html.CharacterCoding; import net.yacy.kelondro.util.FileUtils; +import net.yacy.search.Switchboard; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/index.java b/htroot/index.java index bb1736941..92141e3f4 100644 --- a/htroot/index.java +++ b/htroot/index.java @@ -30,9 +30,9 @@ import net.yacy.cora.protocol.RequestHeader; -import de.anomic.search.ContentDomain; -import de.anomic.search.Switchboard; -import de.anomic.search.SwitchboardConstants; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; +import net.yacy.search.snippet.ContentDomain; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/mediawiki_p.java b/htroot/mediawiki_p.java index b181c9627..4199ac725 100644 --- a/htroot/mediawiki_p.java +++ b/htroot/mediawiki_p.java @@ -30,8 +30,8 @@ import java.io.IOException; import net.yacy.cora.document.UTF8; import net.yacy.cora.protocol.RequestHeader; import net.yacy.document.importer.MediawikiImporter; +import net.yacy.search.Switchboard; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/opensearchdescription.java b/htroot/opensearchdescription.java index b73232bc0..19fb2d4be 100644 --- a/htroot/opensearchdescription.java +++ b/htroot/opensearchdescription.java @@ -25,8 +25,8 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA import net.yacy.cora.protocol.RequestHeader; -import de.anomic.search.Switchboard; -import de.anomic.search.SwitchboardConstants; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; import de.anomic.server.serverCore; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/osm.java b/htroot/osm.java index 3ae2371ea..5edbf1ccd 100644 --- a/htroot/osm.java +++ b/htroot/osm.java @@ -5,10 +5,10 @@ // import net.yacy.cora.protocol.RequestHeader; +import net.yacy.peers.graphics.OSMTile; import net.yacy.visualization.RasterPlotter; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.graphics.OSMTile; public class osm { diff --git a/htroot/rct_p.java b/htroot/rct_p.java index 23d4ac04a..2939738dc 100644 --- a/htroot/rct_p.java +++ b/htroot/rct_p.java @@ -33,14 +33,14 @@ import net.yacy.cora.document.RSSFeed; import net.yacy.cora.document.Hit; import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.data.meta.DigestURI; +import net.yacy.peers.yacyClient; +import net.yacy.peers.yacySeed; +import net.yacy.peers.dht.PeerSelection; +import net.yacy.search.Switchboard; import de.anomic.crawler.retrieval.Request; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacyClient; -import de.anomic.yacy.yacySeed; -import de.anomic.yacy.dht.PeerSelection; public class rct_p { diff --git a/htroot/robots.java b/htroot/robots.java index 0c32b13bc..3432a2c76 100644 --- a/htroot/robots.java +++ b/htroot/robots.java @@ -8,10 +8,10 @@ import java.io.File; import java.util.ArrayList; import net.yacy.cora.protocol.RequestHeader; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; import de.anomic.http.server.RobotsTxtConfig; -import de.anomic.search.Switchboard; -import de.anomic.search.SwitchboardConstants; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; import de.anomic.server.servletProperties; diff --git a/htroot/sharedBlacklist_p.java b/htroot/sharedBlacklist_p.java index 1ed89a5ee..6da4e5723 100644 --- a/htroot/sharedBlacklist_p.java +++ b/htroot/sharedBlacklist_p.java @@ -43,18 +43,18 @@ import java.util.Set; import de.anomic.data.ListManager; import de.anomic.data.list.ListAccumulator; import de.anomic.data.list.XMLBlacklistImporter; -import de.anomic.search.SearchEventCache; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacySeed; import net.yacy.cora.document.UTF8; import net.yacy.cora.protocol.ClientIdentification; import net.yacy.cora.protocol.RequestHeader; import net.yacy.document.parser.html.CharacterCoding; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.util.FileUtils; +import net.yacy.peers.yacySeed; import net.yacy.repository.Blacklist; +import net.yacy.search.Switchboard; +import net.yacy.search.query.SearchEventCache; import org.xml.sax.SAXException; diff --git a/htroot/suggest.java b/htroot/suggest.java index 37d62edbd..26d04d219 100644 --- a/htroot/suggest.java +++ b/htroot/suggest.java @@ -28,11 +28,11 @@ import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.protocol.ResponseHeader; import net.yacy.kelondro.data.word.Word; +import net.yacy.search.Switchboard; +import net.yacy.search.index.Segment; +import net.yacy.search.index.Segments; import de.anomic.data.DidYouMean; -import de.anomic.search.Segment; -import de.anomic.search.Segments; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; import de.anomic.server.servletProperties; diff --git a/htroot/www/welcome.java b/htroot/www/welcome.java index e94e1b592..d8a162e96 100644 --- a/htroot/www/welcome.java +++ b/htroot/www/welcome.java @@ -32,12 +32,12 @@ import java.io.File; import net.yacy.cora.protocol.Domains; import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.RequestHeader; +import net.yacy.peers.yacySeed; +import net.yacy.search.Switchboard; -import de.anomic.search.Switchboard; import de.anomic.server.serverCore; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacySeed; public class welcome { diff --git a/htroot/yacy/crawlReceipt.java b/htroot/yacy/crawlReceipt.java index a480f96b1..2a8770ef6 100644 --- a/htroot/yacy/crawlReceipt.java +++ b/htroot/yacy/crawlReceipt.java @@ -33,17 +33,17 @@ import net.yacy.cora.document.ASCII; import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.data.meta.URIMetadataRow; import net.yacy.kelondro.logging.Log; +import net.yacy.peers.yacyNetwork; +import net.yacy.peers.yacySeed; +import net.yacy.search.Switchboard; +import net.yacy.search.index.Segments; import de.anomic.crawler.ResultURLs; import de.anomic.crawler.ResultURLs.EventOrigin; import de.anomic.crawler.ZURL.FailCategory; -import de.anomic.search.Segments; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; import de.anomic.tools.crypt; -import de.anomic.yacy.yacyNetwork; -import de.anomic.yacy.yacySeed; public final class crawlReceipt { diff --git a/htroot/yacy/hello.java b/htroot/yacy/hello.java index a9b062eff..de76b82b6 100644 --- a/htroot/yacy/hello.java +++ b/htroot/yacy/hello.java @@ -38,17 +38,17 @@ import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.util.EventTracker; -import de.anomic.search.Switchboard; +import net.yacy.peers.yacyClient; +import net.yacy.peers.yacyCore; +import net.yacy.peers.yacyNetwork; +import net.yacy.peers.yacySeed; +import net.yacy.peers.dht.PeerSelection; +import net.yacy.peers.graphics.ProfilingGraph; +import net.yacy.peers.operation.yacyVersion; +import net.yacy.search.Switchboard; import de.anomic.server.serverCore; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacyClient; -import de.anomic.yacy.yacyCore; -import de.anomic.yacy.yacyNetwork; -import de.anomic.yacy.yacySeed; -import de.anomic.yacy.yacyVersion; -import de.anomic.yacy.dht.PeerSelection; -import de.anomic.yacy.graphics.ProfilingGraph; public final class hello { diff --git a/htroot/yacy/idx.java b/htroot/yacy/idx.java index 4e484b364..65b0a3ed0 100644 --- a/htroot/yacy/idx.java +++ b/htroot/yacy/idx.java @@ -28,12 +28,12 @@ import net.yacy.cora.document.ASCII; import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.rwi.ReferenceContainer; import net.yacy.kelondro.rwi.ReferenceContainerCache; -import de.anomic.search.Switchboard; +import net.yacy.peers.yacyNetwork; +import net.yacy.peers.graphics.WebStructureGraph; +import net.yacy.peers.graphics.WebStructureGraph.HostReference; +import net.yacy.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacyNetwork; -import de.anomic.yacy.graphics.WebStructureGraph; -import de.anomic.yacy.graphics.WebStructureGraph.HostReference; public final class idx { diff --git a/htroot/yacy/list.java b/htroot/yacy/list.java index cfd3c7595..94196bffc 100644 --- a/htroot/yacy/list.java +++ b/htroot/yacy/list.java @@ -31,14 +31,14 @@ import java.io.File; import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.util.FileUtils; +import net.yacy.peers.yacyNetwork; +import net.yacy.peers.yacySeed; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; -import de.anomic.search.Switchboard; -import de.anomic.search.SwitchboardConstants; import de.anomic.server.serverCore; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacyNetwork; -import de.anomic.yacy.yacySeed; public final class list { diff --git a/htroot/yacy/message.java b/htroot/yacy/message.java index c90e43b0c..a56712b37 100644 --- a/htroot/yacy/message.java +++ b/htroot/yacy/message.java @@ -41,15 +41,15 @@ import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.util.FileUtils; +import net.yacy.peers.yacyCore; +import net.yacy.peers.yacyNetwork; +import net.yacy.peers.yacySeed; +import net.yacy.search.Switchboard; import de.anomic.data.MessageBoard; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; import de.anomic.tools.crypt; -import de.anomic.yacy.yacyCore; -import de.anomic.yacy.yacyNetwork; -import de.anomic.yacy.yacySeed; public final class message { diff --git a/htroot/yacy/profile.java b/htroot/yacy/profile.java index a49a1be0d..d3b1a5280 100644 --- a/htroot/yacy/profile.java +++ b/htroot/yacy/profile.java @@ -37,11 +37,11 @@ import java.util.Properties; import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.RequestHeader; +import net.yacy.peers.yacyNetwork; +import net.yacy.search.Switchboard; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacyNetwork; public final class profile { diff --git a/htroot/yacy/query.java b/htroot/yacy/query.java index eddd5a097..591cbf57c 100644 --- a/htroot/yacy/query.java +++ b/htroot/yacy/query.java @@ -32,12 +32,12 @@ import net.yacy.cora.date.GenericFormatter; import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.logging.Log; -import de.anomic.search.Segments; -import de.anomic.search.Switchboard; +import net.yacy.peers.yacyCore; +import net.yacy.peers.yacyNetwork; +import net.yacy.search.Switchboard; +import net.yacy.search.index.Segments; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacyCore; -import de.anomic.yacy.yacyNetwork; public final class query { diff --git a/htroot/yacy/search.java b/htroot/yacy/search.java index f125c8d47..e8b6ecc44 100644 --- a/htroot/yacy/search.java +++ b/htroot/yacy/search.java @@ -56,26 +56,26 @@ import net.yacy.kelondro.util.ByteBuffer; import net.yacy.kelondro.util.EventTracker; import net.yacy.kelondro.util.ISO639; import net.yacy.kelondro.util.MemoryControl; -import de.anomic.search.AccessTracker; -import de.anomic.search.ContentDomain; -import de.anomic.search.QueryParams; -import de.anomic.search.RankingProfile; -import de.anomic.search.ResultEntry; -import de.anomic.search.SearchEvent; -import de.anomic.search.SearchEventCache; -import de.anomic.search.Segment; -import de.anomic.search.Segments; -import de.anomic.search.Switchboard; -import de.anomic.search.SwitchboardConstants; +import net.yacy.peers.yacyChannel; +import net.yacy.peers.yacyCore; +import net.yacy.peers.yacyNetwork; +import net.yacy.peers.yacySeed; +import net.yacy.peers.graphics.ProfilingGraph; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; +import net.yacy.search.index.Segment; +import net.yacy.search.index.Segments; +import net.yacy.search.query.AccessTracker; +import net.yacy.search.query.QueryParams; +import net.yacy.search.query.SearchEvent; +import net.yacy.search.query.SearchEventCache; +import net.yacy.search.ranking.RankingProfile; +import net.yacy.search.snippet.ContentDomain; +import net.yacy.search.snippet.ResultEntry; import de.anomic.server.serverCore; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; import de.anomic.tools.crypt; -import de.anomic.yacy.yacyChannel; -import de.anomic.yacy.yacyCore; -import de.anomic.yacy.yacyNetwork; -import de.anomic.yacy.yacySeed; -import de.anomic.yacy.graphics.ProfilingGraph; public final class search { diff --git a/htroot/yacy/transferRWI.java b/htroot/yacy/transferRWI.java index 5669c7898..9839af250 100644 --- a/htroot/yacy/transferRWI.java +++ b/htroot/yacy/transferRWI.java @@ -41,18 +41,18 @@ import net.yacy.kelondro.index.HandleSet; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.rwi.IndexCell; import net.yacy.kelondro.util.FileUtils; +import net.yacy.peers.yacyChannel; +import net.yacy.peers.yacyCore; +import net.yacy.peers.yacyNetwork; +import net.yacy.peers.yacySeed; +import net.yacy.peers.dht.FlatWordPartitionScheme; import net.yacy.repository.Blacklist; -import de.anomic.search.Segments; -import de.anomic.search.Switchboard; -import de.anomic.search.SwitchboardConstants; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; +import net.yacy.search.index.Segments; import de.anomic.server.serverCore; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacyChannel; -import de.anomic.yacy.yacyCore; -import de.anomic.yacy.yacyNetwork; -import de.anomic.yacy.yacySeed; -import de.anomic.yacy.dht.FlatWordPartitionScheme; public final class transferRWI { diff --git a/htroot/yacy/transferURL.java b/htroot/yacy/transferURL.java index a291e958d..9f9257736 100644 --- a/htroot/yacy/transferURL.java +++ b/htroot/yacy/transferURL.java @@ -34,19 +34,19 @@ import net.yacy.cora.document.RSSMessage; import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.data.meta.URIMetadataRow; import net.yacy.kelondro.logging.Log; +import net.yacy.peers.yacyChannel; +import net.yacy.peers.yacyCore; +import net.yacy.peers.yacyNetwork; +import net.yacy.peers.yacySeed; import net.yacy.repository.Blacklist; +import net.yacy.search.Switchboard; +import net.yacy.search.index.Segments; import de.anomic.crawler.ResultURLs; import de.anomic.crawler.ResultURLs.EventOrigin; -import de.anomic.search.Segments; -import de.anomic.search.Switchboard; import de.anomic.server.serverCore; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacyCore; -import de.anomic.yacy.yacyNetwork; -import de.anomic.yacy.yacySeed; -import de.anomic.yacy.yacyChannel; public final class transferURL { diff --git a/htroot/yacy/urls.java b/htroot/yacy/urls.java index 50c27d6b9..6aba13e78 100644 --- a/htroot/yacy/urls.java +++ b/htroot/yacy/urls.java @@ -32,14 +32,14 @@ import net.yacy.cora.document.ASCII; import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.data.meta.URIMetadataRow; +import net.yacy.peers.yacyNetwork; +import net.yacy.search.Switchboard; +import net.yacy.search.index.Segments; import de.anomic.crawler.NoticedURL; import de.anomic.crawler.ZURL.FailCategory; import de.anomic.crawler.retrieval.Request; -import de.anomic.search.Segments; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacyNetwork; public class urls { diff --git a/htroot/yacyinteractive.java b/htroot/yacyinteractive.java index 647916f1d..cfc152bf5 100644 --- a/htroot/yacyinteractive.java +++ b/htroot/yacyinteractive.java @@ -25,8 +25,8 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA import net.yacy.cora.protocol.RequestHeader; -import de.anomic.search.Switchboard; -import de.anomic.search.SwitchboardConstants; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/yacysearch.java b/htroot/yacysearch.java index b8d9aa7c2..024be3dee 100644 --- a/htroot/yacysearch.java +++ b/htroot/yacysearch.java @@ -60,25 +60,25 @@ import net.yacy.kelondro.util.Formatter; import net.yacy.kelondro.util.ISO639; import net.yacy.kelondro.util.MemoryControl; import net.yacy.kelondro.util.SetTools; +import net.yacy.peers.yacyChannel; +import net.yacy.peers.yacyNewsPool; +import net.yacy.peers.graphics.ProfilingGraph; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; +import net.yacy.search.index.Segment; +import net.yacy.search.index.Segments; +import net.yacy.search.query.AccessTracker; +import net.yacy.search.query.QueryParams; +import net.yacy.search.query.SearchEvent; +import net.yacy.search.query.SearchEventCache; +import net.yacy.search.ranking.RankingProfile; +import net.yacy.search.snippet.ContentDomain; import de.anomic.data.DidYouMean; import de.anomic.data.UserDB; -import de.anomic.search.AccessTracker; -import de.anomic.search.ContentDomain; -import de.anomic.search.QueryParams; -import de.anomic.search.RankingProfile; -import de.anomic.search.SearchEvent; -import de.anomic.search.SearchEventCache; -import de.anomic.search.Segment; -import de.anomic.search.Segments; -import de.anomic.search.Switchboard; -import de.anomic.search.SwitchboardConstants; import de.anomic.server.serverCore; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; import de.anomic.server.servletProperties; -import de.anomic.yacy.yacyChannel; -import de.anomic.yacy.yacyNewsPool; -import de.anomic.yacy.graphics.ProfilingGraph; public class yacysearch { diff --git a/htroot/yacysearch_location.java b/htroot/yacysearch_location.java index 473f0ec5a..4fef1d699 100644 --- a/htroot/yacysearch_location.java +++ b/htroot/yacysearch_location.java @@ -29,8 +29,8 @@ import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.services.federated.opensearch.SRURSSConnector; import net.yacy.document.LibraryProvider; import net.yacy.document.geolocalization.Location; -import de.anomic.search.Switchboard; -import de.anomic.search.SwitchboardConstants; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; import de.anomic.server.serverCore; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/yacysearchitem.java b/htroot/yacysearchitem.java index 9a55175e8..6b5765146 100644 --- a/htroot/yacysearchitem.java +++ b/htroot/yacysearchitem.java @@ -36,22 +36,22 @@ import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.util.EventTracker; import net.yacy.kelondro.util.Formatter; -import de.anomic.search.ContentDomain; -import de.anomic.search.MediaSnippet; -import de.anomic.search.QueryParams; -import de.anomic.search.ResultEntry; -import de.anomic.search.SearchEvent; -import de.anomic.search.SearchEventCache; -import de.anomic.search.Switchboard; -import de.anomic.search.SwitchboardConstants; -import de.anomic.search.TextSnippet; +import net.yacy.peers.yacyNewsPool; +import net.yacy.peers.yacySeed; +import net.yacy.peers.graphics.ProfilingGraph; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; +import net.yacy.search.query.QueryParams; +import net.yacy.search.query.SearchEvent; +import net.yacy.search.query.SearchEventCache; +import net.yacy.search.snippet.ContentDomain; +import net.yacy.search.snippet.MediaSnippet; +import net.yacy.search.snippet.ResultEntry; +import net.yacy.search.snippet.TextSnippet; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; import de.anomic.tools.crypt; import de.anomic.tools.nxTools; -import de.anomic.yacy.yacyNewsPool; -import de.anomic.yacy.yacySeed; -import de.anomic.yacy.graphics.ProfilingGraph; public class yacysearchitem { diff --git a/htroot/yacysearchlatestinfo.java b/htroot/yacysearchlatestinfo.java index 0fd3b451c..f4e818516 100644 --- a/htroot/yacysearchlatestinfo.java +++ b/htroot/yacysearchlatestinfo.java @@ -1,8 +1,8 @@ import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.util.Formatter; -import de.anomic.search.QueryParams; -import de.anomic.search.SearchEvent; -import de.anomic.search.SearchEventCache; +import net.yacy.search.query.QueryParams; +import net.yacy.search.query.SearchEvent; +import net.yacy.search.query.SearchEventCache; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/yacysearchtrailer.java b/htroot/yacysearchtrailer.java index 6f7e87d31..6af2368c5 100644 --- a/htroot/yacysearchtrailer.java +++ b/htroot/yacysearchtrailer.java @@ -31,12 +31,12 @@ import net.yacy.cora.ranking.ScoreMap; import net.yacy.document.LibraryProvider; import net.yacy.kelondro.util.EventTracker; import net.yacy.kelondro.util.Formatter; -import de.anomic.search.QueryParams; -import de.anomic.search.SearchEvent; -import de.anomic.search.SearchEventCache; +import net.yacy.peers.graphics.ProfilingGraph; +import net.yacy.search.query.QueryParams; +import net.yacy.search.query.SearchEvent; +import net.yacy.search.query.SearchEventCache; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; -import de.anomic.yacy.graphics.ProfilingGraph; public class yacysearchtrailer { diff --git a/source/de/anomic/crawler/CrawlQueues.java b/source/de/anomic/crawler/CrawlQueues.java index 4cc879a69..6413ea782 100644 --- a/source/de/anomic/crawler/CrawlQueues.java +++ b/source/de/anomic/crawler/CrawlQueues.java @@ -46,17 +46,17 @@ import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.util.FileUtils; import net.yacy.kelondro.workflow.WorkflowJob; +import net.yacy.peers.yacyClient; +import net.yacy.peers.yacySeed; +import net.yacy.peers.dht.PeerSelection; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; +import net.yacy.search.Switchboard.indexingQueueEntry; +import net.yacy.search.index.Segments; import de.anomic.crawler.NoticedURL.StackType; import de.anomic.crawler.ZURL.FailCategory; import de.anomic.crawler.retrieval.Request; import de.anomic.crawler.retrieval.Response; -import de.anomic.search.Segments; -import de.anomic.search.Switchboard; -import de.anomic.search.Switchboard.indexingQueueEntry; -import de.anomic.search.SwitchboardConstants; -import de.anomic.yacy.yacyClient; -import de.anomic.yacy.yacySeed; -import de.anomic.yacy.dht.PeerSelection; public class CrawlQueues { diff --git a/source/de/anomic/crawler/CrawlStacker.java b/source/de/anomic/crawler/CrawlStacker.java index 497e10531..fc6f2a283 100644 --- a/source/de/anomic/crawler/CrawlStacker.java +++ b/source/de/anomic/crawler/CrawlStacker.java @@ -49,17 +49,17 @@ import net.yacy.kelondro.data.meta.URIMetadataRow; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.workflow.WorkflowProcessor; +import net.yacy.peers.yacySeedDB; import net.yacy.repository.Blacklist; import net.yacy.repository.FilterEngine; +import net.yacy.search.Switchboard; +import net.yacy.search.index.Segment; import de.anomic.crawler.ResultURLs.EventOrigin; import de.anomic.crawler.ZURL.FailCategory; import de.anomic.crawler.retrieval.FTPLoader; import de.anomic.crawler.retrieval.HTTPLoader; import de.anomic.crawler.retrieval.Request; import de.anomic.crawler.retrieval.SMBLoader; -import de.anomic.search.Segment; -import de.anomic.search.Switchboard; -import de.anomic.yacy.yacySeedDB; public final class CrawlStacker { diff --git a/source/de/anomic/crawler/Latency.java b/source/de/anomic/crawler/Latency.java index 2ce81adaf..c384084f8 100644 --- a/source/de/anomic/crawler/Latency.java +++ b/source/de/anomic/crawler/Latency.java @@ -32,8 +32,8 @@ import java.util.concurrent.ConcurrentHashMap; import net.yacy.cora.document.MultiProtocolURI; import net.yacy.cora.protocol.Domains; import net.yacy.kelondro.util.MemoryControl; +import net.yacy.search.Switchboard; -import de.anomic.search.Switchboard; public class Latency { diff --git a/source/de/anomic/crawler/RSSLoader.java b/source/de/anomic/crawler/RSSLoader.java index 70dde7331..473d1b4da 100644 --- a/source/de/anomic/crawler/RSSLoader.java +++ b/source/de/anomic/crawler/RSSLoader.java @@ -41,10 +41,10 @@ import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.index.RowSpaceExceededException; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.Base64Order; +import net.yacy.search.Switchboard; +import net.yacy.search.index.Segments; import de.anomic.crawler.retrieval.Response; import de.anomic.data.WorkTables; -import de.anomic.search.Segments; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; public class RSSLoader extends Thread { diff --git a/source/de/anomic/crawler/ResourceObserver.java b/source/de/anomic/crawler/ResourceObserver.java index 3e30e1dc6..05b01405d 100644 --- a/source/de/anomic/crawler/ResourceObserver.java +++ b/source/de/anomic/crawler/ResourceObserver.java @@ -28,8 +28,8 @@ import java.io.File; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.util.MemoryControl; -import de.anomic.search.Switchboard; -import de.anomic.search.SwitchboardConstants; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; public class ResourceObserver { diff --git a/source/de/anomic/crawler/SitemapImporter.java b/source/de/anomic/crawler/SitemapImporter.java index 9d362b74b..9a0a01ec3 100644 --- a/source/de/anomic/crawler/SitemapImporter.java +++ b/source/de/anomic/crawler/SitemapImporter.java @@ -33,9 +33,9 @@ import net.yacy.document.parser.sitemapParser; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.data.meta.URIMetadataRow; import net.yacy.kelondro.logging.Log; +import net.yacy.search.Switchboard; +import net.yacy.search.index.Segments; import de.anomic.crawler.retrieval.Request; -import de.anomic.search.Segments; -import de.anomic.search.Switchboard; public class SitemapImporter extends Thread { diff --git a/source/de/anomic/crawler/retrieval/FTPLoader.java b/source/de/anomic/crawler/retrieval/FTPLoader.java index bfa8926da..711416382 100644 --- a/source/de/anomic/crawler/retrieval/FTPLoader.java +++ b/source/de/anomic/crawler/retrieval/FTPLoader.java @@ -40,11 +40,11 @@ import net.yacy.cora.protocol.ftp.FTPClient; import net.yacy.document.TextParser; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.logging.Log; +import net.yacy.search.Switchboard; +import net.yacy.search.index.Segments; import de.anomic.crawler.CrawlProfile; import de.anomic.crawler.Latency; import de.anomic.crawler.ZURL.FailCategory; -import de.anomic.search.Segments; -import de.anomic.search.Switchboard; public class FTPLoader { diff --git a/source/de/anomic/crawler/retrieval/FileLoader.java b/source/de/anomic/crawler/retrieval/FileLoader.java index 332f8abf3..8c0842358 100644 --- a/source/de/anomic/crawler/retrieval/FileLoader.java +++ b/source/de/anomic/crawler/retrieval/FileLoader.java @@ -30,8 +30,6 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import de.anomic.search.Segments; -import de.anomic.search.Switchboard; import de.anomic.crawler.CrawlProfile; import net.yacy.cora.protocol.HeaderFramework; @@ -43,6 +41,8 @@ import net.yacy.document.TextParser; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.util.FileUtils; +import net.yacy.search.Switchboard; +import net.yacy.search.index.Segments; public class FileLoader { diff --git a/source/de/anomic/crawler/retrieval/HTTPLoader.java b/source/de/anomic/crawler/retrieval/HTTPLoader.java index 5892ca3fc..7c38c90f8 100644 --- a/source/de/anomic/crawler/retrieval/HTTPLoader.java +++ b/source/de/anomic/crawler/retrieval/HTTPLoader.java @@ -37,14 +37,14 @@ import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.io.ByteCount; import net.yacy.kelondro.logging.Log; import net.yacy.repository.Blacklist; +import net.yacy.search.Switchboard; +import net.yacy.search.index.Segments; import de.anomic.crawler.CrawlProfile; import de.anomic.crawler.Latency; import de.anomic.crawler.ZURL.FailCategory; import de.anomic.http.server.AlternativeDomainNames; import de.anomic.http.server.HTTPDemon; -import de.anomic.search.Segments; -import de.anomic.search.Switchboard; public final class HTTPLoader { diff --git a/source/de/anomic/crawler/retrieval/SMBLoader.java b/source/de/anomic/crawler/retrieval/SMBLoader.java index c08dff0b3..018723c11 100644 --- a/source/de/anomic/crawler/retrieval/SMBLoader.java +++ b/source/de/anomic/crawler/retrieval/SMBLoader.java @@ -39,8 +39,6 @@ import jcifs.smb.SmbException; import jcifs.smb.SmbFile; import jcifs.smb.SmbFileInputStream; -import de.anomic.search.Segments; -import de.anomic.search.Switchboard; import de.anomic.crawler.CrawlProfile; import net.yacy.cora.document.MultiProtocolURI; @@ -53,6 +51,8 @@ import net.yacy.document.TextParser; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.util.FileUtils; +import net.yacy.search.Switchboard; +import net.yacy.search.index.Segments; public class SMBLoader { diff --git a/source/de/anomic/data/ListManager.java b/source/de/anomic/data/ListManager.java index a506c44fc..342008ab0 100644 --- a/source/de/anomic/data/ListManager.java +++ b/source/de/anomic/data/ListManager.java @@ -36,9 +36,9 @@ import java.util.Vector; import net.yacy.kelondro.util.FileUtils; import net.yacy.repository.Blacklist; import net.yacy.repository.BlacklistFile; +import net.yacy.search.Switchboard; +import net.yacy.search.query.SearchEventCache; -import de.anomic.search.SearchEventCache; -import de.anomic.search.Switchboard; import java.util.List; import java.util.regex.Pattern; diff --git a/source/de/anomic/data/URLAnalysis.java b/source/de/anomic/data/URLAnalysis.java index a68b4d865..f9d09ce58 100644 --- a/source/de/anomic/data/URLAnalysis.java +++ b/source/de/anomic/data/URLAnalysis.java @@ -61,9 +61,9 @@ import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.rwi.ReferenceContainerArray; import net.yacy.kelondro.util.MemoryControl; -import de.anomic.search.MetadataRepository; -import de.anomic.search.MetadataRepository.Export; -import de.anomic.search.Segment; +import net.yacy.search.index.MetadataRepository; +import net.yacy.search.index.Segment; +import net.yacy.search.index.MetadataRepository.Export; public class URLAnalysis { diff --git a/source/de/anomic/data/WorkTables.java b/source/de/anomic/data/WorkTables.java index c9130bd64..57c5b6ec9 100644 --- a/source/de/anomic/data/WorkTables.java +++ b/source/de/anomic/data/WorkTables.java @@ -47,8 +47,8 @@ import net.yacy.kelondro.index.RowSpaceExceededException; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.rwi.IndexCell; +import net.yacy.search.Switchboard; import de.anomic.data.ymark.YMarkTables; -import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; public class WorkTables extends Tables { diff --git a/source/de/anomic/data/ymark/YMarkMetadata.java b/source/de/anomic/data/ymark/YMarkMetadata.java index 96c3371db..03ea464ea 100644 --- a/source/de/anomic/data/ymark/YMarkMetadata.java +++ b/source/de/anomic/data/ymark/YMarkMetadata.java @@ -43,8 +43,8 @@ import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.data.meta.URIMetadataRow; import net.yacy.kelondro.data.word.Word; import net.yacy.repository.LoaderDispatcher; +import net.yacy.search.index.Segments; import de.anomic.crawler.retrieval.Response; -import de.anomic.search.Segments; public class YMarkMetadata { private DigestURI uri; diff --git a/source/de/anomic/http/server/HTTPDFileHandler.java b/source/de/anomic/http/server/HTTPDFileHandler.java index cf79ba04e..38c0ea330 100644 --- a/source/de/anomic/http/server/HTTPDFileHandler.java +++ b/source/de/anomic/http/server/HTTPDFileHandler.java @@ -104,18 +104,18 @@ import net.yacy.kelondro.order.Digest; import net.yacy.kelondro.util.ByteBuffer; import net.yacy.kelondro.util.FileUtils; import net.yacy.kelondro.util.MemoryControl; +import net.yacy.peers.yacySeed; +import net.yacy.peers.graphics.EncodedImage; +import net.yacy.peers.operation.yacyBuildProperties; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; import net.yacy.visualization.RasterPlotter; import de.anomic.data.UserDB; -import de.anomic.search.Switchboard; -import de.anomic.search.SwitchboardConstants; import de.anomic.server.serverClassLoader; import de.anomic.server.serverCore; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; import de.anomic.server.servletProperties; -import de.anomic.yacy.yacyBuildProperties; -import de.anomic.yacy.yacySeed; -import de.anomic.yacy.graphics.EncodedImage; public final class HTTPDFileHandler { diff --git a/source/de/anomic/http/server/HTTPDProxyHandler.java b/source/de/anomic/http/server/HTTPDProxyHandler.java index 0fdfa44c5..a71cb9a7b 100644 --- a/source/de/anomic/http/server/HTTPDProxyHandler.java +++ b/source/de/anomic/http/server/HTTPDProxyHandler.java @@ -86,13 +86,13 @@ import net.yacy.kelondro.io.ByteCountOutputStream; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.util.FileUtils; import net.yacy.repository.Blacklist; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; import de.anomic.crawler.retrieval.Request; import de.anomic.crawler.retrieval.Response; //import de.anomic.http.client.Client; import de.anomic.http.client.Cache; -import de.anomic.search.Switchboard; -import de.anomic.search.SwitchboardConstants; import de.anomic.server.serverCore; import de.anomic.server.serverObjects; @@ -296,7 +296,7 @@ public final class HTTPDProxyHandler { // remembering the starting time of the request final Date requestDate = new Date(); // remember the time... conProp.put(HeaderFramework.CONNECTION_PROP_REQUEST_START, Long.valueOf(requestDate.getTime())); - if (yacyTrigger) de.anomic.yacy.yacyCore.triggerOnlineAction(); + if (yacyTrigger) net.yacy.peers.yacyCore.triggerOnlineAction(); sb.proxyLastAccess = System.currentTimeMillis(); // using an ByteCount OutputStream to count the send bytes (needed for the logfile) @@ -739,7 +739,7 @@ public final class HTTPDProxyHandler { // remembering the starting time of the request final Date requestDate = new Date(); // remember the time... conProp.put(HeaderFramework.CONNECTION_PROP_REQUEST_START, Long.valueOf(requestDate.getTime())); - if (yacyTrigger) de.anomic.yacy.yacyCore.triggerOnlineAction(); + if (yacyTrigger) net.yacy.peers.yacyCore.triggerOnlineAction(); sb.proxyLastAccess = System.currentTimeMillis(); // using an ByteCount OutputStream to count the send bytes @@ -856,7 +856,7 @@ public final class HTTPDProxyHandler { // remembering the starting time of the request final Date requestDate = new Date(); // remember the time... conProp.put(HeaderFramework.CONNECTION_PROP_REQUEST_START, Long.valueOf(requestDate.getTime())); - if (yacyTrigger) de.anomic.yacy.yacyCore.triggerOnlineAction(); + if (yacyTrigger) net.yacy.peers.yacyCore.triggerOnlineAction(); sb.proxyLastAccess = System.currentTimeMillis(); // using an ByteCount OutputStream to count the send bytes diff --git a/source/de/anomic/http/server/HTTPDemon.java b/source/de/anomic/http/server/HTTPDemon.java index 0af05df25..c0b06c7c3 100644 --- a/source/de/anomic/http/server/HTTPDemon.java +++ b/source/de/anomic/http/server/HTTPDemon.java @@ -65,6 +65,7 @@ import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.util.ByteBuffer; import net.yacy.kelondro.util.FileUtils; import net.yacy.kelondro.util.MemoryControl; +import net.yacy.search.Switchboard; import org.apache.commons.fileupload.FileItem; import org.apache.commons.fileupload.FileItemFactory; @@ -75,7 +76,6 @@ import org.apache.commons.fileupload.RequestContext; import org.apache.commons.fileupload.disk.DiskFileItemFactory; import de.anomic.data.UserDB; -import de.anomic.search.Switchboard; import de.anomic.server.serverCore; import de.anomic.server.serverCore.Session; import de.anomic.server.serverHandler; diff --git a/source/de/anomic/http/server/RobotsTxtConfig.java b/source/de/anomic/http/server/RobotsTxtConfig.java index 6e3baa062..62cad8d0f 100644 --- a/source/de/anomic/http/server/RobotsTxtConfig.java +++ b/source/de/anomic/http/server/RobotsTxtConfig.java @@ -28,7 +28,7 @@ package de.anomic.http.server; -import de.anomic.search.SwitchboardConstants; +import net.yacy.search.SwitchboardConstants; import de.anomic.server.serverSwitch; public final class RobotsTxtConfig { diff --git a/source/de/anomic/server/serverObjects.java b/source/de/anomic/server/serverObjects.java index 6394ddf48..1286c1a66 100644 --- a/source/de/anomic/server/serverObjects.java +++ b/source/de/anomic/server/serverObjects.java @@ -58,8 +58,8 @@ import net.yacy.cora.document.MultiProtocolURI; import net.yacy.cora.document.UTF8; import net.yacy.document.parser.html.CharacterCoding; import net.yacy.kelondro.util.Formatter; +import net.yacy.search.Switchboard; -import de.anomic.search.Switchboard; public class serverObjects extends HashMap implements Cloneable { diff --git a/source/de/anomic/net/UPnP.java b/source/de/anomic/tools/UPnP.java similarity index 95% rename from source/de/anomic/net/UPnP.java rename to source/de/anomic/tools/UPnP.java index 7715501df..3d19ed94c 100644 --- a/source/de/anomic/net/UPnP.java +++ b/source/de/anomic/tools/UPnP.java @@ -24,7 +24,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.net; +package de.anomic.tools; import java.io.IOException; import java.net.MalformedURLException; @@ -32,13 +32,13 @@ import java.net.URL; import net.yacy.cora.protocol.Domains; import net.yacy.kelondro.logging.Log; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; import net.yacy.upnp.DiscoveryAdvertisement; import net.yacy.upnp.DiscoveryEventHandler; import net.yacy.upnp.devices.UPNPRootDevice; import net.yacy.upnp.impls.InternetGatewayDevice; import net.yacy.upnp.messages.UPNPResponseException; -import de.anomic.search.Switchboard; -import de.anomic.search.SwitchboardConstants; public class UPnP { diff --git a/source/de/anomic/net/whois.java b/source/de/anomic/tools/whois.java similarity index 96% rename from source/de/anomic/net/whois.java rename to source/de/anomic/tools/whois.java index 6154a86a0..1be5d70e0 100644 --- a/source/de/anomic/net/whois.java +++ b/source/de/anomic/tools/whois.java @@ -22,7 +22,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.net; +package de.anomic.tools; import java.io.BufferedReader; import java.io.IOException; diff --git a/source/net/yacy/document/importer/OAIPMHImporter.java b/source/net/yacy/document/importer/OAIPMHImporter.java index 10297f676..a97c0b06a 100644 --- a/source/net/yacy/document/importer/OAIPMHImporter.java +++ b/source/net/yacy/document/importer/OAIPMHImporter.java @@ -36,8 +36,8 @@ import net.yacy.cora.date.GenericFormatter; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.logging.Log; import net.yacy.repository.LoaderDispatcher; +import net.yacy.search.Switchboard; -import de.anomic.search.Switchboard; // list records from oai-pmh like // http://opus.bsz-bw.de/fhhv/oai2/oai2.php?verb=ListRecords&metadataPrefix=oai_dc diff --git a/source/de/anomic/yacy/Tray.java b/source/net/yacy/gui/Tray.java similarity index 98% rename from source/de/anomic/yacy/Tray.java rename to source/net/yacy/gui/Tray.java index e32c27717..535f6e965 100644 --- a/source/de/anomic/yacy/Tray.java +++ b/source/net/yacy/gui/Tray.java @@ -25,7 +25,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.yacy; +package net.yacy.gui; import java.awt.Image; import java.awt.MenuItem; @@ -40,9 +40,9 @@ import java.lang.reflect.Method; import net.yacy.gui.framework.Browser; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.util.OS; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; -import de.anomic.search.Switchboard; -import de.anomic.search.SwitchboardConstants; public final class Tray { diff --git a/source/net/yacy/gui/YaCyApp.java b/source/net/yacy/gui/YaCyApp.java index a8db4e271..7230836b4 100644 --- a/source/net/yacy/gui/YaCyApp.java +++ b/source/net/yacy/gui/YaCyApp.java @@ -89,7 +89,7 @@ public class YaCyApp { public void closeAndExit() { if (app != null) app.setVisible(false); // fake closing //Browser.openBrowser("http://" + host + ":" + port + "/Steering.html?shutdown="); - de.anomic.search.Switchboard.getSwitchboard().terminate(10, "shutdown request from gui"); + net.yacy.search.Switchboard.getSwitchboard().terminate(10, "shutdown request from gui"); Switchboard.shutdown(); //System.exit(0); } diff --git a/source/net/yacy/kelondro/data/meta/URIMetadataRow.java b/source/net/yacy/kelondro/data/meta/URIMetadataRow.java index c1f606ab2..ddb5148b1 100644 --- a/source/net/yacy/kelondro/data/meta/URIMetadataRow.java +++ b/source/net/yacy/kelondro/data/meta/URIMetadataRow.java @@ -48,8 +48,8 @@ import net.yacy.kelondro.order.NaturalOrder; import net.yacy.kelondro.util.ByteBuffer; import net.yacy.kelondro.util.MapTools; import net.yacy.kelondro.util.kelondroException; +import net.yacy.search.query.QueryParams; import de.anomic.crawler.retrieval.Request; -import de.anomic.search.QueryParams; import de.anomic.tools.crypt; public class URIMetadataRow implements URIMetadata { diff --git a/source/net/yacy/kelondro/util/EventTracker.java b/source/net/yacy/kelondro/util/EventTracker.java index 22015147c..2207511d9 100644 --- a/source/net/yacy/kelondro/util/EventTracker.java +++ b/source/net/yacy/kelondro/util/EventTracker.java @@ -31,7 +31,8 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedQueue; -import de.anomic.yacy.graphics.ProfilingGraph; +import net.yacy.peers.graphics.ProfilingGraph; + public class EventTracker { diff --git a/source/net/yacy/migration.java b/source/net/yacy/migration.java index 5f4d9c6b0..959654b00 100644 --- a/source/net/yacy/migration.java +++ b/source/net/yacy/migration.java @@ -29,8 +29,8 @@ import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.order.Digest; import net.yacy.kelondro.util.FileUtils; -import de.anomic.search.Switchboard; -import de.anomic.search.SwitchboardConstants; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; public class migration { //SVN constants diff --git a/source/de/anomic/yacy/dht/Dispatcher.java b/source/net/yacy/peers/dht/Dispatcher.java similarity index 99% rename from source/de/anomic/yacy/dht/Dispatcher.java rename to source/net/yacy/peers/dht/Dispatcher.java index 33bb42742..c67fe1a4f 100755 --- a/source/de/anomic/yacy/dht/Dispatcher.java +++ b/source/net/yacy/peers/dht/Dispatcher.java @@ -23,7 +23,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.yacy.dht; +package net.yacy.peers.dht; import java.io.IOException; import java.util.ArrayList; @@ -42,9 +42,9 @@ import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.rwi.ReferenceContainer; import net.yacy.kelondro.util.ByteArray; import net.yacy.kelondro.workflow.WorkflowProcessor; -import de.anomic.search.Segment; -import de.anomic.yacy.yacySeed; -import de.anomic.yacy.yacySeedDB; +import net.yacy.peers.yacySeed; +import net.yacy.peers.yacySeedDB; +import net.yacy.search.index.Segment; public class Dispatcher { diff --git a/source/de/anomic/yacy/dht/FlatWordPartitionScheme.java b/source/net/yacy/peers/dht/FlatWordPartitionScheme.java similarity index 99% rename from source/de/anomic/yacy/dht/FlatWordPartitionScheme.java rename to source/net/yacy/peers/dht/FlatWordPartitionScheme.java index 0b6496ad6..32154d6ff 100755 --- a/source/de/anomic/yacy/dht/FlatWordPartitionScheme.java +++ b/source/net/yacy/peers/dht/FlatWordPartitionScheme.java @@ -23,7 +23,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.yacy.dht; +package net.yacy.peers.dht; import java.util.Random; import java.util.TreeMap; @@ -34,7 +34,7 @@ import net.yacy.kelondro.index.RowSpaceExceededException; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.util.MemoryControl; -import de.anomic.yacy.yacySeed; +import net.yacy.peers.yacySeed; /** * A flat word partition scheme is a metric for words on the range of a distributed diff --git a/source/de/anomic/yacy/dht/PartitionScheme.java b/source/net/yacy/peers/dht/PartitionScheme.java similarity index 98% rename from source/de/anomic/yacy/dht/PartitionScheme.java rename to source/net/yacy/peers/dht/PartitionScheme.java index 187237aee..540eb4366 100755 --- a/source/de/anomic/yacy/dht/PartitionScheme.java +++ b/source/net/yacy/peers/dht/PartitionScheme.java @@ -23,9 +23,9 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.yacy.dht; +package net.yacy.peers.dht; -import de.anomic.yacy.yacySeed; +import net.yacy.peers.yacySeed; /** * A PartitionScheme is a calculation of index storage positions in the network of peers. diff --git a/source/de/anomic/yacy/dht/PeerSelection.java b/source/net/yacy/peers/dht/PeerSelection.java similarity index 99% rename from source/de/anomic/yacy/dht/PeerSelection.java rename to source/net/yacy/peers/dht/PeerSelection.java index a19be437e..7552d6039 100755 --- a/source/de/anomic/yacy/dht/PeerSelection.java +++ b/source/net/yacy/peers/dht/PeerSelection.java @@ -22,7 +22,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.yacy.dht; +package net.yacy.peers.dht; import java.util.ArrayList; import java.util.HashMap; @@ -44,11 +44,11 @@ import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.order.Digest; import net.yacy.kelondro.util.kelondroException; +import net.yacy.peers.yacyCore; +import net.yacy.peers.yacySeed; +import net.yacy.peers.yacySeedDB; +import net.yacy.peers.operation.yacyVersion; -import de.anomic.yacy.yacyCore; -import de.anomic.yacy.yacySeed; -import de.anomic.yacy.yacySeedDB; -import de.anomic.yacy.yacyVersion; /* diff --git a/source/de/anomic/yacy/dht/Transmission.java b/source/net/yacy/peers/dht/Transmission.java similarity index 98% rename from source/de/anomic/yacy/dht/Transmission.java rename to source/net/yacy/peers/dht/Transmission.java index ed992e037..0ce4a4c47 100644 --- a/source/de/anomic/yacy/dht/Transmission.java +++ b/source/net/yacy/peers/dht/Transmission.java @@ -22,7 +22,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.yacy.dht; +package net.yacy.peers.dht; import java.util.ArrayList; import java.util.Iterator; @@ -40,11 +40,11 @@ import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.rwi.ReferenceContainer; import net.yacy.kelondro.rwi.ReferenceContainerCache; import net.yacy.kelondro.workflow.WorkflowJob; +import net.yacy.peers.yacyClient; +import net.yacy.peers.yacySeed; +import net.yacy.peers.yacySeedDB; +import net.yacy.search.index.Segment; -import de.anomic.search.Segment; -import de.anomic.yacy.yacyClient; -import de.anomic.yacy.yacySeed; -import de.anomic.yacy.yacySeedDB; import java.util.List; import java.util.SortedMap; diff --git a/source/de/anomic/yacy/dht/VerticalWordPartitionScheme.java b/source/net/yacy/peers/dht/VerticalWordPartitionScheme.java similarity index 99% rename from source/de/anomic/yacy/dht/VerticalWordPartitionScheme.java rename to source/net/yacy/peers/dht/VerticalWordPartitionScheme.java index 6c7bc5705..6314f6080 100755 --- a/source/de/anomic/yacy/dht/VerticalWordPartitionScheme.java +++ b/source/net/yacy/peers/dht/VerticalWordPartitionScheme.java @@ -23,11 +23,11 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.yacy.dht; +package net.yacy.peers.dht; import net.yacy.cora.document.ASCII; import net.yacy.cora.document.UTF8; -import de.anomic.yacy.yacySeed; +import net.yacy.peers.yacySeed; public class VerticalWordPartitionScheme implements PartitionScheme { diff --git a/source/de/anomic/yacy/graphics/EncodedImage.java b/source/net/yacy/peers/graphics/EncodedImage.java similarity index 94% rename from source/de/anomic/yacy/graphics/EncodedImage.java rename to source/net/yacy/peers/graphics/EncodedImage.java index 7c4337f62..6fae28687 100644 --- a/source/de/anomic/yacy/graphics/EncodedImage.java +++ b/source/net/yacy/peers/graphics/EncodedImage.java @@ -1,4 +1,4 @@ -package de.anomic.yacy.graphics; +package net.yacy.peers.graphics; import java.awt.image.BufferedImage; diff --git a/source/de/anomic/yacy/graphics/NetworkGraph.java b/source/net/yacy/peers/graphics/NetworkGraph.java similarity index 96% rename from source/de/anomic/yacy/graphics/NetworkGraph.java rename to source/net/yacy/peers/graphics/NetworkGraph.java index 35ff56d6d..9e1513674 100644 --- a/source/de/anomic/yacy/graphics/NetworkGraph.java +++ b/source/net/yacy/peers/graphics/NetworkGraph.java @@ -24,7 +24,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.yacy.graphics; +package net.yacy.peers.graphics; import java.awt.Color; import java.awt.Graphics2D; @@ -37,18 +37,18 @@ import net.yacy.cora.document.ASCII; import net.yacy.cora.document.Hit; import net.yacy.cora.document.UTF8; import net.yacy.kelondro.logging.Log; +import net.yacy.peers.yacyChannel; +import net.yacy.peers.yacySearch; +import net.yacy.peers.yacySeed; +import net.yacy.peers.yacySeedDB; +import net.yacy.peers.dht.FlatWordPartitionScheme; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; +import net.yacy.search.query.QueryParams; +import net.yacy.search.query.SearchEvent; +import net.yacy.search.query.SearchEventCache; import net.yacy.visualization.PrintTool; import net.yacy.visualization.RasterPlotter; -import de.anomic.search.QueryParams; -import de.anomic.search.SearchEvent; -import de.anomic.search.SearchEventCache; -import de.anomic.search.Switchboard; -import de.anomic.search.SwitchboardConstants; -import de.anomic.yacy.yacyChannel; -import de.anomic.yacy.yacySearch; -import de.anomic.yacy.yacySeed; -import de.anomic.yacy.yacySeedDB; -import de.anomic.yacy.dht.FlatWordPartitionScheme; public class NetworkGraph { diff --git a/source/de/anomic/yacy/graphics/OSMTile.java b/source/net/yacy/peers/graphics/OSMTile.java similarity index 98% rename from source/de/anomic/yacy/graphics/OSMTile.java rename to source/net/yacy/peers/graphics/OSMTile.java index ec33241d9..981d4edc2 100644 --- a/source/de/anomic/yacy/graphics/OSMTile.java +++ b/source/net/yacy/peers/graphics/OSMTile.java @@ -22,7 +22,7 @@ * If not, see . */ -package de.anomic.yacy.graphics; +package net.yacy.peers.graphics; import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream; @@ -37,10 +37,10 @@ import javax.imageio.ImageIO; import net.yacy.cora.services.federated.yacy.CacheStrategy; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.logging.Log; +import net.yacy.search.Switchboard; import net.yacy.visualization.RasterPlotter; import de.anomic.crawler.retrieval.Response; import de.anomic.http.client.Cache; -import de.anomic.search.Switchboard; public class OSMTile { diff --git a/source/de/anomic/yacy/graphics/ProfilingGraph.java b/source/net/yacy/peers/graphics/ProfilingGraph.java similarity index 99% rename from source/de/anomic/yacy/graphics/ProfilingGraph.java rename to source/net/yacy/peers/graphics/ProfilingGraph.java index 7c9f5cd2f..da0bc9c8a 100644 --- a/source/de/anomic/yacy/graphics/ProfilingGraph.java +++ b/source/net/yacy/peers/graphics/ProfilingGraph.java @@ -24,16 +24,16 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.yacy.graphics; +package net.yacy.peers.graphics; import java.util.ConcurrentModificationException; import java.util.Iterator; import net.yacy.kelondro.util.EventTracker; import net.yacy.kelondro.util.EventTracker.Event; +import net.yacy.search.query.SearchEvent; import net.yacy.visualization.ChartPlotter; import net.yacy.visualization.RasterPlotter; -import de.anomic.search.SearchEvent; public class ProfilingGraph { diff --git a/source/de/anomic/yacy/graphics/WebStructureGraph.java b/source/net/yacy/peers/graphics/WebStructureGraph.java similarity index 99% rename from source/de/anomic/yacy/graphics/WebStructureGraph.java rename to source/net/yacy/peers/graphics/WebStructureGraph.java index 61dffb0b1..8bdf2c2ef 100644 --- a/source/de/anomic/yacy/graphics/WebStructureGraph.java +++ b/source/net/yacy/peers/graphics/WebStructureGraph.java @@ -25,7 +25,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.yacy.graphics; +package net.yacy.peers.graphics; import java.io.File; import java.io.IOException; diff --git a/source/de/anomic/yacy/yacyBuildProperties.java b/source/net/yacy/peers/operation/yacyBuildProperties.java similarity index 94% rename from source/de/anomic/yacy/yacyBuildProperties.java rename to source/net/yacy/peers/operation/yacyBuildProperties.java index 26b9c3bdb..f8e56abd5 100644 --- a/source/de/anomic/yacy/yacyBuildProperties.java +++ b/source/net/yacy/peers/operation/yacyBuildProperties.java @@ -1,9 +1,10 @@ -package de.anomic.yacy; +package net.yacy.peers.operation; import java.util.Locale; import java.util.regex.Pattern; -import de.anomic.yacy.yacyBuildProperties; +import net.yacy.peers.operation.yacyBuildProperties; + /** * Properties set when compiling this release/version diff --git a/source/de/anomic/yacy/yacyRelease.java b/source/net/yacy/peers/operation/yacyRelease.java similarity index 97% rename from source/de/anomic/yacy/yacyRelease.java rename to source/net/yacy/peers/operation/yacyRelease.java index 2e2498f6e..91d71cd74 100644 --- a/source/de/anomic/yacy/yacyRelease.java +++ b/source/net/yacy/peers/operation/yacyRelease.java @@ -25,7 +25,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.yacy; +package net.yacy.peers.operation; import java.io.BufferedOutputStream; import java.io.File; @@ -59,7 +59,8 @@ import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.util.FileUtils; import net.yacy.kelondro.util.OS; -import de.anomic.search.Switchboard; +import net.yacy.peers.yacyCore; +import net.yacy.search.Switchboard; import de.anomic.server.serverCore; import de.anomic.tools.CryptoLib; import de.anomic.tools.SignatureOutputStream; diff --git a/source/de/anomic/yacy/seedUpload/yacySeedUploadFile.java b/source/net/yacy/peers/operation/yacySeedUploadFile.java similarity index 94% rename from source/de/anomic/yacy/seedUpload/yacySeedUploadFile.java rename to source/net/yacy/peers/operation/yacySeedUploadFile.java index cc17b3d31..c7e35d1ca 100644 --- a/source/de/anomic/yacy/seedUpload/yacySeedUploadFile.java +++ b/source/net/yacy/peers/operation/yacySeedUploadFile.java @@ -23,14 +23,13 @@ //along with this program; if not, write to the Free Software //Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.yacy.seedUpload; +package net.yacy.peers.operation; import java.io.File; import net.yacy.kelondro.util.FileUtils; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacySeedUploader; public class yacySeedUploadFile implements yacySeedUploader { diff --git a/source/de/anomic/yacy/seedUpload/yacySeedUploadFtp.java b/source/net/yacy/peers/operation/yacySeedUploadFtp.java similarity index 95% rename from source/de/anomic/yacy/seedUpload/yacySeedUploadFtp.java rename to source/net/yacy/peers/operation/yacySeedUploadFtp.java index 477020cd1..aa8d8b4ab 100644 --- a/source/de/anomic/yacy/seedUpload/yacySeedUploadFtp.java +++ b/source/net/yacy/peers/operation/yacySeedUploadFtp.java @@ -23,14 +23,13 @@ //along with this program; if not, write to the Free Software //Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.yacy.seedUpload; +package net.yacy.peers.operation; import java.io.File; import net.yacy.cora.protocol.ftp.FTPClient; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacySeedUploader; public class yacySeedUploadFtp implements yacySeedUploader { diff --git a/source/de/anomic/yacy/seedUpload/yacySeedUploadScp.java b/source/net/yacy/peers/operation/yacySeedUploadScp.java similarity index 96% rename from source/de/anomic/yacy/seedUpload/yacySeedUploadScp.java rename to source/net/yacy/peers/operation/yacySeedUploadScp.java index 6655d4193..6c51906cb 100644 --- a/source/de/anomic/yacy/seedUpload/yacySeedUploadScp.java +++ b/source/net/yacy/peers/operation/yacySeedUploadScp.java @@ -23,7 +23,7 @@ //along with this program; if not, write to the Free Software //Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.yacy.seedUpload; +package net.yacy.peers.operation; import java.io.BufferedInputStream; import java.io.File; @@ -42,7 +42,6 @@ import com.jcraft.jsch.UIKeyboardInteractive; import com.jcraft.jsch.UserInfo; import de.anomic.server.serverSwitch; -import de.anomic.yacy.yacySeedUploader; public class yacySeedUploadScp implements yacySeedUploader { diff --git a/source/de/anomic/yacy/seedUpload/yacySeedUploadScp.xml b/source/net/yacy/peers/operation/yacySeedUploadScp.xml similarity index 77% rename from source/de/anomic/yacy/seedUpload/yacySeedUploadScp.xml rename to source/net/yacy/peers/operation/yacySeedUploadScp.xml index daada0871..6c54dd911 100644 --- a/source/de/anomic/yacy/seedUpload/yacySeedUploadScp.xml +++ b/source/net/yacy/peers/operation/yacySeedUploadScp.xml @@ -11,7 +11,7 @@ - + @@ -29,13 +29,13 @@ includes="jsch-0.1.21.*" prefix="${releaseDir}/lib/" dirmode="755" mode="644"/> - - - - + + - - + + diff --git a/source/de/anomic/yacy/yacySeedUploader.java b/source/net/yacy/peers/operation/yacySeedUploader.java similarity index 94% rename from source/de/anomic/yacy/yacySeedUploader.java rename to source/net/yacy/peers/operation/yacySeedUploader.java index 4b7715037..215f17d41 100644 --- a/source/de/anomic/yacy/yacySeedUploader.java +++ b/source/net/yacy/peers/operation/yacySeedUploader.java @@ -22,7 +22,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.yacy; +package net.yacy.peers.operation; import java.io.File; diff --git a/source/de/anomic/yacy/yacyUpdateLocation.java b/source/net/yacy/peers/operation/yacyUpdateLocation.java similarity index 97% rename from source/de/anomic/yacy/yacyUpdateLocation.java rename to source/net/yacy/peers/operation/yacyUpdateLocation.java index 861f7669e..5e2c62bee 100644 --- a/source/de/anomic/yacy/yacyUpdateLocation.java +++ b/source/net/yacy/peers/operation/yacyUpdateLocation.java @@ -25,7 +25,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.yacy; +package net.yacy.peers.operation; import java.security.PublicKey; diff --git a/source/de/anomic/yacy/yacyVersion.java b/source/net/yacy/peers/operation/yacyVersion.java similarity index 96% rename from source/de/anomic/yacy/yacyVersion.java rename to source/net/yacy/peers/operation/yacyVersion.java index a97a92652..0938ac188 100644 --- a/source/de/anomic/yacy/yacyVersion.java +++ b/source/net/yacy/peers/operation/yacyVersion.java @@ -1,11 +1,11 @@ -package de.anomic.yacy; +package net.yacy.peers.operation; import java.util.Comparator; import java.util.regex.Matcher; import net.yacy.kelondro.logging.Log; +import net.yacy.search.Switchboard; -import de.anomic.search.Switchboard; public class yacyVersion implements Comparator, Comparable { diff --git a/source/de/anomic/yacy/yacyAccessible.java b/source/net/yacy/peers/yacyAccessible.java similarity index 94% rename from source/de/anomic/yacy/yacyAccessible.java rename to source/net/yacy/peers/yacyAccessible.java index 2217eb9b8..022a3eeaa 100644 --- a/source/de/anomic/yacy/yacyAccessible.java +++ b/source/net/yacy/peers/yacyAccessible.java @@ -26,14 +26,14 @@ /* This class just defines a container */ -package de.anomic.yacy; +package net.yacy.peers; import java.io.File; import net.yacy.cora.document.UTF8; import net.yacy.kelondro.util.FileUtils; +import net.yacy.search.Switchboard; -import de.anomic.search.Switchboard; public class yacyAccessible { public long lastUpdated; diff --git a/source/de/anomic/yacy/yacyChannel.java b/source/net/yacy/peers/yacyChannel.java similarity index 98% rename from source/de/anomic/yacy/yacyChannel.java rename to source/net/yacy/peers/yacyChannel.java index bd7409368..b9bc8bd8e 100644 --- a/source/de/anomic/yacy/yacyChannel.java +++ b/source/net/yacy/peers/yacyChannel.java @@ -22,7 +22,7 @@ * If not, see . */ -package de.anomic.yacy; +package net.yacy.peers; import java.util.EnumSet; import java.util.Set; diff --git a/source/de/anomic/yacy/yacyClient.java b/source/net/yacy/peers/yacyClient.java similarity index 97% rename from source/de/anomic/yacy/yacyClient.java rename to source/net/yacy/peers/yacyClient.java index bef856467..aa843bda9 100644 --- a/source/de/anomic/yacy/yacyClient.java +++ b/source/net/yacy/peers/yacyClient.java @@ -41,7 +41,7 @@ // the intact and unchanged copyright notice. // Contributions and changes to the program code must be marked as such. -package de.anomic.yacy; +package net.yacy.peers; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -89,25 +89,26 @@ import net.yacy.kelondro.rwi.ReferenceContainerCache; import net.yacy.kelondro.util.ByteBuffer; import net.yacy.kelondro.util.EventTracker; import net.yacy.kelondro.util.FileUtils; +import net.yacy.peers.graphics.ProfilingGraph; +import net.yacy.peers.graphics.WebStructureGraph; +import net.yacy.peers.graphics.WebStructureGraph.HostReference; +import net.yacy.peers.operation.yacyVersion; import net.yacy.repository.Blacklist; +import net.yacy.search.Switchboard; +import net.yacy.search.index.Segment; +import net.yacy.search.query.QueryParams; +import net.yacy.search.query.SearchEvent; +import net.yacy.search.ranking.RankingProcess; +import net.yacy.search.ranking.RankingProfile; +import net.yacy.search.snippet.ContentDomain; +import net.yacy.search.snippet.TextSnippet; import org.apache.http.entity.mime.content.ContentBody; import de.anomic.crawler.ResultURLs; import de.anomic.crawler.ResultURLs.EventOrigin; -import de.anomic.search.ContentDomain; -import de.anomic.search.QueryParams; -import de.anomic.search.RankingProcess; -import de.anomic.search.RankingProfile; -import de.anomic.search.SearchEvent; -import de.anomic.search.Segment; -import de.anomic.search.Switchboard; -import de.anomic.search.TextSnippet; import de.anomic.server.serverCore; import de.anomic.tools.crypt; -import de.anomic.yacy.graphics.ProfilingGraph; -import de.anomic.yacy.graphics.WebStructureGraph; -import de.anomic.yacy.graphics.WebStructureGraph.HostReference; public final class yacyClient { diff --git a/source/de/anomic/yacy/yacyCore.java b/source/net/yacy/peers/yacyCore.java similarity index 97% rename from source/de/anomic/yacy/yacyCore.java rename to source/net/yacy/peers/yacyCore.java index f2056a2f8..4a2c47517 100644 --- a/source/de/anomic/yacy/yacyCore.java +++ b/source/net/yacy/peers/yacyCore.java @@ -36,7 +36,7 @@ // contributions: // principal peer status via file generation by Alexander Schier [AS] -package de.anomic.yacy; +package net.yacy.peers; import java.net.MalformedURLException; import java.util.Collections; @@ -55,12 +55,13 @@ import net.yacy.cora.document.RSSFeed; import net.yacy.cora.document.RSSMessage; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.logging.Log; -import de.anomic.search.Switchboard; +import net.yacy.peers.dht.PeerSelection; +import net.yacy.peers.operation.yacySeedUploadFile; +import net.yacy.peers.operation.yacySeedUploadFtp; +import net.yacy.peers.operation.yacySeedUploadScp; +import net.yacy.peers.operation.yacySeedUploader; +import net.yacy.search.Switchboard; import de.anomic.server.serverCore; -import de.anomic.yacy.dht.PeerSelection; -import de.anomic.yacy.seedUpload.yacySeedUploadFile; -import de.anomic.yacy.seedUpload.yacySeedUploadFtp; -import de.anomic.yacy.seedUpload.yacySeedUploadScp; public class yacyCore { diff --git a/source/de/anomic/yacy/yacyNetwork.java b/source/net/yacy/peers/yacyNetwork.java similarity index 98% rename from source/de/anomic/yacy/yacyNetwork.java rename to source/net/yacy/peers/yacyNetwork.java index b4f53d5cc..a426d89cf 100644 --- a/source/de/anomic/yacy/yacyNetwork.java +++ b/source/net/yacy/peers/yacyNetwork.java @@ -25,17 +25,18 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.yacy; +package net.yacy.peers; import java.util.LinkedHashMap; import net.yacy.cora.date.GenericFormatter; import net.yacy.cora.document.UTF8; import net.yacy.kelondro.order.Digest; +import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; + import org.apache.http.entity.mime.content.ContentBody; -import de.anomic.search.Switchboard; -import de.anomic.search.SwitchboardConstants; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/source/de/anomic/yacy/yacyNewsDB.java b/source/net/yacy/peers/yacyNewsDB.java similarity index 97% rename from source/de/anomic/yacy/yacyNewsDB.java rename to source/net/yacy/peers/yacyNewsDB.java index 259fe5659..87baf39d1 100644 --- a/source/de/anomic/yacy/yacyNewsDB.java +++ b/source/net/yacy/peers/yacyNewsDB.java @@ -42,7 +42,7 @@ // the intact and unchanged copyright notice. // Contributions and changes to the program code must be marked as such. -package de.anomic.yacy; +package net.yacy.peers; import java.io.File; import java.io.IOException; diff --git a/source/de/anomic/yacy/yacyNewsPool.java b/source/net/yacy/peers/yacyNewsPool.java similarity index 97% rename from source/de/anomic/yacy/yacyNewsPool.java rename to source/net/yacy/peers/yacyNewsPool.java index 9524079e2..a79f5922f 100644 --- a/source/de/anomic/yacy/yacyNewsPool.java +++ b/source/net/yacy/peers/yacyNewsPool.java @@ -42,7 +42,7 @@ // the intact and unchanged copyright notice. // Contributions and changes to the program code must be marked as such. -package de.anomic.yacy; +package net.yacy.peers; import java.io.File; import java.io.IOException; @@ -57,7 +57,7 @@ import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.index.RowSpaceExceededException; import net.yacy.kelondro.logging.Log; import net.yacy.repository.Blacklist; -import de.anomic.search.Switchboard; +import net.yacy.search.Switchboard; public class yacyNewsPool { diff --git a/source/de/anomic/yacy/yacyNewsQueue.java b/source/net/yacy/peers/yacyNewsQueue.java similarity index 96% rename from source/de/anomic/yacy/yacyNewsQueue.java rename to source/net/yacy/peers/yacyNewsQueue.java index e59660968..205967859 100644 --- a/source/de/anomic/yacy/yacyNewsQueue.java +++ b/source/net/yacy/peers/yacyNewsQueue.java @@ -42,7 +42,7 @@ // the intact and unchanged copyright notice. // Contributions and changes to the program code must be marked as such. -package de.anomic.yacy; +package net.yacy.peers; import java.io.File; import java.io.IOException; diff --git a/source/de/anomic/yacy/yacyPeerActions.java b/source/net/yacy/peers/yacyPeerActions.java similarity index 97% rename from source/de/anomic/yacy/yacyPeerActions.java rename to source/net/yacy/peers/yacyPeerActions.java index eb6e6dfa1..14688b9fe 100644 --- a/source/de/anomic/yacy/yacyPeerActions.java +++ b/source/net/yacy/peers/yacyPeerActions.java @@ -22,7 +22,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.yacy; +package net.yacy.peers; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -31,6 +31,7 @@ import net.yacy.cora.document.ASCII; import net.yacy.cora.document.RSSMessage; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.util.MapTools; +import net.yacy.peers.operation.yacyVersion; public class yacyPeerActions { diff --git a/source/de/anomic/yacy/yacySearch.java b/source/net/yacy/peers/yacySearch.java similarity index 95% rename from source/de/anomic/yacy/yacySearch.java rename to source/net/yacy/peers/yacySearch.java index 87843389d..63fed05f9 100644 --- a/source/de/anomic/yacy/yacySearch.java +++ b/source/net/yacy/peers/yacySearch.java @@ -22,7 +22,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.yacy; +package net.yacy.peers; import java.util.Iterator; import java.util.SortedMap; @@ -32,14 +32,14 @@ import net.yacy.cora.document.ASCII; import net.yacy.kelondro.index.HandleSet; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.Bitfield; +import net.yacy.peers.dht.PeerSelection; import net.yacy.repository.Blacklist; +import net.yacy.search.index.Segment; +import net.yacy.search.query.QueryParams; +import net.yacy.search.query.SearchEvent; +import net.yacy.search.ranking.RankingProcess; +import net.yacy.search.ranking.RankingProfile; -import de.anomic.search.QueryParams; -import de.anomic.search.RankingProfile; -import de.anomic.search.RankingProcess; -import de.anomic.search.SearchEvent; -import de.anomic.search.Segment; -import de.anomic.yacy.dht.PeerSelection; public class yacySearch extends Thread { diff --git a/source/de/anomic/yacy/yacySeed.java b/source/net/yacy/peers/yacySeed.java similarity index 97% rename from source/de/anomic/yacy/yacySeed.java rename to source/net/yacy/peers/yacySeed.java index ce6e63d10..9ed508c11 100644 --- a/source/de/anomic/yacy/yacySeed.java +++ b/source/net/yacy/peers/yacySeed.java @@ -38,7 +38,7 @@ // senior - a peer that has a public socked and serves search queries // principal - a peer like a senior socket and serves as gateway for network definition -package de.anomic.yacy; +package net.yacy.peers; import java.io.File; import java.io.FileReader; @@ -69,10 +69,11 @@ import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.order.Digest; import net.yacy.kelondro.util.MapTools; import net.yacy.kelondro.util.OS; -import de.anomic.search.Switchboard; +import net.yacy.peers.dht.FlatWordPartitionScheme; +import net.yacy.peers.operation.yacyVersion; +import net.yacy.search.Switchboard; import de.anomic.tools.bitfield; import de.anomic.tools.crypt; -import de.anomic.yacy.dht.FlatWordPartitionScheme; public class yacySeed implements Cloneable, Comparable, Comparator { diff --git a/source/de/anomic/yacy/yacySeedDB.java b/source/net/yacy/peers/yacySeedDB.java similarity index 97% rename from source/de/anomic/yacy/yacySeedDB.java rename to source/net/yacy/peers/yacySeedDB.java index 14523c0f1..4d7336ca9 100644 --- a/source/de/anomic/yacy/yacySeedDB.java +++ b/source/net/yacy/peers/yacySeedDB.java @@ -22,7 +22,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.yacy; +package net.yacy.peers; import java.io.BufferedWriter; import java.io.File; @@ -57,13 +57,14 @@ import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.util.FileUtils; import net.yacy.kelondro.util.kelondroException; +import net.yacy.peers.dht.PartitionScheme; +import net.yacy.peers.dht.VerticalWordPartitionScheme; +import net.yacy.peers.operation.yacySeedUploader; +import net.yacy.search.Switchboard; import de.anomic.http.server.AlternativeDomainNames; import de.anomic.http.server.HTTPDemon; -import de.anomic.search.Switchboard; import de.anomic.server.serverCore; import de.anomic.server.serverSwitch; -import de.anomic.yacy.dht.PartitionScheme; -import de.anomic.yacy.dht.VerticalWordPartitionScheme; public final class yacySeedDB implements AlternativeDomainNames { diff --git a/source/net/yacy/repository/LoaderDispatcher.java b/source/net/yacy/repository/LoaderDispatcher.java index 8bcff3335..aa4d7612e 100644 --- a/source/net/yacy/repository/LoaderDispatcher.java +++ b/source/net/yacy/repository/LoaderDispatcher.java @@ -55,6 +55,8 @@ import net.yacy.document.parser.html.ContentScraper; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.util.FileUtils; +import net.yacy.search.Switchboard; +import net.yacy.search.index.Segments; import de.anomic.crawler.CrawlProfile; import de.anomic.crawler.retrieval.FTPLoader; import de.anomic.crawler.retrieval.FileLoader; @@ -63,8 +65,6 @@ import de.anomic.crawler.retrieval.Request; import de.anomic.crawler.retrieval.Response; import de.anomic.crawler.retrieval.SMBLoader; import de.anomic.http.client.Cache; -import de.anomic.search.Segments; -import de.anomic.search.Switchboard; public final class LoaderDispatcher { diff --git a/source/de/anomic/search/IndexAbstracts.java b/source/net/yacy/search/IndexAbstracts.java similarity index 98% rename from source/de/anomic/search/IndexAbstracts.java rename to source/net/yacy/search/IndexAbstracts.java index 8edd21ed1..165d2958c 100644 --- a/source/de/anomic/search/IndexAbstracts.java +++ b/source/net/yacy/search/IndexAbstracts.java @@ -24,7 +24,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.search; +package net.yacy.search; import java.util.Iterator; import java.util.Map; diff --git a/source/de/anomic/search/Switchboard.java b/source/net/yacy/search/Switchboard.java similarity index 97% rename from source/de/anomic/search/Switchboard.java rename to source/net/yacy/search/Switchboard.java index 542ae5c1b..267cfd419 100644 --- a/source/de/anomic/search/Switchboard.java +++ b/source/net/yacy/search/Switchboard.java @@ -34,7 +34,7 @@ - job queues: for parsing, condensing, indexing */ -package de.anomic.search; +package net.yacy.search; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -104,6 +104,7 @@ import net.yacy.document.content.DCEntry; import net.yacy.document.content.SurrogateReader; import net.yacy.document.importer.OAIListFriendsLoader; import net.yacy.document.parser.html.Evaluation; +import net.yacy.gui.Tray; import net.yacy.kelondro.blob.Tables; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.data.meta.URIMetadataRow; @@ -127,9 +128,29 @@ import net.yacy.kelondro.workflow.InstantBusyThread; import net.yacy.kelondro.workflow.WorkflowJob; import net.yacy.kelondro.workflow.WorkflowProcessor; import net.yacy.kelondro.workflow.WorkflowThread; +import net.yacy.peers.yacyChannel; +import net.yacy.peers.yacyClient; +import net.yacy.peers.yacyCore; +import net.yacy.peers.yacyNewsPool; +import net.yacy.peers.yacySeed; +import net.yacy.peers.yacySeedDB; +import net.yacy.peers.dht.Dispatcher; +import net.yacy.peers.dht.PeerSelection; +import net.yacy.peers.graphics.WebStructureGraph; +import net.yacy.peers.operation.yacyBuildProperties; +import net.yacy.peers.operation.yacyRelease; +import net.yacy.peers.operation.yacyUpdateLocation; import net.yacy.repository.Blacklist; import net.yacy.repository.FilterEngine; import net.yacy.repository.LoaderDispatcher; +import net.yacy.search.index.Segment; +import net.yacy.search.index.Segments; +import net.yacy.search.query.AccessTracker; +import net.yacy.search.query.SearchEvent; +import net.yacy.search.query.SearchEventCache; +import net.yacy.search.ranking.BlockRank; +import net.yacy.search.ranking.RankingProfile; +import net.yacy.search.snippet.ContentDomain; import de.anomic.crawler.CrawlProfile; import de.anomic.crawler.CrawlQueues; import de.anomic.crawler.CrawlStacker; @@ -156,24 +177,11 @@ import de.anomic.data.wiki.WikiCode; import de.anomic.data.wiki.WikiParser; import de.anomic.http.client.Cache; import de.anomic.http.server.RobotsTxtConfig; -import de.anomic.net.UPnP; import de.anomic.server.serverCore; import de.anomic.server.serverSwitch; import de.anomic.tools.CryptoLib; +import de.anomic.tools.UPnP; import de.anomic.tools.crypt; -import de.anomic.yacy.Tray; -import de.anomic.yacy.yacyBuildProperties; -import de.anomic.yacy.yacyChannel; -import de.anomic.yacy.yacyClient; -import de.anomic.yacy.yacyCore; -import de.anomic.yacy.yacyNewsPool; -import de.anomic.yacy.yacyRelease; -import de.anomic.yacy.yacySeed; -import de.anomic.yacy.yacySeedDB; -import de.anomic.yacy.yacyUpdateLocation; -import de.anomic.yacy.dht.Dispatcher; -import de.anomic.yacy.dht.PeerSelection; -import de.anomic.yacy.graphics.WebStructureGraph; public final class Switchboard extends serverSwitch { @@ -2217,7 +2225,7 @@ public final class Switchboard extends serverSwitch { if (searchEvent != null) { searchEvent.addHeuristic(url.hash(), heuristicName, true); } - if (this.indexSegments.segment(process).urlMetadata.exists(url.hash())) return; // don't do double-work + if (this.indexSegments.segment(process).exists(url.hash())) return; // don't do double-work final Request request = this.loader.request(url, true, true); final CrawlProfile profile = sb.crawler.getActive(ASCII.getBytes(request.profileHandle())); final String acceptedError = this.crawlStacker.checkAcceptance(url, profile, 0); diff --git a/source/de/anomic/search/SwitchboardConstants.java b/source/net/yacy/search/SwitchboardConstants.java similarity index 99% rename from source/de/anomic/search/SwitchboardConstants.java rename to source/net/yacy/search/SwitchboardConstants.java index 00a72ec50..44dcd8cd6 100644 --- a/source/de/anomic/search/SwitchboardConstants.java +++ b/source/net/yacy/search/SwitchboardConstants.java @@ -24,7 +24,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.search; +package net.yacy.search; import net.yacy.kelondro.util.MapTools; import de.anomic.http.server.RobotsTxtConfig; diff --git a/source/de/anomic/search/DocumentIndex.java b/source/net/yacy/search/index/DocumentIndex.java similarity index 97% rename from source/de/anomic/search/DocumentIndex.java rename to source/net/yacy/search/index/DocumentIndex.java index 2b5620f79..822d41370 100644 --- a/source/de/anomic/search/DocumentIndex.java +++ b/source/net/yacy/search/index/DocumentIndex.java @@ -25,7 +25,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.search; +package net.yacy.search.index; import java.io.File; import java.io.IOException; @@ -44,6 +44,12 @@ import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.data.meta.URIMetadataRow; import net.yacy.kelondro.data.meta.URIMetadataRow.Components; import net.yacy.kelondro.logging.Log; +import net.yacy.search.query.QueryParams; +import net.yacy.search.query.SearchEvent; +import net.yacy.search.ranking.RankingProcess; +import net.yacy.search.ranking.RankingProfile; +import net.yacy.search.ranking.ReferenceOrder; +import net.yacy.search.snippet.ContentDomain; /** diff --git a/source/de/anomic/search/MetadataRepository.java b/source/net/yacy/search/index/MetadataRepository.java similarity index 99% rename from source/de/anomic/search/MetadataRepository.java rename to source/net/yacy/search/index/MetadataRepository.java index 120118644..2f9c024de 100644 --- a/source/de/anomic/search/MetadataRepository.java +++ b/source/net/yacy/search/index/MetadataRepository.java @@ -24,7 +24,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.search; +package net.yacy.search.index; import java.io.BufferedOutputStream; import java.io.File; diff --git a/source/de/anomic/search/Segment.java b/source/net/yacy/search/index/Segment.java similarity index 99% rename from source/de/anomic/search/Segment.java rename to source/net/yacy/search/index/Segment.java index fbe5a962c..d61bbf66c 100644 --- a/source/de/anomic/search/Segment.java +++ b/source/net/yacy/search/index/Segment.java @@ -24,7 +24,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.search; +package net.yacy.search.index; import java.io.File; import java.io.IOException; @@ -62,6 +62,9 @@ import net.yacy.kelondro.rwi.ReferenceFactory; import net.yacy.kelondro.util.ISO639; import net.yacy.repository.Blacklist; import net.yacy.repository.LoaderDispatcher; +import net.yacy.search.Switchboard; +import net.yacy.search.query.SearchEvent; +import net.yacy.search.ranking.RankingProcess; import de.anomic.crawler.retrieval.Response; public class Segment { @@ -170,6 +173,10 @@ public class Segment { public IndexCell termIndex() { return this.termIndex; } + + public boolean exists(byte[] urlhash) { + return this.urlMetadata.exists(urlhash); + } public void clear() { try { diff --git a/source/de/anomic/search/Segments.java b/source/net/yacy/search/index/Segments.java similarity index 99% rename from source/de/anomic/search/Segments.java rename to source/net/yacy/search/index/Segments.java index dc4f5e896..1adb0bfa5 100644 --- a/source/de/anomic/search/Segments.java +++ b/source/net/yacy/search/index/Segments.java @@ -24,7 +24,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.search; +package net.yacy.search.index; import java.io.File; import java.io.IOException; diff --git a/source/de/anomic/search/AccessTracker.java b/source/net/yacy/search/query/AccessTracker.java similarity index 99% rename from source/de/anomic/search/AccessTracker.java rename to source/net/yacy/search/query/AccessTracker.java index 4fdf49d9d..1e822488f 100644 --- a/source/de/anomic/search/AccessTracker.java +++ b/source/net/yacy/search/query/AccessTracker.java @@ -23,7 +23,7 @@ * If not, see . */ -package de.anomic.search; +package net.yacy.search.query; import java.io.File; import java.io.FileNotFoundException; diff --git a/source/de/anomic/search/QueryParams.java b/source/net/yacy/search/query/QueryParams.java similarity index 96% rename from source/de/anomic/search/QueryParams.java rename to source/net/yacy/search/query/QueryParams.java index 5f8420e11..97f9c6b95 100644 --- a/source/de/anomic/search/QueryParams.java +++ b/source/net/yacy/search/query/QueryParams.java @@ -24,7 +24,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.search; +package net.yacy.search.query; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; @@ -54,7 +54,10 @@ import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.order.Bitfield; import net.yacy.kelondro.order.NaturalOrder; import net.yacy.kelondro.util.SetTools; -import de.anomic.yacy.yacySeed; +import net.yacy.peers.yacySeed; +import net.yacy.search.index.Segment; +import net.yacy.search.ranking.RankingProfile; +import net.yacy.search.snippet.ContentDomain; public final class QueryParams { @@ -325,7 +328,7 @@ public final class QueryParams { return ret; } - protected static final boolean anymatch(final String text, final HandleSet keyhashes) { + public static final boolean anymatch(final String text, final HandleSet keyhashes) { // returns true if any of the word hashes in keyhashes appear in the String text // to do this, all words in the string must be recognized and transcoded to word hashes final HandleSet wordhashes = Word.words2hashesHandles(Condenser.getWords(text, null).keySet()); diff --git a/source/de/anomic/search/ResultFetcher.java b/source/net/yacy/search/query/ResultFetcher.java similarity index 98% rename from source/de/anomic/search/ResultFetcher.java rename to source/net/yacy/search/query/ResultFetcher.java index 9edf9439c..ddfd18327 100644 --- a/source/de/anomic/search/ResultFetcher.java +++ b/source/net/yacy/search/query/ResultFetcher.java @@ -24,7 +24,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.search; +package net.yacy.search.query; import java.util.ArrayList; import java.util.Iterator; @@ -47,15 +47,21 @@ import net.yacy.kelondro.index.RowSpaceExceededException; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.util.EventTracker; import net.yacy.kelondro.util.MemoryControl; +import net.yacy.peers.yacySeedDB; +import net.yacy.peers.graphics.ProfilingGraph; import net.yacy.repository.LoaderDispatcher; +import net.yacy.search.Switchboard; +import net.yacy.search.ranking.RankingProcess; +import net.yacy.search.snippet.ContentDomain; +import net.yacy.search.snippet.MediaSnippet; +import net.yacy.search.snippet.ResultEntry; +import net.yacy.search.snippet.TextSnippet; import org.apache.solr.common.SolrDocument; import org.apache.solr.common.SolrDocumentList; import de.anomic.data.WorkTables; import de.anomic.http.client.Cache; -import de.anomic.yacy.yacySeedDB; -import de.anomic.yacy.graphics.ProfilingGraph; public class ResultFetcher { diff --git a/source/de/anomic/search/SearchEvent.java b/source/net/yacy/search/query/SearchEvent.java similarity index 96% rename from source/de/anomic/search/SearchEvent.java rename to source/net/yacy/search/query/SearchEvent.java index 9fa20ece8..99940e6df 100644 --- a/source/de/anomic/search/SearchEvent.java +++ b/source/net/yacy/search/query/SearchEvent.java @@ -24,7 +24,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.search; +package net.yacy.search.query; import java.util.Iterator; import java.util.Map; @@ -47,13 +47,17 @@ import net.yacy.kelondro.rwi.ReferenceContainer; import net.yacy.kelondro.util.EventTracker; import net.yacy.kelondro.util.MemoryControl; import net.yacy.kelondro.util.SetTools; +import net.yacy.peers.yacySearch; +import net.yacy.peers.yacySeedDB; +import net.yacy.peers.dht.FlatWordPartitionScheme; +import net.yacy.peers.graphics.ProfilingGraph; import net.yacy.repository.LoaderDispatcher; +import net.yacy.search.Switchboard; +import net.yacy.search.query.ResultFetcher.Worker; +import net.yacy.search.ranking.RankingProcess; +import net.yacy.search.ranking.ReferenceOrder; +import net.yacy.search.snippet.ResultEntry; import de.anomic.data.WorkTables; -import de.anomic.search.ResultFetcher.Worker; -import de.anomic.yacy.yacySearch; -import de.anomic.yacy.yacySeedDB; -import de.anomic.yacy.dht.FlatWordPartitionScheme; -import de.anomic.yacy.graphics.ProfilingGraph; public final class SearchEvent { diff --git a/source/de/anomic/search/SearchEventCache.java b/source/net/yacy/search/query/SearchEventCache.java similarity index 95% rename from source/de/anomic/search/SearchEventCache.java rename to source/net/yacy/search/query/SearchEventCache.java index c3541bc08..8e5a6e1e2 100644 --- a/source/de/anomic/search/SearchEventCache.java +++ b/source/net/yacy/search/query/SearchEventCache.java @@ -24,7 +24,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.search; +package net.yacy.search.query; import java.util.Iterator; import java.util.Map; @@ -34,9 +34,13 @@ import java.util.concurrent.ConcurrentMap; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.util.MemoryControl; +import net.yacy.peers.yacySeedDB; import net.yacy.repository.LoaderDispatcher; +import net.yacy.search.Switchboard; +import net.yacy.search.index.Segment; +import net.yacy.search.ranking.RankingProfile; +import net.yacy.search.snippet.ContentDomain; import de.anomic.data.WorkTables; -import de.anomic.yacy.yacySeedDB; public class SearchEventCache { diff --git a/source/de/anomic/search/BlockRank.java b/source/net/yacy/search/ranking/BlockRank.java similarity index 97% rename from source/de/anomic/search/BlockRank.java rename to source/net/yacy/search/ranking/BlockRank.java index f9f5be637..79fc98f28 100644 --- a/source/de/anomic/search/BlockRank.java +++ b/source/net/yacy/search/ranking/BlockRank.java @@ -23,7 +23,7 @@ */ -package de.anomic.search; +package net.yacy.search.ranking; import java.io.File; import java.io.IOException; @@ -44,13 +44,14 @@ import net.yacy.kelondro.rwi.ReferenceContainer; import net.yacy.kelondro.rwi.ReferenceContainerCache; import net.yacy.kelondro.rwi.ReferenceIterator; import net.yacy.kelondro.util.FileUtils; +import net.yacy.peers.yacyClient; +import net.yacy.peers.yacySeed; +import net.yacy.peers.yacySeedDB; +import net.yacy.peers.graphics.WebStructureGraph; +import net.yacy.peers.graphics.WebStructureGraph.HostReference; +import net.yacy.search.index.Segment; +import net.yacy.search.index.MetadataRepository.HostStat; -import de.anomic.search.MetadataRepository.HostStat; -import de.anomic.yacy.yacyClient; -import de.anomic.yacy.yacySeed; -import de.anomic.yacy.yacySeedDB; -import de.anomic.yacy.graphics.WebStructureGraph; -import de.anomic.yacy.graphics.WebStructureGraph.HostReference; public class BlockRank { diff --git a/source/de/anomic/search/RankingProcess.java b/source/net/yacy/search/ranking/RankingProcess.java similarity index 96% rename from source/de/anomic/search/RankingProcess.java rename to source/net/yacy/search/ranking/RankingProcess.java index 1f0dba89b..c0b62b9c7 100644 --- a/source/de/anomic/search/RankingProcess.java +++ b/source/net/yacy/search/ranking/RankingProcess.java @@ -24,7 +24,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.search; +package net.yacy.search.ranking; import java.util.Comparator; import java.util.ConcurrentModificationException; @@ -57,7 +57,14 @@ import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.rwi.ReferenceContainer; import net.yacy.kelondro.rwi.TermSearch; import net.yacy.kelondro.util.EventTracker; -import de.anomic.yacy.graphics.ProfilingGraph; +import net.yacy.peers.graphics.ProfilingGraph; +import net.yacy.search.Switchboard; +import net.yacy.search.index.Segment; +import net.yacy.search.query.QueryParams; +import net.yacy.search.query.SearchEvent; +import net.yacy.search.query.SearchEvent.Type; +import net.yacy.search.snippet.ContentDomain; +import net.yacy.search.snippet.ResultEntry; public final class RankingProcess extends Thread { @@ -290,7 +297,7 @@ public final class RankingProcess extends Thread { assert this.feeders >= 0 : "feeders = " + this.feeders; } - protected void moreFeeders(final int countMoreFeeders) { + public void moreFeeders(final int countMoreFeeders) { this.feeders += countMoreFeeders; } @@ -315,7 +322,7 @@ public final class RankingProcess extends Thread { return false; } - protected Map> searchContainerMap() { + public Map> searchContainerMap() { // direct access to the result maps is needed for abstract generation // this is only available if execQuery() was called before return this.localSearchInclusion; @@ -709,7 +716,7 @@ public final class RankingProcess extends Thread { } } - protected void addTopics(final ResultEntry resultEntry) { + public void addTopics(final ResultEntry resultEntry) { // take out relevant information for reference computation if ((resultEntry.url() == null) || (resultEntry.title() == null)) return; //final String[] urlcomps = htmlFilterContentScraper.urlComps(resultEntry.url().toNormalform(true, true)); // word components of the url diff --git a/source/de/anomic/search/RankingProfile.java b/source/net/yacy/search/ranking/RankingProfile.java similarity index 99% rename from source/de/anomic/search/RankingProfile.java rename to source/net/yacy/search/ranking/RankingProfile.java index 6a6be5395..331c2567e 100644 --- a/source/de/anomic/search/RankingProfile.java +++ b/source/net/yacy/search/ranking/RankingProfile.java @@ -24,12 +24,13 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.search; +package net.yacy.search.ranking; import java.util.HashMap; import java.util.Map; import net.yacy.kelondro.logging.Log; +import net.yacy.search.snippet.ContentDomain; public class RankingProfile { diff --git a/source/de/anomic/search/ReferenceOrder.java b/source/net/yacy/search/ranking/ReferenceOrder.java similarity index 98% rename from source/de/anomic/search/ReferenceOrder.java rename to source/net/yacy/search/ranking/ReferenceOrder.java index b4ae83f78..33de6df47 100644 --- a/source/de/anomic/search/ReferenceOrder.java +++ b/source/net/yacy/search/ranking/ReferenceOrder.java @@ -24,7 +24,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.search; +package net.yacy.search.ranking; import java.util.HashMap; import java.util.Iterator; diff --git a/source/de/anomic/search/ContentDomain.java b/source/net/yacy/search/snippet/ContentDomain.java similarity index 50% rename from source/de/anomic/search/ContentDomain.java rename to source/net/yacy/search/snippet/ContentDomain.java index c75efe4af..0c3464eb7 100644 --- a/source/de/anomic/search/ContentDomain.java +++ b/source/net/yacy/search/snippet/ContentDomain.java @@ -1,4 +1,28 @@ -package de.anomic.search; +/** + * ContentDomain + * Copyright 2011 by Michael Christen + * First released 18.05.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 + * 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 . + */ + +package net.yacy.search.snippet; public enum ContentDomain { diff --git a/source/de/anomic/search/MediaSnippet.java b/source/net/yacy/search/snippet/MediaSnippet.java similarity index 97% rename from source/de/anomic/search/MediaSnippet.java rename to source/net/yacy/search/snippet/MediaSnippet.java index ca0b91dff..5c1e7fb01 100644 --- a/source/de/anomic/search/MediaSnippet.java +++ b/source/net/yacy/search/snippet/MediaSnippet.java @@ -22,7 +22,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.search; +package net.yacy.search.snippet; import java.io.IOException; import java.util.ArrayList; @@ -48,6 +48,7 @@ import net.yacy.kelondro.index.RowSpaceExceededException; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.util.ByteArray; +import net.yacy.search.Switchboard; public class MediaSnippet implements Comparable, Comparator { diff --git a/source/de/anomic/search/ResultEntry.java b/source/net/yacy/search/snippet/ResultEntry.java similarity index 95% rename from source/de/anomic/search/ResultEntry.java rename to source/net/yacy/search/snippet/ResultEntry.java index b4b6d56fe..b392e1ed6 100644 --- a/source/de/anomic/search/ResultEntry.java +++ b/source/net/yacy/search/snippet/ResultEntry.java @@ -24,7 +24,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.search; +package net.yacy.search.snippet; import java.io.IOException; import java.util.Comparator; @@ -42,9 +42,10 @@ import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.order.Bitfield; import net.yacy.kelondro.rwi.Reference; import net.yacy.kelondro.util.ByteArray; +import net.yacy.peers.yacySeed; +import net.yacy.peers.yacySeedDB; +import net.yacy.search.index.Segment; -import de.anomic.yacy.yacySeed; -import de.anomic.yacy.yacySeedDB; public class ResultEntry implements Comparable, Comparator { diff --git a/source/de/anomic/search/TextSnippet.java b/source/net/yacy/search/snippet/TextSnippet.java similarity index 97% rename from source/de/anomic/search/TextSnippet.java rename to source/net/yacy/search/snippet/TextSnippet.java index d5f521b9f..06dd5a576 100644 --- a/source/de/anomic/search/TextSnippet.java +++ b/source/net/yacy/search/snippet/TextSnippet.java @@ -22,7 +22,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.search; +package net.yacy.search.snippet; import java.io.ByteArrayInputStream; import java.util.Collection; @@ -50,9 +50,10 @@ import net.yacy.kelondro.index.HandleSet; import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.util.ByteArray; import net.yacy.kelondro.util.ByteBuffer; +import net.yacy.peers.yacySearch; import net.yacy.repository.LoaderDispatcher; +import net.yacy.search.Switchboard; import de.anomic.crawler.retrieval.Response; -import de.anomic.yacy.yacySearch; public class TextSnippet implements Comparable, Comparator { @@ -88,8 +89,8 @@ public class TextSnippet implements Comparable, Comparator