preparations to move the HTCache into cora:

- move the header framework classes to cora
- move the ARC caching classes to cora
- refactoring of code to call these classes from cora

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

bin/graphicstest.sh

@@ -0,0 +1,4 @@
+while [ 1 = 1 ]
+do
+curl "http://localhost:8080/NetworkPicture.png?width=768&height=576&bgcolor=FFFFFF" > /dev/null
+done

htroot/AccessTracker_p.java

@@ -36,8 +36,9 @@ import java.util.TreeSet;
 import java.util.Map.Entry;
 import java.text.SimpleDateFormat;
 
-import de.anomic.http.server.HeaderFramework;
+import net.yacy.cora.protocol.HeaderFramework;
-import de.anomic.http.server.RequestHeader;
+import net.yacy.cora.protocol.RequestHeader;
+
 import de.anomic.net.natLib;
 import de.anomic.search.QueryParams;
 import de.anomic.search.Switchboard;

htroot/Banner.java

@@ -31,9 +31,9 @@ import java.io.IOException;
 
 import javax.imageio.ImageIO;
 
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.visualization.RasterPlotter;
 
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.search.SwitchboardConstants;
 import de.anomic.server.serverObjects;

htroot/BlacklistCleaner_p.java

@@ -44,13 +44,13 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import de.anomic.data.listManager;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.SearchEventCache;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;
 import java.util.Set;
 
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.kelondro.logging.Log;
 import net.yacy.kelondro.util.FileUtils;
 import net.yacy.repository.Blacklist;

htroot/BlacklistImpExp_p.java

@@ -34,13 +34,13 @@ import java.util.Iterator;
 import java.util.TreeMap;
 
 import de.anomic.data.listManager;
