diff --git a/htroot/AccessTracker_p.java b/htroot/AccessTracker_p.java index 799f77ab3..6870cdc20 100644 --- a/htroot/AccessTracker_p.java +++ b/htroot/AccessTracker_p.java @@ -35,7 +35,7 @@ import java.util.TreeSet; import java.util.Map.Entry; import de.anomic.http.httpRequestHeader; -import de.anomic.kelondro.order.DateFormatter; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.net.natLib; import de.anomic.plasma.plasmaSearchQuery; import de.anomic.plasma.plasmaSwitchboard; diff --git a/htroot/Blog.java b/htroot/Blog.java index 5879370ad..c6760f957 100644 --- a/htroot/Blog.java +++ b/htroot/Blog.java @@ -37,7 +37,7 @@ import java.util.Iterator; import de.anomic.data.blogBoard; import de.anomic.data.userDB; import de.anomic.http.httpRequestHeader; -import de.anomic.kelondro.order.DateFormatter; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/Bookmarks.java b/htroot/Bookmarks.java index 9acbe4dfa..ef509ac1d 100644 --- a/htroot/Bookmarks.java +++ b/htroot/Bookmarks.java @@ -41,9 +41,9 @@ import de.anomic.data.listManager; import de.anomic.data.userDB; import de.anomic.data.bookmarksDB.Tag; import de.anomic.http.httpRequestHeader; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.text.MetadataRowContainer; import de.anomic.kelondro.text.URLMetadata; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.Log; import de.anomic.plasma.plasmaParserDocument; import de.anomic.plasma.plasmaSnippetCache; diff --git a/htroot/Connections_p.java b/htroot/Connections_p.java index e8a883f6c..c14cc2e99 100644 --- a/htroot/Connections_p.java +++ b/htroot/Connections_p.java @@ -37,7 +37,7 @@ import de.anomic.http.HttpConnectionInfo; import de.anomic.http.httpClient; import de.anomic.http.httpRequestHeader; import de.anomic.http.httpd; -import de.anomic.kelondro.order.DateFormatter; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.server.serverCore; import de.anomic.server.serverHandler; diff --git a/htroot/CookieMonitorIncoming_p.java b/htroot/CookieMonitorIncoming_p.java index 33d9376c2..945b516ab 100644 --- a/htroot/CookieMonitorIncoming_p.java +++ b/htroot/CookieMonitorIncoming_p.java @@ -29,7 +29,7 @@ import java.util.Iterator; import java.util.Map; import de.anomic.http.httpRequestHeader; -import de.anomic.kelondro.order.DateFormatter; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/CookieMonitorOutgoing_p.java b/htroot/CookieMonitorOutgoing_p.java index 3fbe652fa..d3b6c2dfd 100644 --- a/htroot/CookieMonitorOutgoing_p.java +++ b/htroot/CookieMonitorOutgoing_p.java @@ -29,7 +29,7 @@ import java.util.Iterator; import java.util.Map; import de.anomic.http.httpRequestHeader; -import de.anomic.kelondro.order.DateFormatter; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/IndexControlURLs_p.java b/htroot/IndexControlURLs_p.java index 917d7d51a..1da46f785 100644 --- a/htroot/IndexControlURLs_p.java +++ b/htroot/IndexControlURLs_p.java @@ -32,11 +32,11 @@ import java.util.Iterator; import de.anomic.http.httpRequestHeader; import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.order.RotateIterator; import de.anomic.kelondro.text.MetadataRowContainer; import de.anomic.kelondro.text.URLMetadata; import de.anomic.kelondro.text.MetadataRepository; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/IndexImport_p.java b/htroot/IndexImport_p.java index 5a5be1fd2..51dade8ca 100644 --- a/htroot/IndexImport_p.java +++ b/htroot/IndexImport_p.java @@ -35,8 +35,8 @@ import java.util.Date; import de.anomic.crawler.Importer; import de.anomic.crawler.NoticeURLImporter; import de.anomic.http.httpRequestHeader; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.util.ByteBuffer; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/Messages_p.java b/htroot/Messages_p.java index ab477538d..9f4f58696 100644 --- a/htroot/Messages_p.java +++ b/htroot/Messages_p.java @@ -34,7 +34,7 @@ import java.util.TreeMap; import de.anomic.data.messageBoard; import de.anomic.http.httpRequestHeader; -import de.anomic.kelondro.order.DateFormatter; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.FileUtils; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.server.serverObjects; diff --git a/htroot/Network.java b/htroot/Network.java index 80b2838c6..c2baf1992 100644 --- a/htroot/Network.java +++ b/htroot/Network.java @@ -38,7 +38,7 @@ import java.util.regex.PatternSyntaxException; import de.anomic.crawler.HTTPLoader; import de.anomic.http.httpClient; import de.anomic.http.httpRequestHeader; -import de.anomic.kelondro.order.DateFormatter; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.plasma.plasmaSwitchboardConstants; import de.anomic.server.serverCodings; diff --git a/htroot/News.java b/htroot/News.java index 29adeaabf..d34d98749 100644 --- a/htroot/News.java +++ b/htroot/News.java @@ -30,7 +30,7 @@ import java.util.Map; import java.util.Map.Entry; import de.anomic.http.httpRequestHeader; -import de.anomic.kelondro.order.DateFormatter; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/SettingsAck_p.java b/htroot/SettingsAck_p.java index 1c655d747..5848d25ce 100644 --- a/htroot/SettingsAck_p.java +++ b/htroot/SettingsAck_p.java @@ -43,8 +43,8 @@ import de.anomic.http.httpRemoteProxyConfig; import de.anomic.http.httpd; import de.anomic.http.httpdProxyHandler; import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.order.Digest; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.plasma.plasmaParser; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.server.serverCore; diff --git a/htroot/Status.java b/htroot/Status.java index 72f217aaf..357b15a82 100644 --- a/htroot/Status.java +++ b/htroot/Status.java @@ -33,7 +33,7 @@ import de.anomic.http.httpRequestHeader; import de.anomic.http.httpd; import de.anomic.http.httpdByteCountInputStream; import de.anomic.http.httpdByteCountOutputStream; -import de.anomic.kelondro.order.DateFormatter; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.MemoryControl; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.plasma.plasmaSwitchboardConstants; diff --git a/htroot/Supporter.java b/htroot/Supporter.java index 2ad55e505..208f21ae2 100644 --- a/htroot/Supporter.java +++ b/htroot/Supporter.java @@ -34,9 +34,9 @@ import java.util.Iterator; import de.anomic.http.httpRequestHeader; import de.anomic.kelondro.index.Row; import de.anomic.kelondro.index.Row.Entry; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.order.NaturalOrder; import de.anomic.kelondro.text.Blacklist; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.ScoreCluster; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.server.serverObjects; diff --git a/htroot/Surftips.java b/htroot/Surftips.java index c17716266..d48743578 100644 --- a/htroot/Surftips.java +++ b/htroot/Surftips.java @@ -34,9 +34,9 @@ import java.util.Iterator; import de.anomic.http.httpRequestHeader; import de.anomic.kelondro.index.Row; import de.anomic.kelondro.index.Row.Entry; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.order.NaturalOrder; import de.anomic.kelondro.text.Blacklist; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.ScoreCluster; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.server.serverObjects; diff --git a/htroot/api/bookmarks/get_bookmarks.java b/htroot/api/bookmarks/get_bookmarks.java index 2f7e49282..5fedd7025 100644 --- a/htroot/api/bookmarks/get_bookmarks.java +++ b/htroot/api/bookmarks/get_bookmarks.java @@ -7,7 +7,7 @@ import de.anomic.data.bookmarksDB; import de.anomic.data.userDB; import de.anomic.htmlFilter.htmlFilterCharacterCoding; import de.anomic.http.httpRequestHeader; -import de.anomic.kelondro.order.DateFormatter; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.plasma.plasmaSwitchboard; 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 80538336f..7d0ef1714 100755 --- a/htroot/api/bookmarks/posts/all.java +++ b/htroot/api/bookmarks/posts/all.java @@ -4,8 +4,8 @@ import java.util.Iterator; import de.anomic.data.bookmarksDB; import de.anomic.http.httpRequestHeader; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.order.Digest; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.plasma.plasmaSwitchboard; 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 8138c9ac2..c52b9c805 100755 --- a/htroot/api/bookmarks/posts/get.java +++ b/htroot/api/bookmarks/posts/get.java @@ -7,8 +7,8 @@ import java.util.Iterator; import de.anomic.data.bookmarksDB; import de.anomic.http.httpRequestHeader; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.order.Digest; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.plasma.plasmaSwitchboard; 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 676b259cb..7b1174e64 100755 --- a/htroot/api/bookmarks/xbel/xbel.java +++ b/htroot/api/bookmarks/xbel/xbel.java @@ -6,7 +6,7 @@ import java.util.Iterator; import de.anomic.data.bookmarksDB; import de.anomic.htmlFilter.htmlFilterCharacterCoding; import de.anomic.http.httpRequestHeader; -import de.anomic.kelondro.order.DateFormatter; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/cytag.java b/htroot/cytag.java index ce382b8b4..2bb7d3929 100644 --- a/htroot/cytag.java +++ b/htroot/cytag.java @@ -32,7 +32,7 @@ import java.util.Date; import de.anomic.htmlFilter.htmlFilterCharacterCoding; import de.anomic.http.httpRequestHeader; -import de.anomic.kelondro.order.DateFormatter; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.FileUtils; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.server.serverObjects; diff --git a/htroot/favicon.ico b/htroot/favicon.ico index 35c4a8f89..857c245fe 100644 Binary files a/htroot/favicon.ico and b/htroot/favicon.ico differ diff --git a/htroot/rct_p.java b/htroot/rct_p.java index 32147db53..f2c80e9da 100644 --- a/htroot/rct_p.java +++ b/htroot/rct_p.java @@ -32,7 +32,7 @@ import java.util.Iterator; import de.anomic.crawler.CrawlEntry; import de.anomic.http.httpRequestHeader; -import de.anomic.kelondro.order.DateFormatter; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/yacy/query.java b/htroot/yacy/query.java index 9fc232463..7e636dec7 100644 --- a/htroot/yacy/query.java +++ b/htroot/yacy/query.java @@ -28,7 +28,7 @@ // if the shell's current path is HTROOT import de.anomic.http.httpRequestHeader; -import de.anomic.kelondro.order.DateFormatter; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/yacy/transferURL.java b/htroot/yacy/transferURL.java index d5f452b3a..33e41e671 100644 --- a/htroot/yacy/transferURL.java +++ b/htroot/yacy/transferURL.java @@ -30,10 +30,10 @@ import java.io.IOException; import java.text.ParseException; import de.anomic.http.httpRequestHeader; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.text.MetadataRowContainer; import de.anomic.kelondro.text.URLMetadata; import de.anomic.kelondro.text.Blacklist; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.server.serverCore; import de.anomic.server.serverObjects; diff --git a/htroot/yacy/urls.java b/htroot/yacy/urls.java index 4c6ead6d0..4adf109ee 100644 --- a/htroot/yacy/urls.java +++ b/htroot/yacy/urls.java @@ -30,9 +30,9 @@ import java.util.Date; import de.anomic.crawler.CrawlEntry; import de.anomic.crawler.NoticedURL; import de.anomic.http.httpRequestHeader; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.text.MetadataRowContainer; import de.anomic.kelondro.text.URLMetadata; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/source/de/anomic/crawler/CrawlQueues.java b/source/de/anomic/crawler/CrawlQueues.java index a59fff7e6..9b52169bc 100644 --- a/source/de/anomic/crawler/CrawlQueues.java +++ b/source/de/anomic/crawler/CrawlQueues.java @@ -36,9 +36,9 @@ import java.util.Iterator; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.table.FlexWidthArray; import de.anomic.kelondro.text.Document; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.Log; import de.anomic.plasma.plasmaParser; import de.anomic.plasma.plasmaSwitchboard; diff --git a/source/de/anomic/crawler/FTPLoader.java b/source/de/anomic/crawler/FTPLoader.java index b6d5ac86f..6d3adfff9 100644 --- a/source/de/anomic/crawler/FTPLoader.java +++ b/source/de/anomic/crawler/FTPLoader.java @@ -35,8 +35,8 @@ import java.util.Date; import de.anomic.http.httpRequestHeader; import de.anomic.http.httpResponseHeader; import de.anomic.http.httpdProxyCacheEntry; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.text.Document; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.Log; import de.anomic.net.ftpc; import de.anomic.plasma.plasmaHTCache; diff --git a/source/de/anomic/crawler/IndexingStack.java b/source/de/anomic/crawler/IndexingStack.java index 3838db5f9..0efe849eb 100644 --- a/source/de/anomic/crawler/IndexingStack.java +++ b/source/de/anomic/crawler/IndexingStack.java @@ -37,10 +37,10 @@ import java.util.concurrent.ConcurrentHashMap; import de.anomic.http.httpResponseHeader; import de.anomic.kelondro.index.Row; import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.order.NaturalOrder; import de.anomic.kelondro.table.Stack; import de.anomic.kelondro.text.MetadataRowContainer; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.Log; import de.anomic.plasma.plasmaHTCache; import de.anomic.plasma.plasmaSwitchboardConstants; diff --git a/source/de/anomic/crawler/RobotsTxt.java b/source/de/anomic/crawler/RobotsTxt.java index 772c88ba4..516e1b05d 100644 --- a/source/de/anomic/crawler/RobotsTxt.java +++ b/source/de/anomic/crawler/RobotsTxt.java @@ -46,9 +46,9 @@ import de.anomic.http.httpRequestHeader; import de.anomic.kelondro.blob.BLOB; import de.anomic.kelondro.blob.BLOBHeap; import de.anomic.kelondro.blob.MapView; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.order.NaturalOrder; import de.anomic.kelondro.util.ByteBuffer; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.kelondroException; import de.anomic.kelondro.util.Log; import de.anomic.kelondro.util.FileUtils; diff --git a/source/de/anomic/data/SitemapParser.java b/source/de/anomic/data/SitemapParser.java index 48877a67e..5d49a7002 100644 --- a/source/de/anomic/data/SitemapParser.java +++ b/source/de/anomic/data/SitemapParser.java @@ -45,8 +45,8 @@ import de.anomic.http.httpClient; import de.anomic.http.httpResponse; import de.anomic.http.httpRequestHeader; import de.anomic.http.httpdByteCountInputStream; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.text.MetadataRowContainer; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.Log; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.yacy.yacyURL; diff --git a/source/de/anomic/data/blogBoard.java b/source/de/anomic/data/blogBoard.java index 78eeaaf3f..faee7f7e6 100644 --- a/source/de/anomic/data/blogBoard.java +++ b/source/de/anomic/data/blogBoard.java @@ -50,8 +50,8 @@ import org.xml.sax.SAXException; import de.anomic.kelondro.blob.BLOBTree; import de.anomic.kelondro.blob.MapView; import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.order.NaturalOrder; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.kelondroException; import de.anomic.kelondro.util.Log; diff --git a/source/de/anomic/data/bookmarksDB.java b/source/de/anomic/data/bookmarksDB.java index d46d9b6ae..050b36fcb 100644 --- a/source/de/anomic/data/bookmarksDB.java +++ b/source/de/anomic/data/bookmarksDB.java @@ -67,9 +67,9 @@ import de.anomic.htmlFilter.htmlFilterWriter; import de.anomic.kelondro.blob.BLOBTree; import de.anomic.kelondro.blob.MapView; import de.anomic.kelondro.order.CloneableIterator; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.order.NaturalOrder; import de.anomic.kelondro.text.Word; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.kelondroException; import de.anomic.kelondro.util.Log; import de.anomic.kelondro.util.FileUtils; diff --git a/source/de/anomic/http/httpHeader.java b/source/de/anomic/http/httpHeader.java index bf32cb33a..837388e35 100644 --- a/source/de/anomic/http/httpHeader.java +++ b/source/de/anomic/http/httpHeader.java @@ -50,7 +50,7 @@ import java.util.Properties; import java.util.TreeMap; import java.util.Vector; -import de.anomic.kelondro.order.DateFormatter; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.yacy.yacyURL; diff --git a/source/de/anomic/http/httpRequestHeader.java b/source/de/anomic/http/httpRequestHeader.java index e5487e571..5a7670595 100755 --- a/source/de/anomic/http/httpRequestHeader.java +++ b/source/de/anomic/http/httpRequestHeader.java @@ -31,7 +31,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Properties; -import de.anomic.kelondro.order.DateFormatter; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.server.serverCore; public class httpRequestHeader extends httpHeader { diff --git a/source/de/anomic/http/httpd.java b/source/de/anomic/http/httpd.java index 605200644..9538121e3 100644 --- a/source/de/anomic/http/httpd.java +++ b/source/de/anomic/http/httpd.java @@ -63,9 +63,9 @@ import org.apache.commons.httpclient.ContentLengthInputStream; import de.anomic.data.userDB; import de.anomic.htmlFilter.htmlFilterCharacterCoding; import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.order.Digest; import de.anomic.kelondro.util.ByteBuffer; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.Log; import de.anomic.kelondro.util.FileUtils; import de.anomic.plasma.plasmaSwitchboard; diff --git a/source/de/anomic/http/httpdFileHandler.java b/source/de/anomic/http/httpdFileHandler.java index c9e4b23f9..f612c24e4 100644 --- a/source/de/anomic/http/httpdFileHandler.java +++ b/source/de/anomic/http/httpdFileHandler.java @@ -82,8 +82,8 @@ import java.util.zip.GZIPOutputStream; import de.anomic.htmlFilter.htmlFilterContentScraper; import de.anomic.htmlFilter.htmlFilterInputStream; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.util.ByteBuffer; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.Log; import de.anomic.kelondro.util.FileUtils; import de.anomic.plasma.plasmaParser; diff --git a/source/de/anomic/http/httpdProxyCacheEntry.java b/source/de/anomic/http/httpdProxyCacheEntry.java index cca265f17..f40e3a112 100755 --- a/source/de/anomic/http/httpdProxyCacheEntry.java +++ b/source/de/anomic/http/httpdProxyCacheEntry.java @@ -29,8 +29,8 @@ package de.anomic.http; import java.util.Date; import de.anomic.crawler.CrawlProfile; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.text.Document; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.plasma.plasmaHTCache; import de.anomic.yacy.yacyURL; diff --git a/source/de/anomic/http/httpdProxyHandler.java b/source/de/anomic/http/httpdProxyHandler.java index 566c95509..3f2c27a67 100644 --- a/source/de/anomic/http/httpdProxyHandler.java +++ b/source/de/anomic/http/httpdProxyHandler.java @@ -74,9 +74,9 @@ import java.util.zip.GZIPOutputStream; import de.anomic.crawler.HTTPLoader; import de.anomic.htmlFilter.htmlFilterContentTransformer; import de.anomic.htmlFilter.htmlFilterTransformer; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.text.Blacklist; import de.anomic.kelondro.text.Document; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.Log; import de.anomic.kelondro.util.FileUtils; import de.anomic.plasma.plasmaHTCache; diff --git a/source/de/anomic/icap/icapd.java b/source/de/anomic/icap/icapd.java index 12c60b276..8c1f4548d 100644 --- a/source/de/anomic/icap/icapd.java +++ b/source/de/anomic/icap/icapd.java @@ -40,8 +40,8 @@ import de.anomic.http.httpChunkedInputStream; import de.anomic.http.httpRequestHeader; import de.anomic.http.httpResponseHeader; import de.anomic.http.httpdProxyCacheEntry; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.text.Document; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.Log; import de.anomic.kelondro.util.FileUtils; import de.anomic.plasma.plasmaHTCache; diff --git a/source/de/anomic/kelondro/blob/BLOBArray.java b/source/de/anomic/kelondro/blob/BLOBArray.java index 9ca788b6f..f57fa3689 100755 --- a/source/de/anomic/kelondro/blob/BLOBArray.java +++ b/source/de/anomic/kelondro/blob/BLOBArray.java @@ -38,9 +38,9 @@ import java.util.concurrent.CopyOnWriteArrayList; import de.anomic.kelondro.order.ByteOrder; import de.anomic.kelondro.order.CloneableIterator; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.order.NaturalOrder; import de.anomic.kelondro.order.MergeIterator; +import de.anomic.kelondro.util.DateFormatter; public class BLOBArray implements BLOB { diff --git a/source/de/anomic/kelondro/blob/MapView.java b/source/de/anomic/kelondro/blob/MapView.java index f0eb86db6..8748da2b8 100644 --- a/source/de/anomic/kelondro/blob/MapView.java +++ b/source/de/anomic/kelondro/blob/MapView.java @@ -37,9 +37,9 @@ import java.util.Iterator; import java.util.Map; import de.anomic.kelondro.order.CloneableIterator; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.order.NaturalOrder; import de.anomic.kelondro.order.RotateIterator; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.ScoreCluster; import de.anomic.kelondro.util.kelondroException; diff --git a/source/de/anomic/kelondro/text/MetadataRowContainer.java b/source/de/anomic/kelondro/text/MetadataRowContainer.java index 6f96b9258..37b28610c 100644 --- a/source/de/anomic/kelondro/text/MetadataRowContainer.java +++ b/source/de/anomic/kelondro/text/MetadataRowContainer.java @@ -37,9 +37,9 @@ import de.anomic.crawler.CrawlEntry; import de.anomic.kelondro.index.Row; import de.anomic.kelondro.order.Base64Order; import de.anomic.kelondro.order.Bitfield; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.order.Digest; import de.anomic.kelondro.order.NaturalOrder; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.FileUtils; import de.anomic.kelondro.util.kelondroException; import de.anomic.plasma.plasmaSearchQuery; diff --git a/source/de/anomic/kelondro/order/DateFormatter.java b/source/de/anomic/kelondro/util/DateFormatter.java similarity index 97% rename from source/de/anomic/kelondro/order/DateFormatter.java rename to source/de/anomic/kelondro/util/DateFormatter.java index 30e9357a9..7f1d203fe 100644 --- a/source/de/anomic/kelondro/order/DateFormatter.java +++ b/source/de/anomic/kelondro/util/DateFormatter.java @@ -22,7 +22,7 @@ // this class is needed to replace the slow java built-in date method by a faster version -package de.anomic.kelondro.order; +package de.anomic.kelondro.util; import java.text.DateFormat; import java.text.ParseException; diff --git a/source/de/anomic/plasma/plasmaDbImporter.java b/source/de/anomic/plasma/plasmaDbImporter.java index 6227293a2..b4696c802 100644 --- a/source/de/anomic/plasma/plasmaDbImporter.java +++ b/source/de/anomic/plasma/plasmaDbImporter.java @@ -6,11 +6,11 @@ import java.util.TreeSet; import de.anomic.crawler.AbstractImporter; import de.anomic.crawler.Importer; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.text.MetadataRowContainer; import de.anomic.kelondro.text.Reference; import de.anomic.kelondro.text.ReferenceContainer; import de.anomic.kelondro.text.ReferenceRow; +import de.anomic.kelondro.util.DateFormatter; public class plasmaDbImporter extends AbstractImporter implements Importer { diff --git a/source/de/anomic/plasma/plasmaRankingCRProcess.java b/source/de/anomic/plasma/plasmaRankingCRProcess.java index f3977534b..8c827959c 100644 --- a/source/de/anomic/plasma/plasmaRankingCRProcess.java +++ b/source/de/anomic/plasma/plasmaRankingCRProcess.java @@ -36,11 +36,11 @@ import de.anomic.kelondro.index.ObjectIndex; import de.anomic.kelondro.order.Base64Order; import de.anomic.kelondro.order.Bitfield; import de.anomic.kelondro.order.CloneableIterator; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.order.MicroDate; import de.anomic.kelondro.table.EcoTable; import de.anomic.kelondro.text.IndexCollection; import de.anomic.kelondro.text.ReferenceContainer; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.MemoryControl; import de.anomic.kelondro.util.AttrSeq; import de.anomic.kelondro.util.FileUtils; diff --git a/source/de/anomic/plasma/plasmaSearchAPI.java b/source/de/anomic/plasma/plasmaSearchAPI.java index 59e165538..d0d4a6a55 100644 --- a/source/de/anomic/plasma/plasmaSearchAPI.java +++ b/source/de/anomic/plasma/plasmaSearchAPI.java @@ -34,10 +34,10 @@ import java.util.List; import de.anomic.data.listManager; import de.anomic.kelondro.order.Bitfield; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.text.MetadataRowContainer; import de.anomic.kelondro.text.Reference; import de.anomic.kelondro.text.Blacklist; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.server.serverObjects; import de.anomic.yacy.yacySeed; import de.anomic.yacy.yacyURL; diff --git a/source/de/anomic/plasma/plasmaSearchImages.java b/source/de/anomic/plasma/plasmaSearchImages.java index 21b062fbc..1ce82afb8 100644 --- a/source/de/anomic/plasma/plasmaSearchImages.java +++ b/source/de/anomic/plasma/plasmaSearchImages.java @@ -30,7 +30,7 @@ import java.util.Iterator; import de.anomic.htmlFilter.htmlFilterContentScraper; import de.anomic.htmlFilter.htmlFilterImageEntry; -import de.anomic.kelondro.order.DateFormatter; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.Log; import de.anomic.plasma.parser.ParserException; import de.anomic.yacy.yacyURL; diff --git a/source/de/anomic/plasma/plasmaSwitchboard.java b/source/de/anomic/plasma/plasmaSwitchboard.java index 50a3a807d..0a1cb14c2 100644 --- a/source/de/anomic/plasma/plasmaSwitchboard.java +++ b/source/de/anomic/plasma/plasmaSwitchboard.java @@ -137,13 +137,13 @@ import de.anomic.http.httpRequestHeader; import de.anomic.http.httpResponseHeader; import de.anomic.http.httpd; import de.anomic.http.httpdRobotsTxtConfig; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.order.Digest; import de.anomic.kelondro.order.NaturalOrder; import de.anomic.kelondro.text.Document; import de.anomic.kelondro.text.MetadataRowContainer; import de.anomic.kelondro.text.URLMetadata; import de.anomic.kelondro.text.Blacklist; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.FileUtils; import de.anomic.kelondro.util.Log; import de.anomic.kelondro.util.MemoryControl; diff --git a/source/de/anomic/plasma/plasmaWebStructure.java b/source/de/anomic/plasma/plasmaWebStructure.java index e06c69d9b..d67608cb1 100644 --- a/source/de/anomic/plasma/plasmaWebStructure.java +++ b/source/de/anomic/plasma/plasmaWebStructure.java @@ -38,8 +38,8 @@ import java.util.TreeMap; import java.util.TreeSet; import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.order.MicroDate; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.Log; import de.anomic.kelondro.util.FileUtils; import de.anomic.yacy.yacyURL; diff --git a/source/de/anomic/server/serverObjects.java b/source/de/anomic/server/serverObjects.java index b0927ba1a..db15d3fa6 100644 --- a/source/de/anomic/server/serverObjects.java +++ b/source/de/anomic/server/serverObjects.java @@ -53,7 +53,7 @@ import java.util.HashMap; import java.util.Map; import de.anomic.htmlFilter.htmlFilterCharacterCoding; -import de.anomic.kelondro.order.DateFormatter; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.tools.Formatter; diff --git a/source/de/anomic/yacy/dht/PeerSelection.java b/source/de/anomic/yacy/dht/PeerSelection.java index 9e1652cb8..efdad912b 100755 --- a/source/de/anomic/yacy/dht/PeerSelection.java +++ b/source/de/anomic/yacy/dht/PeerSelection.java @@ -29,10 +29,10 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.Log; import de.anomic.kelondro.util.kelondroException; import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.order.Digest; import de.anomic.kelondro.util.ScoreCluster; import de.anomic.yacy.yacyCore; diff --git a/source/de/anomic/yacy/yacyCore.java b/source/de/anomic/yacy/yacyCore.java index cb0eb7ae0..9995a47c2 100644 --- a/source/de/anomic/yacy/yacyCore.java +++ b/source/de/anomic/yacy/yacyCore.java @@ -51,7 +51,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import de.anomic.kelondro.order.DateFormatter; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.Log; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.server.serverCore; diff --git a/source/de/anomic/yacy/yacyNetwork.java b/source/de/anomic/yacy/yacyNetwork.java index 67cd31bae..580878602 100644 --- a/source/de/anomic/yacy/yacyNetwork.java +++ b/source/de/anomic/yacy/yacyNetwork.java @@ -34,8 +34,8 @@ import java.util.List; import org.apache.commons.httpclient.methods.multipart.Part; import de.anomic.http.DefaultCharsetStringPart; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.order.Digest; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.plasma.plasmaSwitchboardConstants; import de.anomic.server.serverObjects; diff --git a/source/de/anomic/yacy/yacyNewsDB.java b/source/de/anomic/yacy/yacyNewsDB.java index 41b1bc7b6..6ef23444e 100644 --- a/source/de/anomic/yacy/yacyNewsDB.java +++ b/source/de/anomic/yacy/yacyNewsDB.java @@ -52,8 +52,8 @@ import java.util.Iterator; import de.anomic.kelondro.index.Row; import de.anomic.kelondro.index.ObjectIndex; import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.table.EcoTable; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.kelondroException; import de.anomic.server.serverCodings; diff --git a/source/de/anomic/yacy/yacyNewsQueue.java b/source/de/anomic/yacy/yacyNewsQueue.java index b6ad86322..ea44c8e40 100644 --- a/source/de/anomic/yacy/yacyNewsQueue.java +++ b/source/de/anomic/yacy/yacyNewsQueue.java @@ -52,9 +52,9 @@ import java.util.Iterator; import de.anomic.kelondro.index.Column; import de.anomic.kelondro.index.Row; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.order.NaturalOrder; import de.anomic.kelondro.table.Stack; +import de.anomic.kelondro.util.DateFormatter; public class yacyNewsQueue { diff --git a/source/de/anomic/yacy/yacyNewsRecord.java b/source/de/anomic/yacy/yacyNewsRecord.java index e5f84ce43..1d77fc736 100644 --- a/source/de/anomic/yacy/yacyNewsRecord.java +++ b/source/de/anomic/yacy/yacyNewsRecord.java @@ -52,8 +52,8 @@ import java.util.Properties; import java.util.Map.Entry; import de.anomic.kelondro.index.Row; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.order.NaturalOrder; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.server.serverCodings; public class yacyNewsRecord { diff --git a/source/de/anomic/yacy/yacyPeerActions.java b/source/de/anomic/yacy/yacyPeerActions.java index d156679f0..1f8839fde 100644 --- a/source/de/anomic/yacy/yacyPeerActions.java +++ b/source/de/anomic/yacy/yacyPeerActions.java @@ -27,7 +27,7 @@ package de.anomic.yacy; import java.io.IOException; import java.util.HashMap; -import de.anomic.kelondro.order.DateFormatter; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.Log; import de.anomic.server.serverCodings; import de.anomic.xml.RSSFeed; diff --git a/source/de/anomic/yacy/yacySeed.java b/source/de/anomic/yacy/yacySeed.java index 529c1c68b..0861c7c31 100644 --- a/source/de/anomic/yacy/yacySeed.java +++ b/source/de/anomic/yacy/yacySeed.java @@ -56,9 +56,9 @@ import java.util.Set; import java.util.TreeMap; import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.order.Digest; import de.anomic.kelondro.text.Word; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.net.natLib; import de.anomic.server.serverCodings; import de.anomic.server.serverDomains; diff --git a/source/yacy.java b/source/yacy.java index 6a0f2ff87..6dc8aeaa9 100644 --- a/source/yacy.java +++ b/source/yacy.java @@ -56,13 +56,13 @@ import de.anomic.kelondro.blob.BLOBHeap; import de.anomic.kelondro.blob.MapDataMining; import de.anomic.kelondro.index.RowCollection; import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.text.MetadataRowContainer; import de.anomic.kelondro.text.Reference; import de.anomic.kelondro.text.ReferenceContainer; import de.anomic.kelondro.text.ReferenceRow; import de.anomic.kelondro.text.MetadataRepository; import de.anomic.kelondro.text.Word; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.MemoryControl; import de.anomic.kelondro.util.ScoreCluster; import de.anomic.kelondro.util.Log;