refactoring:

- moved many classes from de.anomic to net.yacy
- made more sub-packages for search classes

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7973 6c8d7289-2bf4-0310-a012-ef5d649a1542

build.xml

@@ -119,20 +119,6 @@
 
   <!-- initializing all needed variables -->
   <target name="init" depends="readBuildProperties">
-    <mkdir dir="${build}/de/anomic/crawler"/>
-    <mkdir dir="${build}/de/anomic/data"/>
-    <mkdir dir="${build}/de/anomic/htmlFilter"/>
-    <mkdir dir="${build}/de/anomic/http"/>
-    <mkdir dir="${build}/de/anomic/kelondro"/>
-    <mkdir dir="${build}/de/anomic/net"/>
-    <mkdir dir="${build}/de/anomic/index"/>
-    <mkdir dir="${build}/de/anomic/plasma"/>
-    <mkdir dir="${build}/de/anomic/plasma/parser"/>
-    <mkdir dir="${build}/de/anomic/server"/>
-    <mkdir dir="${build}/de/anomic/tools"/>
-    <mkdir dir="${build}/de/anomic/ymage"/>
-    <mkdir dir="${build}/de/anomic/yacy"/>
-    <mkdir dir="${build}/de/anomic/yacy/seedUpload"/>
     <mkdir dir="${data}"/>
     <mkdir dir="${release}"/>
 
@@ -154,8 +140,8 @@
     <filter token="REPL_RESTARTCMD" value="${RESTARTCMD}"/>
 
     <!-- apply replacments -->
-    <delete file="${build}/de/anomic/yacy/yacyBuildProperties.java" failonerror="false"/>
-    <copy file="${src}/de/anomic/yacy/yacyBuildProperties.java" tofile="${build}/de/anomic/yacy/yacyBuildProperties.java" overwrite="true" filtering="true" />
+    <delete file="${build}/net/yacy/peers/operation/yacyBuildProperties.java" failonerror="false"/>
+    <copy file="${src}/net/yacy/peers/operation/yacyBuildProperties.java" tofile="${build}/net/yacy/peers/operation/yacyBuildProperties.java" overwrite="true" filtering="true" />
     
     <!-- copy log4j config file -->
     <copy file="${src}/log4j.properties" tofile="${build}/log4j.properties" overwrite="true" filtering="true" />
@@ -224,7 +210,7 @@
     <!-- compile yacyBuildProperties.java -->
     <javac srcdir="${build}" destdir="${build}" sourcepath="${src}"
            debug="true" debuglevel="lines,vars,source"
-           includes="de/anomic/yacy/yacyBuildProperties.java"
+           includes="net/yacy/peers/operation/yacyBuildProperties.java"
            source="${javacSource}" target="${javacTarget}">
       <classpath refid="project.class.path" />
       <compilerarg value="-Xlint"/>
@@ -234,7 +220,7 @@
     <!-- compile the core sources -->
     <javac srcdir="${src}/" destdir="${build}"
            debug="true" debuglevel="lines,vars,source"
-           excludes="de/anomic/yacy/yacyBuildProperties.java"
+           excludes="net/yacy/peers/operation/yacyBuildProperties.java"
            source="${javacSource}" target="${javacTarget}">
       <classpath refid="project.class.path" />
       <compilerarg value="-Xlint"/>
@@ -491,7 +477,7 @@
   <!-- make clean -->
   <target name="clean" description="make clean">
     <delete dir="${release_main}" failonerror="false"/>
-    <delete file="${build}/de/anomic/yacy/yacyBuildProperties.java" failonerror="false"/>
+    <delete file="${build}/net/yacy/peers/operation/yacyBuildProperties.java" failonerror="false"/>
     <delete file="${build}/log4j.properties" failonerror="false"/>
     <delete file="${lib}/yacycore.jar" failonerror="false"/>
     <delete file="${lib}/svnRevNr.jar" failonerror="false"/>

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;
 

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 {
 	

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 {

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 {
     

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_";

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;
 

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;
 

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;
 

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 {
 

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 {

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;
 

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;

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;

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 {
     

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;
 

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;
 

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;

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;
 

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;
 

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;
 

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;
 

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 {
 

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;

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;
 

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 {
 

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 {    
     

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;
 

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;
 

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;
 

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 {
     

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;

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 {
 

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;
 

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;
 

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 {
 

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;
 

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;
 

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 {
 

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;
 

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;
 

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 {
     

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 {
     

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 {
     

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 {
     

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 {
     

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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 {
 

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 {
 

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 {
 

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 {

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 {
     

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 {
     

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 {
 

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;
 

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;

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 {
     

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;
 

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;
 

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;

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 {
 

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
 

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;
 

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 {
 

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 {
     

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 {
 

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 {
 

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 {
 

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 {
 

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;
 

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;
 

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;
 

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 {
 

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;

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;
 

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;
 

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 {
 

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;
 

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 {
 

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 {

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;
 

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;
 

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;
 

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;
 

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 {

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;
 

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;
 

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;
 

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;

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;
 

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;
 

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;
 

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 {