-import de.anomic.http.server.RequestHeader;
 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;
 
 public class BlacklistImpExp_p {

htroot/BlacklistTest_p.java

@@ -32,11 +32,11 @@
 import java.io.File;
 import java.net.MalformedURLException;
 
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.kelondro.data.meta.DigestURI;
 import net.yacy.repository.Blacklist;
 
 import de.anomic.data.listManager;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/Blacklist_p.java

@@ -38,6 +38,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import net.yacy.cora.protocol.HeaderFramework;
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.kelondro.data.meta.DigestURI;
 import net.yacy.kelondro.logging.Log;
 import net.yacy.kelondro.util.FileUtils;
@@ -45,8 +47,6 @@ import net.yacy.repository.Blacklist;
 
 import de.anomic.data.WorkTables;
 import de.anomic.data.listManager;
-import de.anomic.http.server.HeaderFramework;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.SearchEventCache;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;

htroot/Blog.java

@@ -37,12 +37,11 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Locale;
 
-import net.yacy.kelondro.util.DateFormatter;
+import net.yacy.cora.protocol.HeaderFramework;
+import net.yacy.cora.protocol.RequestHeader;
 
 import de.anomic.data.blogBoard;
 import de.anomic.data.userDB;
-import de.anomic.http.server.HeaderFramework;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;
@@ -348,7 +347,7 @@ public class Blog {
         }
 
         prop.put("mode_entries_" + number + "_date", dateString(entry.getDate()));
-        prop.put("mode_entries_" + number + "_rfc822date", DateFormatter.formatRFC1123(entry.getDate()));
+        prop.put("mode_entries_" + number + "_rfc822date", HeaderFramework.formatRFC1123(entry.getDate()));
         prop.put("mode_entries_" + number + "_pageid", entry.getKey());
         prop.put("mode_entries_" + number + "_address", address);
         prop.put("mode_entries_" + number + "_ip", entry.getIp());

htroot/BlogComments.java

@@ -39,6 +39,8 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.Locale;
 
+import net.yacy.cora.protocol.HeaderFramework;
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.kelondro.logging.Log;
 import net.yacy.kelondro.util.FileUtils;
 
@@ -47,8 +49,6 @@ import de.anomic.data.blogBoardComments;
 import de.anomic.data.messageBoard;
 import de.anomic.data.userDB;
 import de.anomic.data.blogBoard.BlogEntry;
-import de.anomic.http.server.HeaderFramework;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/Bookmarks.java

@@ -37,6 +37,8 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Set;
 
+import net.yacy.cora.protocol.HeaderFramework;
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.document.Document;
 import net.yacy.document.Parser;
 import net.yacy.kelondro.data.meta.DigestURI;
@@ -49,7 +51,6 @@ import de.anomic.data.BookmarkHelper;
 import de.anomic.data.bookmarksDB;
 import de.anomic.data.listManager;
 import de.anomic.data.userDB;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Segments;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
@@ -305,7 +306,7 @@ public class Bookmarks {
 	       			prop.putHTML("display_bookmarks_"+count+"_title", bookmark.getTitle());
 	       			prop.putHTML("display_bookmarks_"+count+"_description", bookmark.getDescription());
 	       			prop.put("display_bookmarks_"+count+"_date", DateFormatter.formatISO8601(new Date(bookmark.getTimeStamp())));
-	       			prop.put("display_bookmarks_"+count+"_rfc822date", DateFormatter.formatRFC1123(new Date(bookmark.getTimeStamp())));
+	       			prop.put("display_bookmarks_"+count+"_rfc822date", HeaderFramework.formatRFC1123(new Date(bookmark.getTimeStamp())));
 	       			prop.put("display_bookmarks_"+count+"_public", (bookmark.getPublic() ? "1" : "0"));
 	            
 	       			//List Tags.

htroot/CacheResource_p.java

@@ -24,11 +24,11 @@
 
 import java.net.MalformedURLException;
 
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.kelondro.data.meta.DigestURI;
 import net.yacy.kelondro.logging.Log;
 
 import de.anomic.http.client.Cache;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;
 

htroot/Collage.java

@@ -25,10 +25,10 @@
 import java.util.Random;
 
 import net.yacy.cora.document.MultiProtocolURI;
-import net.yacy.kelondro.util.Domains;
+import net.yacy.cora.protocol.Domains;
+import net.yacy.cora.protocol.RequestHeader;
 
 import de.anomic.crawler.ResultImages;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/ConfigAccounts_p.java

@@ -32,13 +32,13 @@
 import java.util.HashMap;
 import java.util.Iterator;
 
+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 de.anomic.data.userDB;
 import de.anomic.http.server.HTTPDemon;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/ConfigAppearance_p.java

@@ -37,11 +37,11 @@ import java.io.PrintWriter;
 import java.util.Iterator;
 import java.util.List;
 
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.kelondro.data.meta.DigestURI;
 import net.yacy.kelondro.util.FileUtils;
 
 import de.anomic.crawler.retrieval.HTTPLoader;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/ConfigBasic.java

@@ -31,15 +31,15 @@
 import java.io.File;
 import java.util.regex.Pattern;
 
-import net.yacy.kelondro.util.Domains;
+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 de.anomic.data.WorkTables;
 import de.anomic.data.translator;
 import de.anomic.http.server.HTTPDemon;
 import de.anomic.http.server.HTTPDFileHandler;
-import de.anomic.http.server.HeaderFramework;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.net.UPnP;
 import de.anomic.search.Switchboard;
 import de.anomic.search.SwitchboardConstants;

htroot/ConfigHeuristics_p.java

@@ -25,8 +25,8 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+import net.yacy.cora.protocol.RequestHeader;
 import de.anomic.data.WorkTables;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/ConfigLanguage_p.java

@@ -37,13 +37,13 @@ import java.io.PrintWriter;
 import java.util.Iterator;
 import java.util.List;
 
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.kelondro.data.meta.DigestURI;
 import net.yacy.kelondro.util.FileUtils;
 
 import de.anomic.crawler.retrieval.HTTPLoader;
 import de.anomic.data.WorkTables;
 import de.anomic.data.translator;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/ConfigLiveSearch.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
 
-import de.anomic.http.server.RequestHeader;
+import net.yacy.cora.protocol.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/ConfigNetwork_p.java

@@ -28,13 +28,13 @@
 import java.io.File;
 import java.util.HashSet;
 
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.kelondro.util.FileUtils;
 import net.yacy.kelondro.util.MapTools;
 import net.yacy.kelondro.workflow.BusyThread;
 
 import de.anomic.data.WorkTables;
 import de.anomic.http.server.HTTPDemon;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.search.SwitchboardConstants;
 import de.anomic.server.serverObjects;

htroot/ConfigParser.java

@@ -25,9 +25,9 @@
 // javac -classpath .:../Classes Settings_p.java
 // if the shell's current path is HTROOT
 
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.document.Parser;
 import net.yacy.document.TextParser;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.search.SwitchboardConstants;
 import de.anomic.server.serverObjects;

htroot/ConfigPortal.java

@@ -25,8 +25,8 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+import net.yacy.cora.protocol.RequestHeader;
 import de.anomic.data.WorkTables;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.search.SwitchboardConstants;
 import de.anomic.server.serverObjects;

htroot/ConfigProfile_p.java

@@ -35,7 +35,8 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.Properties;
 
-import de.anomic.http.server.RequestHeader;
+import net.yacy.cora.protocol.RequestHeader;
+
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/ConfigProperties_p.java

@@ -33,7 +33,8 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
-import de.anomic.http.server.RequestHeader;
+import net.yacy.cora.protocol.RequestHeader;
+
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;
 

htroot/ConfigRobotsTxt_p.java

@@ -29,7 +29,7 @@
 // javac -classpath .:../classes ConfigRobotsTxt_p.java
 // if the shell's current path is HTROOT
 
-import de.anomic.http.server.RequestHeader;
+import net.yacy.cora.protocol.RequestHeader;
 import de.anomic.http.server.RobotsTxtConfig;
 import de.anomic.search.Switchboard;
 import de.anomic.search.SwitchboardConstants;

htroot/ConfigSearchBox.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
 
-import de.anomic.http.server.RequestHeader;
+import net.yacy.cora.protocol.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/ConfigUpdate_p.java

@@ -29,12 +29,12 @@ import java.io.IOException;
 import java.util.Date;
 import java.util.TreeSet;
 
+import net.yacy.cora.protocol.RequestHeader;
 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 de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/Connections_p.java

@@ -33,13 +33,13 @@ import java.net.URLEncoder;
 import java.util.Set;
 
 import net.yacy.cora.protocol.ConnectionInfo;
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.kelondro.logging.Log;
 import net.yacy.kelondro.util.DateFormatter;
 import net.yacy.kelondro.workflow.WorkflowThread;
 
 //import de.anomic.http.client.ConnectionInfo;
 //import de.anomic.http.client.Client;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverCore;
 import de.anomic.server.serverObjects;

htroot/ContentIntegrationPHPBB3_p.java

@@ -24,13 +24,13 @@
 
 import java.io.File;
 
+import net.yacy.cora.protocol.RequestHeader;
 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 net.yacy.kelondro.util.DateFormatter;
 
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/CookieMonitorIncoming_p.java

@@ -31,9 +31,9 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.Map;
 
-import net.yacy.kelondro.util.DateFormatter;
+import net.yacy.cora.protocol.HeaderFramework;
+import net.yacy.cora.protocol.RequestHeader;
 
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;
@@ -82,7 +82,7 @@ public class CookieMonitorIncoming_p {
             prop.put("list_" + entCount + "_dark", dark ? "1" : "0");
             dark =! dark;
             prop.put("list_" + entCount + "_host", host);
-            prop.put("list_" + entCount + "_date", DateFormatter.formatRFC1123(date));
+            prop.put("list_" + entCount + "_date", HeaderFramework.formatRFC1123(date));
             prop.put("list_" + entCount + "_client", client);
             while (tmpCount < cookies.length){
                 prop.putHTML("list_" + entCount + "_cookies_" + tmpCount + "_item", ((String) cookies[tmpCount]));

htroot/CookieMonitorOutgoing_p.java

@@ -31,9 +31,8 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.Map;
 
-import net.yacy.kelondro.util.DateFormatter;
+import net.yacy.cora.protocol.HeaderFramework;
-
+import net.yacy.cora.protocol.RequestHeader;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;
@@ -82,7 +81,7 @@ public class CookieMonitorOutgoing_p {
             prop.put("list_" + entCount + "_dark", dark ? "1" : "0" ); 
             dark =! dark;
             prop.put("list_" + entCount + "_host", host);
-            prop.put("list_" + entCount + "_date", DateFormatter.formatRFC1123(date));
+            prop.put("list_" + entCount + "_date", HeaderFramework.formatRFC1123(date));
             prop.put("list_" + entCount + "_client", client);
             while (tmpCount < cookies.length){
                 prop.putHTML("list_" + entCount + "_cookies_" + tmpCount + "_item", ((String) cookies[tmpCount]));

htroot/CookieTest_p.java

@@ -30,7 +30,8 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import de.anomic.http.server.ResponseHeader;
+import net.yacy.cora.protocol.ResponseHeader;
+
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;
 import de.anomic.server.servletProperties;

htroot/CrawlMonitorRemoteStart.java

@@ -26,7 +26,8 @@
 
 import java.util.Iterator;
 
-import de.anomic.http.server.RequestHeader;
+import net.yacy.cora.protocol.RequestHeader;
+
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/CrawlProfileEditor_p.java

@@ -30,13 +30,13 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.kelondro.index.RowSpaceExceededException;
 import net.yacy.kelondro.logging.Log;
 
 import de.anomic.crawler.CrawlProfile;
 import de.anomic.crawler.CrawlSwitchboard;
 import de.anomic.crawler.CrawlProfile.entry;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/CrawlResults.java

@@ -31,13 +31,13 @@ import java.util.Iterator;
 import java.util.Locale;
 import java.util.Map;
 
+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 de.anomic.crawler.ResultURLs.InitExecEntry;
 import de.anomic.crawler.retrieval.EventOrigin;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Segments;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;

htroot/CrawlStart_p.java

@@ -24,8 +24,8 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+import net.yacy.cora.protocol.RequestHeader;
 import de.anomic.crawler.CrawlProfile;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.SwitchboardConstants;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/Crawler_p.java

@@ -37,6 +37,7 @@ import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
 import net.yacy.cora.document.MultiProtocolURI;
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.document.parser.html.ContentScraper;
 import net.yacy.document.parser.html.TransformerWriter;
 import net.yacy.kelondro.data.meta.DigestURI;
@@ -50,7 +51,6 @@ import de.anomic.data.BookmarkHelper;
 import de.anomic.data.WorkTables;
 import de.anomic.data.bookmarksDB;
 import de.anomic.data.listManager;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Segment;
 import de.anomic.search.Segments;
 import de.anomic.search.Switchboard;

htroot/DictionaryLoader_p.java

@@ -21,6 +21,7 @@
 import java.io.IOException;
 import java.net.MalformedURLException;
 
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.document.geolocalization.GeonamesLocalization;
 import net.yacy.document.geolocalization.OpenGeoDBLocalization;
 import net.yacy.kelondro.data.meta.DigestURI;
@@ -29,7 +30,6 @@ import net.yacy.kelondro.util.FileUtils;
 import de.anomic.crawler.CrawlProfile;
 import de.anomic.crawler.retrieval.Response;
 import de.anomic.data.LibraryProvider;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/Help.java

@@ -4,7 +4,7 @@
 //$LastChangedBy$
 //
 
-import de.anomic.http.server.RequestHeader;
+import net.yacy.cora.protocol.RequestHeader;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;
 import de.anomic.server.servletProperties;

htroot/IndexCleaner_p.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
 
-import de.anomic.http.server.RequestHeader;
+import net.yacy.cora.protocol.RequestHeader;
 import de.anomic.search.MetadataRepository;
 import de.anomic.search.Segment;
 import de.anomic.search.Segments;

htroot/IndexControlRWIs_p.java

@@ -34,6 +34,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.TreeMap;
 
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.document.Condenser;
 import net.yacy.kelondro.data.meta.DigestURI;
 import net.yacy.kelondro.data.meta.URIMetadataRow;
@@ -54,7 +55,6 @@ import net.yacy.repository.Blacklist;
 
 import de.anomic.crawler.CrawlProfile;
 import de.anomic.data.listManager;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.QueryParams;
 import de.anomic.search.RankingProcess;
 import de.anomic.search.ReferenceOrder;

htroot/IndexControlURLs_p.java

@@ -30,6 +30,7 @@ import java.io.IOException;
 import java.net.MalformedURLException;
 import java.util.Iterator;
 
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.kelondro.data.meta.DigestURI;
 import net.yacy.kelondro.data.meta.URIMetadataRow;
 import net.yacy.kelondro.data.word.Word;
@@ -39,7 +40,6 @@ import net.yacy.kelondro.order.RotateIterator;
 import net.yacy.kelondro.util.DateFormatter;
 
 import de.anomic.crawler.CrawlProfile;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.MetadataRepository;
 import de.anomic.search.Segment;
 import de.anomic.search.Switchboard;

htroot/IndexCreateDomainCrawl_p.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
 
-import de.anomic.http.server.RequestHeader;
+import net.yacy.cora.protocol.RequestHeader;
 import de.anomic.search.SwitchboardConstants;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/IndexCreateLoaderQueue_p.java

@@ -27,8 +27,8 @@
 // javac -classpath .:../classes IndexCreate_p.java
 // if the shell's current path is HTROOT
 
+import net.yacy.cora.protocol.RequestHeader;
 import de.anomic.crawler.retrieval.Request;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/IndexCreateParserErrors_p.java

@@ -25,9 +25,9 @@
 
 import java.util.ArrayList;
 
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.kelondro.data.meta.DigestURI;
 import de.anomic.crawler.ZURL;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/IndexCreateWWWGlobalQueue_p.java

@@ -32,10 +32,11 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.Locale;
 
+import net.yacy.cora.protocol.RequestHeader;
+
 import de.anomic.crawler.CrawlProfile;
 import de.anomic.crawler.NoticedURL;
 import de.anomic.crawler.retrieval.Request;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/IndexCreateWWWLocalQueue_p.java

@@ -36,11 +36,11 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.kelondro.logging.Log;
 
 import de.anomic.crawler.CrawlProfile;
 import de.anomic.crawler.NoticedURL;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.crawler.CrawlSwitchboard;
 import de.anomic.crawler.retrieval.Request;
 import de.anomic.search.Switchboard;

htroot/IndexCreateWWWRemoteQueue_p.java

@@ -29,10 +29,11 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.Locale;
 
+import net.yacy.cora.protocol.RequestHeader;
+
 import de.anomic.crawler.CrawlProfile;
 import de.anomic.crawler.NoticedURL;
 import de.anomic.crawler.retrieval.Request;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/IndexImportOAIPMHList_p.java

@@ -25,10 +25,10 @@
 import java.util.ArrayList;
 import java.util.Set;
 
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.document.importer.OAIListFriendsLoader;
 import net.yacy.document.importer.OAIPMHImporter;
 
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/IndexImportOAIPMH_p.java

@@ -29,13 +29,13 @@ import java.util.Map;
 import java.util.Random;
 import java.util.TreeSet;
 
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.document.importer.OAIPMHImporter;
 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 de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/IndexImportWikimedia_p.java

@@ -25,10 +25,10 @@
 import java.io.File;
 import java.net.MalformedURLException;
 
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.document.importer.MediawikiImporter;
 import net.yacy.kelondro.logging.Log;
 
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/IndexShare_p.java

@@ -28,7 +28,7 @@
 //import java.net.*;
 //import java.io.*;
 //import de.anomic.tools.*;
-import de.anomic.http.server.RequestHeader;
+import net.yacy.cora.protocol.RequestHeader;
 import de.anomic.search.Segment;
 import de.anomic.search.Segments;
 import de.anomic.search.Switchboard;

htroot/Load_MediawikiWiki.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
 
-import de.anomic.http.server.RequestHeader;
+import net.yacy.cora.protocol.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.search.SwitchboardConstants;
 import de.anomic.server.serverObjects;

htroot/Load_PHPBB3.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
 
-import de.anomic.http.server.RequestHeader;
+import net.yacy.cora.protocol.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.search.SwitchboardConstants;
 import de.anomic.server.serverObjects;

htroot/Load_RSS_p.java

@@ -26,12 +26,12 @@ import net.yacy.cora.document.Hit;
 import net.yacy.cora.document.RSSFeed;
 import net.yacy.cora.document.RSSMessage;
 import net.yacy.cora.document.RSSReader;
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.kelondro.data.meta.DigestURI;
 import net.yacy.kelondro.logging.Log;
 
 import de.anomic.crawler.CrawlProfile;
 import de.anomic.crawler.retrieval.Response;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/LogStatistics_p.java

@@ -29,9 +29,9 @@
 import java.util.HashSet;
 import java.util.Hashtable;
 
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.kelondro.logging.LogParser;
 
-import de.anomic.http.server.RequestHeader;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;
 

htroot/MessageSend_p.java

@@ -31,7 +31,8 @@ import java.util.Date;
 import java.util.Locale;
 import java.util.Map;
 
-import de.anomic.http.server.RequestHeader;
+import net.yacy.cora.protocol.RequestHeader;
+
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/Messages_p.java

@@ -33,12 +33,11 @@ import java.util.Iterator;
 import java.util.Locale;
 import java.util.TreeMap;
 
-import net.yacy.kelondro.util.DateFormatter;
+import net.yacy.cora.protocol.HeaderFramework;
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.kelondro.util.FileUtils;
 
 import de.anomic.data.messageBoard;
-import de.anomic.http.server.HeaderFramework;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;
@@ -134,7 +133,7 @@ public class Messages_p {
                     	prop.put("mode_messages_"+count+"_peerAddress", peerAddress);
 
                     	// set the rfc822 date
-                    	prop.put("mode_messages_"+count+"_rfc822Date", DateFormatter.formatRFC1123(message.date()));
+                    	prop.put("mode_messages_"+count+"_rfc822Date", HeaderFramework.formatRFC1123(message.date()));
 
                     	// also write out the message body (needed for the RSS feed)
                         try {

htroot/Network.java

@@ -36,14 +36,14 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
+import net.yacy.cora.protocol.HeaderFramework;
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.cora.protocol.http.HTTPClient;
 import net.yacy.kelondro.util.DateFormatter;
 import net.yacy.kelondro.util.MapTools;
 
 import de.anomic.crawler.retrieval.HTTPLoader;
 //import de.anomic.http.client.Client;
-import de.anomic.http.server.HeaderFramework;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.search.SwitchboardConstants;
 import de.anomic.server.serverObjects;

htroot/NetworkPicture.java

@@ -26,9 +26,9 @@
 
 import java.util.concurrent.Semaphore;
 
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.kelondro.logging.Log;
 
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.search.SwitchboardConstants;
 import de.anomic.server.serverObjects;

htroot/News.java

@@ -28,10 +28,11 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import net.yacy.cora.protocol.HeaderFramework;
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.kelondro.logging.Log;
 import net.yacy.kelondro.util.DateFormatter;
 
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;
@@ -117,7 +118,7 @@ public class News {
                     prop.put("table_list_" + i + "_id", record.id());
                     prop.putHTML("table_list_" + i + "_ori", (seed == null) ? record.originator() : seed.getName());
                     prop.put("table_list_" + i + "_cre", DateFormatter.formatShortSecond(record.created()));
-                    prop.put("table_list_" + i + "_crerfcdate", DateFormatter.formatRFC1123(record.created()));
+                    prop.put("table_list_" + i + "_crerfcdate", HeaderFramework.formatRFC1123(record.created()));
                     prop.putHTML("table_list_" + i + "_cat", category);
                     prop.put("table_list_" + i + "_rec", (record.received() == null) ? "-" : DateFormatter.formatShortSecond(record.received()));
                     prop.put("table_list_" + i + "_dis", record.distributed());

htroot/PeerLoadPicture.java

@@ -3,9 +3,9 @@ import java.awt.Image;
 import java.util.HashMap;
 import java.util.Iterator;
 
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.kelondro.workflow.BusyThread;
 
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.SwitchboardConstants;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/PerformanceConcurrency_p.java

@@ -21,9 +21,9 @@
 
 import java.util.Iterator;
 
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.kelondro.workflow.WorkflowProcessor;
 
-import de.anomic.http.server.RequestHeader;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;
 

htroot/PerformanceGraph.java

@@ -24,8 +24,8 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.visualization.RasterPlotter;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/PerformanceMemory_p.java

@@ -29,15 +29,15 @@ import java.io.File;
 import java.util.Iterator;
 import java.util.Map;
 
+import net.yacy.cora.protocol.Domains;
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.kelondro.index.Cache;
 import net.yacy.kelondro.index.RAMIndex;
 import net.yacy.kelondro.table.Table;
-import net.yacy.kelondro.util.Domains;
 import net.yacy.kelondro.util.FileUtils;
 import net.yacy.kelondro.util.Formatter;
 import net.yacy.kelondro.util.MemoryControl;
 
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/PerformanceQueues_p.java

@@ -29,14 +29,14 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
+import net.yacy.cora.protocol.HeaderFramework;
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.kelondro.util.FileUtils;
 import net.yacy.kelondro.util.Formatter;
 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.http.server.HeaderFramework;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Segment;
 import de.anomic.search.Segments;
 import de.anomic.search.Switchboard;

htroot/PerformanceSearch_p.java

@@ -27,9 +27,9 @@
 import java.util.Date;
 import java.util.Iterator;
 
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.kelondro.util.EventTracker;
 
-import de.anomic.http.server.RequestHeader;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;
 import de.anomic.yacy.graphics.ProfilingGraph;

htroot/Performance_p.java

@@ -24,7 +24,7 @@
 //javac -classpath .:../classes Network.java
 //if the shell's current path is HTROOT
 
-import de.anomic.http.server.RequestHeader;
+import net.yacy.cora.protocol.RequestHeader;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;
 

htroot/ProxyIndexingMonitor_p.java

@@ -30,10 +30,10 @@
 import java.io.File;
 import java.io.IOException;
 
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.kelondro.logging.Log;
 
 import de.anomic.http.client.Cache;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.search.SwitchboardConstants;
 import de.anomic.server.serverObjects;

htroot/QuickCrawlLink_p.java

@@ -34,13 +34,13 @@ import java.net.MalformedURLException;
 import java.net.URLDecoder;
 import java.util.Date;
 
+import net.yacy.cora.protocol.HeaderFramework;
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.kelondro.data.meta.DigestURI;
 import net.yacy.kelondro.logging.Log;
 
 import de.anomic.crawler.CrawlProfile;
 import de.anomic.crawler.retrieval.Request;
-import de.anomic.http.server.HeaderFramework;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Segment;
 import de.anomic.search.Segments;
 import de.anomic.search.Switchboard;

htroot/Ranking_p.java

@@ -29,7 +29,8 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import de.anomic.http.server.RequestHeader;
+import net.yacy.cora.protocol.RequestHeader;
+
 import de.anomic.search.ContentDomain;
 import de.anomic.search.RankingProfile;
 import de.anomic.search.SearchEventCache;

htroot/SearchEventPicture.java

@@ -24,8 +24,8 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.visualization.RasterPlotter;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.SearchEventCache;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;

htroot/SettingsAck_p.java

@@ -36,6 +36,7 @@ import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
 import net.yacy.cora.document.MultiProtocolURI;
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.kelondro.order.Base64Order;
 import net.yacy.kelondro.order.Digest;
 import net.yacy.kelondro.util.DateFormatter;
@@ -43,7 +44,6 @@ import net.yacy.kelondro.util.Formatter;
 
 import de.anomic.http.server.HTTPDemon;
 import de.anomic.http.server.HTTPDProxyHandler;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverCore;
 import de.anomic.server.serverObjects;

htroot/Settings_p.java

@@ -25,8 +25,9 @@
 import java.util.HashMap;
 import java.util.Iterator;
 
-import de.anomic.http.server.HeaderFramework;
+import net.yacy.cora.protocol.HeaderFramework;
-import de.anomic.http.server.RequestHeader;
+import net.yacy.cora.protocol.RequestHeader;
+
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/Status.java

@@ -30,17 +30,17 @@
 import java.net.InetAddress;
 import java.util.Date;
 
+import net.yacy.cora.protocol.Domains;
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.kelondro.io.ByteCountInputStream;
 import net.yacy.kelondro.io.ByteCountOutputStream;
 import net.yacy.kelondro.util.DateFormatter;
-import net.yacy.kelondro.util.Domains;
 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 de.anomic.http.server.HTTPDemon;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.search.SwitchboardConstants;
 import de.anomic.server.serverCore;

htroot/Steering.java

@@ -29,10 +29,10 @@
 
 import java.io.File;
 
+import net.yacy.cora.protocol.HeaderFramework;
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.kelondro.logging.Log;
 
-import de.anomic.http.server.HeaderFramework;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/Supporter.java

@@ -31,6 +31,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.kelondro.data.meta.DigestURI;
 import net.yacy.kelondro.index.Row;
 import net.yacy.kelondro.index.Row.Entry;
@@ -39,7 +40,6 @@ import net.yacy.kelondro.util.DateFormatter;
 import net.yacy.kelondro.util.ScoreCluster;
 import net.yacy.repository.Blacklist;
 
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/Surftips.java

@@ -31,6 +31,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.kelondro.data.meta.DigestURI;
 import net.yacy.kelondro.index.Row;
 import net.yacy.kelondro.index.Row.Entry;
@@ -39,7 +40,6 @@ import net.yacy.kelondro.util.DateFormatter;
 import net.yacy.kelondro.util.ScoreCluster;
 import net.yacy.repository.Blacklist;
 
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/Table_API_p.java

@@ -24,12 +24,12 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.TreeSet;
 
+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 de.anomic.data.WorkTables;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.search.SwitchboardConstants;
 import de.anomic.server.serverObjects;

htroot/Table_RobotsTxt_p.java

@@ -1,4 +1,4 @@
-import de.anomic.http.server.RequestHeader;
+import net.yacy.cora.protocol.RequestHeader;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;
 

htroot/Tables_p.java

@@ -25,11 +25,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
 
+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 de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/Threaddump_p.java

@@ -39,11 +39,11 @@ import java.util.Map.Entry;
 import java.util.ArrayList;
 import java.util.HashMap;
 
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.document.parser.html.CharacterCoding;
 import net.yacy.kelondro.util.FileUtils;
 import net.yacy.kelondro.util.MemoryControl;
 
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/Trails.java

@@ -1,4 +1,4 @@
-import de.anomic.http.server.RequestHeader;
+import net.yacy.cora.protocol.RequestHeader;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;
 import de.anomic.server.servletProperties;

htroot/User.java

@@ -27,15 +27,15 @@
 //javac -classpath .:../Classes Message.java
 //if the shell's current path is HTROOT
 
+import net.yacy.cora.protocol.HeaderFramework;
+import net.yacy.cora.protocol.RequestHeader;
+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 de.anomic.data.userDB;
 import de.anomic.http.server.HTTPDemon;
-import de.anomic.http.server.HeaderFramework;
-import de.anomic.http.server.RequestHeader;
-import de.anomic.http.server.ResponseHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/ViewFile.java

@@ -35,6 +35,7 @@ import java.util.Iterator;
 import java.util.Map;
 
 import net.yacy.cora.document.MultiProtocolURI;
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.document.Condenser;
 import net.yacy.document.Document;
 import net.yacy.document.Parser;
@@ -46,7 +47,6 @@ import net.yacy.kelondro.data.meta.URIMetadataRow;
 import de.anomic.crawler.CrawlProfile;
 import de.anomic.crawler.retrieval.Response;
 import de.anomic.http.client.Cache;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Segment;
 import de.anomic.search.Segments;
 import de.anomic.search.Switchboard;

htroot/ViewImage.java

@@ -30,14 +30,14 @@ import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.util.HashMap;
 
+import net.yacy.cora.protocol.HeaderFramework;
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.document.ImageParser;
 import net.yacy.kelondro.data.meta.DigestURI;
 import net.yacy.kelondro.logging.Log;
 import net.yacy.kelondro.util.FileUtils;
 
 import de.anomic.crawler.CrawlProfile;
-import de.anomic.http.server.HeaderFramework;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/ViewLog_p.java

@@ -33,11 +33,11 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.kelondro.logging.GuiHandler;
 import net.yacy.kelondro.logging.Log;
 import net.yacy.kelondro.logging.LogalizerHandler;
 
-import de.anomic.http.server.RequestHeader;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;
 

htroot/ViewProfile.java

@@ -40,10 +40,10 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Properties;
 
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.kelondro.logging.Log;
 import net.yacy.kelondro.order.Base64Order;
 
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/WatchWebStructure_p.java

@@ -6,8 +6,9 @@
 
 import java.util.Iterator;
 
+import net.yacy.cora.protocol.RequestHeader;
+
 import de.anomic.crawler.CrawlProfile.entry;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.crawler.CrawlSwitchboard;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;

htroot/WebStructurePicture_p.java

@@ -31,6 +31,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
+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;
@@ -38,7 +39,6 @@ import net.yacy.visualization.PrintTool;
 import net.yacy.visualization.RasterPlotter;
 import net.yacy.visualization.GraphPlotter;
 
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/Wiki.java

@@ -38,10 +38,11 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Locale;
 
+import net.yacy.cora.protocol.HeaderFramework;
+import net.yacy.cora.protocol.RequestHeader;
+
 import de.anomic.data.diff;
 import de.anomic.data.wiki.wikiBoard;
-import de.anomic.http.server.HeaderFramework;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/WikiHelp.java

@@ -27,7 +27,7 @@
 // javac -classpath .:../classes WikiHelp.java
 // if the shell's current path is HTROOT
 
-import de.anomic.http.server.RequestHeader;
+import net.yacy.cora.protocol.RequestHeader;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;
 

htroot/YaCySearchPluginFF.java

@@ -27,8 +27,8 @@
 //javac -classpath .:../Classes Status.java
 //if the shell's current path is HTROOT
 
-import de.anomic.http.server.HeaderFramework;
+import net.yacy.cora.protocol.HeaderFramework;
-import de.anomic.http.server.RequestHeader;
+import net.yacy.cora.protocol.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/api/blacklists.java

@@ -2,10 +2,10 @@
 import java.io.File;
 import java.util.List;
 
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.kelondro.util.FileUtils;
 
 import de.anomic.data.listManager;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;
 

htroot/api/blacklists_p.java

@@ -2,11 +2,11 @@
 import java.io.File;
 import java.util.List;
 
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.kelondro.util.FileUtils;
 import net.yacy.repository.Blacklist;
 
 import de.anomic.data.listManager;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;
 

htroot/api/bookmarks/get_bookmarks.java

@@ -3,13 +3,14 @@
 import java.util.Date;
 import java.util.Iterator;
 
+import net.yacy.cora.protocol.HeaderFramework;
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.document.parser.html.CharacterCoding;
 import net.yacy.kelondro.util.DateFormatter;
 
 import de.anomic.data.BookmarkHelper;
 import de.anomic.data.bookmarksDB;
 import de.anomic.data.userDB;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;
@@ -141,7 +142,7 @@ public class get_bookmarks {
 	       			prop.put("display_bookmarks_"+count+"_id",count);
 	       			prop.put("display_bookmarks_"+count+"_link",bookmark.getUrl());
 	       			prop.put("display_bookmarks_"+count+"_date", DateFormatter.formatISO8601(new Date(bookmark.getTimeStamp())));
-	       			prop.put("display_bookmarks_"+count+"_rfc822date", DateFormatter.formatRFC1123(new Date(bookmark.getTimeStamp())));
+	       			prop.put("display_bookmarks_"+count+"_rfc822date", HeaderFramework.formatRFC1123(new Date(bookmark.getTimeStamp())));
 	       			prop.put("display_bookmarks_"+count+"_public", (bookmark.getPublic() ? "0" : "1"));
 	       			prop.put("display_bookmarks_"+count+"_hash", bookmark.getUrlHash());
 	       			prop.put("display_bookmarks_"+count+"_comma", ",");

htroot/api/bookmarks/get_folders.java

@@ -2,10 +2,11 @@
 
 import java.util.Iterator;
 
+import net.yacy.cora.protocol.RequestHeader;
+
 import de.anomic.data.BookmarkHelper;
 import de.anomic.data.bookmarksDB;
 import de.anomic.data.userDB;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/api/bookmarks/posts/add_p.java

@@ -2,11 +2,12 @@
 import java.util.HashMap;
 import java.util.Set;
 
+import net.yacy.cora.protocol.RequestHeader;
+
 import de.anomic.data.BookmarkHelper;
 import de.anomic.data.bookmarksDB;
 import de.anomic.data.listManager;
 import de.anomic.data.userDB;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/api/bookmarks/posts/all.java

@@ -2,11 +2,11 @@
 import java.util.Date;
 import java.util.Iterator;
 
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.kelondro.order.Digest;
 import net.yacy.kelondro.util.DateFormatter;
 
 import de.anomic.data.bookmarksDB;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/api/bookmarks/posts/delete_p.java

@@ -1,9 +1,9 @@
 
 import java.net.MalformedURLException;
 
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.kelondro.data.meta.DigestURI;
 
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;

htroot/api/bookmarks/posts/get.java

@@ -5,11 +5,11 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.Iterator;
 
+import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.kelondro.order.Digest;
 import net.yacy.kelondro.util.DateFormatter;
 
 import de.anomic.data.bookmarksDB;
-import de.anomic.http.server.RequestHeader;
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;