From 3197ca42ed2026ae01cd8c75cdabb41a0f714f95 Mon Sep 17 00:00:00 2001 From: orbiter Date: Mon, 23 Aug 2010 12:32:02 +0000 Subject: [PATCH] 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 | 4 + htroot/AccessTracker_p.java | 5 +- htroot/Banner.java | 2 +- htroot/BlacklistCleaner_p.java | 2 +- htroot/BlacklistImpExp_p.java | 2 +- htroot/BlacklistTest_p.java | 2 +- htroot/Blacklist_p.java | 4 +- htroot/Blog.java | 7 +- htroot/BlogComments.java | 4 +- htroot/Bookmarks.java | 5 +- htroot/CacheResource_p.java | 2 +- htroot/Collage.java | 4 +- htroot/ConfigAccounts_p.java | 2 +- htroot/ConfigAppearance_p.java | 2 +- htroot/ConfigBasic.java | 6 +- htroot/ConfigHeuristics_p.java | 2 +- htroot/ConfigLanguage_p.java | 2 +- htroot/ConfigLiveSearch.java | 2 +- htroot/ConfigNetwork_p.java | 2 +- htroot/ConfigParser.java | 2 +- htroot/ConfigPortal.java | 2 +- htroot/ConfigProfile_p.java | 3 +- htroot/ConfigProperties_p.java | 3 +- htroot/ConfigRobotsTxt_p.java | 2 +- htroot/ConfigSearchBox.java | 2 +- htroot/ConfigUpdate_p.java | 2 +- htroot/Connections_p.java | 2 +- htroot/ContentIntegrationPHPBB3_p.java | 2 +- htroot/CookieMonitorIncoming_p.java | 6 +- htroot/CookieMonitorOutgoing_p.java | 7 +- htroot/CookieTest_p.java | 3 +- htroot/CrawlMonitorRemoteStart.java | 3 +- htroot/CrawlProfileEditor_p.java | 2 +- htroot/CrawlResults.java | 2 +- htroot/CrawlStart_p.java | 2 +- htroot/Crawler_p.java | 2 +- htroot/DictionaryLoader_p.java | 2 +- htroot/Help.java | 2 +- htroot/IndexCleaner_p.java | 2 +- htroot/IndexControlRWIs_p.java | 2 +- htroot/IndexControlURLs_p.java | 2 +- htroot/IndexCreateDomainCrawl_p.java | 2 +- htroot/IndexCreateLoaderQueue_p.java | 2 +- htroot/IndexCreateParserErrors_p.java | 2 +- htroot/IndexCreateWWWGlobalQueue_p.java | 3 +- htroot/IndexCreateWWWLocalQueue_p.java | 2 +- htroot/IndexCreateWWWRemoteQueue_p.java | 3 +- htroot/IndexImportOAIPMHList_p.java | 2 +- htroot/IndexImportOAIPMH_p.java | 2 +- htroot/IndexImportWikimedia_p.java | 2 +- htroot/IndexShare_p.java | 2 +- htroot/Load_MediawikiWiki.java | 2 +- htroot/Load_PHPBB3.java | 2 +- htroot/Load_RSS_p.java | 2 +- htroot/LogStatistics_p.java | 2 +- htroot/MessageSend_p.java | 3 +- htroot/Messages_p.java | 7 +- htroot/Network.java | 4 +- htroot/NetworkPicture.java | 2 +- htroot/News.java | 5 +- htroot/PeerLoadPicture.java | 2 +- htroot/PerformanceConcurrency_p.java | 2 +- htroot/PerformanceGraph.java | 2 +- htroot/PerformanceMemory_p.java | 4 +- htroot/PerformanceQueues_p.java | 4 +- htroot/PerformanceSearch_p.java | 2 +- htroot/Performance_p.java | 2 +- htroot/ProxyIndexingMonitor_p.java | 2 +- htroot/QuickCrawlLink_p.java | 4 +- htroot/Ranking_p.java | 3 +- htroot/SearchEventPicture.java | 2 +- htroot/SettingsAck_p.java | 2 +- htroot/Settings_p.java | 5 +- htroot/Status.java | 4 +- htroot/Steering.java | 4 +- htroot/Supporter.java | 2 +- htroot/Surftips.java | 2 +- htroot/Table_API_p.java | 2 +- htroot/Table_RobotsTxt_p.java | 2 +- htroot/Tables_p.java | 2 +- htroot/Threaddump_p.java | 2 +- htroot/Trails.java | 2 +- htroot/User.java | 6 +- htroot/ViewFile.java | 2 +- htroot/ViewImage.java | 4 +- htroot/ViewLog_p.java | 2 +- htroot/ViewProfile.java | 2 +- htroot/WatchWebStructure_p.java | 3 +- htroot/WebStructurePicture_p.java | 2 +- htroot/Wiki.java | 5 +- htroot/WikiHelp.java | 2 +- htroot/YaCySearchPluginFF.java | 4 +- htroot/api/blacklists.java | 2 +- htroot/api/blacklists_p.java | 2 +- htroot/api/bookmarks/get_bookmarks.java | 5 +- htroot/api/bookmarks/get_folders.java | 3 +- htroot/api/bookmarks/posts/add_p.java | 3 +- htroot/api/bookmarks/posts/all.java | 2 +- htroot/api/bookmarks/posts/delete_p.java | 2 +- htroot/api/bookmarks/posts/get.java | 2 +- htroot/api/bookmarks/tags/addTag_p.java | 2 +- htroot/api/bookmarks/tags/editTag_p.java | 2 +- htroot/api/bookmarks/tags/getTag.java | 3 +- htroot/api/bookmarks/xbel/xbel.java | 2 +- htroot/api/config_p.java | 3 +- htroot/api/feed.java | 2 +- htroot/api/latency_p.java | 2 +- htroot/api/queues_p.java | 3 +- htroot/api/status_p.java | 2 +- htroot/api/table_p.java | 2 +- htroot/api/timeline.java | 2 +- htroot/api/trail_p.java | 2 +- htroot/api/util/getpageinfo_p.java | 2 +- htroot/api/util/ynetSearch.java | 3 +- htroot/api/version.java | 2 +- htroot/api/webstructure.java | 2 +- htroot/api/yacydoc.java | 2 +- htroot/autoconfig.java | 4 +- htroot/compare_yacy.java | 3 +- htroot/cytag.java | 4 +- htroot/imagetest.java | 2 +- htroot/index.java | 2 +- htroot/mediawiki_p.java | 2 +- htroot/opensearchdescription.java | 2 +- htroot/osm.java | 2 +- htroot/rct_p.java | 2 +- htroot/robots.java | 3 +- htroot/sharedBlacklist_p.java | 2 +- htroot/ssitestservlet.java | 2 +- htroot/test.java | 2 +- htroot/www/welcome.java | 5 +- htroot/yacy/crawlReceipt.java | 2 +- htroot/yacy/hello.java | 6 +- htroot/yacy/list.java | 4 +- htroot/yacy/message.java | 4 +- htroot/yacy/profile.java | 5 +- htroot/yacy/query.java | 4 +- htroot/yacy/search.java | 4 +- htroot/yacy/transfer.java | 4 +- htroot/yacy/transferRWI.java | 2 +- htroot/yacy/transferURL.java | 2 +- htroot/yacy/urls.java | 2 +- htroot/yacyinteractive.java | 2 +- htroot/yacysearch.java | 6 +- htroot/yacysearch_location.java | 7 +- htroot/yacysearchitem.java | 6 +- htroot/yacysearchtrailer.java | 2 +- maptest | Bin 150 -> 54 bytes source/de/anomic/crawler/CrawlStacker.java | 2 +- source/de/anomic/crawler/Latency.java | 2 +- source/de/anomic/crawler/RobotsTxt.java | 88 ++++++------------ .../anomic/crawler/retrieval/FTPLoader.java | 12 +-- .../anomic/crawler/retrieval/FileLoader.java | 11 +-- .../anomic/crawler/retrieval/HTTPLoader.java | 6 +- .../de/anomic/crawler/retrieval/Response.java | 6 +- .../anomic/crawler/retrieval/SMBLoader.java | 11 +-- source/de/anomic/data/SitemapParser.java | 6 +- source/de/anomic/data/userDB.java | 2 +- source/de/anomic/http/client/Cache.java | 2 +- .../anomic/http/server/HTTPDFileHandler.java | 7 +- .../anomic/http/server/HTTPDProxyHandler.java | 21 ++--- source/de/anomic/http/server/HTTPDemon.java | 57 +++++++++--- .../http/server/ServerSideIncludes.java | 2 + source/de/anomic/net/UPnP.java | 2 +- source/de/anomic/search/Switchboard.java | 8 +- source/de/anomic/search/TextSnippet.java | 4 +- source/de/anomic/server/serverCore.java | 2 +- source/de/anomic/server/serverSwitch.java | 2 +- .../de/anomic/server/servletProperties.java | 2 +- source/de/anomic/yacy/yacyRelease.java | 6 +- source/de/anomic/yacy/yacySeedDB.java | 4 +- .../yacy/cora/document/MultiProtocolURI.java | 2 +- source/net/yacy/cora/document/RSSMessage.java | 2 +- source/net/yacy/cora/document/RSSReader.java | 2 +- .../util => cora/protocol}/Domains.java | 51 +++++----- .../yacy/cora/protocol}/HeaderFramework.java | 88 +++++++++++------- .../yacy/cora/protocol}/RequestHeader.java | 77 +++++---------- .../yacy/cora/protocol}/ResponseHeader.java | 44 +++++---- .../net/yacy/cora/protocol/ftp/FTPClient.java | 2 +- .../{kelondro/index => cora/storage}/ARC.java | 46 +++++---- .../index => cora/storage}/ConcurrentARC.java | 46 +++++---- .../index => cora/storage}/SimpleARC.java | 47 +++++----- .../net/yacy/kelondro/blob/BEncodedHeap.java | 2 +- source/net/yacy/kelondro/blob/MapHeap.java | 4 +- .../yacy/kelondro/data/meta/DigestURI.java | 2 +- source/net/yacy/kelondro/data/word/Word.java | 4 +- .../net/yacy/kelondro/util/DateFormatter.java | 16 ---- .../net/yacy/repository/LoaderDispatcher.java | 6 +- source/net/yacy/yacy.java | 2 +- .../kelondro/util/DateFormatterTest.java | 3 +- 190 files changed, 547 insertions(+), 581 deletions(-) create mode 100755 bin/graphicstest.sh rename source/net/yacy/{kelondro/util => cora/protocol}/Domains.java (94%) rename source/{de/anomic/http/server => net/yacy/cora/protocol}/HeaderFramework.java (91%) rename source/{de/anomic/http/server => net/yacy/cora/protocol}/RequestHeader.java (77%) rename source/{de/anomic/http/server => net/yacy/cora/protocol}/ResponseHeader.java (80%) rename source/net/yacy/{kelondro/index => cora/storage}/ARC.java (53%) rename source/net/yacy/{kelondro/index => cora/storage}/ConcurrentARC.java (64%) rename source/net/yacy/{kelondro/index => cora/storage}/SimpleARC.java (76%) diff --git a/bin/graphicstest.sh b/bin/graphicstest.sh new file mode 100755 index 000000000..0a8651c13 --- /dev/null +++ b/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 diff --git a/htroot/AccessTracker_p.java b/htroot/AccessTracker_p.java index 98157cb36..e979f5234 100644 --- a/htroot/AccessTracker_p.java +++ b/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 de.anomic.http.server.RequestHeader; +import net.yacy.cora.protocol.HeaderFramework; +import net.yacy.cora.protocol.RequestHeader; + import de.anomic.net.natLib; import de.anomic.search.QueryParams; import de.anomic.search.Switchboard; diff --git a/htroot/Banner.java b/htroot/Banner.java index d65eb2503..4576d25d4 100644 --- a/htroot/Banner.java +++ b/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; diff --git a/htroot/BlacklistCleaner_p.java b/htroot/BlacklistCleaner_p.java index 269903288..a9116ea16 100644 --- a/htroot/BlacklistCleaner_p.java +++ b/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; diff --git a/htroot/BlacklistImpExp_p.java b/htroot/BlacklistImpExp_p.java index 8f32fadc2..da1a20e81 100644 --- a/htroot/BlacklistImpExp_p.java +++ b/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 { diff --git a/htroot/BlacklistTest_p.java b/htroot/BlacklistTest_p.java index 1f5b3be37..1d93eb15f 100644 --- a/htroot/BlacklistTest_p.java +++ b/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; diff --git a/htroot/Blacklist_p.java b/htroot/Blacklist_p.java index c90ed636f..3299dd0a5 100644 --- a/htroot/Blacklist_p.java +++ b/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; diff --git a/htroot/Blog.java b/htroot/Blog.java index 5c24c3bf9..96f1a5c8c 100644 --- a/htroot/Blog.java +++ b/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()); diff --git a/htroot/BlogComments.java b/htroot/BlogComments.java index f6c42406e..06518af7d 100644 --- a/htroot/BlogComments.java +++ b/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; diff --git a/htroot/Bookmarks.java b/htroot/Bookmarks.java index 4f5fa9f8b..cd5451a7b 100644 --- a/htroot/Bookmarks.java +++ b/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. diff --git a/htroot/CacheResource_p.java b/htroot/CacheResource_p.java index a975f358f..4450e54ed 100644 --- a/htroot/CacheResource_p.java +++ b/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; diff --git a/htroot/Collage.java b/htroot/Collage.java index 55352b624..2681c7afe 100755 --- a/htroot/Collage.java +++ b/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; diff --git a/htroot/ConfigAccounts_p.java b/htroot/ConfigAccounts_p.java index bde2fc19d..8abe2a46c 100644 --- a/htroot/ConfigAccounts_p.java +++ b/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; diff --git a/htroot/ConfigAppearance_p.java b/htroot/ConfigAppearance_p.java index 427b9b699..6c4433bc1 100644 --- a/htroot/ConfigAppearance_p.java +++ b/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; diff --git a/htroot/ConfigBasic.java b/htroot/ConfigBasic.java index 06927cd8f..7fc8f2e6e 100644 --- a/htroot/ConfigBasic.java +++ b/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; diff --git a/htroot/ConfigHeuristics_p.java b/htroot/ConfigHeuristics_p.java index a2358c3e4..7a89a7bb5 100644 --- a/htroot/ConfigHeuristics_p.java +++ b/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; diff --git a/htroot/ConfigLanguage_p.java b/htroot/ConfigLanguage_p.java index 10b141cbb..f92cc509f 100644 --- a/htroot/ConfigLanguage_p.java +++ b/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; diff --git a/htroot/ConfigLiveSearch.java b/htroot/ConfigLiveSearch.java index 7434f6f74..62c82dd93 100644 --- a/htroot/ConfigLiveSearch.java +++ b/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; diff --git a/htroot/ConfigNetwork_p.java b/htroot/ConfigNetwork_p.java index 31002f8f1..6e1e14d63 100644 --- a/htroot/ConfigNetwork_p.java +++ b/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; diff --git a/htroot/ConfigParser.java b/htroot/ConfigParser.java index a5b86b460..633944e0b 100644 --- a/htroot/ConfigParser.java +++ b/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; diff --git a/htroot/ConfigPortal.java b/htroot/ConfigPortal.java index 91a7b94a0..95f6c82fe 100644 --- a/htroot/ConfigPortal.java +++ b/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; diff --git a/htroot/ConfigProfile_p.java b/htroot/ConfigProfile_p.java index 0c66b3ce9..1e7acbc32 100644 --- a/htroot/ConfigProfile_p.java +++ b/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; diff --git a/htroot/ConfigProperties_p.java b/htroot/ConfigProperties_p.java index f00e2b00a..dc661b2c0 100644 --- a/htroot/ConfigProperties_p.java +++ b/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; diff --git a/htroot/ConfigRobotsTxt_p.java b/htroot/ConfigRobotsTxt_p.java index 400930755..54ec8a6a8 100644 --- a/htroot/ConfigRobotsTxt_p.java +++ b/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; diff --git a/htroot/ConfigSearchBox.java b/htroot/ConfigSearchBox.java index 975b9f492..247bc95bb 100644 --- a/htroot/ConfigSearchBox.java +++ b/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; diff --git a/htroot/ConfigUpdate_p.java b/htroot/ConfigUpdate_p.java index 34a774dc2..9925eea48 100644 --- a/htroot/ConfigUpdate_p.java +++ b/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; diff --git a/htroot/Connections_p.java b/htroot/Connections_p.java index 1645204d4..84adb640e 100644 --- a/htroot/Connections_p.java +++ b/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; diff --git a/htroot/ContentIntegrationPHPBB3_p.java b/htroot/ContentIntegrationPHPBB3_p.java index fd72d0513..93710af46 100644 --- a/htroot/ContentIntegrationPHPBB3_p.java +++ b/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; diff --git a/htroot/CookieMonitorIncoming_p.java b/htroot/CookieMonitorIncoming_p.java index 533cd993b..bcd0c334d 100644 --- a/htroot/CookieMonitorIncoming_p.java +++ b/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])); diff --git a/htroot/CookieMonitorOutgoing_p.java b/htroot/CookieMonitorOutgoing_p.java index fbb197da3..5e92cbbfc 100644 --- a/htroot/CookieMonitorOutgoing_p.java +++ b/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 de.anomic.http.server.RequestHeader; +import net.yacy.cora.protocol.HeaderFramework; +import net.yacy.cora.protocol.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])); diff --git a/htroot/CookieTest_p.java b/htroot/CookieTest_p.java index 5f859374f..4c717a9f2 100644 --- a/htroot/CookieTest_p.java +++ b/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; diff --git a/htroot/CrawlMonitorRemoteStart.java b/htroot/CrawlMonitorRemoteStart.java index aa34ddd4e..5bf30cc5f 100644 --- a/htroot/CrawlMonitorRemoteStart.java +++ b/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; diff --git a/htroot/CrawlProfileEditor_p.java b/htroot/CrawlProfileEditor_p.java index 80a84cc77..a0c3d6d49 100644 --- a/htroot/CrawlProfileEditor_p.java +++ b/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; diff --git a/htroot/CrawlResults.java b/htroot/CrawlResults.java index 9b340ca0d..a0901ef0c 100644 --- a/htroot/CrawlResults.java +++ b/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; diff --git a/htroot/CrawlStart_p.java b/htroot/CrawlStart_p.java index 9d1d472e9..212d3de71 100644 --- a/htroot/CrawlStart_p.java +++ b/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; diff --git a/htroot/Crawler_p.java b/htroot/Crawler_p.java index cde706716..1d1aae168 100644 --- a/htroot/Crawler_p.java +++ b/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; diff --git a/htroot/DictionaryLoader_p.java b/htroot/DictionaryLoader_p.java index 4c3b1bc69..3cfff407e 100644 --- a/htroot/DictionaryLoader_p.java +++ b/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; diff --git a/htroot/Help.java b/htroot/Help.java index b310e27a8..656407478 100644 --- a/htroot/Help.java +++ b/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; diff --git a/htroot/IndexCleaner_p.java b/htroot/IndexCleaner_p.java index 45384d7ba..31efed14f 100755 --- a/htroot/IndexCleaner_p.java +++ b/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; diff --git a/htroot/IndexControlRWIs_p.java b/htroot/IndexControlRWIs_p.java index b5763daa2..dc28051db 100644 --- a/htroot/IndexControlRWIs_p.java +++ b/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; diff --git a/htroot/IndexControlURLs_p.java b/htroot/IndexControlURLs_p.java index 1bed53899..4a7be5610 100644 --- a/htroot/IndexControlURLs_p.java +++ b/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; diff --git a/htroot/IndexCreateDomainCrawl_p.java b/htroot/IndexCreateDomainCrawl_p.java index 8129d156a..a6011d698 100644 --- a/htroot/IndexCreateDomainCrawl_p.java +++ b/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; diff --git a/htroot/IndexCreateLoaderQueue_p.java b/htroot/IndexCreateLoaderQueue_p.java index 758dbbd3c..e1b71ba33 100644 --- a/htroot/IndexCreateLoaderQueue_p.java +++ b/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; diff --git a/htroot/IndexCreateParserErrors_p.java b/htroot/IndexCreateParserErrors_p.java index 79704592a..5de67b30a 100644 --- a/htroot/IndexCreateParserErrors_p.java +++ b/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; diff --git a/htroot/IndexCreateWWWGlobalQueue_p.java b/htroot/IndexCreateWWWGlobalQueue_p.java index 0591654eb..27a998d10 100644 --- a/htroot/IndexCreateWWWGlobalQueue_p.java +++ b/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; diff --git a/htroot/IndexCreateWWWLocalQueue_p.java b/htroot/IndexCreateWWWLocalQueue_p.java index 5fba1df3b..6ad6218c7 100644 --- a/htroot/IndexCreateWWWLocalQueue_p.java +++ b/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; diff --git a/htroot/IndexCreateWWWRemoteQueue_p.java b/htroot/IndexCreateWWWRemoteQueue_p.java index 14de3b7c2..dfeae983b 100644 --- a/htroot/IndexCreateWWWRemoteQueue_p.java +++ b/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; diff --git a/htroot/IndexImportOAIPMHList_p.java b/htroot/IndexImportOAIPMHList_p.java index 2ee901456..0d431d6c8 100644 --- a/htroot/IndexImportOAIPMHList_p.java +++ b/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; diff --git a/htroot/IndexImportOAIPMH_p.java b/htroot/IndexImportOAIPMH_p.java index 300896331..8348506a6 100644 --- a/htroot/IndexImportOAIPMH_p.java +++ b/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; diff --git a/htroot/IndexImportWikimedia_p.java b/htroot/IndexImportWikimedia_p.java index a3342af3f..a7a74d1ba 100644 --- a/htroot/IndexImportWikimedia_p.java +++ b/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; diff --git a/htroot/IndexShare_p.java b/htroot/IndexShare_p.java index 6eb1590eb..56b3df875 100644 --- a/htroot/IndexShare_p.java +++ b/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; diff --git a/htroot/Load_MediawikiWiki.java b/htroot/Load_MediawikiWiki.java index db1714f19..7941ea696 100644 --- a/htroot/Load_MediawikiWiki.java +++ b/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; diff --git a/htroot/Load_PHPBB3.java b/htroot/Load_PHPBB3.java index f93431068..8c8bf5656 100644 --- a/htroot/Load_PHPBB3.java +++ b/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; diff --git a/htroot/Load_RSS_p.java b/htroot/Load_RSS_p.java index ab1a4d38c..1f02d8f30 100644 --- a/htroot/Load_RSS_p.java +++ b/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; diff --git a/htroot/LogStatistics_p.java b/htroot/LogStatistics_p.java index a42d19c6b..7f8c62a63 100644 --- a/htroot/LogStatistics_p.java +++ b/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; diff --git a/htroot/MessageSend_p.java b/htroot/MessageSend_p.java index b797d002a..e5d7dcde6 100644 --- a/htroot/MessageSend_p.java +++ b/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; diff --git a/htroot/Messages_p.java b/htroot/Messages_p.java index 33532016c..ca7dbfb1a 100644 --- a/htroot/Messages_p.java +++ b/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 { diff --git a/htroot/Network.java b/htroot/Network.java index 50032806a..2b5f1a8b6 100644 --- a/htroot/Network.java +++ b/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; diff --git a/htroot/NetworkPicture.java b/htroot/NetworkPicture.java index 8140e3755..32b6a680a 100644 --- a/htroot/NetworkPicture.java +++ b/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; diff --git a/htroot/News.java b/htroot/News.java index ef20a75cd..7d0093bc4 100644 --- a/htroot/News.java +++ b/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()); diff --git a/htroot/PeerLoadPicture.java b/htroot/PeerLoadPicture.java index b9ea82a63..c37944e91 100644 --- a/htroot/PeerLoadPicture.java +++ b/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; diff --git a/htroot/PerformanceConcurrency_p.java b/htroot/PerformanceConcurrency_p.java index 725630a9b..8ff0e12e7 100644 --- a/htroot/PerformanceConcurrency_p.java +++ b/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; diff --git a/htroot/PerformanceGraph.java b/htroot/PerformanceGraph.java index 64d0ee95a..90135d95f 100644 --- a/htroot/PerformanceGraph.java +++ b/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; diff --git a/htroot/PerformanceMemory_p.java b/htroot/PerformanceMemory_p.java index 1fef294f2..ac288de74 100644 --- a/htroot/PerformanceMemory_p.java +++ b/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; diff --git a/htroot/PerformanceQueues_p.java b/htroot/PerformanceQueues_p.java index 8a5efe424..5b11f55b3 100644 --- a/htroot/PerformanceQueues_p.java +++ b/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; diff --git a/htroot/PerformanceSearch_p.java b/htroot/PerformanceSearch_p.java index 726144c86..2acaae1bd 100644 --- a/htroot/PerformanceSearch_p.java +++ b/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; diff --git a/htroot/Performance_p.java b/htroot/Performance_p.java index cee401a45..78ee1c6f2 100644 --- a/htroot/Performance_p.java +++ b/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; diff --git a/htroot/ProxyIndexingMonitor_p.java b/htroot/ProxyIndexingMonitor_p.java index 03bae423d..b603e2874 100644 --- a/htroot/ProxyIndexingMonitor_p.java +++ b/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; diff --git a/htroot/QuickCrawlLink_p.java b/htroot/QuickCrawlLink_p.java index 6d01dae62..3d9da8f5a 100644 --- a/htroot/QuickCrawlLink_p.java +++ b/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; diff --git a/htroot/Ranking_p.java b/htroot/Ranking_p.java index edc126c47..c2afd223d 100644 --- a/htroot/Ranking_p.java +++ b/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; diff --git a/htroot/SearchEventPicture.java b/htroot/SearchEventPicture.java index ba8f44098..6352203c8 100644 --- a/htroot/SearchEventPicture.java +++ b/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; diff --git a/htroot/SettingsAck_p.java b/htroot/SettingsAck_p.java index 93c2ffcf1..32d974486 100644 --- a/htroot/SettingsAck_p.java +++ b/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; diff --git a/htroot/Settings_p.java b/htroot/Settings_p.java index 382f78718..e19aeb51a 100644 --- a/htroot/Settings_p.java +++ b/htroot/Settings_p.java @@ -25,8 +25,9 @@ import java.util.HashMap; import java.util.Iterator; -import de.anomic.http.server.HeaderFramework; -import de.anomic.http.server.RequestHeader; +import net.yacy.cora.protocol.HeaderFramework; +import net.yacy.cora.protocol.RequestHeader; + import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/Status.java b/htroot/Status.java index eecc9d55c..7ec67754e 100644 --- a/htroot/Status.java +++ b/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; diff --git a/htroot/Steering.java b/htroot/Steering.java index 8bfcf574e..4724489c0 100644 --- a/htroot/Steering.java +++ b/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; diff --git a/htroot/Supporter.java b/htroot/Supporter.java index 9110a4f02..62db2f4ef 100644 --- a/htroot/Supporter.java +++ b/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; diff --git a/htroot/Surftips.java b/htroot/Surftips.java index ed033090d..021754d28 100644 --- a/htroot/Surftips.java +++ b/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; diff --git a/htroot/Table_API_p.java b/htroot/Table_API_p.java index b8a6d3675..c98a386fe 100644 --- a/htroot/Table_API_p.java +++ b/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; diff --git a/htroot/Table_RobotsTxt_p.java b/htroot/Table_RobotsTxt_p.java index 892b42751..24a16b8b1 100644 --- a/htroot/Table_RobotsTxt_p.java +++ b/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; diff --git a/htroot/Tables_p.java b/htroot/Tables_p.java index 2c1812ddd..bd9d47edb 100644 --- a/htroot/Tables_p.java +++ b/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; diff --git a/htroot/Threaddump_p.java b/htroot/Threaddump_p.java index 89f8e25af..295ef205a 100644 --- a/htroot/Threaddump_p.java +++ b/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; diff --git a/htroot/Trails.java b/htroot/Trails.java index 853e467f5..97616d056 100644 --- a/htroot/Trails.java +++ b/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; diff --git a/htroot/User.java b/htroot/User.java index b6c3c18c9..fd2a17a09 100644 --- a/htroot/User.java +++ b/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; diff --git a/htroot/ViewFile.java b/htroot/ViewFile.java index af67b31fa..f6aba9517 100644 --- a/htroot/ViewFile.java +++ b/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; diff --git a/htroot/ViewImage.java b/htroot/ViewImage.java index da63cef73..9b4eaddda 100644 --- a/htroot/ViewImage.java +++ b/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; diff --git a/htroot/ViewLog_p.java b/htroot/ViewLog_p.java index ea05c0d05..b98341846 100644 --- a/htroot/ViewLog_p.java +++ b/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; diff --git a/htroot/ViewProfile.java b/htroot/ViewProfile.java index cdf99a47e..3770de282 100644 --- a/htroot/ViewProfile.java +++ b/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; diff --git a/htroot/WatchWebStructure_p.java b/htroot/WatchWebStructure_p.java index 5988f6106..4f79c0c3c 100644 --- a/htroot/WatchWebStructure_p.java +++ b/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; diff --git a/htroot/WebStructurePicture_p.java b/htroot/WebStructurePicture_p.java index 6c80c8952..c5e3208aa 100644 --- a/htroot/WebStructurePicture_p.java +++ b/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; diff --git a/htroot/Wiki.java b/htroot/Wiki.java index aaf9a3304..b58119cbf 100644 --- a/htroot/Wiki.java +++ b/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; diff --git a/htroot/WikiHelp.java b/htroot/WikiHelp.java index bb84d6db9..6399049d8 100644 --- a/htroot/WikiHelp.java +++ b/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; diff --git a/htroot/YaCySearchPluginFF.java b/htroot/YaCySearchPluginFF.java index 4e40c2ea0..0b272c233 100644 --- a/htroot/YaCySearchPluginFF.java +++ b/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 de.anomic.http.server.RequestHeader; +import net.yacy.cora.protocol.HeaderFramework; +import net.yacy.cora.protocol.RequestHeader; import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/api/blacklists.java b/htroot/api/blacklists.java index c92f233b0..63d81205b 100644 --- a/htroot/api/blacklists.java +++ b/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; diff --git a/htroot/api/blacklists_p.java b/htroot/api/blacklists_p.java index 180481484..963d576c8 100644 --- a/htroot/api/blacklists_p.java +++ b/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; diff --git a/htroot/api/bookmarks/get_bookmarks.java b/htroot/api/bookmarks/get_bookmarks.java index 375f282c8..88fe64159 100644 --- a/htroot/api/bookmarks/get_bookmarks.java +++ b/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", ","); diff --git a/htroot/api/bookmarks/get_folders.java b/htroot/api/bookmarks/get_folders.java index 45cf89c97..80e37eadf 100644 --- a/htroot/api/bookmarks/get_folders.java +++ b/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; diff --git a/htroot/api/bookmarks/posts/add_p.java b/htroot/api/bookmarks/posts/add_p.java index c534f76c6..881fff332 100755 --- a/htroot/api/bookmarks/posts/add_p.java +++ b/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; diff --git a/htroot/api/bookmarks/posts/all.java b/htroot/api/bookmarks/posts/all.java index d66103e02..8a01da381 100755 --- a/htroot/api/bookmarks/posts/all.java +++ b/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; diff --git a/htroot/api/bookmarks/posts/delete_p.java b/htroot/api/bookmarks/posts/delete_p.java index 5fa1c4440..e26acae49 100755 --- a/htroot/api/bookmarks/posts/delete_p.java +++ b/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; diff --git a/htroot/api/bookmarks/posts/get.java b/htroot/api/bookmarks/posts/get.java index 6b25464a7..c75a39a21 100755 --- a/htroot/api/bookmarks/posts/get.java +++ b/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; diff --git a/htroot/api/bookmarks/tags/addTag_p.java b/htroot/api/bookmarks/tags/addTag_p.java index 61295ff5f..252081e07 100644 --- a/htroot/api/bookmarks/tags/addTag_p.java +++ b/htroot/api/bookmarks/tags/addTag_p.java @@ -1,5 +1,5 @@ -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; diff --git a/htroot/api/bookmarks/tags/editTag_p.java b/htroot/api/bookmarks/tags/editTag_p.java index 2af81bdf1..56884247f 100755 --- a/htroot/api/bookmarks/tags/editTag_p.java +++ b/htroot/api/bookmarks/tags/editTag_p.java @@ -1,5 +1,5 @@ -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; diff --git a/htroot/api/bookmarks/tags/getTag.java b/htroot/api/bookmarks/tags/getTag.java index 1d67caeb8..294c49702 100755 --- a/htroot/api/bookmarks/tags/getTag.java +++ b/htroot/api/bookmarks/tags/getTag.java @@ -1,8 +1,9 @@ import java.util.Iterator; +import net.yacy.cora.protocol.RequestHeader; + 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; diff --git a/htroot/api/bookmarks/xbel/xbel.java b/htroot/api/bookmarks/xbel/xbel.java index 92578cc0c..a89ae24d4 100755 --- a/htroot/api/bookmarks/xbel/xbel.java +++ b/htroot/api/bookmarks/xbel/xbel.java @@ -3,12 +3,12 @@ import java.util.Date; import java.util.Iterator; +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.http.server.RequestHeader; import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/api/config_p.java b/htroot/api/config_p.java index f0f5075bb..9c4aefdc1 100644 --- a/htroot/api/config_p.java +++ b/htroot/api/config_p.java @@ -4,7 +4,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; diff --git a/htroot/api/feed.java b/htroot/api/feed.java index 00b49fe61..9d889d99b 100755 --- a/htroot/api/feed.java +++ b/htroot/api/feed.java @@ -4,8 +4,8 @@ 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.http.server.RequestHeader; import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/api/latency_p.java b/htroot/api/latency_p.java index 5167adb19..e331ccee8 100644 --- a/htroot/api/latency_p.java +++ b/htroot/api/latency_p.java @@ -25,12 +25,12 @@ import java.util.Date; import java.util.Iterator; import java.util.Map; +import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.util.DateFormatter; import de.anomic.crawler.Latency; import de.anomic.crawler.NoticedURL; import de.anomic.crawler.Latency.Host; -import de.anomic.http.server.RequestHeader; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/api/queues_p.java b/htroot/api/queues_p.java index 12faf9518..1ea531a9e 100755 --- a/htroot/api/queues_p.java +++ b/htroot/api/queues_p.java @@ -3,9 +3,10 @@ import java.util.ArrayList; import java.util.Date; import java.util.Locale; +import net.yacy.cora.protocol.RequestHeader; + import de.anomic.crawler.NoticedURL; import de.anomic.crawler.retrieval.Request; -import de.anomic.http.server.RequestHeader; import de.anomic.search.Segment; import de.anomic.search.Segments; import de.anomic.search.Switchboard; diff --git a/htroot/api/status_p.java b/htroot/api/status_p.java index 3bc018901..c89d3bd4e 100644 --- a/htroot/api/status_p.java +++ b/htroot/api/status_p.java @@ -1,10 +1,10 @@ +import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.io.ByteCountInputStream; import net.yacy.kelondro.io.ByteCountOutputStream; import net.yacy.kelondro.util.MemoryControl; import net.yacy.kelondro.workflow.WorkflowProcessor; -import de.anomic.http.server.RequestHeader; import de.anomic.search.Segment; import de.anomic.search.Segments; import de.anomic.search.Switchboard; diff --git a/htroot/api/table_p.java b/htroot/api/table_p.java index 303718cec..4de9e5d3d 100644 --- a/htroot/api/table_p.java +++ b/htroot/api/table_p.java @@ -21,10 +21,10 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; +import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.blob.Tables; 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; diff --git a/htroot/api/timeline.java b/htroot/api/timeline.java index 87c7ad96c..98161a275 100644 --- a/htroot/api/timeline.java +++ b/htroot/api/timeline.java @@ -28,6 +28,7 @@ import java.util.Date; import java.util.Iterator; import java.util.TreeSet; +import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.data.word.Word; import net.yacy.kelondro.data.word.WordReference; import net.yacy.kelondro.index.HandleSet; @@ -38,7 +39,6 @@ import net.yacy.kelondro.rwi.TermSearch; import net.yacy.kelondro.util.DateFormatter; import net.yacy.kelondro.util.ISO639; -import de.anomic.http.server.RequestHeader; import de.anomic.search.QueryParams; import de.anomic.search.Segment; import de.anomic.search.Segments; diff --git a/htroot/api/trail_p.java b/htroot/api/trail_p.java index 7078a6edd..2e3756773 100644 --- a/htroot/api/trail_p.java +++ b/htroot/api/trail_p.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; diff --git a/htroot/api/util/getpageinfo_p.java b/htroot/api/util/getpageinfo_p.java index e722e7d7d..acd2bcb68 100755 --- a/htroot/api/util/getpageinfo_p.java +++ b/htroot/api/util/getpageinfo_p.java @@ -4,11 +4,11 @@ import java.net.MalformedURLException; import java.util.Set; import net.yacy.cora.document.MultiProtocolURI; +import net.yacy.cora.protocol.RequestHeader; import net.yacy.document.parser.html.ContentScraper; import net.yacy.kelondro.data.meta.DigestURI; import de.anomic.crawler.CrawlProfile; -import de.anomic.http.server.RequestHeader; import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/api/util/ynetSearch.java b/htroot/api/util/ynetSearch.java index 343a465c5..a4c1b7298 100755 --- a/htroot/api/util/ynetSearch.java +++ b/htroot/api/util/ynetSearch.java @@ -7,7 +7,8 @@ import java.util.Iterator; import java.util.Map; import java.util.Scanner; -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; diff --git a/htroot/api/version.java b/htroot/api/version.java index b510212b5..c4c21c2c3 100644 --- a/htroot/api/version.java +++ b/htroot/api/version.java @@ -1,6 +1,6 @@ -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.yacy.yacyBuildProperties; diff --git a/htroot/api/webstructure.java b/htroot/api/webstructure.java index 078d1cfab..6c9273eb9 100644 --- a/htroot/api/webstructure.java +++ b/htroot/api/webstructure.java @@ -26,9 +26,9 @@ import java.net.MalformedURLException; import java.util.Iterator; import java.util.Map; +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; diff --git a/htroot/api/yacydoc.java b/htroot/api/yacydoc.java index da8de0e12..3abe52b4a 100644 --- a/htroot/api/yacydoc.java +++ b/htroot/api/yacydoc.java @@ -27,12 +27,12 @@ import java.net.MalformedURLException; +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; import net.yacy.kelondro.logging.Log; -import de.anomic.http.server.RequestHeader; import de.anomic.search.Segment; import de.anomic.search.Segments; import de.anomic.search.Switchboard; diff --git a/htroot/autoconfig.java b/htroot/autoconfig.java index eb9ea4c9a..732beb964 100644 --- a/htroot/autoconfig.java +++ b/htroot/autoconfig.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 de.anomic.http.server.RequestHeader; +import net.yacy.cora.protocol.HeaderFramework; +import net.yacy.cora.protocol.RequestHeader; import de.anomic.search.SwitchboardConstants; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/compare_yacy.java b/htroot/compare_yacy.java index 6c93742db..69dc462f2 100755 --- a/htroot/compare_yacy.java +++ b/htroot/compare_yacy.java @@ -24,7 +24,6 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -import de.anomic.http.server.RequestHeader; import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; @@ -33,6 +32,8 @@ import de.anomic.server.servletProperties; import java.util.HashMap; import java.util.Map; +import net.yacy.cora.protocol.RequestHeader; + public class compare_yacy { private static final String defaultsearch = "YaCy"; diff --git a/htroot/cytag.java b/htroot/cytag.java index 98a28c5ab..2ae808c1e 100644 --- a/htroot/cytag.java +++ b/htroot/cytag.java @@ -30,13 +30,13 @@ import java.io.File; import java.io.IOException; import java.util.Date; +import net.yacy.cora.protocol.HeaderFramework; +import net.yacy.cora.protocol.RequestHeader; import net.yacy.document.ImageParser; import net.yacy.document.parser.html.CharacterCoding; import net.yacy.kelondro.util.DateFormatter; import net.yacy.kelondro.util.FileUtils; -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; diff --git a/htroot/imagetest.java b/htroot/imagetest.java index 8385a7e9d..4b4e9b717 100644 --- a/htroot/imagetest.java +++ b/htroot/imagetest.java @@ -24,9 +24,9 @@ // 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.PrintTool; import net.yacy.visualization.RasterPlotter; -import de.anomic.http.server.RequestHeader; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/index.java b/htroot/index.java index 5d14b8ae1..ea4341598 100644 --- a/htroot/index.java +++ b/htroot/index.java @@ -29,7 +29,7 @@ // if the shell's current path is HTROOT -import de.anomic.http.server.RequestHeader; +import net.yacy.cora.protocol.RequestHeader; import de.anomic.search.ContentDomain; import de.anomic.search.Switchboard; import de.anomic.search.SwitchboardConstants; diff --git a/htroot/mediawiki_p.java b/htroot/mediawiki_p.java index 14690c280..40fc2e4c8 100644 --- a/htroot/mediawiki_p.java +++ b/htroot/mediawiki_p.java @@ -27,9 +27,9 @@ import java.io.File; import java.io.IOException; +import net.yacy.cora.protocol.RequestHeader; import net.yacy.document.importer.MediawikiImporter; -import de.anomic.http.server.RequestHeader; import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/opensearchdescription.java b/htroot/opensearchdescription.java index 97d01fb4c..2d6bec224 100644 --- a/htroot/opensearchdescription.java +++ b/htroot/opensearchdescription.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.serverCore; diff --git a/htroot/osm.java b/htroot/osm.java index 3a9fb8dbc..f663ac56f 100644 --- a/htroot/osm.java +++ b/htroot/osm.java @@ -4,8 +4,8 @@ //$LastChangedBy$ // +import net.yacy.cora.protocol.RequestHeader; import net.yacy.visualization.RasterPlotter; -import de.anomic.http.server.RequestHeader; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; import de.anomic.yacy.graphics.OSMTile; diff --git a/htroot/rct_p.java b/htroot/rct_p.java index 52b916d0b..b9d9600f5 100644 --- a/htroot/rct_p.java +++ b/htroot/rct_p.java @@ -31,10 +31,10 @@ import java.util.Iterator; import net.yacy.cora.document.RSSFeed; import net.yacy.cora.document.Hit; +import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.data.meta.DigestURI; import 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; diff --git a/htroot/robots.java b/htroot/robots.java index 6c6ed8eee..0c32b13bc 100644 --- a/htroot/robots.java +++ b/htroot/robots.java @@ -7,7 +7,8 @@ import java.io.File; import java.util.ArrayList; -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; diff --git a/htroot/sharedBlacklist_p.java b/htroot/sharedBlacklist_p.java index 5d8d870dc..a8560ce2d 100644 --- a/htroot/sharedBlacklist_p.java +++ b/htroot/sharedBlacklist_p.java @@ -43,12 +43,12 @@ import de.anomic.crawler.retrieval.HTTPLoader; import de.anomic.data.listManager; import de.anomic.data.list.ListAccumulator; import de.anomic.data.list.XMLBlacklistImporter; -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 de.anomic.yacy.yacySeed; +import net.yacy.cora.protocol.RequestHeader; import net.yacy.document.parser.html.CharacterCoding; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.util.FileUtils; diff --git a/htroot/ssitestservlet.java b/htroot/ssitestservlet.java index d4bcd0a5c..0cbc29a6c 100644 --- a/htroot/ssitestservlet.java +++ b/htroot/ssitestservlet.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.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/test.java b/htroot/test.java index 83d65cd48..ec03dd5a8 100644 --- a/htroot/test.java +++ b/htroot/test.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; diff --git a/htroot/www/welcome.java b/htroot/www/welcome.java index c54d44365..b5c0a787f 100644 --- a/htroot/www/welcome.java +++ b/htroot/www/welcome.java @@ -32,8 +32,9 @@ import java.io.File; import java.net.InetAddress; import java.net.UnknownHostException; -import de.anomic.http.server.HeaderFramework; -import de.anomic.http.server.RequestHeader; +import net.yacy.cora.protocol.HeaderFramework; +import net.yacy.cora.protocol.RequestHeader; + import de.anomic.search.Switchboard; import de.anomic.server.serverCore; import de.anomic.server.serverObjects; diff --git a/htroot/yacy/crawlReceipt.java b/htroot/yacy/crawlReceipt.java index a0875f4da..967a69a59 100644 --- a/htroot/yacy/crawlReceipt.java +++ b/htroot/yacy/crawlReceipt.java @@ -29,11 +29,11 @@ import java.io.IOException; +import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.data.meta.URIMetadataRow; import net.yacy.kelondro.logging.Log; 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; diff --git a/htroot/yacy/hello.java b/htroot/yacy/hello.java index 35767f9e3..78ac45c41 100644 --- a/htroot/yacy/hello.java +++ b/htroot/yacy/hello.java @@ -32,11 +32,11 @@ import java.util.ConcurrentModificationException; import java.util.Iterator; import java.util.Map; +import net.yacy.cora.protocol.Domains; +import net.yacy.cora.protocol.HeaderFramework; +import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.logging.Log; -import net.yacy.kelondro.util.Domains; -import de.anomic.http.server.HeaderFramework; -import de.anomic.http.server.RequestHeader; import de.anomic.search.Switchboard; import de.anomic.server.serverCore; import de.anomic.server.serverObjects; diff --git a/htroot/yacy/list.java b/htroot/yacy/list.java index 3566b85ce..e1c8df7ca 100644 --- a/htroot/yacy/list.java +++ b/htroot/yacy/list.java @@ -28,10 +28,10 @@ import java.io.File; +import net.yacy.cora.protocol.HeaderFramework; +import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.util.FileUtils; -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.serverCore; diff --git a/htroot/yacy/message.java b/htroot/yacy/message.java index 0da56c405..4fdb5ce22 100644 --- a/htroot/yacy/message.java +++ b/htroot/yacy/message.java @@ -35,12 +35,12 @@ import java.text.SimpleDateFormat; import java.util.Date; 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; 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; diff --git a/htroot/yacy/profile.java b/htroot/yacy/profile.java index 2cee560b1..a49a1be0d 100644 --- a/htroot/yacy/profile.java +++ b/htroot/yacy/profile.java @@ -35,8 +35,9 @@ import java.io.IOException; import java.util.Iterator; import java.util.Properties; -import de.anomic.http.server.HeaderFramework; -import de.anomic.http.server.RequestHeader; +import net.yacy.cora.protocol.HeaderFramework; +import net.yacy.cora.protocol.RequestHeader; + import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/yacy/query.java b/htroot/yacy/query.java index df8786011..cf5866b86 100644 --- a/htroot/yacy/query.java +++ b/htroot/yacy/query.java @@ -29,11 +29,11 @@ import java.io.IOException; +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.HeaderFramework; -import de.anomic.http.server.RequestHeader; import de.anomic.search.Segments; import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; diff --git a/htroot/yacy/search.java b/htroot/yacy/search.java index d67ac514f..617f31f75 100644 --- a/htroot/yacy/search.java +++ b/htroot/yacy/search.java @@ -36,6 +36,8 @@ import java.util.TreeMap; import java.util.TreeSet; import net.yacy.cora.document.RSSMessage; +import net.yacy.cora.protocol.HeaderFramework; +import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.data.word.WordReference; import net.yacy.kelondro.data.word.WordReferenceRow; @@ -47,8 +49,6 @@ import net.yacy.kelondro.util.SortStack; import net.yacy.kelondro.util.ISO639; import de.anomic.crawler.CrawlProfile; -import de.anomic.http.server.HeaderFramework; -import de.anomic.http.server.RequestHeader; import de.anomic.net.natLib; import de.anomic.search.ContentDomain; import de.anomic.search.Navigator; diff --git a/htroot/yacy/transfer.java b/htroot/yacy/transfer.java index 73c4a4b77..1c87a4e12 100644 --- a/htroot/yacy/transfer.java +++ b/htroot/yacy/transfer.java @@ -27,12 +27,12 @@ import java.io.File; import java.io.IOException; +import net.yacy.cora.protocol.HeaderFramework; +import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.order.Digest; import net.yacy.kelondro.util.FileUtils; -import de.anomic.http.server.HeaderFramework; -import de.anomic.http.server.RequestHeader; import de.anomic.search.Switchboard; import de.anomic.search.blockrank.CRDistribution; import de.anomic.server.serverObjects; diff --git a/htroot/yacy/transferRWI.java b/htroot/yacy/transferRWI.java index 88c1f31df..79e6a936e 100644 --- a/htroot/yacy/transferRWI.java +++ b/htroot/yacy/transferRWI.java @@ -31,6 +31,7 @@ import java.util.ArrayList; import java.util.Iterator; import net.yacy.cora.document.RSSMessage; +import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.data.meta.URIMetadataRow; import net.yacy.kelondro.data.word.WordReferenceRow; import net.yacy.kelondro.index.HandleSet; @@ -38,7 +39,6 @@ import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.util.FileUtils; import net.yacy.repository.Blacklist; -import de.anomic.http.server.RequestHeader; import de.anomic.search.Segments; import de.anomic.search.Switchboard; import de.anomic.search.SwitchboardConstants; diff --git a/htroot/yacy/transferURL.java b/htroot/yacy/transferURL.java index 9b539510c..75d7375d8 100644 --- a/htroot/yacy/transferURL.java +++ b/htroot/yacy/transferURL.java @@ -30,13 +30,13 @@ import java.io.IOException; import java.text.ParseException; import net.yacy.cora.document.RSSMessage; +import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.data.meta.URIMetadataRow; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.util.DateFormatter; import net.yacy.repository.Blacklist; 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.serverCore; diff --git a/htroot/yacy/urls.java b/htroot/yacy/urls.java index 802c693e5..5e9e39dd5 100644 --- a/htroot/yacy/urls.java +++ b/htroot/yacy/urls.java @@ -27,13 +27,13 @@ import java.io.IOException; import java.util.Date; +import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.data.meta.URIMetadataRow; import net.yacy.kelondro.util.DateFormatter; import de.anomic.crawler.NoticedURL; import de.anomic.crawler.retrieval.Request; -import de.anomic.http.server.RequestHeader; import de.anomic.search.Segments; import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; diff --git a/htroot/yacyinteractive.java b/htroot/yacyinteractive.java index d8b41339f..1eaf89a17 100644 --- a/htroot/yacyinteractive.java +++ b/htroot/yacyinteractive.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; diff --git a/htroot/yacysearch.java b/htroot/yacysearch.java index f221a9e21..9eb791b21 100644 --- a/htroot/yacysearch.java +++ b/htroot/yacysearch.java @@ -33,6 +33,9 @@ import java.util.Iterator; import java.util.TreeSet; import net.yacy.cora.document.RSSMessage; +import net.yacy.cora.protocol.Domains; +import net.yacy.cora.protocol.HeaderFramework; +import net.yacy.cora.protocol.RequestHeader; import net.yacy.document.Condenser; import net.yacy.document.Document; import net.yacy.document.Parser; @@ -43,7 +46,6 @@ import net.yacy.kelondro.data.word.Word; import net.yacy.kelondro.index.HandleSet; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.Bitfield; -import net.yacy.kelondro.util.Domains; import net.yacy.kelondro.util.EventTracker; import net.yacy.kelondro.util.Formatter; import net.yacy.kelondro.util.MemoryControl; @@ -53,8 +55,6 @@ import net.yacy.kelondro.util.ISO639; import de.anomic.crawler.CrawlProfile; import de.anomic.data.DidYouMean; import de.anomic.data.LibraryProvider; -import de.anomic.http.server.HeaderFramework; -import de.anomic.http.server.RequestHeader; import de.anomic.search.ContentDomain; import de.anomic.search.QueryParams; import de.anomic.search.RankingProfile; diff --git a/htroot/yacysearch_location.java b/htroot/yacysearch_location.java index 1cab05061..9c467bed3 100644 --- a/htroot/yacysearch_location.java +++ b/htroot/yacysearch_location.java @@ -23,11 +23,11 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.TimeUnit; import net.yacy.cora.document.RSSMessage; +import net.yacy.cora.protocol.HeaderFramework; +import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.services.Search; import net.yacy.document.geolocalization.Location; import de.anomic.data.LibraryProvider; -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.serverCore; @@ -35,7 +35,6 @@ import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; import java.util.Date; -import net.yacy.kelondro.util.DateFormatter; public class yacysearch_location { @@ -140,7 +139,7 @@ public class yacysearch_location { final String originalquerystring = (post == null) ? "" : post.get("query", post.get("search", "")).trim(); // SRU compliance final boolean global = post.get("kml_resource", "local").equals("global"); - prop.put("kml_date822", DateFormatter.formatRFC1123(new Date())); + prop.put("kml_date822", HeaderFramework.formatRFC1123(new Date())); prop.put("kml_promoteSearchPageGreeting", promoteSearchPageGreeting); prop.put("kml_rssYacyImageURL", "http://" + hostName + "/env/grafics/yacy.gif"); prop.put("kml_searchBaseURL", "http://" + hostName + "/yacysearch_location.rss"); diff --git a/htroot/yacysearchitem.java b/htroot/yacysearchitem.java index 035f8d47b..0503b9e1a 100644 --- a/htroot/yacysearchitem.java +++ b/htroot/yacysearchitem.java @@ -28,13 +28,13 @@ import java.net.MalformedURLException; import java.util.ArrayList; import java.util.TreeSet; +import net.yacy.cora.protocol.HeaderFramework; +import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.util.DateFormatter; import net.yacy.kelondro.util.EventTracker; import net.yacy.kelondro.util.Formatter; -import de.anomic.http.server.HeaderFramework; -import de.anomic.http.server.RequestHeader; import de.anomic.search.ContentDomain; import de.anomic.search.MediaSnippet; import de.anomic.search.QueryParams; @@ -128,7 +128,7 @@ public class yacysearchitem { prop.put("content_urlhexhash", yacySeed.b64Hash2hexHash(resulthashString)); prop.putHTML("content_urlname", nxTools.shortenURLString(result.urlname(), urllength)); prop.put("content_date", DateFormatter.formatRFC1123_short(result.modified())); - prop.put("content_date822", DateFormatter.formatRFC1123(result.modified())); + prop.put("content_date822", HeaderFramework.formatRFC1123(result.modified())); //prop.put("content_ybr", RankingProcess.ybr(result.hash())); prop.putHTML("content_size", Integer.toString(result.filesize())); // we don't use putNUM here because that number shall be usable as sorting key. To print the size, use 'sizename' prop.putHTML("content_sizename", sizename(result.filesize())); diff --git a/htroot/yacysearchtrailer.java b/htroot/yacysearchtrailer.java index 8c81de2c6..6729a831b 100644 --- a/htroot/yacysearchtrailer.java +++ b/htroot/yacysearchtrailer.java @@ -28,10 +28,10 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.util.EventTracker; import de.anomic.data.LibraryProvider; -import de.anomic.http.server.RequestHeader; import de.anomic.search.Navigator; import de.anomic.search.QueryParams; import de.anomic.search.SearchEvent; diff --git a/maptest b/maptest index 35885194cf2fc7819967bd63e43df5d53912e81b..4893be0a935ce56b5903b803632c9a0d6f3669b9 100644 GIT binary patch literal 54 ucmZQzVBj+}GG<6Iw8}QNGB7YmWdMqpn3_RF3=IvzBIXvBP!S^|qf`L*rwQc% literal 150 zcmZQzV9+x(GLDAcp4ii%| Zn1*=lIt&dBQFNGFSQ5}-WMl-_0RT8g9-ROH diff --git a/source/de/anomic/crawler/CrawlStacker.java b/source/de/anomic/crawler/CrawlStacker.java index 0e3fce96e..75591b83b 100644 --- a/source/de/anomic/crawler/CrawlStacker.java +++ b/source/de/anomic/crawler/CrawlStacker.java @@ -32,11 +32,11 @@ import java.net.InetAddress; import java.net.UnknownHostException; import java.util.Date; +import net.yacy.cora.protocol.Domains; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.data.meta.URIMetadataRow; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.Base64Order; -import net.yacy.kelondro.util.Domains; import net.yacy.kelondro.workflow.WorkflowProcessor; import net.yacy.repository.Blacklist; diff --git a/source/de/anomic/crawler/Latency.java b/source/de/anomic/crawler/Latency.java index 7b7f6098b..381346f7d 100644 --- a/source/de/anomic/crawler/Latency.java +++ b/source/de/anomic/crawler/Latency.java @@ -28,7 +28,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import net.yacy.cora.document.MultiProtocolURI; -import net.yacy.kelondro.util.Domains; +import net.yacy.cora.protocol.Domains; import de.anomic.search.Switchboard; diff --git a/source/de/anomic/crawler/RobotsTxt.java b/source/de/anomic/crawler/RobotsTxt.java index dd11a07aa..a047b3212 100644 --- a/source/de/anomic/crawler/RobotsTxt.java +++ b/source/de/anomic/crawler/RobotsTxt.java @@ -26,8 +26,6 @@ package de.anomic.crawler; -//import java.io.BufferedInputStream; -//import java.io.BufferedOutputStream; import java.io.IOException; import java.net.MalformedURLException; import java.util.ArrayList; @@ -35,26 +33,23 @@ import java.util.Date; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import org.apache.log4j.Logger; + import net.yacy.cora.document.MultiProtocolURI; +import net.yacy.cora.protocol.HeaderFramework; +import net.yacy.cora.protocol.RequestHeader; +import net.yacy.cora.protocol.ResponseHeader; import net.yacy.cora.protocol.http.HTTPClient; import net.yacy.kelondro.blob.BEncodedHeap; import net.yacy.kelondro.index.RowSpaceExceededException; -import net.yacy.kelondro.logging.Log; -//import net.yacy.kelondro.util.ByteBuffer; -import net.yacy.kelondro.util.DateFormatter; -//import net.yacy.kelondro.util.FileUtils; 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.http.server.ResponseContainer; -import de.anomic.http.server.ResponseHeader; public class RobotsTxt { - public static final String ROBOTS_DB_PATH_SEPARATOR = ";"; - private static final Log log = new Log("ROBOTS"); + private static Logger log = Logger.getLogger(RobotsTxt.class); + + public static final String ROBOTS_DB_PATH_SEPARATOR = ";"; BEncodedHeap robotsTable; private final ConcurrentHashMap syncObjects; @@ -67,11 +62,11 @@ public class RobotsTxt { public RobotsTxt(final BEncodedHeap robotsTable) { this.robotsTable = robotsTable; syncObjects = new ConcurrentHashMap(); - log.logInfo("initiated robots table: " + robotsTable.getFile()); + log.info("initiated robots table: " + robotsTable.getFile()); } public void clear() { - log.logInfo("clearing robots table"); + log.info("clearing robots table"); try { this.robotsTable.clear(); } catch (IOException e) { @@ -91,7 +86,7 @@ public class RobotsTxt { try { record = this.robotsTable.get(this.robotsTable.encodedKey(urlHostPort)); } catch (RowSpaceExceededException e) { - Log.logException(e); + log.warn("memory exhausted", e); record = null; } if (record != null) robotsTxt4Host = new RobotsEntry(urlHostPort, record); @@ -119,7 +114,7 @@ public class RobotsTxt { try { record = this.robotsTable.get(this.robotsTable.encodedKey(urlHostPort)); } catch (RowSpaceExceededException e) { - Log.logException(e); + log.warn("memory exhausted", e); record = null; } if (record != null) robotsTxt4Host = new RobotsEntry(urlHostPort, record); @@ -134,13 +129,13 @@ public class RobotsTxt { try { robotsURL = new MultiProtocolURI("http://" + urlHostPort + "/robots.txt"); } catch (final MalformedURLException e) { - log.logSevere("Unable to generate robots.txt URL for host:port '" + urlHostPort + "'."); + log.fatal("Unable to generate robots.txt URL for host:port '" + urlHostPort + "'.", e); robotsURL = null; } Object[] result = null; if (robotsURL != null) { - if (log.isFine()) log.logFine("Trying to download the robots.txt file from URL '" + robotsURL + "'."); + if (log.isDebugEnabled()) log.debug("Trying to download the robots.txt file from URL '" + robotsURL + "'."); try { result = downloadRobotsTxt(robotsURL, 5, robotsTxt4Host); } catch (final Exception e) { @@ -176,7 +171,7 @@ public class RobotsTxt { int sz = this.robotsTable.size(); addEntry(robotsTxt4Host); if (this.robotsTable.size() <= sz) { - log.logSevere("new entry in robots.txt table failed, resetting database"); + log.fatal("new entry in robots.txt table failed, resetting database"); this.clear(); addEntry(robotsTxt4Host); } @@ -229,7 +224,7 @@ public class RobotsTxt { this.robotsTable.put(this.robotsTable.encodedKey(entry.hostName), entry.getMem()); return entry.hostName; } catch (final Exception e) { - Log.logException(e); + log.warn("cannot write robots.txt entry", e); return null; } } @@ -292,7 +287,7 @@ public class RobotsTxt { try { robotsEntry = getEntry(theURL, true); } catch (IOException e) { - Log.logException(e); + log.warn("cannot load robots.txt entry", e); return 0; } return robotsEntry.getCrawlDelayMillis(); @@ -307,7 +302,7 @@ public class RobotsTxt { try { robotsTxt4Host = getEntry(nexturl, true); } catch (IOException e) { - Log.logException(e); + log.warn("cannot load robots.txt entry", e); return false; } return robotsTxt4Host.isDisallowed(nexturl.getFile()); @@ -339,14 +334,12 @@ public class RobotsTxt { oldEtag = entry.getETag(); reqHeaders = new RequestHeader(); final Date modDate = entry.getModDate(); - if (modDate != null) reqHeaders.put(RequestHeader.IF_MODIFIED_SINCE, DateFormatter.formatRFC1123(entry.getModDate())); + if (modDate != null) reqHeaders.put(RequestHeader.IF_MODIFIED_SINCE, HeaderFramework.formatRFC1123(entry.getModDate())); } // setup http-client //TODO: adding Traffic statistic for robots download? -// final Client client = new Client(10000, reqHeaders); -// ResponseContainer res = null; final HTTPClient client = new HTTPClient(); client.setHeader(reqHeaders.entrySet()); try { @@ -354,57 +347,39 @@ public class RobotsTxt { if (Thread.currentThread().isInterrupted()) throw new InterruptedException("Shutdown in progress."); // sending the get request -// res = client.GET(robotsURL.toString()); robotsTxt = client.GETbytes(robotsURL.toString()); final int code = client.getHttpResponse().getStatusLine().getStatusCode(); final ResponseHeader header = new ResponseHeader(client.getHttpResponse().getAllHeaders()); // check the response status -// if (res.getStatusLine().startsWith("2")) { if (code > 199 && code < 300) { -// if (!res.getResponseHeader().mime().startsWith("text/plain")) { if (!header.mime().startsWith("text/plain")) { robotsTxt = null; -// if (log.isFinest()) log.logFinest("Robots.txt from URL '" + robotsURL + "' has wrong mimetype '" + res.getResponseHeader().mime() + "'."); - if (log.isFinest()) log.logFinest("Robots.txt from URL '" + robotsURL + "' has wrong mimetype '" + header.mime() + "'."); + if (log.isDebugEnabled()) log.debug("Robots.txt from URL '" + robotsURL + "' has wrong mimetype '" + header.mime() + "'."); } else { // getting some metadata -// eTag = res.getResponseHeader().containsKey(HeaderFramework.ETAG)?(res.getResponseHeader().get(HeaderFramework.ETAG)).trim():null; -// lastMod = res.getResponseHeader().lastModified(); eTag = header.containsKey(HeaderFramework.ETAG)?(header.get(HeaderFramework.ETAG)).trim():null; lastMod = header.lastModified(); // if the robots.txt file was not changed we break here if ((eTag != null) && (oldEtag != null) && (eTag.equals(oldEtag))) { - if (log.isFinest()) log.logFinest("Robots.txt from URL '" + robotsURL + "' was not modified. Abort downloading of new version."); + if (log.isDebugEnabled()) log.debug("Robots.txt from URL '" + robotsURL + "' was not modified. Abort downloading of new version."); return null; } -// // downloading the content -// final ByteBuffer sbb = new ByteBuffer(); -// try { -// FileUtils.copyToStream(new BufferedInputStream(res.getDataAsStream()), new BufferedOutputStream(sbb)); -// } finally { -// res.closeStream(); -// } -// robotsTxt = sbb.getBytes(); downloadEnd = System.currentTimeMillis(); - if (log.isFinest()) log.logFinest("Robots.txt successfully loaded from URL '" + robotsURL + "' in " + (downloadEnd-downloadStart) + " ms."); + if (log.isDebugEnabled()) log.debug("Robots.txt successfully loaded from URL '" + robotsURL + "' in " + (downloadEnd-downloadStart) + " ms."); } -// } else if (res.getStatusCode() == 304) { } else if (code == 304) { return null; -// } else if (res.getStatusLine().startsWith("3")) { } else if (code > 299 && code < 400) { // getting redirection URL -// String redirectionUrlString = res.getResponseHeader().get(HeaderFramework.LOCATION); String redirectionUrlString = header.get(HeaderFramework.LOCATION); if (redirectionUrlString==null) { -// if (log.isFinest()) log.logFinest("robots.txt could not be downloaded from URL '" + robotsURL + "' because of missing redirecton header. [" + res.getStatusLine() + "]."); - if (log.isFinest()) - log.logFinest("robots.txt could not be downloaded from URL '" + robotsURL + "' because of missing redirecton header. [" + client.getHttpResponse().getStatusLine() + "]."); + if (log.isDebugEnabled()) + log.debug("robots.txt could not be downloaded from URL '" + robotsURL + "' because of missing redirecton header. [" + client.getHttpResponse().getStatusLine() + "]."); robotsTxt = null; } else { @@ -414,27 +389,20 @@ public class RobotsTxt { final MultiProtocolURI redirectionUrl = MultiProtocolURI.newURL(robotsURL, redirectionUrlString); // following the redirection - if (log.isFinest()) log.logFinest("Redirection detected for robots.txt with URL '" + robotsURL + "'." + + if (log.isDebugEnabled()) log.debug("Redirection detected for robots.txt with URL '" + robotsURL + "'." + "\nRedirecting request to: " + redirectionUrl); return downloadRobotsTxt(redirectionUrl,redirectionCount,entry); } -// } else if (res.getStatusCode() == 401 || res.getStatusCode() == 403) { } else if (code == 401 || code == 403) { accessCompletelyRestricted = true; - if (log.isFinest()) log.logFinest("Access to Robots.txt not allowed on URL '" + robotsURL + "'."); + if (log.isDebugEnabled()) log.debug("Access to Robots.txt not allowed on URL '" + robotsURL + "'."); } else { -// if (log.isFinest()) log.logFinest("robots.txt could not be downloaded from URL '" + robotsURL + "'. [" + res.getStatusLine() + "]."); - if (log.isFinest()) - log.logFinest("robots.txt could not be downloaded from URL '" + robotsURL + "'. [" + client.getHttpResponse().getStatusLine() + "]."); + if (log.isDebugEnabled()) + log.debug("robots.txt could not be downloaded from URL '" + robotsURL + "'. [" + client.getHttpResponse().getStatusLine() + "]."); robotsTxt = null; } } catch (final Exception e) { throw e; -// } finally { -// if(res != null) { -// // release connection -// res.closeStream(); -// } } return new Object[]{Boolean.valueOf(accessCompletelyRestricted),robotsTxt,eTag,lastMod}; } diff --git a/source/de/anomic/crawler/retrieval/FTPLoader.java b/source/de/anomic/crawler/retrieval/FTPLoader.java index 8e316b25f..773ff8c44 100644 --- a/source/de/anomic/crawler/retrieval/FTPLoader.java +++ b/source/de/anomic/crawler/retrieval/FTPLoader.java @@ -33,16 +33,14 @@ import java.io.PrintStream; import java.util.Date; import net.yacy.cora.document.MultiProtocolURI; +import net.yacy.cora.protocol.HeaderFramework; +import net.yacy.cora.protocol.RequestHeader; +import net.yacy.cora.protocol.ResponseHeader; import net.yacy.cora.protocol.ftp.FTPClient; import net.yacy.document.TextParser; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.logging.Log; -import net.yacy.kelondro.util.DateFormatter; - import de.anomic.crawler.Latency; -import de.anomic.http.server.HeaderFramework; -import de.anomic.http.server.RequestHeader; -import de.anomic.http.server.ResponseHeader; import de.anomic.search.Segments; import de.anomic.search.Switchboard; @@ -124,7 +122,7 @@ public class FTPLoader { response = null; } else { ResponseHeader responseHeader = new ResponseHeader(); - responseHeader.put(HeaderFramework.LAST_MODIFIED, DateFormatter.formatRFC1123(new Date())); + responseHeader.put(HeaderFramework.LAST_MODIFIED, HeaderFramework.formatRFC1123(new Date())); responseHeader.put(HeaderFramework.CONTENT_TYPE, "text/html"); response = new Response( request, @@ -220,7 +218,7 @@ public class FTPLoader { RequestHeader requestHeader = new RequestHeader(); if (request.referrerhash() != null) requestHeader.put(RequestHeader.REFERER, sb.getURL(Segments.Process.LOCALCRAWLING, request.referrerhash()).toNormalform(true, false)); ResponseHeader responseHeader = new ResponseHeader(); - responseHeader.put(HeaderFramework.LAST_MODIFIED, DateFormatter.formatRFC1123(fileDate)); + responseHeader.put(HeaderFramework.LAST_MODIFIED, HeaderFramework.formatRFC1123(fileDate)); responseHeader.put(HeaderFramework.CONTENT_TYPE, mime); // if the mimetype and file extension is supported we start to download the file diff --git a/source/de/anomic/crawler/retrieval/FileLoader.java b/source/de/anomic/crawler/retrieval/FileLoader.java index a40733657..ad8a3d649 100644 --- a/source/de/anomic/crawler/retrieval/FileLoader.java +++ b/source/de/anomic/crawler/retrieval/FileLoader.java @@ -26,18 +26,17 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import de.anomic.http.server.HeaderFramework; -import de.anomic.http.server.RequestHeader; -import de.anomic.http.server.ResponseHeader; import de.anomic.search.Segments; import de.anomic.search.Switchboard; import de.anomic.data.MimeTable; +import net.yacy.cora.protocol.HeaderFramework; +import net.yacy.cora.protocol.RequestHeader; +import net.yacy.cora.protocol.ResponseHeader; import net.yacy.cora.protocol.ftp.FTPClient; import net.yacy.document.TextParser; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.logging.Log; -import net.yacy.kelondro.util.DateFormatter; import net.yacy.kelondro.util.FileUtils; public class FileLoader { @@ -80,7 +79,7 @@ public class FileLoader { StringBuilder content = FTPClient.dirhtml(u, null, null, null, list, true); ResponseHeader responseHeader = new ResponseHeader(); - responseHeader.put(HeaderFramework.LAST_MODIFIED, DateFormatter.formatRFC1123(new Date())); + responseHeader.put(HeaderFramework.LAST_MODIFIED, HeaderFramework.formatRFC1123(new Date())); responseHeader.put(HeaderFramework.CONTENT_TYPE, "text/html"); Response response = new Response( request, @@ -96,7 +95,7 @@ public class FileLoader { // create response header String mime = MimeTable.ext2mime(url.getFileExtension()); ResponseHeader responseHeader = new ResponseHeader(); - responseHeader.put(HeaderFramework.LAST_MODIFIED, DateFormatter.formatRFC1123(new Date(url.lastModified()))); + responseHeader.put(HeaderFramework.LAST_MODIFIED, HeaderFramework.formatRFC1123(new Date(url.lastModified()))); responseHeader.put(HeaderFramework.CONTENT_TYPE, mime); // check mime type and availability of parsers diff --git a/source/de/anomic/crawler/retrieval/HTTPLoader.java b/source/de/anomic/crawler/retrieval/HTTPLoader.java index f48f6a4f9..db507e4e1 100644 --- a/source/de/anomic/crawler/retrieval/HTTPLoader.java +++ b/source/de/anomic/crawler/retrieval/HTTPLoader.java @@ -28,15 +28,15 @@ import java.io.IOException; import java.util.Date; import net.yacy.cora.document.MultiProtocolURI; +import net.yacy.cora.protocol.HeaderFramework; +import net.yacy.cora.protocol.RequestHeader; +import net.yacy.cora.protocol.ResponseHeader; import net.yacy.cora.protocol.http.HTTPClient; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.logging.Log; import net.yacy.repository.Blacklist; import de.anomic.crawler.Latency; -import de.anomic.http.server.HeaderFramework; -import de.anomic.http.server.RequestHeader; -import de.anomic.http.server.ResponseHeader; import de.anomic.search.Segments; import de.anomic.search.Switchboard; diff --git a/source/de/anomic/crawler/retrieval/Response.java b/source/de/anomic/crawler/retrieval/Response.java index 73ca3fa27..73ba3eb80 100755 --- a/source/de/anomic/crawler/retrieval/Response.java +++ b/source/de/anomic/crawler/retrieval/Response.java @@ -29,6 +29,9 @@ package de.anomic.crawler.retrieval; import java.io.ByteArrayInputStream; import java.util.Date; +import net.yacy.cora.protocol.HeaderFramework; +import net.yacy.cora.protocol.RequestHeader; +import net.yacy.cora.protocol.ResponseHeader; import net.yacy.document.Classification; import net.yacy.document.Document; import net.yacy.document.Parser; @@ -37,9 +40,6 @@ import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.util.DateFormatter; import de.anomic.crawler.CrawlProfile; -import de.anomic.http.server.HeaderFramework; -import de.anomic.http.server.RequestHeader; -import de.anomic.http.server.ResponseHeader; public class Response { diff --git a/source/de/anomic/crawler/retrieval/SMBLoader.java b/source/de/anomic/crawler/retrieval/SMBLoader.java index b3ff48882..ab34a63c8 100644 --- a/source/de/anomic/crawler/retrieval/SMBLoader.java +++ b/source/de/anomic/crawler/retrieval/SMBLoader.java @@ -39,18 +39,17 @@ import jcifs.smb.SmbException; import jcifs.smb.SmbFile; import jcifs.smb.SmbFileInputStream; -import de.anomic.http.server.HeaderFramework; -import de.anomic.http.server.RequestHeader; -import de.anomic.http.server.ResponseHeader; import de.anomic.search.Segments; import de.anomic.search.Switchboard; import de.anomic.data.MimeTable; +import net.yacy.cora.protocol.HeaderFramework; +import net.yacy.cora.protocol.RequestHeader; +import net.yacy.cora.protocol.ResponseHeader; import net.yacy.cora.protocol.ftp.FTPClient; import net.yacy.document.TextParser; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.logging.Log; -import net.yacy.kelondro.util.DateFormatter; import net.yacy.kelondro.util.FileUtils; public class SMBLoader { @@ -99,7 +98,7 @@ public class SMBLoader { StringBuilder content = FTPClient.dirhtml(u, null, null, null, list, true); ResponseHeader responseHeader = new ResponseHeader(); - responseHeader.put(HeaderFramework.LAST_MODIFIED, DateFormatter.formatRFC1123(new Date())); + responseHeader.put(HeaderFramework.LAST_MODIFIED, HeaderFramework.formatRFC1123(new Date())); responseHeader.put(HeaderFramework.CONTENT_TYPE, "text/html"); Response response = new Response( request, @@ -115,7 +114,7 @@ public class SMBLoader { // create response header String mime = MimeTable.ext2mime(url.getFileExtension()); ResponseHeader responseHeader = new ResponseHeader(); - responseHeader.put(HeaderFramework.LAST_MODIFIED, DateFormatter.formatRFC1123(new Date(url.lastModified()))); + responseHeader.put(HeaderFramework.LAST_MODIFIED, HeaderFramework.formatRFC1123(new Date(url.lastModified()))); responseHeader.put(HeaderFramework.CONTENT_TYPE, mime); // check mime type and availability of parsers diff --git a/source/de/anomic/data/SitemapParser.java b/source/de/anomic/data/SitemapParser.java index 8e1f244f8..f3f8e57f1 100644 --- a/source/de/anomic/data/SitemapParser.java +++ b/source/de/anomic/data/SitemapParser.java @@ -34,6 +34,9 @@ import java.util.zip.GZIPInputStream; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; +import net.yacy.cora.protocol.HeaderFramework; +import net.yacy.cora.protocol.RequestHeader; +import net.yacy.cora.protocol.ResponseHeader; import net.yacy.cora.protocol.http.HTTPClient; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.data.meta.URIMetadataRow; @@ -49,10 +52,7 @@ import de.anomic.crawler.CrawlProfile; import de.anomic.crawler.retrieval.HTTPLoader; import de.anomic.crawler.retrieval.Request; //import de.anomic.http.client.Client; -import de.anomic.http.server.HeaderFramework; -import de.anomic.http.server.RequestHeader; //import de.anomic.http.server.ResponseContainer; -import de.anomic.http.server.ResponseHeader; import de.anomic.search.Segments; import de.anomic.search.Switchboard; diff --git a/source/de/anomic/data/userDB.java b/source/de/anomic/data/userDB.java index f285b98cf..008726a5a 100644 --- a/source/de/anomic/data/userDB.java +++ b/source/de/anomic/data/userDB.java @@ -35,6 +35,7 @@ import java.util.Iterator; import java.util.Map; import java.util.Random; +import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.blob.MapHeap; import net.yacy.kelondro.index.RowSpaceExceededException; import net.yacy.kelondro.logging.Log; @@ -45,7 +46,6 @@ import net.yacy.kelondro.order.NaturalOrder; import net.yacy.kelondro.util.FileUtils; import net.yacy.kelondro.util.kelondroException; -import de.anomic.http.server.RequestHeader; public final class userDB { diff --git a/source/de/anomic/http/client/Cache.java b/source/de/anomic/http/client/Cache.java index f9ba1aa49..2059a5d1f 100644 --- a/source/de/anomic/http/client/Cache.java +++ b/source/de/anomic/http/client/Cache.java @@ -40,6 +40,7 @@ import java.io.UnsupportedEncodingException; import java.util.HashMap; import java.util.Map; +import net.yacy.cora.protocol.ResponseHeader; import net.yacy.kelondro.blob.ArrayStack; import net.yacy.kelondro.blob.Compressor; import net.yacy.kelondro.blob.MapHeap; @@ -49,7 +50,6 @@ import net.yacy.kelondro.index.RowSpaceExceededException; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.Base64Order; -import de.anomic.http.server.ResponseHeader; public final class Cache { diff --git a/source/de/anomic/http/server/HTTPDFileHandler.java b/source/de/anomic/http/server/HTTPDFileHandler.java index cbdbd17b4..54b00ad7a 100644 --- a/source/de/anomic/http/server/HTTPDFileHandler.java +++ b/source/de/anomic/http/server/HTTPDFileHandler.java @@ -79,6 +79,10 @@ import java.util.Properties; import java.util.concurrent.ConcurrentHashMap; import java.util.zip.GZIPOutputStream; +import net.yacy.cora.protocol.Domains; +import net.yacy.cora.protocol.HeaderFramework; +import net.yacy.cora.protocol.RequestHeader; +import net.yacy.cora.protocol.ResponseHeader; import net.yacy.document.Classification; import net.yacy.document.parser.htmlParser; import net.yacy.document.parser.html.ContentScraper; @@ -87,7 +91,6 @@ import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.util.ByteBuffer; import net.yacy.kelondro.util.DateFormatter; -import net.yacy.kelondro.util.Domains; import net.yacy.kelondro.util.FileUtils; import net.yacy.kelondro.util.MemoryControl; import net.yacy.visualization.RasterPlotter; @@ -224,7 +227,7 @@ public final class HTTPDFileHandler { ext = path.substring(pos + 1).toLowerCase(); } headers.put(HeaderFramework.SERVER, "AnomicHTTPD (www.anomic.de)"); - headers.put(HeaderFramework.DATE, DateFormatter.formatRFC1123(new Date())); + headers.put(HeaderFramework.DATE, HeaderFramework.formatRFC1123(new Date())); if(!(Classification.isMediaExtension(ext))){ headers.put(HeaderFramework.PRAGMA, "no-cache"); } diff --git a/source/de/anomic/http/server/HTTPDProxyHandler.java b/source/de/anomic/http/server/HTTPDProxyHandler.java index d43eef44b..263b8255f 100644 --- a/source/de/anomic/http/server/HTTPDProxyHandler.java +++ b/source/de/anomic/http/server/HTTPDProxyHandler.java @@ -71,6 +71,10 @@ import java.util.logging.LogManager; import java.util.logging.Logger; import java.util.zip.GZIPOutputStream; +import net.yacy.cora.protocol.Domains; +import net.yacy.cora.protocol.HeaderFramework; +import net.yacy.cora.protocol.RequestHeader; +import net.yacy.cora.protocol.ResponseHeader; import net.yacy.cora.protocol.http.HTTPClient; import net.yacy.cora.protocol.http.ProxySettings; import net.yacy.document.TextParser; @@ -79,8 +83,6 @@ import net.yacy.document.parser.html.Transformer; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.io.ByteCountOutputStream; import net.yacy.kelondro.logging.Log; -import net.yacy.kelondro.util.DateFormatter; -import net.yacy.kelondro.util.Domains; import net.yacy.kelondro.util.FileUtils; import net.yacy.repository.Blacklist; @@ -278,7 +280,7 @@ public final class HTTPDProxyHandler { * @param conProp a collection of properties about the connection, like URL * @param requestHeader The header lines of the connection from the request * @param respond the OutputStream to the client - * @see de.anomic.http.httpdHandler#doGet(java.util.Properties, de.anomic.http.server.HeaderFramework, java.io.OutputStream) + * @see de.anomic.http.httpdHandler#doGet(java.util.Properties, net.yacy.cora.protocol.HeaderFramework, java.io.OutputStream) */ public static void doGet(final Properties conProp, final RequestHeader requestHeader, final OutputStream respond) { ByteCountOutputStream countedRespond = null; @@ -696,18 +698,7 @@ public final class HTTPDProxyHandler { prepareResponseHeader(cachedResponseHeader, httpVer); // replace date field in old header by actual date, this is according to RFC - cachedResponseHeader.put(HeaderFramework.DATE, DateFormatter.formatRFC1123(new Date())); - -// if (((String)requestHeader.get(httpHeader.ACCEPT_ENCODING,"")).indexOf("gzip") != -1) { -// chunked = new httpChunkedOutputStream(respond); -// zipped = new GZIPOutputStream(chunked); -// cachedResponseHeader.put(httpHeader.TRANSFER_ENCODING, "chunked"); -// cachedResponseHeader.put(httpHeader.CONTENT_ENCODING, "gzip"); -// } else { - // maybe the content length is missing -// if (!(cachedResponseHeader.containsKey(httpHeader.CONTENT_LENGTH))) -// cachedResponseHeader.put(httpHeader.CONTENT_LENGTH, Long.toString(cacheFile.length())); -// } + cachedResponseHeader.put(HeaderFramework.DATE, HeaderFramework.formatRFC1123(new Date())); // check if we can send a 304 instead the complete content if (requestHeader.containsKey(RequestHeader.IF_MODIFIED_SINCE)) { diff --git a/source/de/anomic/http/server/HTTPDemon.java b/source/de/anomic/http/server/HTTPDemon.java index ea318a96b..7eff11ee2 100644 --- a/source/de/anomic/http/server/HTTPDemon.java +++ b/source/de/anomic/http/server/HTTPDemon.java @@ -50,14 +50,16 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import java.util.zip.GZIPInputStream; +import net.yacy.cora.protocol.Domains; +import net.yacy.cora.protocol.HeaderFramework; +import net.yacy.cora.protocol.RequestHeader; +import net.yacy.cora.protocol.ResponseHeader; import net.yacy.document.parser.html.CharacterCoding; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.order.Digest; import net.yacy.kelondro.util.ByteBuffer; -import net.yacy.kelondro.util.DateFormatter; -import net.yacy.kelondro.util.Domains; import net.yacy.kelondro.util.FileUtils; import net.yacy.kelondro.util.MemoryControl; import net.yacy.kelondro.util.MapTools; @@ -394,7 +396,7 @@ public final class HTTPDemon implements serverHandler, Cloneable { final String httpVersion = prop.getProperty(HeaderFramework.CONNECTION_PROP_HTTP_VER, HeaderFramework.HTTP_VERSION_0_9); final RequestHeader header = (httpVersion.equals(HeaderFramework.HTTP_VERSION_0_9)) ? new RequestHeader(reverseMappingCache) - : RequestHeader.readHeader(prop, session); + : readHeader(prop, session); // handling transparent proxy support HeaderFramework.handleTransparentProxySupport(header, prop, virtualHost, HTTPDProxyHandler.isTransparentProxy); @@ -460,7 +462,7 @@ public final class HTTPDemon implements serverHandler, Cloneable { RequestHeader header; final String httpVersion = prop.getProperty(HeaderFramework.CONNECTION_PROP_HTTP_VER, HeaderFramework.HTTP_VERSION_0_9); if (httpVersion.equals(HeaderFramework.HTTP_VERSION_0_9)) header = new RequestHeader(reverseMappingCache); - else header = RequestHeader.readHeader(prop,session); + else header = readHeader(prop,session); // handle transparent proxy support HeaderFramework.handleTransparentProxySupport(header, prop, virtualHost, HTTPDProxyHandler.isTransparentProxy); @@ -506,7 +508,7 @@ public final class HTTPDemon implements serverHandler, Cloneable { RequestHeader header; final String httpVersion = prop.getProperty(HeaderFramework.CONNECTION_PROP_HTTP_VER, HeaderFramework.HTTP_VERSION_0_9); if (httpVersion.equals(HeaderFramework.HTTP_VERSION_0_9)) header = new RequestHeader(reverseMappingCache); - else header = RequestHeader.readHeader(prop, session); + else header = readHeader(prop, session); // handle transfer-coding final InputStream sessionIn; @@ -596,7 +598,7 @@ public final class HTTPDemon implements serverHandler, Cloneable { prop.setProperty(HeaderFramework.CONNECTION_PROP_URL, ""); // parse remaining lines - final RequestHeader header = RequestHeader.readHeader(prop,session); + final RequestHeader header = readHeader(prop,session); if (!(allowProxy(session))) { // not authorized through firewall blocking (ip does not match filter) @@ -1107,7 +1109,7 @@ public final class HTTPDemon implements serverHandler, Cloneable { // Generated Tue, 23 Aug 2005 11:19:14 GMT by brain.wg (squid/2.5.STABLE3) // adding some system information - final String systemDate = DateFormatter.formatRFC1123(new Date()); + final String systemDate = HeaderFramework.formatRFC1123(new Date()); tp.put("date", systemDate); // rewrite the file @@ -1179,12 +1181,12 @@ public final class HTTPDemon implements serverHandler, Cloneable { final Date now = new Date(System.currentTimeMillis()); headers.put(HeaderFramework.SERVER, "AnomicHTTPD (www.anomic.de)"); - headers.put(HeaderFramework.DATE, DateFormatter.formatRFC1123(now)); + headers.put(HeaderFramework.DATE, HeaderFramework.formatRFC1123(now)); if (moddate.after(now)) { //System.out.println("*** DEBUG: correcting moddate = " + moddate.toString() + " to now = " + now.toString()); moddate = now; } - headers.put(HeaderFramework.LAST_MODIFIED, DateFormatter.formatRFC1123(moddate)); + headers.put(HeaderFramework.LAST_MODIFIED, HeaderFramework.formatRFC1123(moddate)); if (nocache) { if (httpVersion.toUpperCase().equals(HeaderFramework.HTTP_VERSION_1_1)) headers.put(HeaderFramework.CACHE_CONTROL, "no-cache"); @@ -1195,7 +1197,7 @@ public final class HTTPDemon implements serverHandler, Cloneable { headers.put(HeaderFramework.CONTENT_TYPE, contentType); if (contentLength > 0) headers.put(HeaderFramework.CONTENT_LENGTH, Long.toString(contentLength)); //if (cookie != null) headers.put(httpHeader.SET_COOKIE, cookie); - if (expires != null) headers.put(HeaderFramework.EXPIRES, DateFormatter.formatRFC1123(expires)); + if (expires != null) headers.put(HeaderFramework.EXPIRES, HeaderFramework.formatRFC1123(expires)); if (contentEnc != null) headers.put(HeaderFramework.CONTENT_ENCODING, contentEnc); if (transferEnc != null) headers.put(HeaderFramework.TRANSFER_ENCODING, transferEnc); @@ -1246,7 +1248,7 @@ public final class HTTPDemon implements serverHandler, Cloneable { // prepare header if (!responseHeader.containsKey(HeaderFramework.DATE)) - responseHeader.put(HeaderFramework.DATE, DateFormatter.formatRFC1123(new Date())); + responseHeader.put(HeaderFramework.DATE, HeaderFramework.formatRFC1123(new Date())); if (!responseHeader.containsKey(HeaderFramework.CONTENT_TYPE)) responseHeader.put(HeaderFramework.CONTENT_TYPE, "text/html; charset=UTF-8"); // fix this if (!responseHeader.containsKey(RequestHeader.CONNECTION) && conProp.containsKey(HeaderFramework.CONNECTION_PROP_PERSISTENT)) @@ -1428,5 +1430,36 @@ public final class HTTPDemon implements serverHandler, Cloneable { */ static AlternativeDomainNames getAlternativeResolver() { return alternativeResolver; - } + } + + + public static RequestHeader readHeader(final Properties prop, final serverCore.Session theSession) throws IOException { + + // reading all headers + final RequestHeader header = new RequestHeader(HTTPDemon.reverseMappingCache); + int p; + String line; + while ((line = theSession.readLineAsString()) != null) { + if (line.length() == 0) break; // this separates the header of the HTTP request from the body + // parse the header line: a property separated with the ':' sign + if ((p = line.indexOf(':')) >= 0) { + // store a property + header.add(line.substring(0, p).trim(), line.substring(p + 1).trim()); + } + } + + /* + * doing some header validation here ... + */ + final String httpVersion = prop.getProperty(HeaderFramework.CONNECTION_PROP_HTTP_VER, "HTTP/0.9"); + if (httpVersion.equals("HTTP/1.1") && !header.containsKey(HeaderFramework.HOST)) { + // the HTTP/1.1 specification requires that an HTTP/1.1 server must reject any + // HTTP/1.1 message that does not contain a Host header. + HTTPDemon.sendRespondError(prop,theSession.out,0,400,null,null,null); + throw new IOException("400 Bad request"); + } + + return header; + } + } diff --git a/source/de/anomic/http/server/ServerSideIncludes.java b/source/de/anomic/http/server/ServerSideIncludes.java index 8bd2f8a7a..e406e3618 100644 --- a/source/de/anomic/http/server/ServerSideIncludes.java +++ b/source/de/anomic/http/server/ServerSideIncludes.java @@ -31,6 +31,8 @@ import java.io.IOException; import java.io.OutputStream; import java.util.Properties; +import net.yacy.cora.protocol.HeaderFramework; +import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.util.ByteBuffer; diff --git a/source/de/anomic/net/UPnP.java b/source/de/anomic/net/UPnP.java index 81285e576..b1c5d0429 100644 --- a/source/de/anomic/net/UPnP.java +++ b/source/de/anomic/net/UPnP.java @@ -30,8 +30,8 @@ import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; +import net.yacy.cora.protocol.Domains; import net.yacy.kelondro.logging.Log; -import net.yacy.kelondro.util.Domains; import net.yacy.upnp.DiscoveryAdvertisement; import net.yacy.upnp.DiscoveryEventHandler; import net.yacy.upnp.devices.UPNPRootDevice; diff --git a/source/de/anomic/search/Switchboard.java b/source/de/anomic/search/Switchboard.java index fb6e98758..2159624ce 100644 --- a/source/de/anomic/search/Switchboard.java +++ b/source/de/anomic/search/Switchboard.java @@ -73,6 +73,10 @@ import java.util.zip.ZipInputStream; import net.yacy.cora.document.MultiProtocolURI; import net.yacy.cora.document.RSSMessage; import net.yacy.cora.protocol.ConnectionInfo; +import net.yacy.cora.protocol.Domains; +import net.yacy.cora.protocol.HeaderFramework; +import net.yacy.cora.protocol.RequestHeader; +import net.yacy.cora.protocol.ResponseHeader; import net.yacy.cora.protocol.http.HTTPClient; import net.yacy.cora.protocol.http.ProxySettings; import net.yacy.document.Condenser; @@ -94,7 +98,6 @@ import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.order.Digest; import net.yacy.kelondro.order.NaturalOrder; import net.yacy.kelondro.util.DateFormatter; -import net.yacy.kelondro.util.Domains; import net.yacy.kelondro.util.EventTracker; import net.yacy.kelondro.util.FileUtils; import net.yacy.kelondro.util.MemoryControl; @@ -139,9 +142,6 @@ import de.anomic.data.wiki.wikiCode; import de.anomic.data.wiki.wikiParser; import de.anomic.http.client.Cache; 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.http.server.RobotsTxtConfig; import de.anomic.net.UPnP; import de.anomic.search.blockrank.CRDistribution; diff --git a/source/de/anomic/search/TextSnippet.java b/source/de/anomic/search/TextSnippet.java index c7dd53a14..8300356f0 100644 --- a/source/de/anomic/search/TextSnippet.java +++ b/source/de/anomic/search/TextSnippet.java @@ -31,6 +31,8 @@ import java.util.TreeMap; import java.util.regex.Matcher; import java.util.regex.Pattern; +import net.yacy.cora.storage.ARC; +import net.yacy.cora.storage.ConcurrentARC; import net.yacy.document.Condenser; import net.yacy.document.Document; import net.yacy.document.Parser; @@ -38,8 +40,6 @@ import net.yacy.document.parser.html.CharacterCoding; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.data.meta.URIMetadataRow; import net.yacy.kelondro.data.word.Word; -import net.yacy.kelondro.index.ARC; -import net.yacy.kelondro.index.ConcurrentARC; import net.yacy.kelondro.index.HandleSet; import net.yacy.kelondro.index.RowSpaceExceededException; import net.yacy.kelondro.logging.Log; diff --git a/source/de/anomic/server/serverCore.java b/source/de/anomic/server/serverCore.java index 27a677c86..1a8c7b331 100644 --- a/source/de/anomic/server/serverCore.java +++ b/source/de/anomic/server/serverCore.java @@ -58,9 +58,9 @@ import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSocket; import javax.net.ssl.SSLSocketFactory; +import net.yacy.cora.protocol.Domains; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.util.ByteBuffer; -import net.yacy.kelondro.util.Domains; import net.yacy.kelondro.workflow.AbstractBusyThread; import net.yacy.kelondro.workflow.BusyThread; diff --git a/source/de/anomic/server/serverSwitch.java b/source/de/anomic/server/serverSwitch.java index 829aca2d7..eb3359bf9 100644 --- a/source/de/anomic/server/serverSwitch.java +++ b/source/de/anomic/server/serverSwitch.java @@ -31,8 +31,8 @@ import java.util.Map; import java.util.TreeMap; import java.util.concurrent.ConcurrentHashMap; +import net.yacy.cora.protocol.Domains; import net.yacy.kelondro.logging.Log; -import net.yacy.kelondro.util.Domains; import net.yacy.kelondro.util.FileUtils; import net.yacy.kelondro.workflow.BusyThread; import net.yacy.kelondro.workflow.WorkflowThread; diff --git a/source/de/anomic/server/servletProperties.java b/source/de/anomic/server/servletProperties.java index 142a62ced..7fc91c031 100644 --- a/source/de/anomic/server/servletProperties.java +++ b/source/de/anomic/server/servletProperties.java @@ -21,7 +21,7 @@ // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 US package de.anomic.server; -import de.anomic.http.server.ResponseHeader; +import net.yacy.cora.protocol.ResponseHeader; public class servletProperties extends serverObjects { diff --git a/source/de/anomic/yacy/yacyRelease.java b/source/de/anomic/yacy/yacyRelease.java index b2776b860..d005e0cb6 100644 --- a/source/de/anomic/yacy/yacyRelease.java +++ b/source/de/anomic/yacy/yacyRelease.java @@ -46,6 +46,9 @@ import java.util.TreeSet; import java.util.concurrent.ConcurrentHashMap; import net.yacy.cora.document.MultiProtocolURI; +import net.yacy.cora.protocol.HeaderFramework; +import net.yacy.cora.protocol.RequestHeader; +import net.yacy.cora.protocol.ResponseHeader; import net.yacy.cora.protocol.http.HTTPClient; import net.yacy.document.parser.html.ContentScraper; import net.yacy.kelondro.io.CharBuffer; @@ -57,10 +60,7 @@ import net.yacy.kelondro.util.OS; import de.anomic.crawler.CrawlProfile; 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.http.server.ResponseContainer; -import de.anomic.http.server.ResponseHeader; import de.anomic.search.Switchboard; import de.anomic.server.serverCore; import de.anomic.tools.CryptoLib; diff --git a/source/de/anomic/yacy/yacySeedDB.java b/source/de/anomic/yacy/yacySeedDB.java index ca4e102fa..5a320cb83 100644 --- a/source/de/anomic/yacy/yacySeedDB.java +++ b/source/de/anomic/yacy/yacySeedDB.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.TreeMap; import java.util.concurrent.ConcurrentHashMap; +import net.yacy.cora.protocol.HeaderFramework; +import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.protocol.http.HTTPClient; import net.yacy.kelondro.blob.MapDataMining; import net.yacy.kelondro.data.meta.DigestURI; @@ -54,8 +56,6 @@ import de.anomic.crawler.retrieval.HTTPLoader; //import de.anomic.http.client.Client; import de.anomic.http.server.HTTPDemon; import de.anomic.http.server.AlternativeDomainNames; -import de.anomic.http.server.HeaderFramework; -import de.anomic.http.server.RequestHeader; //import de.anomic.http.server.ResponseContainer; import de.anomic.search.Switchboard; import de.anomic.server.serverCore; diff --git a/source/net/yacy/cora/document/MultiProtocolURI.java b/source/net/yacy/cora/document/MultiProtocolURI.java index 1459922bc..32be6b19a 100644 --- a/source/net/yacy/cora/document/MultiProtocolURI.java +++ b/source/net/yacy/cora/document/MultiProtocolURI.java @@ -41,9 +41,9 @@ import jcifs.smb.SmbFile; import jcifs.smb.SmbFileInputStream; import net.yacy.cora.document.Punycode.PunycodeException; +import net.yacy.cora.protocol.Domains; import net.yacy.cora.protocol.ftp.FTPClient; import net.yacy.cora.protocol.http.HTTPClient; -import net.yacy.kelondro.util.Domains; /** * MultiProtocolURI provides a URL object for multiple protocols like http, https, ftp, smb and file diff --git a/source/net/yacy/cora/document/RSSMessage.java b/source/net/yacy/cora/document/RSSMessage.java index 363a1f764..6341eafde 100644 --- a/source/net/yacy/cora/document/RSSMessage.java +++ b/source/net/yacy/cora/document/RSSMessage.java @@ -27,8 +27,8 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import de.anomic.http.server.HeaderFramework; +import net.yacy.cora.protocol.HeaderFramework; import net.yacy.kelondro.util.DateFormatter; public class RSSMessage implements Hit { diff --git a/source/net/yacy/cora/document/RSSReader.java b/source/net/yacy/cora/document/RSSReader.java index a699f7f1c..8236d8075 100644 --- a/source/net/yacy/cora/document/RSSReader.java +++ b/source/net/yacy/cora/document/RSSReader.java @@ -41,7 +41,7 @@ public class RSSReader extends DefaultHandler { private boolean parsingChannel, parsingImage, parsingItem; private final RSSFeed theChannel; - public RSSReader(int maxsize) { + private RSSReader(int maxsize) { theChannel = new RSSFeed(maxsize); buffer = new StringBuilder(); item = null; diff --git a/source/net/yacy/kelondro/util/Domains.java b/source/net/yacy/cora/protocol/Domains.java similarity index 94% rename from source/net/yacy/kelondro/util/Domains.java rename to source/net/yacy/cora/protocol/Domains.java index a389c6bd6..2078861d4 100644 --- a/source/net/yacy/kelondro/util/Domains.java +++ b/source/net/yacy/cora/protocol/Domains.java @@ -1,31 +1,24 @@ -// Domains.java -// ----------------------------- -// (C) 2007 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany -// first published 23.07.2007 on http://yacy.net -// -// This is a part of YaCy, a peer-to-peer based web search engine -// -// $LastChangedDate: 2006-04-02 22:40:07 +0200 (So, 02 Apr 2006) $ -// $LastChangedRevision: 1986 $ -// $LastChangedBy: orbiter $ -// -// LICENSE -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +/** + * Domains + * Copyright 2007 by Michael Peter Christen, mc@yacy.net, Frankfurt a. M., Germany + * First released 23.7.2007 at http://yacy.net + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program in the file lgpl21.txt + * If not, see . + */ -package net.yacy.kelondro.util; +package net.yacy.cora.protocol; import java.net.InetAddress; import java.net.UnknownHostException; @@ -37,8 +30,8 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.regex.Pattern; -import net.yacy.kelondro.index.ARC; -import net.yacy.kelondro.index.ConcurrentARC; +import net.yacy.cora.storage.ARC; +import net.yacy.cora.storage.ConcurrentARC; public class Domains { diff --git a/source/de/anomic/http/server/HeaderFramework.java b/source/net/yacy/cora/protocol/HeaderFramework.java similarity index 91% rename from source/de/anomic/http/server/HeaderFramework.java rename to source/net/yacy/cora/protocol/HeaderFramework.java index 07d49cd4c..89f06627f 100644 --- a/source/de/anomic/http/server/HeaderFramework.java +++ b/source/net/yacy/cora/protocol/HeaderFramework.java @@ -1,39 +1,24 @@ -// HeaderFramework.java -// ----------------------- -// (C) by Michael Peter Christen; mc@yacy.net -// first published on http://www.anomic.de -// Frankfurt, Germany, 2004 -// -// last major change: $LastChangedDate$ by $LastChangedBy$ -// Revision: $LastChangedRevision$ -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +/** + * HeaderFramework + * Copyright 2004 by Michael Peter Christen, mc@yacy.net, Frankfurt a. M., Germany + * First released 2004 at http://yacy.net + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program in the file lgpl21.txt + * If not, see . + */ -/* - Documentation: - this class implements a key-value mapping, as a hashtable - The difference to ordinary hashtable implementations is that the - keys are not compared by the equal() method, but are always - treated as string and compared as - key.uppercase().equal(.uppercase(comparator)) - You use this class by first creation of a static HashMap - that then is used a the reverse mapping cache for every new - instance of this class. -*/ - -package de.anomic.http.server; +package net.yacy.cora.protocol; import java.io.BufferedReader; import java.io.File; @@ -54,8 +39,21 @@ import java.util.TreeMap; import java.util.Vector; import java.util.concurrent.ConcurrentHashMap; +import de.anomic.http.server.HTTPDemon; + import net.yacy.cora.document.MultiProtocolURI; + +/** + * this class implements a key-value mapping, as a hashtable + * The difference to ordinary hashtable implementations is that the + * keys are not compared by the equal() method, but are always + * treated as string and compared as + * key.uppercase().equal(.uppercase(comparator)) + * You use this class by first creation of a static HashMap + * that then is used a the reverse mapping cache for every new + * instance of this class. + */ public class HeaderFramework extends TreeMap implements Map { @@ -243,7 +241,7 @@ public class HeaderFramework extends TreeMap implements Map implements Map. + */ -package de.anomic.http.server; +package net.yacy.cora.protocol; -import java.io.IOException; import java.net.MalformedURLException; import java.util.Date; import java.util.Map; import java.util.Properties; import java.util.regex.Pattern; +import de.anomic.http.server.HTTPDemon; + import net.yacy.cora.document.MultiProtocolURI; -import de.anomic.server.serverCore; public class RequestHeader extends HeaderFramework { @@ -232,36 +229,6 @@ public class RequestHeader extends HeaderFramework { prop.setProperty(CONNECTION_PROP_EXT, ext); return prop; - } - - public static RequestHeader readHeader(final Properties prop, final serverCore.Session theSession) throws IOException { - - // reading all headers - final RequestHeader header = new RequestHeader(HTTPDemon.reverseMappingCache); - int p; - String line; - while ((line = theSession.readLineAsString()) != null) { - if (line.length() == 0) break; // this separates the header of the HTTP request from the body - // parse the header line: a property separated with the ':' sign - if ((p = line.indexOf(':')) >= 0) { - // store a property - header.add(line.substring(0, p).trim(), line.substring(p + 1).trim()); - } - } - - /* - * doing some header validation here ... - */ - final String httpVersion = prop.getProperty(HeaderFramework.CONNECTION_PROP_HTTP_VER, "HTTP/0.9"); - if (httpVersion.equals("HTTP/1.1") && !header.containsKey(HeaderFramework.HOST)) { - // the HTTP/1.1 specification requires that an HTTP/1.1 server must reject any - // HTTP/1.1 message that does not contain a Host header. - HTTPDemon.sendRespondError(prop,theSession.out,0,400,null,null,null); - throw new IOException("400 Bad request"); - } - - return header; } - } diff --git a/source/de/anomic/http/server/ResponseHeader.java b/source/net/yacy/cora/protocol/ResponseHeader.java similarity index 80% rename from source/de/anomic/http/server/ResponseHeader.java rename to source/net/yacy/cora/protocol/ResponseHeader.java index 2d8223b49..568bb3670 100755 --- a/source/de/anomic/http/server/ResponseHeader.java +++ b/source/net/yacy/cora/protocol/ResponseHeader.java @@ -1,27 +1,24 @@ -// ResponseHeader.java -// ----------------------- -// (C) 2008 by Michael Peter Christen; mc@yacy.net -// first published on http://yacy.net -// Frankfurt, Germany, 22.08.2008 -// -// last major change: $LastChangedDate$ by $LastChangedBy$ -// Revision: $LastChangedRevision$ -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +/** + * ResponseHeader + * Copyright 2008 by Michael Peter Christen, mc@yacy.net, Frankfurt a. M., Germany + * First released 22.08.2008 at http://yacy.net + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program in the file lgpl21.txt + * If not, see . + */ -package de.anomic.http.server; +package net.yacy.cora.protocol; import java.nio.charset.Charset; import java.nio.charset.IllegalCharsetNameException; @@ -34,6 +31,7 @@ import org.apache.http.Header; import org.apache.log4j.Logger; + public class ResponseHeader extends HeaderFramework { // response header properties diff --git a/source/net/yacy/cora/protocol/ftp/FTPClient.java b/source/net/yacy/cora/protocol/ftp/FTPClient.java index b4e1ec248..8b4b9f519 100644 --- a/source/net/yacy/cora/protocol/ftp/FTPClient.java +++ b/source/net/yacy/cora/protocol/ftp/FTPClient.java @@ -62,7 +62,7 @@ import java.util.StringTokenizer; import java.util.regex.Matcher; import java.util.regex.Pattern; -import net.yacy.kelondro.util.Domains; +import net.yacy.cora.protocol.Domains; import org.apache.log4j.Logger; diff --git a/source/net/yacy/kelondro/index/ARC.java b/source/net/yacy/cora/storage/ARC.java similarity index 53% rename from source/net/yacy/kelondro/index/ARC.java rename to source/net/yacy/cora/storage/ARC.java index 757469663..862a72d68 100644 --- a/source/net/yacy/kelondro/index/ARC.java +++ b/source/net/yacy/cora/storage/ARC.java @@ -1,29 +1,25 @@ -// ARC.java -// an interface for Adaptive Replacement Caches -// (C) 2009 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany -// first published 29.08.2009 on http://yacy.net -// -// $LastChangedDate: 2006-04-02 22:40:07 +0200 (So, 02 Apr 2006) $ -// $LastChangedRevision: 1986 $ -// $LastChangedBy: orbiter $ -// -// LICENSE -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +/** + * ARC + * an interface for Adaptive Replacement Caches + * Copyright 2009 by Michael Peter Christen, mc@yacy.net, Frankfurt a. M., Germany + * First released 29.08.2009 at http://yacy.net + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program in the file lgpl21.txt + * If not, see . + */ -package net.yacy.kelondro.index; +package net.yacy.cora.storage; /** * This is a simple cache using two generations of hashtables to store the content with a LFU strategy. diff --git a/source/net/yacy/kelondro/index/ConcurrentARC.java b/source/net/yacy/cora/storage/ConcurrentARC.java similarity index 64% rename from source/net/yacy/kelondro/index/ConcurrentARC.java rename to source/net/yacy/cora/storage/ConcurrentARC.java index e188531e6..020cd894f 100644 --- a/source/net/yacy/kelondro/index/ConcurrentARC.java +++ b/source/net/yacy/cora/storage/ConcurrentARC.java @@ -1,29 +1,25 @@ -// ConcurrentARC.java -// a Simple Adaptive Replacement Cache -// (C) 2009 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany -// first published 17.04.2009 on http://yacy.net -// -// $LastChangedDate: 2006-04-02 22:40:07 +0200 (So, 02 Apr 2006) $ -// $LastChangedRevision: 1986 $ -// $LastChangedBy: orbiter $ -// -// LICENSE -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +/** + * ConcurrentARC + * Copyright 2009 by Michael Peter Christen, mc@yacy.net, Frankfurt a. M., Germany + * First released 17.04.2009 at http://yacy.net + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program in the file lgpl21.txt + * If not, see . + */ + +package net.yacy.cora.storage; -package net.yacy.kelondro.index; /** * This is a simple cache using two generations of hashtables to store the content with a LFU strategy. diff --git a/source/net/yacy/kelondro/index/SimpleARC.java b/source/net/yacy/cora/storage/SimpleARC.java similarity index 76% rename from source/net/yacy/kelondro/index/SimpleARC.java rename to source/net/yacy/cora/storage/SimpleARC.java index acbbc21a0..376c324ee 100644 --- a/source/net/yacy/kelondro/index/SimpleARC.java +++ b/source/net/yacy/cora/storage/SimpleARC.java @@ -1,33 +1,30 @@ -// SimpleARC.java -// a Simple Adaptive Replacement Cache -// (C) 2009 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany -// first published 17.04.2009 on http://yacy.net -// -// $LastChangedDate: 2006-04-02 22:40:07 +0200 (So, 02 Apr 2006) $ -// $LastChangedRevision: 1986 $ -// $LastChangedBy: orbiter $ -// -// LICENSE -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +/** + * SimpleARC + * a Simple Adaptive Replacement Cache + * Copyright 2009 by Michael Peter Christen, mc@yacy.net, Frankfurt a. M., Germany + * First released 17.04.2009 at http://yacy.net + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program in the file lgpl21.txt + * If not, see . + */ -package net.yacy.kelondro.index; +package net.yacy.cora.storage; import java.util.LinkedHashMap; import java.util.Map; + /** * This is a simple cache using two generations of hashtables to store the content with a LFU strategy. * The Algorithm is described in a slightly more complex version as Adaptive Replacement Cache, "ARC". diff --git a/source/net/yacy/kelondro/blob/BEncodedHeap.java b/source/net/yacy/kelondro/blob/BEncodedHeap.java index 5ce9f4493..c3e6ff549 100644 --- a/source/net/yacy/kelondro/blob/BEncodedHeap.java +++ b/source/net/yacy/kelondro/blob/BEncodedHeap.java @@ -48,7 +48,7 @@ import net.yacy.kelondro.util.BDecoder.BObject; * store a table of properties (instead of fixed-field entries) * this is realized using blobs and BEncoded property lists */ -public class BEncodedHeap implements Iterable>> { +public class BEncodedHeap implements /* Map>,*/ Iterable>> { private Heap table; private LinkedHashSet columnames; diff --git a/source/net/yacy/kelondro/blob/MapHeap.java b/source/net/yacy/kelondro/blob/MapHeap.java index 5fb4b4ac0..2fea3a1df 100644 --- a/source/net/yacy/kelondro/blob/MapHeap.java +++ b/source/net/yacy/kelondro/blob/MapHeap.java @@ -37,8 +37,8 @@ import java.util.Iterator; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import net.yacy.kelondro.index.ARC; -import net.yacy.kelondro.index.ConcurrentARC; +import net.yacy.cora.storage.ARC; +import net.yacy.cora.storage.ConcurrentARC; import net.yacy.kelondro.index.RowSpaceExceededException; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.ByteOrder; diff --git a/source/net/yacy/kelondro/data/meta/DigestURI.java b/source/net/yacy/kelondro/data/meta/DigestURI.java index 25db5e8d3..5cc87055c 100644 --- a/source/net/yacy/kelondro/data/meta/DigestURI.java +++ b/source/net/yacy/kelondro/data/meta/DigestURI.java @@ -32,11 +32,11 @@ import java.io.Serializable; import java.net.MalformedURLException; import net.yacy.cora.document.MultiProtocolURI; +import net.yacy.cora.protocol.Domains; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.order.Digest; import net.yacy.kelondro.util.ByteArray; -import net.yacy.kelondro.util.Domains; public class DigestURI extends MultiProtocolURI implements Serializable { diff --git a/source/net/yacy/kelondro/data/word/Word.java b/source/net/yacy/kelondro/data/word/Word.java index a7584ade2..4408e4007 100644 --- a/source/net/yacy/kelondro/data/word/Word.java +++ b/source/net/yacy/kelondro/data/word/Word.java @@ -31,8 +31,8 @@ import java.util.Iterator; import java.util.Locale; import java.util.Set; -import net.yacy.kelondro.index.ARC; -import net.yacy.kelondro.index.ConcurrentARC; +import net.yacy.cora.storage.ARC; +import net.yacy.cora.storage.ConcurrentARC; import net.yacy.kelondro.index.HandleSet; import net.yacy.kelondro.index.RowSpaceExceededException; import net.yacy.kelondro.logging.Log; diff --git a/source/net/yacy/kelondro/util/DateFormatter.java b/source/net/yacy/kelondro/util/DateFormatter.java index 60ccc5761..87d406cbb 100644 --- a/source/net/yacy/kelondro/util/DateFormatter.java +++ b/source/net/yacy/kelondro/util/DateFormatter.java @@ -72,7 +72,6 @@ public final class DateFormatter { private static final SimpleDateFormat FORMAT_ISO8601 = new SimpleDateFormat(PATTERN_ISO8601, Locale.US); /** Date formatter/parser for standard compliant HTTP header dates (RFC 1123) */ - private static final SimpleDateFormat FORMAT_RFC1123 = new SimpleDateFormat(PATTERN_RFC1123, Locale.US); private static final SimpleDateFormat FORMAT_ANSIC = new SimpleDateFormat(PATTERN_ANSIC, Locale.US); private static final SimpleDateFormat FORMAT_RFC1123_SHORT = new SimpleDateFormat(PATTERN_RFC1123_SHORT, Locale.US); @@ -109,21 +108,6 @@ public final class DateFormatter { if (date == null) return ""; return format(FORMAT_ANSIC, date); } - - private static long lastRFC1123long = 0; - private static String lastRFC1123string = ""; - - public static final String formatRFC1123(final Date date) { - if (date == null) return ""; - if (Math.abs(date.getTime() - lastRFC1123long) < 1000) { - //System.out.println("date cache hit - " + lastRFC1123string); - return lastRFC1123string; - } - String s = format(FORMAT_RFC1123, date); - lastRFC1123long = date.getTime(); - lastRFC1123string = s; - return s; - } public static String formatRFC1123_short(final Date date) { if (date == null) return ""; diff --git a/source/net/yacy/repository/LoaderDispatcher.java b/source/net/yacy/repository/LoaderDispatcher.java index f2820419d..6c8f33179 100644 --- a/source/net/yacy/repository/LoaderDispatcher.java +++ b/source/net/yacy/repository/LoaderDispatcher.java @@ -39,6 +39,9 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import net.yacy.cora.document.MultiProtocolURI; +import net.yacy.cora.protocol.HeaderFramework; +import net.yacy.cora.protocol.RequestHeader; +import net.yacy.cora.protocol.ResponseHeader; import net.yacy.document.Document; import net.yacy.document.Parser; import net.yacy.document.TextParser; @@ -56,9 +59,6 @@ import de.anomic.crawler.retrieval.Request; import de.anomic.crawler.retrieval.Response; import de.anomic.crawler.retrieval.SMBLoader; import de.anomic.http.client.Cache; -import de.anomic.http.server.HeaderFramework; -import de.anomic.http.server.RequestHeader; -import de.anomic.http.server.ResponseHeader; import de.anomic.search.Segments; import de.anomic.search.Switchboard; diff --git a/source/net/yacy/yacy.java b/source/net/yacy/yacy.java index 5f040a618..49c3d7d2d 100644 --- a/source/net/yacy/yacy.java +++ b/source/net/yacy/yacy.java @@ -46,6 +46,7 @@ import java.util.concurrent.Semaphore; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; +import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.protocol.http.HTTPClient; import net.yacy.gui.YaCyApp; import net.yacy.gui.framework.Browser; @@ -71,7 +72,6 @@ import net.yacy.kelondro.util.OS; import de.anomic.data.translator; //import de.anomic.http.client.Client; import de.anomic.http.server.HTTPDemon; -import de.anomic.http.server.RequestHeader; //import de.anomic.http.server.ResponseContainer; import de.anomic.search.MetadataRepository; import de.anomic.search.Segment; diff --git a/test/de/anomic/kelondro/util/DateFormatterTest.java b/test/de/anomic/kelondro/util/DateFormatterTest.java index 9b96b7cfe..4e8d406ac 100644 --- a/test/de/anomic/kelondro/util/DateFormatterTest.java +++ b/test/de/anomic/kelondro/util/DateFormatterTest.java @@ -2,7 +2,8 @@ package de.anomic.kelondro.util; import java.util.Date; -import de.anomic.http.server.HeaderFramework; +import net.yacy.cora.protocol.HeaderFramework; + import junit.framework.TestCase;