From 910a496c9f657adaa8560d068c5a2e29d9bdd68a Mon Sep 17 00:00:00 2001 From: Michael Peter Christen Date: Sun, 21 Jul 2024 18:02:58 +0200 Subject: [PATCH] replaced http links with https --- build.xml | 2 +- defaults/oaiListFriendsSource.xml | 4 +- defaults/yacy.init | 8 +- .../src/YaCySearchClient.java | 2 +- htroot/api/yacydoc.xml | 2 +- htroot/env/grafics/donate.html | 41 + htroot/js/Crawler.js | 4 +- htroot/portalsearch/yacy-portalsearch.js | 2 +- htroot/yacysearch.atom | 2 +- htroot/yacysearch.rss | 2 +- htroot/yacysearch_location.rss | 2 +- source/net/yacy/ai/OllamaClient.java | 66 +- source/net/yacy/ai/OpenAIClient.java | 92 +- .../net/yacy/cora/date/AbstractFormatter.java | 16 +- source/net/yacy/cora/date/DateFormatter.java | 8 +- .../net/yacy/cora/date/GenericFormatter.java | 26 +- .../net/yacy/cora/date/ISO8601Formatter.java | 56 +- source/net/yacy/cora/date/MicroDate.java | 16 +- source/net/yacy/cora/document/WordCache.java | 38 +- .../document/analysis/Classification.java | 32 +- .../yacy/cora/document/encoding/ASCII.java | 24 +- .../net/yacy/cora/document/encoding/UTF8.java | 12 +- .../net/yacy/cora/document/feed/Channel.java | 20 +- source/net/yacy/cora/document/feed/Hit.java | 58 +- .../net/yacy/cora/document/feed/RSSFeed.java | 26 +- .../yacy/cora/document/feed/RSSMessage.java | 74 +- .../yacy/cora/document/feed/RSSReader.java | 22 +- .../net/yacy/cora/document/id/AnchorURL.java | 36 +- .../net/yacy/cora/document/id/DigestURL.java | 34 +- .../cora/document/id/MultiProtocolURL.java | 174 +-- .../AbstractFederateSearchConnector.java | 2 +- .../federate/FederateSearchConnector.java | 2 +- .../cora/federate/FederateSearchManager.java | 2 +- .../federate/SolrFederateSearchConnector.java | 2 +- .../opensearch/OpenSearchConnector.java | 126 +- .../federate/opensearch/SRURSSConnector.java | 8 +- .../yacy/cora/federate/solr/FailCategory.java | 2 +- .../net/yacy/cora/federate/solr/FailType.java | 2 +- .../yacy/cora/federate/solr/ProcessType.java | 2 +- .../net/yacy/cora/federate/solr/Ranking.java | 2 +- .../federate/solr/SchemaConfiguration.java | 2 +- .../cora/federate/solr/SchemaDeclaration.java | 2 +- .../net/yacy/cora/federate/solr/SolrType.java | 2 +- .../solr/connector/AbstractSolrConnector.java | 2 +- .../solr/connector/EmbeddedSolrConnector.java | 2 +- .../solr/connector/MirrorSolrConnector.java | 2 +- .../solr/connector/RemoteSolrConnector.java | 2 +- .../solr/connector/ShardSelection.java | 2 +- .../solr/connector/SolrConnector.java | 2 +- .../solr/connector/SolrServerConnector.java | 2 +- .../solr/instance/EmbeddedInstance.java | 2 +- .../solr/instance/InstanceMirror.java | 2 +- .../solr/instance/RemoteInstance.java | 2 +- .../solr/instance/ResponseAccumulator.java | 2 +- .../federate/solr/instance/ServerMirror.java | 2 +- .../federate/solr/instance/ServerShard.java | 2 +- .../federate/solr/instance/ShardInstance.java | 2 +- .../federate/solr/instance/SolrInstance.java | 2 +- .../federate/solr/logic/AbstractTerm.java | 2 +- .../federate/solr/logic/BooleanLiteral.java | 2 +- .../federate/solr/logic/CatchallLiteral.java | 2 +- .../cora/federate/solr/logic/Conjunction.java | 2 +- .../cora/federate/solr/logic/Disjunction.java | 2 +- .../cora/federate/solr/logic/Literal.java | 2 +- .../cora/federate/solr/logic/LongLiteral.java | 2 +- .../cora/federate/solr/logic/Negation.java | 2 +- .../federate/solr/logic/StringLiteral.java | 2 +- .../yacy/cora/federate/solr/logic/Term.java | 2 +- .../cora/federate/solr/logic/TermTools.java | 2 +- .../EnhancedXMLResponseWriter.java | 2 +- .../FlatJSONResponseWriter.java | 2 +- .../GrepHTMLResponseWriter.java | 2 +- .../responsewriter/HTMLResponseWriter.java | 2 +- .../OpensearchResponseWriter.java | 2 +- .../responsewriter/YJsonResponseWriter.java | 2 +- .../cora/federate/yacy/CacheStrategy.java | 2 +- .../yacy/cora/federate/yacy/Distribution.java | 2 +- source/net/yacy/cora/federate/yacy/Peer.java | 2 +- source/net/yacy/cora/federate/yacy/Peers.java | 2 +- .../yacy/cora/federate/yacy/api/Network.java | 2 +- .../yacy/cora/language/phonetic/Phonetic.java | 2 +- source/net/yacy/cora/lod/Literal.java | 2 +- source/net/yacy/cora/lod/Node.java | 2 +- source/net/yacy/cora/lod/Syntax.java | 2 +- source/net/yacy/cora/lod/Vocabulary.java | 2 +- .../yacy/cora/lod/vocabulary/AnnoteaA.java | 2 +- .../yacy/cora/lod/vocabulary/AnnoteaB.java | 2 +- .../cora/lod/vocabulary/CreativeCommons.java | 2 +- source/net/yacy/cora/lod/vocabulary/DMOZ.java | 2 +- .../yacy/cora/lod/vocabulary/DublinCore.java | 2 +- source/net/yacy/cora/lod/vocabulary/Foaf.java | 2 +- source/net/yacy/cora/lod/vocabulary/Geo.java | 2 +- .../yacy/cora/lod/vocabulary/HttpHeader.java | 2 +- source/net/yacy/cora/lod/vocabulary/Owl.java | 2 +- source/net/yacy/cora/lod/vocabulary/Rdf.java | 2 +- .../cora/lod/vocabulary/YaCyMetadata.java | 2 +- source/net/yacy/cora/order/AbstractOrder.java | 2 +- source/net/yacy/cora/order/Order.java | 2 +- source/net/yacy/cora/order/RatingOrder.java | 2 +- .../net/yacy/cora/plugin/ClassProvider.java | 2 +- .../net/yacy/cora/protocol/ByteArrayBody.java | 2 +- .../cora/protocol/ClientIdentification.java | 38 +- source/net/yacy/cora/protocol/Domains.java | 2 +- .../yacy/cora/protocol/HeaderFramework.java | 2 +- .../net/yacy/cora/protocol/RequestHeader.java | 2 +- .../yacy/cora/protocol/ResponseHeader.java | 2 +- source/net/yacy/cora/protocol/Scanner.java | 2 +- .../yacy/cora/protocol/TimeoutRequest.java | 2 +- .../protocol/http/GzipCompressingEntity.java | 2 +- .../protocol/http/GzipRequestInterceptor.java | 2 +- .../http/GzipResponseInterceptor.java | 2 +- .../yacy/cora/protocol/http/HTTPClient.java | 2 +- .../cora/protocol/http/LinkExtractor.java | 2 +- .../cora/protocol/http/ProxySettings.java | 2 +- .../yacy/cora/sorting/AbstractScoreMap.java | 2 +- source/net/yacy/cora/sorting/Array.java | 2 +- .../yacy/cora/sorting/ClusteredScoreMap.java | 2 +- .../yacy/cora/sorting/ConcurrentScoreMap.java | 2 +- .../yacy/cora/sorting/OrderedScoreMap.java | 2 +- source/net/yacy/cora/sorting/Rating.java | 2 +- .../yacy/cora/sorting/ReversibleScoreMap.java | 2 +- .../yacy/cora/sorting/ScoreComparator.java | 2 +- source/net/yacy/cora/sorting/ScoreMap.java | 2 +- source/net/yacy/cora/sorting/Sortable.java | 2 +- .../sorting/WeakPriorityBlockingQueue.java | 2 +- source/net/yacy/cora/storage/ARC.java | 2 +- source/net/yacy/cora/storage/ARH.java | 2 +- .../yacy/cora/storage/AbstractMapStore.java | 2 +- .../net/yacy/cora/storage/ComparableARC.java | 2 +- .../net/yacy/cora/storage/ConcurrentARC.java | 2 +- .../net/yacy/cora/storage/ConcurrentARH.java | 2 +- .../net/yacy/cora/storage/Configuration.java | 2 +- source/net/yacy/cora/storage/Files.java | 2 +- source/net/yacy/cora/storage/HashARC.java | 2 +- source/net/yacy/cora/storage/KeyList.java | 2 +- source/net/yacy/cora/storage/MapStore.java | 2 +- .../cora/storage/OutOfLimitsException.java | 2 +- source/net/yacy/cora/storage/SimpleARC.java | 2 +- .../net/yacy/cora/storage/SizeLimitedMap.java | 2 +- .../net/yacy/cora/storage/SizeLimitedSet.java | 2 +- source/net/yacy/cora/storage/ZIPReader.java | 2 +- source/net/yacy/cora/storage/ZIPWriter.java | 2 +- source/net/yacy/cora/util/NumberTools.java | 2 +- .../cora/util/StringBuilderComparator.java | 2 +- source/net/yacy/crawler/Balancer.java | 2 +- source/net/yacy/crawler/HarvestProcess.java | 2 +- source/net/yacy/crawler/HostBalancer.java | 2 +- source/net/yacy/crawler/HostQueue.java | 2 +- .../net/yacy/crawler/RecrawlBusyThread.java | 2 +- source/net/yacy/crawler/data/Snapshots.java | 2 +- .../net/yacy/crawler/data/Transactions.java | 2 +- .../yacy/crawler/retrieval/FileLoader.java | 2 +- .../net/yacy/crawler/retrieval/RSSLoader.java | 2 +- source/net/yacy/document/AbstractParser.java | 2 +- source/net/yacy/document/Condenser.java | 2 +- source/net/yacy/document/DateDetection.java | 2 +- source/net/yacy/document/ImageParser.java | 2 +- .../net/yacy/document/LargeNumberCache.java | 2 +- source/net/yacy/document/Parser.java | 2 +- source/net/yacy/document/Phrase.java | 2 +- .../net/yacy/document/SnippetExtractor.java | 2 +- source/net/yacy/document/TextParser.java | 2 +- source/net/yacy/document/Tokenizer.java | 2 +- .../net/yacy/document/VocabularyScraper.java | 2 +- .../net/yacy/document/importer/Importer.java | 2 +- .../document/importer/MediawikiImporter.java | 2 +- .../importer/OAIListFriendsLoader.java | 2 +- .../document/importer/OAIPMHImporter.java | 2 +- .../yacy/document/importer/OAIPMHLoader.java | 2 +- .../document/importer/ResumptionToken.java | 2 +- .../net/yacy/document/parser/apkParser.java | 2 +- .../yacy/document/parser/audioTagParser.java | 2 +- .../net/yacy/document/parser/csvParser.java | 2 +- .../yacy/document/parser/genericParser.java | 2 +- .../yacy/document/parser/html/EmbedEntry.java | 2 +- .../yacy/document/parser/html/Evaluation.java | 2 +- .../net/yacy/document/parser/htmlParser.java | 2 +- .../document/parser/images/svgParser.java | 2 +- .../document/parser/linkScraperParser.java | 2 +- source/net/yacy/document/parser/mmParser.java | 2 +- .../net/yacy/document/parser/rdfParser.java | 2 +- .../net/yacy/document/parser/rssParser.java | 2 +- .../yacy/document/parser/sidAudioParser.java | 2 +- .../yacy/document/parser/sitemapParser.java | 2 +- .../net/yacy/document/parser/tarParser.java | 2 +- .../yacy/document/parser/torrentParser.java | 2 +- .../net/yacy/document/parser/zipParser.java | 2 +- source/net/yacy/gui/Audio.java | 2 +- source/net/yacy/gui/InfoPage.java | 2 +- source/net/yacy/gui/YaCyApp.java | 2 +- .../net/yacy/gui/framework/Application.java | 2 +- source/net/yacy/gui/framework/Browser.java | 2 +- source/net/yacy/gui/framework/Layout.java | 2 +- source/net/yacy/gui/framework/Operation.java | 2 +- .../net/yacy/gui/framework/Switchboard.java | 2 +- source/net/yacy/htroot/AccessGrid_p.java | 2 +- source/net/yacy/htroot/AccessPicture_p.java | 2 +- source/net/yacy/htroot/ContentAnalysis_p.java | 2 +- source/net/yacy/htroot/CrawlCheck_p.java | 2 +- .../net/yacy/htroot/CrawlStartScanner_p.java | 2 +- source/net/yacy/htroot/IndexBrowser_p.java | 2 +- source/net/yacy/htroot/IndexDeletion_p.java | 2 +- source/net/yacy/htroot/IndexFederated_p.java | 2 +- .../yacy/htroot/IndexReIndexMonitor_p.java | 2 +- source/net/yacy/htroot/IndexSchema_p.java | 2 +- source/net/yacy/htroot/Load_RSS_p.java | 2 +- source/net/yacy/htroot/NetworkHistory.java | 2 +- source/net/yacy/htroot/RankingSolr_p.java | 2 +- source/net/yacy/htroot/RegexTest.java | 2 +- source/net/yacy/htroot/ServerScannerList.java | 2 +- source/net/yacy/htroot/Trails.java | 2 +- source/net/yacy/htroot/Translator_p.java | 2 +- source/net/yacy/htroot/Vocabulary_p.java | 2 +- source/net/yacy/htroot/api/citation.java | 2 +- source/net/yacy/htroot/api/push_p.java | 2 +- source/net/yacy/htroot/api/schema.java | 2 +- source/net/yacy/htroot/api/share.java | 2 +- source/net/yacy/htroot/api/snapshot.java | 2 +- source/net/yacy/htroot/osm.java | 2 +- source/net/yacy/htroot/yacy/idx.java | 2 +- .../net/yacy/http/AbstractRemoteHandler.java | 2 +- source/net/yacy/http/MonitorHandler.java | 2 +- source/net/yacy/http/ProxyCacheHandler.java | 2 +- source/net/yacy/http/ProxyHandler.java | 2 +- source/net/yacy/http/YaCyErrorHandler.java | 2 +- source/net/yacy/http/YaCyHttpServer.java | 2 +- .../net/yacy/http/YaCyLegacyCredential.java | 2 +- source/net/yacy/http/YaCyLoginService.java | 2 +- source/net/yacy/http/YaCySecurityHandler.java | 2 +- source/net/yacy/http/YacyDomainHandler.java | 2 +- .../yacy/http/servlets/RAGProxyServlet.java | 2 +- .../yacy/http/servlets/SolrSelectServlet.java | 2 +- .../net/yacy/http/servlets/SolrServlet.java | 2 +- .../http/servlets/YaCyDefaultServlet.java | 2 +- .../net/yacy/http/servlets/YaCyQoSFilter.java | 2 +- .../yacy/kelondro/blob/BEncodedHeapBag.java | 2 +- .../yacy/kelondro/blob/BEncodedHeapShard.java | 2 +- .../yacy/kelondro/blob/MapColumnIndex.java | 2 +- .../data/citation/CitationReference.java | 2 +- .../citation/CitationReferenceFactory.java | 2 +- .../kelondro/data/meta/URIMetadataNode.java | 2 +- .../kelondro/index/BufferedObjectIndex.java | 2 +- source/net/yacy/kelondro/index/Cache.java | 2 +- source/net/yacy/kelondro/index/Index.java | 2 +- .../kelondro/index/OnDemandOpenFileIndex.java | 2 +- source/net/yacy/kelondro/index/RAMIndex.java | 2 +- .../yacy/kelondro/index/RAMIndexCluster.java | 2 +- .../net/yacy/kelondro/index/RowHandleMap.java | 2 +- source/net/yacy/kelondro/index/RowSet.java | 2 +- .../net/yacy/kelondro/table/IndexTable.java | 2 +- source/net/yacy/peers/EventChannel.java | 2 +- .../net/yacy/peers/graphics/EncodedImage.java | 2 +- source/net/yacy/peers/graphics/OSMTile.java | 2 +- source/net/yacy/search/AutoSearch.java | 2 +- .../net/yacy/search/IndexingQueueEntry.java | 2 +- source/net/yacy/search/Shutdown.java | 2 +- source/net/yacy/search/Switchboard.java | 1263 +++++++++-------- source/net/yacy/search/index/ErrorCache.java | 2 +- .../search/index/ReindexSolrBusyThread.java | 2 +- .../net/yacy/search/query/AccessTracker.java | 2 +- .../yacy/search/query/HeuristicResult.java | 2 +- .../yacy/search/query/SearchEventType.java | 2 +- source/net/yacy/search/ranking/BlockRank.java | 2 +- .../schema/CollectionConfiguration.java | 2 +- .../yacy/search/schema/CollectionSchema.java | 2 +- .../net/yacy/search/schema/HyperlinkEdge.java | 2 +- .../yacy/search/schema/HyperlinkGraph.java | 2 +- .../net/yacy/search/schema/HyperlinkType.java | 2 +- .../search/schema/WebgraphConfiguration.java | 2 +- .../yacy/search/schema/WebgraphSchema.java | 2 +- .../net/yacy/visualization/AnimationGIF.java | 2 +- .../yacy/visualization/AnimationPlotter.java | 2 +- .../net/yacy/visualization/ChartPlotter.java | 2 +- source/net/yacy/visualization/CircleTool.java | 2 +- .../visualization/FontGenerator3Pixel.java | 2 +- .../visualization/FontGenerator5Pixel.java | 2 +- .../net/yacy/visualization/GraphPlotter.java | 2 +- .../yacy/visualization/HexGridPlotter.java | 2 +- source/net/yacy/visualization/PrintTool.java | 2 +- .../net/yacy/visualization/RasterPlotter.java | 2 +- source/net/yacy/yacy.java | 9 +- startYACY.sh | 2 +- startYACY_debug.bat | 2 +- .../document/id/MultiProtocolURLTest.java | 8 +- .../java/net/yacy/crawler/data/CacheTest.java | 12 +- .../java/net/yacy/data/wiki/WikiCodeTest.java | 8 +- .../document/parser/GenericXMLParserTest.java | 29 +- .../parser/html/ContentScraperTest.java | 30 +- .../document/parser/html/IconEntryTest.java | 18 +- .../yacy/document/parser/ooxmlParserTest.java | 2 +- .../yacy/data/URLLicenseConcurrentTest.java | 2 +- 291 files changed, 1496 insertions(+), 1454 deletions(-) create mode 100644 htroot/env/grafics/donate.html diff --git a/build.xml b/build.xml index 62d374a47..37a91d5e8 100644 --- a/build.xml +++ b/build.xml @@ -12,7 +12,7 @@ # ========================================== # This Software is Copyrighted # (C) by Michael Peter Christen; mc@yacy.net -# first published on http://yacy.net +# first published on https://yacy.net # Frankfurt, Germany, 2005-2009 # # This program is free software; you can redistribute it and/or modify diff --git a/defaults/oaiListFriendsSource.xml b/defaults/oaiListFriendsSource.xml index 838686b07..3b41b2a3e 100644 --- a/defaults/oaiListFriendsSource.xml +++ b/defaults/oaiListFriendsSource.xml @@ -2,6 +2,6 @@ Sources for OAI ListFriends entries. The Key is the URL to the ListFriends Source, the Value is the Path to the local file where the ListFriends file is stored - DATA/DICTIONARIES/harvesting/export_roar_ROAR_ListFriends.xml - DATA/DICTIONARIES/harvesting/ListFriends.xml + DATA/DICTIONARIES/harvesting/export_roar_ROAR_ListFriends.xml + DATA/DICTIONARIES/harvesting/ListFriends.xml \ No newline at end of file diff --git a/defaults/yacy.init b/defaults/yacy.init index 68e3e72cc..eac5bef47 100644 --- a/defaults/yacy.init +++ b/defaults/yacy.init @@ -597,7 +597,7 @@ proxyIndexingLocalMedia=true # proxy usage only for .yacy-Domains for autoconfig proxyYacyOnly=false -# enable proxy via url (/proxy.html?url=http://yacy.net) +# enable proxy via url (/proxy.html?url=https://yacy.net) proxyURL=false proxyURL.access=127.0.0.1,0:0:0:0:0:0:0:1 # which urls to rewrite to /proxy.html?url=x (values: all, domainlist) @@ -1288,8 +1288,8 @@ content.phpbb3.dumpfile = # search engine teaser: an about box in search results # this is only shown, if the about.body is filled -about.headline= -about.body= +about.headline=Please Help Us +about.body= donation.iframesource=https://yacy.net/include/donate.html donation.iframetarget=env/donate.html @@ -1405,7 +1405,7 @@ postprocessing.partialUpdate = true # To use this user agent option, you must define completely different names and strings # and remove the given example here, which will be ignored by default. crawler.userAgent.name = yacybot -crawler.userAgent.string = yacybot ($$SYSTEM$$) http://yacy.net/bot.html +crawler.userAgent.string = yacybot ($$SYSTEM$$) https://yacy.net/bot.html crawler.userAgent.minimumdelta = 500 crawler.userAgent.clienttimeout = 10000 diff --git a/examples/SimpleSearchClient/src/YaCySearchClient.java b/examples/SimpleSearchClient/src/YaCySearchClient.java index 0c2a6f535..7c8f11b95 100644 --- a/examples/SimpleSearchClient/src/YaCySearchClient.java +++ b/examples/SimpleSearchClient/src/YaCySearchClient.java @@ -2,7 +2,7 @@ * YaCySearchClient * an interface for Adaptive Replacement Caches * Copyright 2010 by Michael Peter Christen, mc@yacy.net, Frankfurt a. M., Germany - * First released 20.09.2010 at http://yacy.net + * First released 20.09.2010 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/htroot/api/yacydoc.xml b/htroot/api/yacydoc.xml index 10ed03988..887abbc2a 100644 --- a/htroot/api/yacydoc.xml +++ b/htroot/api/yacydoc.xml @@ -6,7 +6,7 @@ this is a xml file with embedded dublin core properties you can validate it with http://www.stg.brown.edu/service/xmlvalid/ --> - + #[dc_title]# #[dc_creator]# diff --git a/htroot/env/grafics/donate.html b/htroot/env/grafics/donate.html new file mode 100644 index 000000000..d01b4bf5f --- /dev/null +++ b/htroot/env/grafics/donate.html @@ -0,0 +1,41 @@ + + + + + +Please support our work on YaCy! + + + + + + + + + + + + + + + + + + + +
Github Sponsors
+ + + + + + +
+
+ + diff --git a/htroot/js/Crawler.js b/htroot/js/Crawler.js index c2f77404e..3e840ac23 100644 --- a/htroot/js/Crawler.js +++ b/htroot/js/Crawler.js @@ -1,6 +1,6 @@ /* * Copyright (C) 2005 - 2014 Alexander Schier, Michael Peter Christen, -* and other YaCy developers (see http://yacy.net/en/Join.html) +* and other YaCy developers (see https://yacy.net/en/Join.html) * * This file is part of YaCy. * @@ -15,7 +15,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with YaCy. If not, see . +* along with YaCy. If not, see . */ DELETE_STRING="delete"; diff --git a/htroot/portalsearch/yacy-portalsearch.js b/htroot/portalsearch/yacy-portalsearch.js index a1f80cffb..ad499ed91 100644 --- a/htroot/portalsearch/yacy-portalsearch.js +++ b/htroot/portalsearch/yacy-portalsearch.js @@ -50,7 +50,7 @@ $(document).ready(function() { theme : 'start', title : 'YaCy Search Widget', logo : yconf.url + '/yacy/ui/img/yacy-logo.png', - link : 'http://yacy.net', + link : 'https://yacy.net', width : 640, height : 640, position : [150,50], diff --git a/htroot/yacysearch.atom b/htroot/yacysearch.atom index 4513f8ce2..21f2f29f6 100644 --- a/htroot/yacysearch.atom +++ b/htroot/yacysearch.atom @@ -4,7 +4,7 @@ xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:yacy="http://www.yacy.net/" > - + #[promoteSearchPageGreeting]#: #[rss_query]# Search for #[rss_query]# diff --git a/htroot/yacysearch.rss b/htroot/yacysearch.rss index 9513be15a..c85a744e7 100644 --- a/htroot/yacysearch.rss +++ b/htroot/yacysearch.rss @@ -9,7 +9,7 @@ xmlns:geo="http://www.w3.org/2003/01/geo/wgs84_pos#" xmlns:ev="http://purl.org/rss/1.0/modules/event/" > - + #[promoteSearchPageGreeting]#: #[rss_query]# Search for #[rss_query]# diff --git a/htroot/yacysearch_location.rss b/htroot/yacysearch_location.rss index e58547c12..8311f8772 100644 --- a/htroot/yacysearch_location.rss +++ b/htroot/yacysearch_location.rss @@ -4,7 +4,7 @@ xmlns:yacy="http://www.yacy.net/" xmlns:geo="http://www.w3.org/2003/01/geo/wgs84_pos#" > - + #[promoteSearchPageGreeting]# Search for #[rss_query]# diff --git a/source/net/yacy/ai/OllamaClient.java b/source/net/yacy/ai/OllamaClient.java index 742645fee..9eaba920b 100644 --- a/source/net/yacy/ai/OllamaClient.java +++ b/source/net/yacy/ai/OllamaClient.java @@ -1,7 +1,7 @@ /** * OllamaClient * Copyright 2024 by Michael Peter Christen - * First released 17.05.2024 at http://yacy.net + * First released 17.05.2024 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -35,33 +35,33 @@ import org.json.JSONObject; public class OllamaClient { public static String OLLAMA_API_HOST = "http://localhost:11434"; - - private String hoststub; - - public OllamaClient(String hoststub) { + + private final String hoststub; + + public OllamaClient(final String hoststub) { this.hoststub = hoststub; } public LinkedHashMap listOllamaModels() { - LinkedHashMap sortedMap = new LinkedHashMap<>(); + final LinkedHashMap sortedMap = new LinkedHashMap<>(); try { - String response = OpenAIClient.sendGetRequest(this.hoststub + "/api/tags"); - JSONObject responseObject = new JSONObject(response); - JSONArray models = responseObject.getJSONArray("models"); - - List> list = new ArrayList<>(); + final String response = OpenAIClient.sendGetRequest(this.hoststub + "/api/tags"); + final JSONObject responseObject = new JSONObject(response); + final JSONArray models = responseObject.getJSONArray("models"); + + final List> list = new ArrayList<>(); for (int i = 0; i < models.length(); i++) { - JSONObject model = models.getJSONObject(i); - String name = model.optString("name", ""); - long size = model.optLong("size", 0); - list.add(new AbstractMap.SimpleEntry(name, size)); + final JSONObject model = models.getJSONObject(i); + final String name = model.optString("name", ""); + final long size = model.optLong("size", 0); + list.add(new AbstractMap.SimpleEntry<>(name, size)); } // Sort the list in descending order based on the values list.sort((o1, o2) -> o2.getValue().compareTo(o1.getValue())); - + // Create a new LinkedHashMap and add the sorted entries - for (Map.Entry entry : list) { + for (final Map.Entry entry : list) { sortedMap.put(entry.getKey(), entry.getValue()); } } catch (JSONException | URISyntaxException | IOException e) { @@ -70,8 +70,8 @@ public class OllamaClient { return sortedMap; } - public boolean ollamaModelExists(String name) { - JSONObject data = new JSONObject(); + public boolean ollamaModelExists(final String name) { + final JSONObject data = new JSONObject(); try { data.put("name", name); OpenAIClient.sendPostRequest(this.hoststub + "/api/show", data); @@ -81,37 +81,37 @@ public class OllamaClient { } } - public boolean pullOllamaModel(String name) { - JSONObject data = new JSONObject(); + public boolean pullOllamaModel(final String name) { + final JSONObject data = new JSONObject(); try { data.put("name", name); data.put("stream", false); - String response = OpenAIClient.sendPostRequest(this.hoststub + "/api/pull", data); + final String response = OpenAIClient.sendPostRequest(this.hoststub + "/api/pull", data); // this sends {"status": "success"} in case of success - JSONObject responseObject = new JSONObject(response); - String status = responseObject.optString("status", ""); + final JSONObject responseObject = new JSONObject(response); + final String status = responseObject.optString("status", ""); return status.equals("success"); } catch (JSONException | URISyntaxException | IOException e) { return false; } } - - public static void main(String[] args) { - OllamaClient oc = new OllamaClient(OLLAMA_API_HOST); - - LinkedHashMap models = oc.listOllamaModels(); + + public static void main(final String[] args) { + final OllamaClient oc = new OllamaClient(OLLAMA_API_HOST); + + final LinkedHashMap models = oc.listOllamaModels(); System.out.println(models.toString()); // check if model exists - String model = "phi3:3.8b"; + final String model = "phi3:3.8b"; if (oc.ollamaModelExists(model)) System.out.println("model " + model + " exists"); else System.out.println("model " + model + " does not exist"); - + // pull a model - boolean success = oc.pullOllamaModel(model); + final boolean success = oc.pullOllamaModel(model); System.out.println("pulled model + " + model + ": " + success); - + } } diff --git a/source/net/yacy/ai/OpenAIClient.java b/source/net/yacy/ai/OpenAIClient.java index d823426ec..f068eadd2 100644 --- a/source/net/yacy/ai/OpenAIClient.java +++ b/source/net/yacy/ai/OpenAIClient.java @@ -1,7 +1,7 @@ /** * OpenAIClient * Copyright 2024 by Michael Peter Christen - * First released 17.05.2024 at http://yacy.net + * First released 17.05.2024 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -38,31 +38,31 @@ public class OpenAIClient { private static String[] STOPTOKENS = new String[]{"[/INST]", "<|im_end|>", "<|end_of_turn|>", "<|eot_id|>", "<|end_header_id|>", "", "", "<|end|>"}; - private String hoststub; - - public OpenAIClient(String hoststub) { + private final String hoststub; + + public OpenAIClient(final String hoststub) { this.hoststub = hoststub; } // API Helper Methods - - public static String sendPostRequest(String endpoint, JSONObject data) throws IOException, URISyntaxException { - URL url = new URI(endpoint).toURL(); - HttpURLConnection conn = (HttpURLConnection) url.openConnection(); + + public static String sendPostRequest(final String endpoint, final JSONObject data) throws IOException, URISyntaxException { + final URL url = new URI(endpoint).toURL(); + final HttpURLConnection conn = (HttpURLConnection) url.openConnection(); conn.setRequestMethod("POST"); conn.setRequestProperty("Content-Type", "application/json"); conn.setDoOutput(true); try (OutputStream os = conn.getOutputStream()) { - byte[] input = data.toString().getBytes("utf-8"); + final byte[] input = data.toString().getBytes("utf-8"); os.write(input, 0, input.length); } - int responseCode = conn.getResponseCode(); + final int responseCode = conn.getResponseCode(); if (responseCode == HttpURLConnection.HTTP_OK) { try (BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream(), "utf-8"))) { - StringBuilder response = new StringBuilder(); + final StringBuilder response = new StringBuilder(); String responseLine; while ((responseLine = br.readLine()) != null) { response.append(responseLine.trim()); @@ -74,15 +74,15 @@ public class OpenAIClient { } } - public static String sendGetRequest(String endpoint) throws IOException, URISyntaxException { - URL url = new URI(endpoint).toURL(); - HttpURLConnection conn = (HttpURLConnection) url.openConnection(); + public static String sendGetRequest(final String endpoint) throws IOException, URISyntaxException { + final URL url = new URI(endpoint).toURL(); + final HttpURLConnection conn = (HttpURLConnection) url.openConnection(); conn.setRequestMethod("GET"); - int responseCode = conn.getResponseCode(); + final int responseCode = conn.getResponseCode(); if (responseCode == HttpURLConnection.HTTP_OK) { try (BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream(), "utf-8"))) { - StringBuilder response = new StringBuilder(); + final StringBuilder response = new StringBuilder(); String responseLine; while ((responseLine = br.readLine()) != null) { response.append(responseLine.trim()); @@ -93,14 +93,14 @@ public class OpenAIClient { throw new IOException("Request failed with response code " + responseCode); } } - - // OpenAI chat client, works with llama.cpp and Ollama - - public String chat(String model, String prompt, int max_tokens) throws IOException { - JSONObject data = new JSONObject(); - JSONArray messages = new JSONArray(); - JSONObject systemPrompt = new JSONObject(true); - JSONObject userPrompt = new JSONObject(true); + + // OpenAI chat client, works with llama.cpp and Ollama + + public String chat(final String model, final String prompt, final int max_tokens) throws IOException { + final JSONObject data = new JSONObject(); + final JSONArray messages = new JSONArray(); + final JSONObject systemPrompt = new JSONObject(true); + final JSONObject userPrompt = new JSONObject(true); messages.put(systemPrompt); messages.put(userPrompt); try { @@ -114,52 +114,52 @@ public class OpenAIClient { data.put("messages", messages); data.put("stop", new JSONArray(STOPTOKENS)); data.put("stream", false); - String response = sendPostRequest(this.hoststub + "/v1/chat/completions", data); - JSONObject responseObject = new JSONObject(response); - JSONArray choices = responseObject.getJSONArray("choices"); - JSONObject choice = choices.getJSONObject(0); - JSONObject message = choice.getJSONObject("message"); - String content = message.optString("content", ""); + final String response = sendPostRequest(this.hoststub + "/v1/chat/completions", data); + final JSONObject responseObject = new JSONObject(response); + final JSONArray choices = responseObject.getJSONArray("choices"); + final JSONObject choice = choices.getJSONObject(0); + final JSONObject message = choice.getJSONObject("message"); + final String content = message.optString("content", ""); return content; } catch (JSONException | URISyntaxException e) { throw new IOException(e.getMessage()); } } - public static String[] stringsFromChat(String answer) { - int p = answer.indexOf('['); - int q = answer.indexOf(']'); + public static String[] stringsFromChat(final String answer) { + final int p = answer.indexOf('['); + final int q = answer.indexOf(']'); if (p < 0 || q < 0 || q < p) return new String[0]; try { - JSONArray a = new JSONArray(answer.substring(p, q + 1)); - String[] arr = new String[a.length()]; + final JSONArray a = new JSONArray(answer.substring(p, q + 1)); + final String[] arr = new String[a.length()]; for (int i = 0; i < a.length(); i++) arr[i] = a.getString(i); return arr; - } catch (JSONException e) { + } catch (final JSONException e) { return new String[0]; } } - - public static void main(String[] args) { - String model = "phi3:3.8b"; - OpenAIClient oaic = new OpenAIClient(OllamaClient.OLLAMA_API_HOST); + + public static void main(final String[] args) { + final String model = "phi3:3.8b"; + final OpenAIClient oaic = new OpenAIClient(OllamaClient.OLLAMA_API_HOST); // make chat completion with model String question = "Who invented the wheel?"; try { - String answer = oaic.chat(model, question, 80); + final String answer = oaic.chat(model, question, 80); System.out.println(answer); - } catch (IOException e) { + } catch (final IOException e) { e.printStackTrace(); } // try the json parser from chat results question = "Make a list of four names from Star Wars movies. Use a JSON Array."; try { - String[] a = stringsFromChat(oaic.chat(model, question, 80)); - for (String s: a) System.out.println(s); - } catch (IOException e) { + final String[] a = stringsFromChat(oaic.chat(model, question, 80)); + for (final String s: a) System.out.println(s); + } catch (final IOException e) { e.printStackTrace(); } } - + } diff --git a/source/net/yacy/cora/date/AbstractFormatter.java b/source/net/yacy/cora/date/AbstractFormatter.java index e2c834720..d5d6d9fbb 100644 --- a/source/net/yacy/cora/date/AbstractFormatter.java +++ b/source/net/yacy/cora/date/AbstractFormatter.java @@ -1,7 +1,7 @@ /** * AbstractFormatter * Copyright 2011 by Michael Peter Christen - * First released 2.1.2011 at http://yacy.net + * First released 2.1.2011 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ @@ -11,12 +11,12 @@ * 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 . @@ -62,7 +62,7 @@ public abstract class AbstractFormatter implements DateFormatter { @Override public abstract String format(); - private static final HashMap DATE_FORMAT_REGEXPS = new HashMap() { + private static final HashMap DATE_FORMAT_REGEXPS = new HashMap<>() { private static final long serialVersionUID = 1321140786174228717L; { put(Pattern.compile("^\\d{8}$"), new SimpleDateFormat("yyyyMMdd", Locale.US)); @@ -92,16 +92,16 @@ public abstract class AbstractFormatter implements DateFormatter { }}; @Override - public Date parse(String s) { + public Date parse(final String s) { return parseAny(s); } - public static Date parseAny(String s) { - for (Map.Entry ps: DATE_FORMAT_REGEXPS.entrySet()) { + public static Date parseAny(final String s) { + for (final Map.Entry ps: DATE_FORMAT_REGEXPS.entrySet()) { if (ps.getKey().matcher(s.toLowerCase()).matches()) { try { return ps.getValue().parse(s); - } catch (ParseException e) { + } catch (final ParseException e) { } } } diff --git a/source/net/yacy/cora/date/DateFormatter.java b/source/net/yacy/cora/date/DateFormatter.java index 261e0fa97..1163bd4ed 100644 --- a/source/net/yacy/cora/date/DateFormatter.java +++ b/source/net/yacy/cora/date/DateFormatter.java @@ -1,7 +1,7 @@ /** * DateFormatter * Copyright 2011 by Michael Peter Christen - * First released 2.1.2011 at http://yacy.net + * First released 2.1.2011 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ @@ -11,12 +11,12 @@ * 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 . @@ -34,5 +34,5 @@ public interface DateFormatter { public Calendar parse(String s, int timezoneOffset) throws ParseException; public String format(final Date date); public String format(); - + } diff --git a/source/net/yacy/cora/date/GenericFormatter.java b/source/net/yacy/cora/date/GenericFormatter.java index 31a5ac67d..09f0d16fb 100644 --- a/source/net/yacy/cora/date/GenericFormatter.java +++ b/source/net/yacy/cora/date/GenericFormatter.java @@ -1,7 +1,7 @@ /** * GenericFormatter * Copyright 2011 by Michael Peter Christen - * First released 2.1.2011 at http://yacy.net + * First released 2.1.2011 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ @@ -50,7 +50,7 @@ public class GenericFormatter extends AbstractFormatter implements DateFormatter public static final String PATTERN_RFC1123_SHORT = "EEE, dd MMM yyyy"; public static final String PATTERN_ANSIC = "EEE MMM d HH:mm:ss yyyy"; public static final String PATTERN_SIMPLE = "yyyy/MM/dd HH:mm:ss"; - + /** * A regular expression matching the PATTERN_SIMPLE pattern (does not control * last day of month (30/31 or 28/29 for february). Can be used as a HTML5 input @@ -74,7 +74,7 @@ public class GenericFormatter extends AbstractFormatter implements DateFormatter public static final DateTimeFormatter FORMAT_SHORT_MINUTE = DateTimeFormatter .ofPattern(PATTERN_SHORT_MINUTE.replace("yyyy", "uuuu"), Locale.US).withZone(ZoneId.systemDefault()); - + /** * A thread-safe date formatter using the * {@link GenericFormatter#PATTERN_SHORT_SECOND} pattern with the US locale on @@ -257,17 +257,17 @@ public class GenericFormatter extends AbstractFormatter implements DateFormatter @Override public Calendar parse(final String timeString, final int timezoneOffset) throws ParseException { synchronized (this.dateFormat) { - Calendar cal = Calendar.getInstance(UTCtimeZone); + final Calendar cal = Calendar.getInstance(UTCtimeZone); cal.setTime(this.dateFormat.parse(timeString)); cal.add(Calendar.MINUTE, timezoneOffset); // add a correction; i.e. for UTC+1 -60 minutes is added to patch a time given in UTC+1 to the actual time at UTC return cal; } } - + /** * Like {@link #parseShortSecond(String)} using additional timezone information provided in an * offset String, like "+0100" for CET. - * @throws ParseException + * @throws ParseException */ public Calendar parse(final String timeString, final String UTCOffset) throws ParseException { if (timeString == null || timeString.isEmpty()) { return Calendar.getInstance(UTCtimeZone); } @@ -292,7 +292,7 @@ public class GenericFormatter extends AbstractFormatter implements DateFormatter final int om = NumberTools.parseIntDecSubstring(diffString, 3); return ((ahead) ? 1 : -1) * (oh * 60 + om); } - + /** * get the difference of this servers time zone to UTC/GMT in milliseconds * @return @@ -307,7 +307,7 @@ public class GenericFormatter extends AbstractFormatter implements DateFormatter return zoneOffsetHours + DSTOffsetHours; } } - + public static String UTCDiffString() { // we express the UTC Difference in 5 digits: // SHHMM @@ -330,12 +330,12 @@ public class GenericFormatter extends AbstractFormatter implements DateFormatter } private final static DecimalFormat D2 = new DecimalFormat("00"); - + /** * Safely format the given time value using the given formatter. Fallback to * ISO-8601 representation or to raw time value without exception when the * format can not be applied. - * + * * @param time * a time value as millisecnods from Epoch (1970-01-01T00:00:00Z) * @param formatter @@ -355,11 +355,11 @@ public class GenericFormatter extends AbstractFormatter implements DateFormatter } return res; } - + /** * Safely format the given instant using the given formatter. Fallback to * ISO-8601 representation without exception when the format can not be applied. - * + * * @param instant * the instant to format * @param formatter @@ -384,7 +384,7 @@ public class GenericFormatter extends AbstractFormatter implements DateFormatter return res; } - public static void main(String[] args) { + public static void main(final String[] args) { System.out.println(UTCDiffString()); } } diff --git a/source/net/yacy/cora/date/ISO8601Formatter.java b/source/net/yacy/cora/date/ISO8601Formatter.java index 7c74143f8..a16d80ca4 100644 --- a/source/net/yacy/cora/date/ISO8601Formatter.java +++ b/source/net/yacy/cora/date/ISO8601Formatter.java @@ -1,7 +1,7 @@ /** * ISO8601 * Copyright 2011 by Michael Peter Christen - * First released 2.1.2011 at http://yacy.net + * First released 2.1.2011 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ @@ -11,12 +11,12 @@ * 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 . @@ -36,25 +36,25 @@ public class ISO8601Formatter extends AbstractFormatter implements DateFormatter /** pattern for a W3C datetime variant of a non-localized ISO8601 date */ private static final String PATTERN_ISO8601 = "yyyy-MM-dd'T'HH:mm:ss'Z'"; - + /** Date formatter/non-sloppy parser for W3C datetime (ISO8601) in GMT/UTC */ private static final SimpleDateFormat FORMAT_ISO8601 = new SimpleDateFormat(PATTERN_ISO8601, Locale.US); - + static { FORMAT_ISO8601.setTimeZone(AbstractFormatter.UTCtimeZone); } - + public static final ISO8601Formatter FORMATTER = new ISO8601Formatter(); public ISO8601Formatter() { - last_time = 0; - last_format = ""; + this.last_time = 0; + this.last_format = ""; } - + /** * Parse dates as defined in http://www.w3.org/TR/NOTE-datetime. * This format (also specified in ISO8601) allows different "precisions". - * The following lower precision versions for the complete date + * The following lower precision versions for the complete date * "2007-12-19T10:20:30.567+0300" are allowed:
* "2007"
* "2007-12"
@@ -66,7 +66,7 @@ public class ISO8601Formatter extends AbstractFormatter implements DateFormatter * Parsing is done in a fuzzy way. If there is an illegal character somewhere in * the String, the date parsed so far will be returned, e.g. the input * "2007-12-19FOO" would return a date that represents "2007-12-19". - * + * * @param s * @return * @throws ParseException @@ -85,17 +85,17 @@ public class ISO8601Formatter extends AbstractFormatter implements DateFormatter int p = s.indexOf(';'); if (p >= 0) s = s.substring(0, p); // a semicolon may be used to separate two dates from each other; then we take the first p = s.indexOf(','); if (p >= 0) s = s.substring(0, p); // a comma may be used to separate two dates from each other; then we take the first while (!s.isEmpty() && s.endsWith("?")) s = s.substring(0, s.length() - 1); // sometimes used if write is not sure about date - + // no go for exact parsing final Calendar cal = Calendar.getInstance(AbstractFormatter.UTCtimeZone, Locale.US); cal.clear(); - + // split 2007-12-19T10:20:30.789+0500 into its parts // correct: yyyy['-'MM['-'dd['T'HH':'MM[':'ss['.'SSS]]('Z'|ZZZZZ)]]] final StringTokenizer t = new StringTokenizer(s, "-T:.Z+", true); if (s == null || t.countTokens() == 0) throw new ParseException("parseISO8601: Cannot parse '" + s + "'", 0); - + try { // year cal.set(Calendar.YEAR, Integer.parseInt(t.nextToken())); @@ -134,7 +134,7 @@ public class ISO8601Formatter extends AbstractFormatter implements DateFormatter token = t.nextToken(); } } - + // check for TZ data int offset; if (token.equals("Z")) { @@ -158,13 +158,11 @@ public class ISO8601Formatter extends AbstractFormatter implements DateFormatter cal.set(Calendar.SECOND, sec); cal.set(Calendar.MILLISECOND, msec); } - } catch (final NoSuchElementException e) { - // ignore this as it is perfectly fine to have non-complete date in this format } catch (final Exception e) { // catch all Exceptions and return what we parsed so far //serverLog.logInfo("SERVER", "parseISO8601: DATE ERROR with: '" + s + "' got so far: '" + cal.toString()); } - + // in case we couldn't even parse a year if (!cal.isSet(Calendar.YEAR)) throw new ParseException("parseISO8601: Cannot parse '" + s + "'", 0); @@ -176,29 +174,29 @@ public class ISO8601Formatter extends AbstractFormatter implements DateFormatter * Creates a String representation of a Date using the format defined * in ISO8601/W3C datetime * The result will be in UTC/GMT, e.g. "2007-12-19T10:20:30Z". - * + * * @param date The Date instance to transform. * @return A fixed width (20 chars) ISO8601 date String. */ @Override public final String format(final Date date) { if (date == null) return ""; - if (Math.abs(date.getTime() - last_time) < 1000) return last_format; + if (Math.abs(date.getTime() - this.last_time) < 1000) return this.last_format; synchronized (FORMAT_ISO8601) { - last_format = FORMAT_ISO8601.format(date); - last_time = date.getTime(); + this.last_format = FORMAT_ISO8601.format(date); + this.last_time = date.getTime(); } - return last_format; + return this.last_format; } @Override public final String format() { - long time = System.currentTimeMillis(); - if (Math.abs(time - last_time) < 1000) return last_format; + final long time = System.currentTimeMillis(); + if (Math.abs(time - this.last_time) < 1000) return this.last_format; synchronized (FORMAT_ISO8601) { - last_format = FORMAT_ISO8601.format(new Date(time)); - last_time = time; + this.last_format = FORMAT_ISO8601.format(new Date(time)); + this.last_time = time; } - return last_format; + return this.last_format; } - + } diff --git a/source/net/yacy/cora/date/MicroDate.java b/source/net/yacy/cora/date/MicroDate.java index 8563b6e46..9c4624c00 100644 --- a/source/net/yacy/cora/date/MicroDate.java +++ b/source/net/yacy/cora/date/MicroDate.java @@ -1,7 +1,7 @@ /** * MicroDate * Copyright 2008 by Michael Peter Christen - * First released 3.7.2008 at http://yacy.net + * First released 3.7.2008 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -29,11 +29,11 @@ public class MicroDate { private static final long hour = 3600000L; // milliseconds of a hour private static final long day = 86400000L; // milliseconds of a day - + public static int microDateDays(final Date modified) { return microDateDays(modified.getTime()); } - + public static int microDateDays(final long modified) { // this calculates a virtual age from a given date // the purpose is to have an age in days of a given modified date @@ -42,20 +42,20 @@ public class MicroDate { // we take mod 64**3 = 262144, this is the mask of the storage return (int) ((modified / day) % 262144L); } - + public static int microDateHoursInt(final long time) { return (int) ((time / hour) % 262144L); } - + public static int microDateHoursAge(final String mdhs) { return microDateHoursInt(System.currentTimeMillis()) - (int) Base64Order.enhancedCoder.decodeLong(mdhs); } - + public static long reverseMicroDateDays(final long microDateDays) { return Math.min(System.currentTimeMillis(), microDateDays * day); } - + public static void main(final String[] args) { - + } } diff --git a/source/net/yacy/cora/document/WordCache.java b/source/net/yacy/cora/document/WordCache.java index 968a30abf..f43672374 100644 --- a/source/net/yacy/cora/document/WordCache.java +++ b/source/net/yacy/cora/document/WordCache.java @@ -1,7 +1,7 @@ /** * WordCache * Copyright 2009 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany - * first published 01.10.2009 on http://yacy.net + * first published 01.10.2009 on https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -50,11 +50,11 @@ import net.yacy.cora.util.StringBuilderComparator; public class WordCache { private final static ConcurrentLog log = new ConcurrentLog(WordCache.class.getName()); - + // common word cache private static final int commonWordsMaxSize = 20000; // maximum size of common word cache private static final int commonWordsMinLength = 5; // words must have that length at minimum - private static OrderedScoreMap commonWords = new OrderedScoreMap(StringBuilderComparator.CASE_INSENSITIVE_ORDER); + private static OrderedScoreMap commonWords = new OrderedScoreMap<>(StringBuilderComparator.CASE_INSENSITIVE_ORDER); // dictionaries private final File dictionaryPath; @@ -67,8 +67,8 @@ public class WordCache { public Dictionary(final File file) throws IOException { - this.dict = new TreeSet(StringBuilderComparator.CASE_INSENSITIVE_ORDER); - this.tcid = new TreeSet(StringBuilderComparator.CASE_INSENSITIVE_ORDER); + this.dict = new TreeSet<>(StringBuilderComparator.CASE_INSENSITIVE_ORDER); + this.tcid = new TreeSet<>(StringBuilderComparator.CASE_INSENSITIVE_ORDER); InputStream is = new FileInputStream(file); if (file.getName().endsWith(".gz")) { @@ -103,7 +103,7 @@ public class WordCache { * @return set that contains all words that start or end with the input value */ public Set recommend(StringBuilder string) { - final Set ret = new HashSet(); + final Set ret = new HashSet<>(); SortedSet t = this.dict.tailSet(string); for (final StringBuilder r: t) { if (StringBuilderComparator.CASE_INSENSITIVE_ORDER.startsWith(r, string) && r.length() > string.length()) { @@ -201,7 +201,7 @@ public class WordCache { */ public WordCache(final File dictionaryPath) { this.dictionaryPath = dictionaryPath; - this.dictionaries = new ConcurrentHashMap(); + this.dictionaries = new ConcurrentHashMap<>(); reload(); } @@ -222,8 +222,8 @@ public class WordCache { } } - public static void learn(Collection wordset) { - for (String s: wordset) { + public static void learn(final Collection wordset) { + for (final String s: wordset) { learn(new StringBuilder(s)); } } @@ -239,7 +239,7 @@ public class WordCache { for (final String f: files) { if (f.endsWith(".words")) { try { - Dictionary dict = new Dictionary(new File(this.dictionaryPath, f)); + final Dictionary dict = new Dictionary(new File(this.dictionaryPath, f)); this.dictionaries.put(f.substring(0, f.length() - 6), dict); } catch (final IOException e) { log.warn(e); @@ -262,9 +262,9 @@ public class WordCache { * @param string input value that is used to match recommendations * @return set that contains all words that start or end with the input value */ - public Set recommend(StringBuilder string) { - Set ret = new HashSet(); - for (Dictionary dict: this.dictionaries.values()) { + public Set recommend(final StringBuilder string) { + final Set ret = new HashSet<>(); + for (final Dictionary dict: this.dictionaries.values()) { ret.addAll(dict.recommend(string)); } final SortedMap u = commonWords.tailMap(string); @@ -290,7 +290,7 @@ public class WordCache { * @return true if the library contains the word */ public boolean contains(final StringBuilder s) { - for (Dictionary dict: this.dictionaries.values()) { + for (final Dictionary dict: this.dictionaries.values()) { if (dict.contains(s)) { return true; } @@ -305,8 +305,8 @@ public class WordCache { * @param string the given word * @return true if the library supports the word */ - public boolean supports(StringBuilder string) { - for (Dictionary dict: this.dictionaries.values()) { + public boolean supports(final StringBuilder string) { + for (final Dictionary dict: this.dictionaries.values()) { if (dict.supports(string)) { return true; } @@ -320,7 +320,7 @@ public class WordCache { */ public int size() { int size = 0; - for (Dictionary dict: this.dictionaries.values()) { + for (final Dictionary dict: this.dictionaries.values()) { size += dict.size(); } return size; @@ -329,7 +329,7 @@ public class WordCache { public static int sizeCommonWords() { return commonWords.size(); } - + public static void clearCommonWords() { commonWords.clear(); } @@ -343,7 +343,7 @@ public class WordCache { * @return */ public boolean isRelevant(final int minimumWords) { - for (Dictionary dict: this.dictionaries.values()) { + for (final Dictionary dict: this.dictionaries.values()) { if (dict.isRelevant(minimumWords)) { return true; } diff --git a/source/net/yacy/cora/document/analysis/Classification.java b/source/net/yacy/cora/document/analysis/Classification.java index e04f84994..d5b9f326a 100644 --- a/source/net/yacy/cora/document/analysis/Classification.java +++ b/source/net/yacy/cora/document/analysis/Classification.java @@ -1,7 +1,7 @@ /** * Classification.java * Copyright 2009 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 09.07.2009 at http://yacy.net + * First released 09.07.2009 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -34,13 +34,13 @@ import net.yacy.cora.util.CommonPattern; public class Classification { - private static final Set textExtSet = new HashSet(); - private static final Set mediaExtSet = new HashSet(); - private static final Set imageExtSet = new HashSet(); - private static final Set audioExtSet = new HashSet(); - private static final Set videoExtSet = new HashSet(); - private static final Set appsExtSet = new HashSet(); - private static final Set ctrlExtSet = new HashSet(); + private static final Set textExtSet = new HashSet<>(); + private static final Set mediaExtSet = new HashSet<>(); + private static final Set imageExtSet = new HashSet<>(); + private static final Set audioExtSet = new HashSet<>(); + private static final Set videoExtSet = new HashSet<>(); + private static final Set appsExtSet = new HashSet<>(); + private static final Set ctrlExtSet = new HashSet<>(); public enum ContentDomain { @@ -54,7 +54,7 @@ public class Classification { private final int code; - ContentDomain(int code) { + ContentDomain(final int code) { this.code = code; } @@ -104,17 +104,17 @@ public class Classification { addSet(mediaExtSet, apps + "," + audio + "," + video + "," + image); // all media formats } - private static void addSet(Set set, final String extString) { + private static void addSet(final Set set, final String extString) { if ((extString == null) || (extString.isEmpty())) return; - for (String s: CommonPattern.COMMA.split(extString, 0)) set.add(s.toLowerCase(Locale.ROOT).trim()); + for (final String s: CommonPattern.COMMA.split(extString, 0)) set.add(s.toLowerCase(Locale.ROOT).trim()); } - public static boolean isTextExtension(String textExt) { + public static boolean isTextExtension(final String textExt) { if (textExt == null) return false; return textExtSet.contains(textExt.trim().toLowerCase(Locale.ROOT)); } - public static boolean isMediaExtension(String mediaExt) { + public static boolean isMediaExtension(final String mediaExt) { if (mediaExt == null) return false; return mediaExtSet.contains(mediaExt.trim().toLowerCase(Locale.ROOT)); } @@ -200,9 +200,9 @@ public class Classification { if (mimeTableInputStream != null) try { mimeTableInputStream.close(); } catch (final Exception e1) {} } } - for (Entry entry: mimeTable.entrySet()) { - String ext = (String) entry.getKey(); - String mime = (String) entry.getValue(); + for (final Entry entry: mimeTable.entrySet()) { + final String ext = (String) entry.getKey(); + final String mime = (String) entry.getValue(); if (mime.startsWith("text/")) textExtSet.add(ext.toLowerCase(Locale.ROOT)); if (mime.startsWith("audio/")) audioExtSet.add(ext.toLowerCase(Locale.ROOT)); if (mime.startsWith("video/")) videoExtSet.add(ext.toLowerCase(Locale.ROOT)); diff --git a/source/net/yacy/cora/document/encoding/ASCII.java b/source/net/yacy/cora/document/encoding/ASCII.java index d4c71fa39..af401dbf6 100644 --- a/source/net/yacy/cora/document/encoding/ASCII.java +++ b/source/net/yacy/cora/document/encoding/ASCII.java @@ -1,7 +1,7 @@ /** * ASCIIComparator * Copyright 2010 by Michael Peter Christen - * First released 25.2.2011 at http://yacy.net + * First released 25.2.2011 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ @@ -42,7 +42,7 @@ public class ASCII implements Comparator { public boolean insensitive; - public ASCII(boolean insensitive) { + public ASCII(final boolean insensitive) { this.insensitive = insensitive; } @@ -52,13 +52,13 @@ public class ASCII implements Comparator { } @Override - public int compare(String s0, String s1) { + public int compare(final String s0, final String s1) { if (s0 == null && s1 == null) return 0; if (s0 == null) return -1; if (s1 == null) return 1; int i = 0; - int l0 = s0.length(), l1 = s1.length(); - int lm = Math.min(l0, l1); + final int l0 = s0.length(), l1 = s1.length(); + final int lm = Math.min(l0, l1); char c0, c1; while (i < lm) { c0 = s0.charAt(i); @@ -74,13 +74,13 @@ public class ASCII implements Comparator { return 0; } - public boolean equals(String s0, String s1) { + public boolean equals(final String s0, final String s1) { if (s0 == null && s1 == null) return true; if (s0 == null) return false; if (s1 == null) return false; int i = 0; - int l0 = s0.length(), l1 = s1.length(); - int lm = Math.min(l0, l1); + final int l0 = s0.length(), l1 = s1.length(); + final int lm = Math.min(l0, l1); char c0, c1; while (i < lm) { c0 = s0.charAt(i); @@ -95,7 +95,7 @@ public class ASCII implements Comparator { } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { return (obj == this); } @@ -112,7 +112,7 @@ public class ASCII implements Comparator { } public final static String String(final byte[] bytes, final int offset, final int length) { - int l = Math.min(length, bytes.length - offset); + final int l = Math.min(length, bytes.length - offset); final char[] c = new char[l]; for (int i = 0; i < l; ++ i) { if (bytes[i + offset] < 0) throw new IllegalArgumentException(); @@ -124,7 +124,7 @@ public class ASCII implements Comparator { public final static byte[] getBytes(final String s) { assert s != null; //assert s.length() < 3 || s.charAt(2) != '@'; - int count = s.length(); + final int count = s.length(); final byte[] b = new byte[count]; for (int i = 0; i < count; i++) { b[i] = (byte) s.charAt(i); @@ -135,7 +135,7 @@ public class ASCII implements Comparator { public final static byte[] getBytes(final String s, final int beginIndex, final int endIndex) { assert s != null; //assert s.length() < 3 || s.charAt(2) != '@'; - int count = endIndex - beginIndex; + final int count = endIndex - beginIndex; final byte[] b = new byte[count]; for (int i = 0; i < count; i++) { b[i] = (byte) s.charAt(i + beginIndex); diff --git a/source/net/yacy/cora/document/encoding/UTF8.java b/source/net/yacy/cora/document/encoding/UTF8.java index 5a871cfd6..8b500dd0c 100644 --- a/source/net/yacy/cora/document/encoding/UTF8.java +++ b/source/net/yacy/cora/document/encoding/UTF8.java @@ -1,7 +1,7 @@ /** * UTF8 * Copyright 2011 by Michael Peter Christen - * First released 25.2.2011 at http://yacy.net + * First released 25.2.2011 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ @@ -50,12 +50,12 @@ public class UTF8 implements Comparator { public boolean insensitive; - public UTF8(boolean insensitive) { + public UTF8(final boolean insensitive) { this.insensitive = insensitive; } @Override - public int compare(String o0, String o1) { + public int compare(final String o0, final String o1) { final int l0 = o0.length(); final int l1 = o1.length(); final int ml = Math.min(l0, l1); @@ -96,7 +96,7 @@ public class UTF8 implements Comparator { } return true; } - + public final static StringBody StringBody(final byte[] b) { return StringBody(UTF8.String(b)); } @@ -270,12 +270,12 @@ public class UTF8 implements Comparator { return (needToChange? sb.toString() : s); } - + /** * Utility wrapper around the standard JDK {@link URLEncoder#encode(String)} * function, using the UTF-8 character set and catching * {@link UnsupportedEncodingException} exception. - * + * * @param str a string to encode. Must not be null. * @return str encoded in application/x-www-form-urlencoded format */ diff --git a/source/net/yacy/cora/document/feed/Channel.java b/source/net/yacy/cora/document/feed/Channel.java index 2200ae3ff..2ba471915 100644 --- a/source/net/yacy/cora/document/feed/Channel.java +++ b/source/net/yacy/cora/document/feed/Channel.java @@ -1,7 +1,7 @@ /** * Channel * Copyright 2010 by Michael Peter Christen - * First released 10.5.2010 at http://yacy.net + * First released 10.5.2010 at https//yacy.net * * $LastChangedDate$ * $LastChangedRevision$ @@ -13,12 +13,12 @@ * 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 . @@ -30,18 +30,18 @@ package net.yacy.cora.document.feed; public interface Channel extends Iterable { public void setTitle(String title); - + public void setLink(String link); - + public void setDescription(String description); - + public void setImageURL(String imageUrl); - + public void setTotalResults(String totalResults); - + public void setStartIndex(String startIndex); - + public void setItemsPerPage(String itemsPerPage); - + public void setSearchTerms(String searchTerms); } diff --git a/source/net/yacy/cora/document/feed/Hit.java b/source/net/yacy/cora/document/feed/Hit.java index 3cb61ab71..06386fc8a 100644 --- a/source/net/yacy/cora/document/feed/Hit.java +++ b/source/net/yacy/cora/document/feed/Hit.java @@ -1,7 +1,7 @@ /** * Hit * Copyright 2010 by Michael Peter Christen - * First released 10.5.2010 at http://yacy.net + * First released 10.5.2010 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ @@ -13,12 +13,12 @@ * 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 . @@ -32,68 +32,68 @@ import java.util.List; public interface Hit { public void setAuthor(String title); - + public void setCopyright(String title); - + public void setCategory(String title); - + public void setTitle(String title); - + public void setLink(String link); - + public void setReferrer(String title); - + public void setLanguage(String title); - + public void setDescription(String description); - + public void setPubDate(Date pubdate); - + public void setGuid(String guid); - + public void setDocs(String docs); public void setSubject(String[] tags); - + public void setSize(long size); - + /** * @param enclosure an URL describing a media object that is attached to a feed item */ public void setEnclosure(String enclosure); - + public String getAuthor(); - + public String getCopyright(); - + public String getCategory(); - + public String getTitle(); - + public String getLink(); - + public String getReferrer(); - + public String getLanguage(); - + public List getDescriptions(); - + public Date getPubDate(); - + public String getGuid(); - + public String getDocs(); // A URL that points to the documentation for the format used in the RSS file. public String[] getSubject(); - + public long getSize(); - + /** * @return an URL describing a media object that is attached to a feed item */ public String getEnclosure(); public double getLon(); - + public double getLat(); } diff --git a/source/net/yacy/cora/document/feed/RSSFeed.java b/source/net/yacy/cora/document/feed/RSSFeed.java index b9b95be8c..ff59386c2 100644 --- a/source/net/yacy/cora/document/feed/RSSFeed.java +++ b/source/net/yacy/cora/document/feed/RSSFeed.java @@ -1,7 +1,7 @@ /** * RSSFeed * Copyright 2007 by Michael Peter Christen - * First released 16.7.2007 at http://yacy.net + * First released 16.7.2007 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -36,22 +36,22 @@ public class RSSFeed implements Iterable { public static final int DEFAULT_MAXSIZE = 10000; // class variables - + /** Single required element see http://www.rssboard.org/rss-profile#element-channel */ private RSSMessage channel = null; - + /** A guid:Item map */ private final Map messages; private final int maxsize; - + /** Set to true when maxsize messages limit has been exceeded and exceeding messages have been discarded */ private boolean maxSizeExceeded; - + @Override public String toString() { - StringBuilder sb = new StringBuilder(); + final StringBuilder sb = new StringBuilder(); sb.append("\n"); sb.append(" { sb.append("0\n"); sb.append("" + this.size() + "\n"); sb.append("" + this.size() + "\n"); - for (RSSMessage item: messages.values()) { + for (final RSSMessage item: this.messages.values()) { sb.append(item.toString()); } sb.append("\n"); sb.append("\n"); return sb.toString(); } - + public RSSFeed(final int maxsize) { this.messages = Collections.synchronizedMap(new LinkedHashMap()); this.channel = null; @@ -83,11 +83,11 @@ public class RSSFeed implements Iterable { * @param links * @param source */ - public RSSFeed(Set links, String source) { + public RSSFeed(final Set links, final String source) { this(Integer.MAX_VALUE); String u; RSSMessage message; - for (MultiProtocolURL uri: links) { + for (final MultiProtocolURL uri: links) { u = uri.toNormalform(true); message = new RSSMessage(u, "", u); message.setAuthor(source); @@ -112,8 +112,8 @@ public class RSSFeed implements Iterable { } public Set getLinks() { - Set links = new HashSet(); - for (RSSMessage message: this.messages.values()) { + final Set links = new HashSet<>(); + for (final RSSMessage message: this.messages.values()) { try {links.add(new MultiProtocolURL(message.getLink()));} catch (final MalformedURLException e) {} } return links; @@ -141,7 +141,7 @@ public class RSSFeed implements Iterable { public int size() { return this.messages.size(); } - + /** * @return true when maxsize messages limit has been exceeded and exceeding messages have been discarded */ diff --git a/source/net/yacy/cora/document/feed/RSSMessage.java b/source/net/yacy/cora/document/feed/RSSMessage.java index 8906d103b..b2e55a210 100644 --- a/source/net/yacy/cora/document/feed/RSSMessage.java +++ b/source/net/yacy/cora/document/feed/RSSMessage.java @@ -1,7 +1,7 @@ /** * RSSMessage * Copyright 2007 by Michael Peter Christen - * First released 16.7.2007 at http://yacy.net + * First released 16.7.2007 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ @@ -58,53 +58,53 @@ public class RSSMessage implements Hit, Comparable, Comparator keys; private Token(final String[] keylist) { - this.keys = new HashSet(); + this.keys = new HashSet<>(); this.keys.addAll(Arrays.asList(keylist)); this.keys.add(this.name()); } @@ -127,23 +127,23 @@ public class RSSMessage implements Hit, Comparable, Comparator tokenNick2Token = new HashMap(); + + private static Map tokenNick2Token = new HashMap<>(); static { - for (Token t: Token.values()) { - for (String nick: t.keys) tokenNick2Token.put(nick, t); + for (final Token t: Token.values()) { + for (final String nick: t.keys) tokenNick2Token.put(nick, t); } } - public static Token valueOfNick(String nick) { + public static Token valueOfNick(final String nick) { return tokenNick2Token.get(nick); } - + private static String artificialGuidPrefix = "c0_"; private static String calculatedGuidPrefix = "c1_"; public static final RSSMessage POISON = new RSSMessage("", "", ""); - public static final HashSet tags = new HashSet(); + public static final HashSet tags = new HashSet<>(); static { for (final Token token: Token.values()) { tags.addAll(token.keys()); @@ -153,7 +153,7 @@ public class RSSMessage implements Hit, Comparable, Comparator map; public RSSMessage(final String title, final String description, final String link) { - this.map = new HashMap(); + this.map = new HashMap<>(); if (title.length() > 0) this.map.put(Token.title.name(), title); if (description.length() > 0) this.map.put(Token.description.name(), description); if (link.length() > 0) this.map.put(Token.link.name(), link); @@ -162,7 +162,7 @@ public class RSSMessage implements Hit, Comparable, Comparator(); + this.map = new HashMap<>(); if (title.length() > 0) this.map.put(Token.title.name(), title); if (description.length() > 0) this.map.put(Token.description.name(), description); this.map.put(Token.link.name(), link.toNormalform(true)); @@ -173,9 +173,9 @@ public class RSSMessage implements Hit, Comparable, Comparator(); + this.map = new HashMap<>(); } - + public void setValue(final Token token, final String value) { if (value.length() > 0) { this.map.put(token.name(), value); @@ -214,8 +214,8 @@ public class RSSMessage implements Hit, Comparable, Comparator getDescriptions() { - List ds = new ArrayList(); - String d = Token.description.valueFrom(this.map, ""); + final List ds = new ArrayList<>(); + final String d = Token.description.valueFrom(this.map, ""); if (d.length() > 0) ds.add(d); return ds; } @@ -285,12 +285,12 @@ public class RSSMessage implements Hit, Comparable, Comparator, Comparator\n"); if (this.map.containsKey(Token.title.name())) sb.append("").append(this.map.get(Token.title.name())).append("\n"); if (this.map.containsKey(Token.link.name())) sb.append("").append(this.map.get(Token.link.name())).append("\n"); @@ -384,12 +384,12 @@ public class RSSMessage implements Hit, Comparable, Comparator tlSax = new ThreadLocal(); + private static final ThreadLocal tlSax = new ThreadLocal<>(); private static SAXParser getParser() throws SAXException { SAXParser parser = tlSax.get(); if (parser == null) { @@ -98,16 +98,16 @@ public class RSSReader extends DefaultHandler { throw new IOException (e.getMessage()); } } - + public RSSReader(final int maxsize, final long maxBytes, InputStream stream) throws IOException { this(maxsize); - + if (!(stream instanceof ByteArrayInputStream) && !(stream instanceof BufferedInputStream)) { stream = new BufferedInputStream(stream); } - - StrictLimitInputStream limitedSource = new StrictLimitInputStream(stream, maxBytes); - + + final StrictLimitInputStream limitedSource = new StrictLimitInputStream(stream, maxBytes); + try { final SAXParser saxParser = getParser(); // do not look at external dtd - see: http://www.ibm.com/developerworks/xml/library/x-tipcfsx/index.html @@ -121,7 +121,7 @@ public class RSSReader extends DefaultHandler { saxParser.parse(limitedSource, this); } catch (final SAXException e) { throw new IOException (e.getMessage()); - } catch(StreamLimitException e) { + } catch(final StreamLimitException e) { this.maxBytesExceeded = true; } } @@ -194,7 +194,7 @@ public class RSSReader extends DefaultHandler { if(StringUtils.isNotBlank(url)) { this.item.setEnclosure(url); } - } + } } } else if ("rss".equals(tag)) { this.type = Type.rss; @@ -236,7 +236,7 @@ public class RSSReader extends DefaultHandler { public RSSFeed getFeed() { return this.theChannel; } - + /** * @return true when a parsing limit on instance construction has been exceeded */ diff --git a/source/net/yacy/cora/document/id/AnchorURL.java b/source/net/yacy/cora/document/id/AnchorURL.java index f63fc0619..820f9939e 100644 --- a/source/net/yacy/cora/document/id/AnchorURL.java +++ b/source/net/yacy/cora/document/id/AnchorURL.java @@ -1,18 +1,18 @@ /** * Anchor * Copyright 2013 by Michael Peter Christen - * first published 15.09.2013 on http://yacy.net + * first published 15.09.2013 on https://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 . @@ -40,7 +40,7 @@ public class AnchorURL extends DigestURL { this.imageURL = null; this.imageAlt = null; } - + public AnchorURL(final AnchorURL url) { super(url, url.hash()); this.textBody = url.textBody; @@ -76,7 +76,7 @@ public class AnchorURL extends DigestURL { this.imageURL = null; this.imageAlt = null; } - + public AnchorURL(final String protocol, final String host, final int port, final String path, final DigestURL imageURL, final String imageAlt) throws MalformedURLException { super(protocol, host, port, path); this.textBody = ""; @@ -104,42 +104,42 @@ public class AnchorURL extends DigestURL { } public String getNameProperty() { - return nameProperty; + return this.nameProperty; } - public void setNameProperty(String name) { + public void setNameProperty(final String name) { this.nameProperty = name; } public String getTextProperty() { - return textBody; + return this.textBody; } - public void setTextProperty(String text) { + public void setTextProperty(final String text) { this.textBody = text; } public String getRelProperty() { - return relProperty; + return this.relProperty; } - public void setRelProperty(String rel) { + public void setRelProperty(final String rel) { this.relProperty = rel; } public DigestURL getImageURL() { - return imageURL; + return this.imageURL; } - public void setImageURL(DigestURL imageURL) { + public void setImageURL(final DigestURL imageURL) { this.imageURL = imageURL; } public String getImageAlt() { - return imageAlt; + return this.imageAlt; } - public void setImageAlt(String imageAlt) { + public void setImageAlt(final String imageAlt) { this.imageAlt = imageAlt; } @@ -156,16 +156,16 @@ public class AnchorURL extends DigestURL { tagopts.setProperty("rel", this.relProperty); return tagopts; } - + public boolean attachedNofollow() { return this.relProperty.indexOf("nofollow") >= 0; } - + public String toHTML() { return " 0 ? (" name=\"" + this.nameProperty + "\"") : "") + (this.relProperty.length() > 0 ? (" rel=\"" + this.relProperty + "\"") : "") + ">" + this.textBody + ""; } - + } diff --git a/source/net/yacy/cora/document/id/DigestURL.java b/source/net/yacy/cora/document/id/DigestURL.java index 93b7f00a2..f6ccdcbd4 100644 --- a/source/net/yacy/cora/document/id/DigestURL.java +++ b/source/net/yacy/cora/document/id/DigestURL.java @@ -1,18 +1,18 @@ /** * DigestURL * Copyright 2006 by Michael Peter Christen - * first published 13.07.2006 on http://yacy.net + * first published 13.07.2006 on https://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 . @@ -46,7 +46,7 @@ import net.yacy.cora.util.CommonPattern; public class DigestURL extends MultiProtocolURL implements Serializable { public static final DigestURL POISON = new DigestURL(); // poison pill for concurrent link generators - + private static final long serialVersionUID = -1173233022912141885L; // class variables @@ -67,7 +67,7 @@ public class DigestURL extends MultiProtocolURL implements Serializable { else if (port > 999) h = "http://" + h + ":" + port; else h = "http://" + h; } - DigestURL url = new DigestURL(h); + final DigestURL url = new DigestURL(h); return (url == null) ? null : url.hosthash(); } @@ -76,11 +76,11 @@ public class DigestURL extends MultiProtocolURL implements Serializable { * the list is separated by comma * @param hostlist * @return list of host hashes without separation - * @throws MalformedURLException + * @throws MalformedURLException */ public static String hosthashes(final String hostlist) throws MalformedURLException { - String[] hs = CommonPattern.COMMA.split(hostlist); - StringBuilder sb = new StringBuilder(hostlist.length()); + final String[] hs = CommonPattern.COMMA.split(hostlist); + final StringBuilder sb = new StringBuilder(hostlist.length()); for (String h: hs) { if (h == null) continue; h = h.trim(); @@ -92,9 +92,9 @@ public class DigestURL extends MultiProtocolURL implements Serializable { return sb.toString(); } - public static Set hosthashess(String hosthashes) { + public static Set hosthashess(final String hosthashes) { if (hosthashes == null || hosthashes.isEmpty()) return null; - HashSet h = new HashSet(); + final HashSet h = new HashSet<>(); assert hosthashes.length() % 6 == 0; for (int i = 0; i < hosthashes.length(); i = i + 6) { h.add(hosthashes.substring(i, i + 6)); @@ -135,7 +135,7 @@ public class DigestURL extends MultiProtocolURL implements Serializable { super(url); this.hash = hash; } - + /** * DigestURI from general URI, hash already calculated * @param baseURL @@ -172,9 +172,9 @@ public class DigestURL extends MultiProtocolURL implements Serializable { } return new DigestURL(baseURL, relPath); } - + private int hashCache = Integer.MIN_VALUE; // if this is used in a compare method many times, a cache is useful - + @Override public int hashCode() { if (this.hashCache == Integer.MIN_VALUE) { @@ -211,13 +211,13 @@ public class DigestURL extends MultiProtocolURL implements Serializable { /** *

Extract a fragment of the url hash that can be used as a hash for the host name part of this url.

- *

WARNING : two URLs with the same host name but different protocols or ports will produce two different host hashes with this method!

+ *

WARNING : two URLs with the same host name but different protocols or ports will produce two different host hashes with this method!

* @return a 6-byte hash fragment */ public String hosthash() { return ASCII.String(this.hash(), 6, 6); } - + /** * calculated YaCy-Hash of this URI * @@ -306,7 +306,7 @@ public class DigestURL extends MultiProtocolURL implements Serializable { if (host == null) { return Base64Order.enhancedCoder.encode(Digest.encodeMD5Raw(protocol)).substring(0, 5); } - boolean isIPv6HostIP = host.indexOf(':') >= 0; + final boolean isIPv6HostIP = host.indexOf(':') >= 0; final StringBuilder sb = new StringBuilder(host.length() + 15); sb.append(protocol).append(':'); if (isIPv6HostIP) {sb.append('[').append(host).append(']');} else sb.append(host); @@ -346,7 +346,7 @@ public class DigestURL extends MultiProtocolURL implements Serializable { public static final String hosthash6(final String host) { return hosthash6("http", host, 80); } - + //private static String[] testTLDs = new String[] { "com", "net", "org", "uk", "fr", "de", "es", "it" }; public static final int domLengthEstimation(final byte[] urlHashBytes) { diff --git a/source/net/yacy/cora/document/id/MultiProtocolURL.java b/source/net/yacy/cora/document/id/MultiProtocolURL.java index 768ca0aa6..27e9bc205 100644 --- a/source/net/yacy/cora/document/id/MultiProtocolURL.java +++ b/source/net/yacy/cora/document/id/MultiProtocolURL.java @@ -1,7 +1,7 @@ /** * MultiProtocolURI * Copyright 2010 by Michael Peter Christen - * First released 25.5.2010 at http://yacy.net + * First released 25.5.2010 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ @@ -84,20 +84,20 @@ public class MultiProtocolURL implements Serializable, ComparableRegular * expressions string literals documentation */ private static final BitSet PATTERN_METACHARACTERS = new BitSet(128); - + static { // unreserved characters (chars not to escape in url) for (int i = 'A'; i <= 'Z'; i++) { // hialpha RFC1738 Section 5 @@ -134,7 +134,7 @@ public class MultiProtocolURL implements Serializable, Comparable sessionIDnames = new ConcurrentHashMap(); + private static final ConcurrentHashMap sessionIDnames = new ConcurrentHashMap<>(); public static final void initSessionIDNames(final Set idNames) { for (String s: idNames) { @@ -224,7 +224,7 @@ public class MultiProtocolURL implements Serializable, Comparable 3 && h.charAt(3) == ':') { // Missing root slash such as "path" or "c:/path" accepted, but the path attribute must by after all start with it - this.path = "/" + h.substring(2); + this.path = "/" + h.substring(2); } else { this.host = h.substring(2, q ); // TODO: handle "c:" ? if (this.host.equalsIgnoreCase(Domains.LOCALHOST)) this.host = null; - this.path = h.substring(q ); // "/path" + this.path = h.substring(q ); // "/path" } } else if (h.startsWith("/")) { // "/host/path" or "/host/c:/path" this.path = h; @@ -442,7 +442,7 @@ public class MultiProtocolURL implements Serializable, Comparable 0 && relPath.charAt(0) == '/') { this.path = relPath; } else if (baseURL.path.endsWith("/")) { - /* According to RFC 3986 example in Appendix B. (https://tools.ietf.org/html/rfc3986) + /* According to RFC 3986 example in Appendix B. (https://tools.ietf.org/html/rfc3986) such an URL is valid : http://www.ics.uci.edu/pub/ietf/uri/#Related - - We also find similar usages in the 2016 URL living standard (https://url.spec.whatwg.org/), - for example : https://url.spec.whatwg.org/#syntax-url-absolute-with-fragment - + + We also find similar usages in the 2016 URL living standard (https://url.spec.whatwg.org/), + for example : https://url.spec.whatwg.org/#syntax-url-absolute-with-fragment + java.lang.URL constructor also accepts this form.*/ if (relPath.startsWith("/")) this.path = baseURL.path + relPath.substring(1); else this.path = baseURL.path + relPath; } else { @@ -518,7 +518,7 @@ public class MultiProtocolURL implements Serializable, Comparable= 0 && host.charAt(0) != '[') { copy.host = '[' + host + ']'; // IPv6 host must be enclosed in square brackets } else { - copy.host = host; + copy.host = host; } - + if (!Punycode.isBasic(this.host)) try { this.host = toPunycode(this.host); } catch (final PunycodeException e) { ConcurrentLog.logException(e); } - + return copy; - + } /** @@ -568,7 +568,7 @@ public class MultiProtocolURL implements Serializable, Comparable parts 2.C and 2.D */ while(p.startsWith("/../")) { p = p.substring(3); @@ -600,7 +600,7 @@ public class MultiProtocolURL implements Serializable, Comparable *

Important : already percent-encoded characters are not re-encoded

- * + * * @param pathToEscape the path part to escape. * @return an escaped path with only ASCII characters, or null when pathToEscape * is null. @@ -612,13 +612,13 @@ public class MultiProtocolURL implements Serializable, ComparablePercent-encode/escape an URL path regular expression according to the allowed * characters in an URL path (see RFC3986) and in the {@link Pattern} regular * expressions. Uses UTF-8 character codes for non-ASCII.

*

Important : already percent-encoded characters are not re-encoded

- * + * * @param pathPattern the URL path regular expression to escape. * @return an escaped path regular expression with only allowed ASCII * characters, or null when pathPattern is null. @@ -630,7 +630,7 @@ public class MultiProtocolURL implements Serializable, Comparable * Percent-encode/escape an URL path part according to the allowed characters @@ -642,7 +642,7 @@ public class MultiProtocolURL implements Serializable, Comparable - * + * * @param pathToEscape the path part to escape. * @param isPattern when true, regular meta-characters are not escaped * @return an escaped path regular expression with only allowed ASCII @@ -661,7 +661,7 @@ public class MultiProtocolURL implements Serializable, Comparable @@ -715,7 +715,7 @@ public class MultiProtocolURL implements Serializable, Comparablethe '+' character is not decoded to space character *
  • no exception is thrown when invalid hexadecimal digits are found after a '%' character
    • * - * + * * @param path an URL path eventually escaped * @return return the unescaped path or null when path is null. */ @@ -738,7 +738,7 @@ public class MultiProtocolURL implements Serializable, Comparable= '0' && character <= '9') || (character >= 'a' && character <= 'f') || (character >= 'A' && character <= 'F'); } - + private void escapeSearchpart() { final StringBuilder qtmp = new StringBuilder(this.searchpart.length() + 10); for (final Map.Entry element: getAttributes().entrySet()) { @@ -827,7 +827,7 @@ public class MultiProtocolURL implements Serializable, ComparableThe unreserved characters & : - _ . ! ~ * ' ( ) ; , = remain the same. * see RFC 1738 2.2 and RFC 3986 2.2 - * + * *
  • All other ASCII characters are converted into the * 3-character string "%xy", where xy is * the two-digit hexadecimal representation of the character @@ -849,24 +849,24 @@ public class MultiProtocolURL implements Serializable, Comparable= '0' && s.charAt(i + 1) <= '9' && s.charAt(i + 2) >= '0' && s.charAt(i + 2) <= '9') { // TODO: actually 0..9 A..F a..f is allowed (or any of hex[] sequence) sbuf.append((char)ch); // lets consider this is used for encoding, leave it that way } else { sbuf.append("%25"); // '%' RFC 1738 2.2 unsafe char shall be encoded } - } else if (ch == '&') { + } else if (ch == '&') { if (i < len - 6 && "amp;".equals(s.substring(i + 1, i + 5).toLowerCase(Locale.ROOT))) { sbuf.append((char)ch); // leave it that way, it is used the right way } else { sbuf.append("%26"); // this must be urlencoded } - } else if (ch == '#') { // RFC 1738 2.2 unsafe char is _not_ encoded because it may already be used for encoding + } else if (ch == '#') { // RFC 1738 2.2 unsafe char is _not_ encoded because it may already be used for encoding sbuf.append((char)ch); } else if (ch == '!' || ch == ':' // unreserved || ch == '-' || ch == '_' - || ch == '.' || ch == '~' + || ch == '.' || ch == '~' || ch == '*' || ch == '\'' || ch == '(' || ch == ')' || ch == '{' || ch == '}' @@ -903,16 +903,16 @@ public class MultiProtocolURL implements Serializable, Comparable 1) { // prevent StringIndexOutOfBoundsException c = this.path.charAt(2); if (c == ':' || c == '|') return new File(this.path.charAt(1) + ":" + this.path.substring(3)); @@ -1124,12 +1124,12 @@ public class MultiProtocolURL implements Serializable, ComparableURL fragment concept at WHATWG - * @see URL fragment section in RFC 3986 + * @see URL fragment section in RFC 3986 */ public String getRef() { return this.anchor; @@ -1194,10 +1194,10 @@ public class MultiProtocolURL implements Serializable, Comparable getSearchpartMap() { if (this.searchpart == null) return null; this.searchpart = this.searchpart.replaceAll("&", "&"); - String[] parts = CommonPattern.AMP.split(this.searchpart); - Map map = new LinkedHashMap(); - for (String part: parts) { - int p = part.indexOf('='); + final String[] parts = CommonPattern.AMP.split(this.searchpart); + final Map map = new LinkedHashMap<>(); + for (final String part: parts) { + final int p = part.indexOf('='); if (p > 0) map.put(part.substring(0, p), part.substring(p + 1)); else map.put(part, ""); } return map; @@ -1210,7 +1210,7 @@ public class MultiProtocolURL implements Serializable, Comparable token = new LinkedHashSet(); + final Set token = new LinkedHashSet<>(); for (final String r: u) token.add(r); for (final String r: u) token.addAll(parseCamelCase(r)); @@ -1246,7 +1246,7 @@ public class MultiProtocolURL implements Serializable, Comparable parseCamelCase(String s) { - final Set token = new LinkedHashSet(); + final Set token = new LinkedHashSet<>(); if (s.isEmpty()) return token; int p = 0; CharType type = charType(s.charAt(0)), nct = type; @@ -1272,18 +1272,18 @@ public class MultiProtocolURL implements Serializable, Comparable getAttributes() { - Map map = new LinkedHashMap<>(); + final Map map = new LinkedHashMap<>(); if (this.searchpart == null) return map; final String[] questp = CommonPattern.AMP.split(this.searchpart, -1); for (final String element : questp) { - int p = element.indexOf('='); + final int p = element.indexOf('='); if (p != -1) { map.put(unescape(element.substring(0, p)), unescape(element.substring(p + 1))); } else { @@ -1292,13 +1292,13 @@ public class MultiProtocolURL implements Serializable, Comparable
  • Html mapping file path (optional)
    • * */ - public static void main(String args[]) { + public static void main(final String args[]) { try { if (args.length < 2) { System.out.println("Usage : java " + OpenSearchConnector.class.getCanonicalName() + " <\"searchTerms\"> [htmlMappingFile]"); return; } - OpenSearchConnector connector = new OpenSearchConnector(args[0]); + final OpenSearchConnector connector = new OpenSearchConnector(args[0]); String htmlMappingFile; if (args.length > 2) { htmlMappingFile = args[2]; @@ -407,12 +407,12 @@ public class OpenSearchConnector extends AbstractFederateSearchConnector impleme if(searchTerms.length() > 2 && searchTerms.startsWith("\"") && searchTerms.endsWith("\"")) { searchTerms = searchTerms.substring(1, searchTerms.length() - 1); } - List docs = connector.query(searchTerms, 0, 20); + final List docs = connector.query(searchTerms, 0, 20); if (docs.isEmpty()) { System.out.println("No results"); } else { - for (URIMetadataNode doc : docs) { + for (final URIMetadataNode doc : docs) { System.out.println("title : " + doc.getFieldValue(CollectionSchema.title.getSolrFieldName())); System.out.println("sku : " + doc.getFieldValue(CollectionSchema.sku.getSolrFieldName())); System.out.println( diff --git a/source/net/yacy/cora/federate/opensearch/SRURSSConnector.java b/source/net/yacy/cora/federate/opensearch/SRURSSConnector.java index a8e1ebb15..e217f75d0 100644 --- a/source/net/yacy/cora/federate/opensearch/SRURSSConnector.java +++ b/source/net/yacy/cora/federate/opensearch/SRURSSConnector.java @@ -1,7 +1,7 @@ /** * AccumulateSRURSS * Copyright 2010 by Michael Peter Christen - * First released 06.01.2011 at http://yacy.net + * First released 06.01.2011 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -25,6 +25,8 @@ import java.net.MalformedURLException; import java.util.LinkedHashMap; import java.util.concurrent.BlockingQueue; +import org.apache.http.entity.mime.content.ContentBody; + import net.yacy.cora.document.encoding.UTF8; import net.yacy.cora.document.feed.RSSFeed; import net.yacy.cora.document.feed.RSSMessage; @@ -34,8 +36,6 @@ import net.yacy.cora.federate.yacy.CacheStrategy; import net.yacy.cora.protocol.ClientIdentification; import net.yacy.cora.protocol.http.HTTPClient; -import org.apache.http.entity.mime.content.ContentBody; - public class SRURSSConnector { private final static int recordsPerSession = 250; @@ -114,7 +114,7 @@ public class SRURSSConnector { // send request byte[] result = new byte[0]; try { - final LinkedHashMap parts = new LinkedHashMap(); + final LinkedHashMap parts = new LinkedHashMap<>(); parts.put("query", UTF8.StringBody(query)); parts.put("startRecord", UTF8.StringBody(Integer.toString(startRecord))); parts.put("maximumRecords", UTF8.StringBody(Long.toString(maximumRecords))); diff --git a/source/net/yacy/cora/federate/solr/FailCategory.java b/source/net/yacy/cora/federate/solr/FailCategory.java index cad47f461..31d27d748 100644 --- a/source/net/yacy/cora/federate/solr/FailCategory.java +++ b/source/net/yacy/cora/federate/solr/FailCategory.java @@ -1,7 +1,7 @@ /** * FailCategory * Copyright 2013 by Michael Peter Christen - * First released 17.10.2013 at http://yacy.net + * First released 17.10.2013 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/federate/solr/FailType.java b/source/net/yacy/cora/federate/solr/FailType.java index 59a57e7f8..c3531b497 100644 --- a/source/net/yacy/cora/federate/solr/FailType.java +++ b/source/net/yacy/cora/federate/solr/FailType.java @@ -1,7 +1,7 @@ /** * FailType * Copyright 2012 by Michael Peter Christen - * First released 23.11.2012 at http://yacy.net + * First released 23.11.2012 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/federate/solr/ProcessType.java b/source/net/yacy/cora/federate/solr/ProcessType.java index 8c64da5b3..803f703ca 100644 --- a/source/net/yacy/cora/federate/solr/ProcessType.java +++ b/source/net/yacy/cora/federate/solr/ProcessType.java @@ -1,7 +1,7 @@ /** * ProcessType * Copyright 2013 by Michael Peter Christen - * First released 02.01.2013 at http://yacy.net + * First released 02.01.2013 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/federate/solr/Ranking.java b/source/net/yacy/cora/federate/solr/Ranking.java index ee82c887d..a16e3b56e 100644 --- a/source/net/yacy/cora/federate/solr/Ranking.java +++ b/source/net/yacy/cora/federate/solr/Ranking.java @@ -1,7 +1,7 @@ /** * Ranking * Copyright 2013 by Michael Peter Christen - * First released 12.03.2013 at http://yacy.net + * First released 12.03.2013 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/federate/solr/SchemaConfiguration.java b/source/net/yacy/cora/federate/solr/SchemaConfiguration.java index 175effcc0..bf2edc686 100644 --- a/source/net/yacy/cora/federate/solr/SchemaConfiguration.java +++ b/source/net/yacy/cora/federate/solr/SchemaConfiguration.java @@ -1,7 +1,7 @@ /** * SchemaConfiguration * Copyright 2011 by Michael Peter Christen, mc@yacy.net, Frankfurt a. M., Germany - * First released 29.06.2011 at http://yacy.net + * First released 29.06.2011 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/federate/solr/SchemaDeclaration.java b/source/net/yacy/cora/federate/solr/SchemaDeclaration.java index 94767e64c..1460a1d51 100644 --- a/source/net/yacy/cora/federate/solr/SchemaDeclaration.java +++ b/source/net/yacy/cora/federate/solr/SchemaDeclaration.java @@ -1,7 +1,7 @@ /** * SchemaDeclaration * Copyright 2011 by Michael Peter Christen - * First released 14.04.2011 at http://yacy.net + * First released 14.04.2011 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/federate/solr/SolrType.java b/source/net/yacy/cora/federate/solr/SolrType.java index 1b844a903..70694e3c7 100644 --- a/source/net/yacy/cora/federate/solr/SolrType.java +++ b/source/net/yacy/cora/federate/solr/SolrType.java @@ -1,7 +1,7 @@ /** * SolrType * Copyright 2011 by Michael Peter Christen - * First released 14.04.2011 at http://yacy.net + * First released 14.04.2011 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/federate/solr/connector/AbstractSolrConnector.java b/source/net/yacy/cora/federate/solr/connector/AbstractSolrConnector.java index b284e876c..e2e9ea0ec 100644 --- a/source/net/yacy/cora/federate/solr/connector/AbstractSolrConnector.java +++ b/source/net/yacy/cora/federate/solr/connector/AbstractSolrConnector.java @@ -1,7 +1,7 @@ /** * AbstractSolrConnector * Copyright 2012 by Michael Peter Christen - * First released 27.06.2012 at http://yacy.net + * First released 27.06.2012 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/federate/solr/connector/EmbeddedSolrConnector.java b/source/net/yacy/cora/federate/solr/connector/EmbeddedSolrConnector.java index b1a931acd..1b0728727 100644 --- a/source/net/yacy/cora/federate/solr/connector/EmbeddedSolrConnector.java +++ b/source/net/yacy/cora/federate/solr/connector/EmbeddedSolrConnector.java @@ -1,7 +1,7 @@ /** * EmbeddedSolrConnector * Copyright 2012 by Michael Peter Christen - * First released 21.06.2012 at http://yacy.net + * First released 21.06.2012 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/federate/solr/connector/MirrorSolrConnector.java b/source/net/yacy/cora/federate/solr/connector/MirrorSolrConnector.java index b46d13193..97e5b402e 100644 --- a/source/net/yacy/cora/federate/solr/connector/MirrorSolrConnector.java +++ b/source/net/yacy/cora/federate/solr/connector/MirrorSolrConnector.java @@ -1,7 +1,7 @@ /** * MirrorSolrConnector * Copyright 2013 by Michael Peter Christen - * First released 18.02.2012 at http://yacy.net + * First released 18.02.2012 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/federate/solr/connector/RemoteSolrConnector.java b/source/net/yacy/cora/federate/solr/connector/RemoteSolrConnector.java index 645c301f9..7ab94cb2e 100644 --- a/source/net/yacy/cora/federate/solr/connector/RemoteSolrConnector.java +++ b/source/net/yacy/cora/federate/solr/connector/RemoteSolrConnector.java @@ -1,7 +1,7 @@ /** * SolrSingleConnector * Copyright 2011 by Michael Peter Christen - * First released 14.04.2011 at http://yacy.net + * First released 14.04.2011 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/federate/solr/connector/ShardSelection.java b/source/net/yacy/cora/federate/solr/connector/ShardSelection.java index c05afd312..7c07124a5 100644 --- a/source/net/yacy/cora/federate/solr/connector/ShardSelection.java +++ b/source/net/yacy/cora/federate/solr/connector/ShardSelection.java @@ -1,7 +1,7 @@ /** * SolrChardingSelection * Copyright 2011 by Michael Peter Christen - * First released 25.05.2011 at http://yacy.net + * First released 25.05.2011 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/federate/solr/connector/SolrConnector.java b/source/net/yacy/cora/federate/solr/connector/SolrConnector.java index a0de17230..b9706fb35 100644 --- a/source/net/yacy/cora/federate/solr/connector/SolrConnector.java +++ b/source/net/yacy/cora/federate/solr/connector/SolrConnector.java @@ -1,7 +1,7 @@ /** * SolrConnector * Copyright 2011 by Michael Peter Christen - * First released 13.09.2011 at http://yacy.net + * First released 13.09.2011 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/federate/solr/connector/SolrServerConnector.java b/source/net/yacy/cora/federate/solr/connector/SolrServerConnector.java index 4a1b7c4fb..9fabc4d8e 100644 --- a/source/net/yacy/cora/federate/solr/connector/SolrServerConnector.java +++ b/source/net/yacy/cora/federate/solr/connector/SolrServerConnector.java @@ -1,7 +1,7 @@ /** * SolrServerConnector * Copyright 2012 by Michael Peter Christen - * First released 21.06.2012 at http://yacy.net + * First released 21.06.2012 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/federate/solr/instance/EmbeddedInstance.java b/source/net/yacy/cora/federate/solr/instance/EmbeddedInstance.java index 4ffa81cef..cd453f057 100644 --- a/source/net/yacy/cora/federate/solr/instance/EmbeddedInstance.java +++ b/source/net/yacy/cora/federate/solr/instance/EmbeddedInstance.java @@ -1,7 +1,7 @@ /** * EmbeddedInstance * Copyright 2013 by Michael Peter Christen - * First released 13.02.2013 at http://yacy.net + * First released 13.02.2013 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/federate/solr/instance/InstanceMirror.java b/source/net/yacy/cora/federate/solr/instance/InstanceMirror.java index bb48a4d5a..61e4321e6 100644 --- a/source/net/yacy/cora/federate/solr/instance/InstanceMirror.java +++ b/source/net/yacy/cora/federate/solr/instance/InstanceMirror.java @@ -1,7 +1,7 @@ /** * InstanceMirror * Copyright 2013 by Michael Peter Christen - * First released 18.02.2013 at http://yacy.net + * First released 18.02.2013 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/federate/solr/instance/RemoteInstance.java b/source/net/yacy/cora/federate/solr/instance/RemoteInstance.java index 39a0adb4f..0052eb2f4 100644 --- a/source/net/yacy/cora/federate/solr/instance/RemoteInstance.java +++ b/source/net/yacy/cora/federate/solr/instance/RemoteInstance.java @@ -1,7 +1,7 @@ /** * RemoteInstance * Copyright 2013 by Michael Peter Christen - * First released 13.02.2013 at http://yacy.net + * First released 13.02.2013 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/federate/solr/instance/ResponseAccumulator.java b/source/net/yacy/cora/federate/solr/instance/ResponseAccumulator.java index 9ef9b6710..71afe3fb0 100644 --- a/source/net/yacy/cora/federate/solr/instance/ResponseAccumulator.java +++ b/source/net/yacy/cora/federate/solr/instance/ResponseAccumulator.java @@ -1,7 +1,7 @@ /** * ResponseAccumulator * Copyright 2013 by Michael Peter Christen - * First released 13.02.2013 at http://yacy.net + * First released 13.02.2013 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/federate/solr/instance/ServerMirror.java b/source/net/yacy/cora/federate/solr/instance/ServerMirror.java index 523cd5a58..3ecc57b53 100644 --- a/source/net/yacy/cora/federate/solr/instance/ServerMirror.java +++ b/source/net/yacy/cora/federate/solr/instance/ServerMirror.java @@ -1,7 +1,7 @@ /** * ServerMirror * Copyright 2013 by Michael Peter Christen - * First released 18.02.2013 at http://yacy.net + * First released 18.02.2013 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/federate/solr/instance/ServerShard.java b/source/net/yacy/cora/federate/solr/instance/ServerShard.java index fc9329854..65be7b6eb 100644 --- a/source/net/yacy/cora/federate/solr/instance/ServerShard.java +++ b/source/net/yacy/cora/federate/solr/instance/ServerShard.java @@ -1,7 +1,7 @@ /** * ServerShard * Copyright 2013 by Michael Peter Christen - * First released 13.02.2013 at http://yacy.net + * First released 13.02.2013 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/federate/solr/instance/ShardInstance.java b/source/net/yacy/cora/federate/solr/instance/ShardInstance.java index b955391d2..2244be4c2 100644 --- a/source/net/yacy/cora/federate/solr/instance/ShardInstance.java +++ b/source/net/yacy/cora/federate/solr/instance/ShardInstance.java @@ -1,7 +1,7 @@ /** * ShardInstance * Copyright 2013 by Michael Peter Christen - * First released 13.02.2013 at http://yacy.net + * First released 13.02.2013 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/federate/solr/instance/SolrInstance.java b/source/net/yacy/cora/federate/solr/instance/SolrInstance.java index dd16c69ef..70285108b 100644 --- a/source/net/yacy/cora/federate/solr/instance/SolrInstance.java +++ b/source/net/yacy/cora/federate/solr/instance/SolrInstance.java @@ -1,7 +1,7 @@ /** * SolrInstance * Copyright 2013 by Michael Peter Christen - * First released 13.02.2013 at http://yacy.net + * First released 13.02.2013 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/federate/solr/logic/AbstractTerm.java b/source/net/yacy/cora/federate/solr/logic/AbstractTerm.java index 18bb7f3f4..a88b1cd2a 100644 --- a/source/net/yacy/cora/federate/solr/logic/AbstractTerm.java +++ b/source/net/yacy/cora/federate/solr/logic/AbstractTerm.java @@ -1,7 +1,7 @@ /** * AbstractTerm * Copyright 2014 by Michael Peter Christen - * First released 03.08.2014 at http://yacy.net + * First released 03.08.2014 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/federate/solr/logic/BooleanLiteral.java b/source/net/yacy/cora/federate/solr/logic/BooleanLiteral.java index 47b5f8b37..46d9e7d3a 100644 --- a/source/net/yacy/cora/federate/solr/logic/BooleanLiteral.java +++ b/source/net/yacy/cora/federate/solr/logic/BooleanLiteral.java @@ -1,7 +1,7 @@ /** * BooleanLiteral * Copyright 2014 by Michael Peter Christen - * First released 24.10.2014 at http://yacy.net + * First released 24.10.2014 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/federate/solr/logic/CatchallLiteral.java b/source/net/yacy/cora/federate/solr/logic/CatchallLiteral.java index 1a9aa5e0d..02104a42f 100644 --- a/source/net/yacy/cora/federate/solr/logic/CatchallLiteral.java +++ b/source/net/yacy/cora/federate/solr/logic/CatchallLiteral.java @@ -1,7 +1,7 @@ /** * CatchallLiteral * Copyright 2014 by Michael Peter Christen - * First released 24.10.2014 at http://yacy.net + * First released 24.10.2014 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/federate/solr/logic/Conjunction.java b/source/net/yacy/cora/federate/solr/logic/Conjunction.java index 06f09204e..294e7471e 100644 --- a/source/net/yacy/cora/federate/solr/logic/Conjunction.java +++ b/source/net/yacy/cora/federate/solr/logic/Conjunction.java @@ -1,7 +1,7 @@ /** * Conjunction * Copyright 2014 by Michael Peter Christen - * First released 03.08.2014 at http://yacy.net + * First released 03.08.2014 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/federate/solr/logic/Disjunction.java b/source/net/yacy/cora/federate/solr/logic/Disjunction.java index bd2c74073..ea11b02b4 100644 --- a/source/net/yacy/cora/federate/solr/logic/Disjunction.java +++ b/source/net/yacy/cora/federate/solr/logic/Disjunction.java @@ -1,7 +1,7 @@ /** * Disjunction * Copyright 2014 by Michael Peter Christen - * First released 03.08.2014 at http://yacy.net + * First released 03.08.2014 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/federate/solr/logic/Literal.java b/source/net/yacy/cora/federate/solr/logic/Literal.java index edea5a1d7..9dbaa6773 100644 --- a/source/net/yacy/cora/federate/solr/logic/Literal.java +++ b/source/net/yacy/cora/federate/solr/logic/Literal.java @@ -1,7 +1,7 @@ /** * Literal * Copyright 2014 by Michael Peter Christen - * First released 03.08.2014 at http://yacy.net + * First released 03.08.2014 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/federate/solr/logic/LongLiteral.java b/source/net/yacy/cora/federate/solr/logic/LongLiteral.java index 0b6dca17f..67677d2ae 100644 --- a/source/net/yacy/cora/federate/solr/logic/LongLiteral.java +++ b/source/net/yacy/cora/federate/solr/logic/LongLiteral.java @@ -1,7 +1,7 @@ /** * LongLiteral * Copyright 2014 by Michael Peter Christen - * First released 24.10.2014 at http://yacy.net + * First released 24.10.2014 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/federate/solr/logic/Negation.java b/source/net/yacy/cora/federate/solr/logic/Negation.java index 5042342b1..add759ab7 100644 --- a/source/net/yacy/cora/federate/solr/logic/Negation.java +++ b/source/net/yacy/cora/federate/solr/logic/Negation.java @@ -1,7 +1,7 @@ /** * Negation * Copyright 2014 by Michael Peter Christen - * First released 03.08.2014 at http://yacy.net + * First released 03.08.2014 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/federate/solr/logic/StringLiteral.java b/source/net/yacy/cora/federate/solr/logic/StringLiteral.java index fc00137df..c078f37ff 100644 --- a/source/net/yacy/cora/federate/solr/logic/StringLiteral.java +++ b/source/net/yacy/cora/federate/solr/logic/StringLiteral.java @@ -1,7 +1,7 @@ /** * StringLiteral * Copyright 2014 by Michael Peter Christen - * First released 03.08.2014 at http://yacy.net + * First released 03.08.2014 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/federate/solr/logic/Term.java b/source/net/yacy/cora/federate/solr/logic/Term.java index 685e0bf7f..c9f208e97 100644 --- a/source/net/yacy/cora/federate/solr/logic/Term.java +++ b/source/net/yacy/cora/federate/solr/logic/Term.java @@ -1,7 +1,7 @@ /** * Term * Copyright 2014 by Michael Peter Christen - * First released 03.08.2014 at http://yacy.net + * First released 03.08.2014 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/federate/solr/logic/TermTools.java b/source/net/yacy/cora/federate/solr/logic/TermTools.java index 0be80e926..7c167a906 100644 --- a/source/net/yacy/cora/federate/solr/logic/TermTools.java +++ b/source/net/yacy/cora/federate/solr/logic/TermTools.java @@ -1,7 +1,7 @@ /** * TermTools * Copyright 2014 by Michael Peter Christen - * First released 04.08.2014 at http://yacy.net + * First released 04.08.2014 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/federate/solr/responsewriter/EnhancedXMLResponseWriter.java b/source/net/yacy/cora/federate/solr/responsewriter/EnhancedXMLResponseWriter.java index 3504048c2..f25e599af 100644 --- a/source/net/yacy/cora/federate/solr/responsewriter/EnhancedXMLResponseWriter.java +++ b/source/net/yacy/cora/federate/solr/responsewriter/EnhancedXMLResponseWriter.java @@ -1,7 +1,7 @@ /** * FastXMLResponseWriter * Copyright 2012 by Michael Peter Christen - * First released 06.08.2012 at http://yacy.net + * First released 06.08.2012 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/federate/solr/responsewriter/FlatJSONResponseWriter.java b/source/net/yacy/cora/federate/solr/responsewriter/FlatJSONResponseWriter.java index 48ec35d47..57047c951 100644 --- a/source/net/yacy/cora/federate/solr/responsewriter/FlatJSONResponseWriter.java +++ b/source/net/yacy/cora/federate/solr/responsewriter/FlatJSONResponseWriter.java @@ -1,7 +1,7 @@ /** * FlatJSONResponseWriter * Copyright 2017 by Michael Peter Christen - * First released 30.03.2017 at http://yacy.net + * First released 30.03.2017 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/federate/solr/responsewriter/GrepHTMLResponseWriter.java b/source/net/yacy/cora/federate/solr/responsewriter/GrepHTMLResponseWriter.java index e57b056da..d662c119c 100644 --- a/source/net/yacy/cora/federate/solr/responsewriter/GrepHTMLResponseWriter.java +++ b/source/net/yacy/cora/federate/solr/responsewriter/GrepHTMLResponseWriter.java @@ -1,7 +1,7 @@ /** * GrepHTMLResponseWriter * Copyright 2013 by Michael Peter Christen - * First released 09.06.2013 at http://yacy.net + * First released 09.06.2013 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/federate/solr/responsewriter/HTMLResponseWriter.java b/source/net/yacy/cora/federate/solr/responsewriter/HTMLResponseWriter.java index 51ff9b8f1..8e03fb832 100644 --- a/source/net/yacy/cora/federate/solr/responsewriter/HTMLResponseWriter.java +++ b/source/net/yacy/cora/federate/solr/responsewriter/HTMLResponseWriter.java @@ -1,7 +1,7 @@ /** * HTMLResponseWriter * Copyright 2013 by Michael Peter Christen - * First released 09.06.2013 at http://yacy.net + * First released 09.06.2013 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/federate/solr/responsewriter/OpensearchResponseWriter.java b/source/net/yacy/cora/federate/solr/responsewriter/OpensearchResponseWriter.java index 8fed925ac..6786f0ed4 100644 --- a/source/net/yacy/cora/federate/solr/responsewriter/OpensearchResponseWriter.java +++ b/source/net/yacy/cora/federate/solr/responsewriter/OpensearchResponseWriter.java @@ -1,7 +1,7 @@ /** * OpensearchResponseWriter * Copyright 2012 by Michael Peter Christen - * First released 06.08.2012 at http://yacy.net + * First released 06.08.2012 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/federate/solr/responsewriter/YJsonResponseWriter.java b/source/net/yacy/cora/federate/solr/responsewriter/YJsonResponseWriter.java index 9ff2da1bc..b7395a284 100644 --- a/source/net/yacy/cora/federate/solr/responsewriter/YJsonResponseWriter.java +++ b/source/net/yacy/cora/federate/solr/responsewriter/YJsonResponseWriter.java @@ -1,7 +1,7 @@ /** * JsonResponseWriter * Copyright 2012 by Michael Peter Christen - * First released 10.09.2012 at http://yacy.net + * First released 10.09.2012 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/federate/yacy/CacheStrategy.java b/source/net/yacy/cora/federate/yacy/CacheStrategy.java index 5b43a9dd5..addeb62fc 100644 --- a/source/net/yacy/cora/federate/yacy/CacheStrategy.java +++ b/source/net/yacy/cora/federate/yacy/CacheStrategy.java @@ -1,7 +1,7 @@ /** * CacheStrategy * Copyright 2011 by Michael Peter Christen - * First released 2011 at http://yacy.net + * First released 2011 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/federate/yacy/Distribution.java b/source/net/yacy/cora/federate/yacy/Distribution.java index a35de9aca..be4d2c6f8 100644 --- a/source/net/yacy/cora/federate/yacy/Distribution.java +++ b/source/net/yacy/cora/federate/yacy/Distribution.java @@ -1,7 +1,7 @@ /** * VerticalPartition * Copyright 2009 by Michael Peter Christen - * First released 28.01.2009 at http://yacy.net + * First released 28.01.2009 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/federate/yacy/Peer.java b/source/net/yacy/cora/federate/yacy/Peer.java index 457288dc2..608dc0031 100644 --- a/source/net/yacy/cora/federate/yacy/Peer.java +++ b/source/net/yacy/cora/federate/yacy/Peer.java @@ -1,7 +1,7 @@ /** * Peer * Copyright 2012 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 21.09.2012 at http://yacy.net + * First released 21.09.2012 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/federate/yacy/Peers.java b/source/net/yacy/cora/federate/yacy/Peers.java index 490313189..e982fd827 100644 --- a/source/net/yacy/cora/federate/yacy/Peers.java +++ b/source/net/yacy/cora/federate/yacy/Peers.java @@ -1,7 +1,7 @@ /** * Peers * Copyright 2012 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 21.09.2012 at http://yacy.net + * First released 21.09.2012 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/federate/yacy/api/Network.java b/source/net/yacy/cora/federate/yacy/api/Network.java index 486b1b917..0b8316719 100644 --- a/source/net/yacy/cora/federate/yacy/api/Network.java +++ b/source/net/yacy/cora/federate/yacy/api/Network.java @@ -1,7 +1,7 @@ /** * Peers * Copyright 2012 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 21.09.2012 at http://yacy.net + * First released 21.09.2012 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/language/phonetic/Phonetic.java b/source/net/yacy/cora/language/phonetic/Phonetic.java index c7d6ff2af..11c468e51 100644 --- a/source/net/yacy/cora/language/phonetic/Phonetic.java +++ b/source/net/yacy/cora/language/phonetic/Phonetic.java @@ -1,7 +1,7 @@ /** * Phonetic * Copyright 201 by Michael Peter Christen, mc@yacy.net, Frankfurt a. M., Germany - * First released 13.12.2011 at http://yacy.net + * First released 13.12.2011 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/cora/lod/Literal.java b/source/net/yacy/cora/lod/Literal.java index 94b0bea70..40e3acb1e 100644 --- a/source/net/yacy/cora/lod/Literal.java +++ b/source/net/yacy/cora/lod/Literal.java @@ -1,7 +1,7 @@ /** * Literal * Copyright 2011 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 18.12.2011 at http://yacy.net + * First released 18.12.2011 at https://yacy.net * * $LastChangedDate: 2011-04-14 00:04:23 +0200 (Do, 14 Apr 2011) $ * $LastChangedRevision: 7653 $ diff --git a/source/net/yacy/cora/lod/Node.java b/source/net/yacy/cora/lod/Node.java index c2f279b70..a33a1571b 100644 --- a/source/net/yacy/cora/lod/Node.java +++ b/source/net/yacy/cora/lod/Node.java @@ -1,7 +1,7 @@ /** * AbstractScoreMap * Copyright 2011 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 16.12.2011 at http://yacy.net + * First released 16.12.2011 at https://yacy.net * * $LastChangedDate: 2011-04-14 00:04:23 +0200 (Do, 14 Apr 2011) $ * $LastChangedRevision: 7653 $ diff --git a/source/net/yacy/cora/lod/Syntax.java b/source/net/yacy/cora/lod/Syntax.java index b34a78e87..084dbf1a4 100644 --- a/source/net/yacy/cora/lod/Syntax.java +++ b/source/net/yacy/cora/lod/Syntax.java @@ -1,7 +1,7 @@ /** * Syntax * Copyright 2011 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 17.12.2011 at http://yacy.net + * First released 17.12.2011 at https://yacy.net * * $LastChangedDate: 2011-04-14 00:04:23 +0200 (Do, 14 Apr 2011) $ * $LastChangedRevision: 7653 $ diff --git a/source/net/yacy/cora/lod/Vocabulary.java b/source/net/yacy/cora/lod/Vocabulary.java index 3566128e3..dde7d605d 100644 --- a/source/net/yacy/cora/lod/Vocabulary.java +++ b/source/net/yacy/cora/lod/Vocabulary.java @@ -1,7 +1,7 @@ /** * Vocabulary * Copyright 2011 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 16.12.2011 at http://yacy.net + * First released 16.12.2011 at https://yacy.net * * $LastChangedDate: 2011-04-14 00:04:23 +0200 (Do, 14 Apr 2011) $ * $LastChangedRevision: 7653 $ diff --git a/source/net/yacy/cora/lod/vocabulary/AnnoteaA.java b/source/net/yacy/cora/lod/vocabulary/AnnoteaA.java index eb0e2fef2..139375e44 100644 --- a/source/net/yacy/cora/lod/vocabulary/AnnoteaA.java +++ b/source/net/yacy/cora/lod/vocabulary/AnnoteaA.java @@ -1,7 +1,7 @@ /** * AnnoteaA * Copyright 2011 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 16.12.2011 at http://yacy.net + * First released 16.12.2011 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/lod/vocabulary/AnnoteaB.java b/source/net/yacy/cora/lod/vocabulary/AnnoteaB.java index 3591c6d56..fc16071f5 100644 --- a/source/net/yacy/cora/lod/vocabulary/AnnoteaB.java +++ b/source/net/yacy/cora/lod/vocabulary/AnnoteaB.java @@ -1,7 +1,7 @@ /** * AnnoteaB * Copyright 2011 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 16.12.2011 at http://yacy.net + * First released 16.12.2011 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/lod/vocabulary/CreativeCommons.java b/source/net/yacy/cora/lod/vocabulary/CreativeCommons.java index d21e11bf2..390fd4503 100644 --- a/source/net/yacy/cora/lod/vocabulary/CreativeCommons.java +++ b/source/net/yacy/cora/lod/vocabulary/CreativeCommons.java @@ -1,7 +1,7 @@ /** * CreativeCommons * Copyright 2011 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 17.12.2011 at http://yacy.net + * First released 17.12.2011 at https://yacy.net * * $LastChangedDate: 2011-04-14 00:04:23 +0200 (Do, 14 Apr 2011) $ * $LastChangedRevision: 7653 $ diff --git a/source/net/yacy/cora/lod/vocabulary/DMOZ.java b/source/net/yacy/cora/lod/vocabulary/DMOZ.java index 74080a26c..f4b290633 100644 --- a/source/net/yacy/cora/lod/vocabulary/DMOZ.java +++ b/source/net/yacy/cora/lod/vocabulary/DMOZ.java @@ -1,7 +1,7 @@ /** * DMOZ * Copyright 2011 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 16.12.2011 at http://yacy.net + * First released 16.12.2011 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/lod/vocabulary/DublinCore.java b/source/net/yacy/cora/lod/vocabulary/DublinCore.java index 0f8a54401..c12a9ecf8 100644 --- a/source/net/yacy/cora/lod/vocabulary/DublinCore.java +++ b/source/net/yacy/cora/lod/vocabulary/DublinCore.java @@ -1,7 +1,7 @@ /** * DublinCore * Copyright 2011 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 16.12.2011 at http://yacy.net + * First released 16.12.2011 at https://yacy.net * * $LastChangedDate: 2011-04-14 00:04:23 +0200 (Do, 14 Apr 2011) $ * $LastChangedRevision: 7653 $ diff --git a/source/net/yacy/cora/lod/vocabulary/Foaf.java b/source/net/yacy/cora/lod/vocabulary/Foaf.java index 760c969e1..c4b2000f5 100644 --- a/source/net/yacy/cora/lod/vocabulary/Foaf.java +++ b/source/net/yacy/cora/lod/vocabulary/Foaf.java @@ -1,7 +1,7 @@ /** * Foaf * Copyright 2011 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 17.12.2011 at http://yacy.net + * First released 17.12.2011 at https://yacy.net * * $LastChangedDate: 2011-04-14 00:04:23 +0200 (Do, 14 Apr 2011) $ * $LastChangedRevision: 7653 $ diff --git a/source/net/yacy/cora/lod/vocabulary/Geo.java b/source/net/yacy/cora/lod/vocabulary/Geo.java index 1b6084bbb..ed61b37fc 100644 --- a/source/net/yacy/cora/lod/vocabulary/Geo.java +++ b/source/net/yacy/cora/lod/vocabulary/Geo.java @@ -1,7 +1,7 @@ /** * Geo * Copyright 2011 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 16.12.2011 at http://yacy.net + * First released 16.12.2011 at https://yacy.net * * $LastChangedDate: 2011-04-14 00:04:23 +0200 (Do, 14 Apr 2011) $ * $LastChangedRevision: 7653 $ diff --git a/source/net/yacy/cora/lod/vocabulary/HttpHeader.java b/source/net/yacy/cora/lod/vocabulary/HttpHeader.java index ae6934295..341e1ec71 100644 --- a/source/net/yacy/cora/lod/vocabulary/HttpHeader.java +++ b/source/net/yacy/cora/lod/vocabulary/HttpHeader.java @@ -1,7 +1,7 @@ /** * HttpHeader * Copyright 2011 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 16.12.2011 at http://yacy.net + * First released 16.12.2011 at https://yacy.net * * $LastChangedDate: 2011-04-14 00:04:23 +0200 (Do, 14 Apr 2011) $ * $LastChangedRevision: 7653 $ diff --git a/source/net/yacy/cora/lod/vocabulary/Owl.java b/source/net/yacy/cora/lod/vocabulary/Owl.java index a4c56e5e0..478b0f547 100644 --- a/source/net/yacy/cora/lod/vocabulary/Owl.java +++ b/source/net/yacy/cora/lod/vocabulary/Owl.java @@ -1,7 +1,7 @@ /** * Owl * Copyright 2012 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 11.06.2011 at http://yacy.net + * First released 11.06.2011 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/lod/vocabulary/Rdf.java b/source/net/yacy/cora/lod/vocabulary/Rdf.java index 9b394d5d4..9e784da7b 100644 --- a/source/net/yacy/cora/lod/vocabulary/Rdf.java +++ b/source/net/yacy/cora/lod/vocabulary/Rdf.java @@ -1,7 +1,7 @@ /** * Rdf * Copyright 2011 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 17.12.2011 at http://yacy.net + * First released 17.12.2011 at https://yacy.net * * $LastChangedDate: 2011-04-14 00:04:23 +0200 (Do, 14 Apr 2011) $ * $LastChangedRevision: 7653 $ diff --git a/source/net/yacy/cora/lod/vocabulary/YaCyMetadata.java b/source/net/yacy/cora/lod/vocabulary/YaCyMetadata.java index 2b8ecde4d..691cf8b0c 100644 --- a/source/net/yacy/cora/lod/vocabulary/YaCyMetadata.java +++ b/source/net/yacy/cora/lod/vocabulary/YaCyMetadata.java @@ -1,7 +1,7 @@ /** * YaCyMetadata * Copyright 2011 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 16.12.2011 at http://yacy.net + * First released 16.12.2011 at https://yacy.net * * $LastChangedDate: 2011-04-14 00:04:23 +0200 (Do, 14 Apr 2011) $ * $LastChangedRevision: 7653 $ diff --git a/source/net/yacy/cora/order/AbstractOrder.java b/source/net/yacy/cora/order/AbstractOrder.java index 42e38f0cd..447c7d0ed 100644 --- a/source/net/yacy/cora/order/AbstractOrder.java +++ b/source/net/yacy/cora/order/AbstractOrder.java @@ -1,7 +1,7 @@ /** * AbstractOrder * Copyright 2011 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 25.08.2011 at http://yacy.net + * First released 25.08.2011 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/cora/order/Order.java b/source/net/yacy/cora/order/Order.java index 4872f2784..9c2fe2386 100644 --- a/source/net/yacy/cora/order/Order.java +++ b/source/net/yacy/cora/order/Order.java @@ -1,7 +1,7 @@ /** * Order * Copyright 2011 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 25.08.2011 at http://yacy.net + * First released 25.08.2011 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/cora/order/RatingOrder.java b/source/net/yacy/cora/order/RatingOrder.java index 95b6cb64c..de4673f30 100644 --- a/source/net/yacy/cora/order/RatingOrder.java +++ b/source/net/yacy/cora/order/RatingOrder.java @@ -1,7 +1,7 @@ /** * RatingOrder.java * Copyright 2011 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 25.08.2011 at http://yacy.net + * First released 25.08.2011 at https://yacy.net * * $LastChangedDate: 2011-04-14 00:04:23 +0200 (Do, 14 Apr 2011) $ * $LastChangedRevision: 7653 $ diff --git a/source/net/yacy/cora/plugin/ClassProvider.java b/source/net/yacy/cora/plugin/ClassProvider.java index a8b02a535..4beafdd29 100644 --- a/source/net/yacy/cora/plugin/ClassProvider.java +++ b/source/net/yacy/cora/plugin/ClassProvider.java @@ -1,7 +1,7 @@ /** * ClassProvider * Copyright 201 by Michael Peter Christen, mc@yacy.net, Frankfurt a. M., Germany - * First released 13.12.2011 at http://yacy.net + * First released 13.12.2011 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/cora/protocol/ByteArrayBody.java b/source/net/yacy/cora/protocol/ByteArrayBody.java index 132b20f41..f65829ca3 100644 --- a/source/net/yacy/cora/protocol/ByteArrayBody.java +++ b/source/net/yacy/cora/protocol/ByteArrayBody.java @@ -1,7 +1,7 @@ /** * ByteArrayBody * Copyright 2010 by Sebastian Gaebel - * First released 01.07.2010 at http://yacy.net + * First released 01.07.2010 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/cora/protocol/ClientIdentification.java b/source/net/yacy/cora/protocol/ClientIdentification.java index 761b65551..8e3eba44b 100644 --- a/source/net/yacy/cora/protocol/ClientIdentification.java +++ b/source/net/yacy/cora/protocol/ClientIdentification.java @@ -1,7 +1,7 @@ /** * ClientIdentification * Copyright 2011 by Michael Peter Christen, mc@yacy.net, Frankfurt a. M., Germany - * First released 26.04.2011 at http://yacy.net + * First released 26.04.2011 at https://yacy.net * * $LastChangedDate: 2011-04-21 23:59:56 +0200 (Do, 21 Apr 2011) $ * $LastChangedRevision: 7673 $ @@ -11,12 +11,12 @@ * 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 . @@ -34,7 +34,7 @@ public class ClientIdentification { public static final int clientTimeoutInit = 10000; public static final int minimumLocalDeltaInit = 10; // the minimum time difference between access of the same local domain public static final int minimumGlobalDeltaInit = 250; // the minimum time difference between access of the same global domain - + public static class Agent { public final String userAgent; // the name that is send in http request to identify the agent public final String[] robotIDs; // the name that is used in robots.txt to identify the agent @@ -47,7 +47,7 @@ public class ClientIdentification { this.clientTimeout = clientTimeout; } } - + private final static String[] browserAgents = new String[]{ // fake browser user agents are NOT AVAILABLE IN P2P OPERATION, only on special customer configurations (commercial users demanded this, I personally think this is inadvisable) "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1500.95 Safari/537.36", "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:22.0) Gecko/20100101 Firefox/22.0", @@ -66,7 +66,7 @@ public class ClientIdentification { "Mozilla/5.0 (X11; Ubuntu; Linux i686; rv:21.0) Gecko/20100101 Firefox/21.0" }; private static final Random random = new Random(System.currentTimeMillis()); - private static Map agents = new ConcurrentHashMap(); + private static Map agents = new ConcurrentHashMap<>(); public final static String yacyInternetCrawlerAgentName = "YaCy Internet (cautious)"; public static Agent yacyInternetCrawlerAgent = null; // defined later in static public final static String yacyIntranetCrawlerAgentName = "YaCy Intranet (greedy)"; @@ -85,7 +85,7 @@ public class ClientIdentification { public static final String yacySystem = System.getProperty("os.arch", "no-os-arch") + " " + System.getProperty("os.name", "no-os-name") + " " + System.getProperty("os.version", "no-os-version") + "; " + "java " + System.getProperty("java.version", "no-java-version") + "; " + generateLocation(); // keep this before the following static initialization block as this constant is used by generateYaCyBot() - + static { generateYaCyBot("new"); browserAgent = new Agent(browserAgents[random.nextInt(browserAgents.length)], new String[]{"Mozilla"}, minimumLocalDeltaInit, clientTimeoutInit); @@ -93,23 +93,23 @@ public class ClientIdentification { agents.put(browserAgentName, browserAgent); agents.put(yacyProxyAgentName, yacyProxyAgent); } - + /** * produce a YaCy user agent string * @param addinfo * @return */ - public static void generateYaCyBot(String addinfo) { - String agentString = "yacybot (" + addinfo + "; " + yacySystem + ") http://yacy.net/bot.html"; + public static void generateYaCyBot(final String addinfo) { + final String agentString = "yacybot (" + addinfo + "; " + yacySystem + ") https://yacy.net/bot.html"; yacyInternetCrawlerAgent = new Agent(agentString, new String[]{"yacybot"}, minimumGlobalDeltaInit, clientTimeoutInit); yacyIntranetCrawlerAgent = new Agent(agentString, new String[]{"yacybot"}, minimumLocalDeltaInit, clientTimeoutInit); // must have the same userAgent String as the web crawler because this is also used for snippets agents.put(yacyInternetCrawlerAgentName, yacyInternetCrawlerAgent); agents.put(yacyIntranetCrawlerAgentName, yacyIntranetCrawlerAgent); } - - public static void generateCustomBot(String name, String string, int minimumdelta, int clienttimeout) { + + public static void generateCustomBot(final String name, final String string, final int minimumdelta, final int clienttimeout) { if (name.toLowerCase().indexOf("yacy") >= 0 || string.toLowerCase().indexOf("yacy") >= 0) return; // don't allow 'yacy' in custom bot strings - String agentString = string.replace("$$SYSTEM$$", yacySystem.replace("java", "O")); + final String agentString = string.replace("$$SYSTEM$$", yacySystem.replace("java", "O")); agents.put(customAgentName, new Agent(agentString, new String[]{name}, minimumdelta, clienttimeout)); } @@ -117,15 +117,15 @@ public class ClientIdentification { * get the default agent * @param newagent */ - public static Agent getAgent(String agentName) { + public static Agent getAgent(final String agentName) { if (agentName == null || agentName.length() == 0) return yacyInternetCrawlerAgent; - Agent agent = agents.get(agentName); + final Agent agent = agents.get(agentName); return agent == null ? yacyInternetCrawlerAgent : agent; } - + /** * generating the location string - * + * * @return */ public static String generateLocation() { @@ -140,9 +140,9 @@ public class ClientIdentification { /** * gets the location out of the user agent - * + * * location must be after last ; and before first ) - * + * * @param userAgent in form "useragentinfo (some params; _location_) additional info" * @return */ diff --git a/source/net/yacy/cora/protocol/Domains.java b/source/net/yacy/cora/protocol/Domains.java index 6bb6c63ef..527d6cf67 100644 --- a/source/net/yacy/cora/protocol/Domains.java +++ b/source/net/yacy/cora/protocol/Domains.java @@ -1,7 +1,7 @@ /** * Domains * Copyright 2007 by Michael Peter Christen, mc@yacy.net, Frankfurt a. M., Germany - * First released 23.7.2007 at http://yacy.net + * First released 23.7.2007 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/cora/protocol/HeaderFramework.java b/source/net/yacy/cora/protocol/HeaderFramework.java index 0eeb3ddf2..5eba1cbbf 100644 --- a/source/net/yacy/cora/protocol/HeaderFramework.java +++ b/source/net/yacy/cora/protocol/HeaderFramework.java @@ -1,7 +1,7 @@ /** * HeaderFramework * Copyright 2004 by Michael Peter Christen, mc@yacy.net, Frankfurt a. M., Germany - * First released 2004 at http://yacy.net + * First released 2004 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/protocol/RequestHeader.java b/source/net/yacy/cora/protocol/RequestHeader.java index df1a09a1a..ccc8be808 100644 --- a/source/net/yacy/cora/protocol/RequestHeader.java +++ b/source/net/yacy/cora/protocol/RequestHeader.java @@ -1,7 +1,7 @@ /** * RequestHeader * Copyright 2008 by Michael Peter Christen, mc@yacy.net, Frankfurt a. M., Germany - * First released 22.08.2008 at http://yacy.net + * First released 22.08.2008 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/protocol/ResponseHeader.java b/source/net/yacy/cora/protocol/ResponseHeader.java index 9ae002d13..c7be30fa7 100644 --- a/source/net/yacy/cora/protocol/ResponseHeader.java +++ b/source/net/yacy/cora/protocol/ResponseHeader.java @@ -1,7 +1,7 @@ /** * ResponseHeader * Copyright 2008 by Michael Peter Christen, mc@yacy.net, Frankfurt a. M., Germany - * First released 22.08.2008 at http://yacy.net + * First released 22.08.2008 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/protocol/Scanner.java b/source/net/yacy/cora/protocol/Scanner.java index 9af8c8841..a034e0fa9 100644 --- a/source/net/yacy/cora/protocol/Scanner.java +++ b/source/net/yacy/cora/protocol/Scanner.java @@ -1,7 +1,7 @@ /** * Scanner * Copyright 2010 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 28.10.2010 at http://yacy.net + * First released 28.10.2010 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/cora/protocol/TimeoutRequest.java b/source/net/yacy/cora/protocol/TimeoutRequest.java index b4485fa0c..9e7fa2f9d 100644 --- a/source/net/yacy/cora/protocol/TimeoutRequest.java +++ b/source/net/yacy/cora/protocol/TimeoutRequest.java @@ -1,7 +1,7 @@ /** * TimeoutRequest * Copyright 2010 by Michael Peter Christen, mc@yacy.net, Frankfurt a. M., Germany - * First released 08.10.2007 at http://yacy.net + * First released 08.10.2007 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/cora/protocol/http/GzipCompressingEntity.java b/source/net/yacy/cora/protocol/http/GzipCompressingEntity.java index e2649239c..ead13772f 100644 --- a/source/net/yacy/cora/protocol/http/GzipCompressingEntity.java +++ b/source/net/yacy/cora/protocol/http/GzipCompressingEntity.java @@ -1,7 +1,7 @@ /** * GzipCompressingEntity * Copyright 2010 by Sebastian Gaebel - * First released 01.07.2010 at http://yacy.net + * First released 01.07.2010 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/cora/protocol/http/GzipRequestInterceptor.java b/source/net/yacy/cora/protocol/http/GzipRequestInterceptor.java index 87160b8fe..0d7d07c33 100644 --- a/source/net/yacy/cora/protocol/http/GzipRequestInterceptor.java +++ b/source/net/yacy/cora/protocol/http/GzipRequestInterceptor.java @@ -1,7 +1,7 @@ /** * GzipRequestInterceptor * Copyright 2010 by Sebastian Gaebel - * First released 01.07.2010 at http://yacy.net + * First released 01.07.2010 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/cora/protocol/http/GzipResponseInterceptor.java b/source/net/yacy/cora/protocol/http/GzipResponseInterceptor.java index 5290239f9..4b91f20aa 100644 --- a/source/net/yacy/cora/protocol/http/GzipResponseInterceptor.java +++ b/source/net/yacy/cora/protocol/http/GzipResponseInterceptor.java @@ -1,7 +1,7 @@ /** * GzipResponseInterceptor * Copyright 2010 by Sebastian Gaebel - * First released 01.07.2010 at http://yacy.net + * First released 01.07.2010 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/cora/protocol/http/HTTPClient.java b/source/net/yacy/cora/protocol/http/HTTPClient.java index 45e206b6d..f924fd1d2 100644 --- a/source/net/yacy/cora/protocol/http/HTTPClient.java +++ b/source/net/yacy/cora/protocol/http/HTTPClient.java @@ -1,7 +1,7 @@ /** * HTTPClient * Copyright 2010 by Sebastian Gaebel - * First released 01.07.2010 at http://yacy.net + * First released 01.07.2010 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/cora/protocol/http/LinkExtractor.java b/source/net/yacy/cora/protocol/http/LinkExtractor.java index 793549286..c73ce5419 100644 --- a/source/net/yacy/cora/protocol/http/LinkExtractor.java +++ b/source/net/yacy/cora/protocol/http/LinkExtractor.java @@ -1,7 +1,7 @@ /** * LinkExtractor * Copyright 2011 by Michael Peter Christen - * First released 2.01.2011 at http://yacy.net + * First released 2.01.2011 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/cora/protocol/http/ProxySettings.java b/source/net/yacy/cora/protocol/http/ProxySettings.java index 710ab1258..7c25b72d5 100644 --- a/source/net/yacy/cora/protocol/http/ProxySettings.java +++ b/source/net/yacy/cora/protocol/http/ProxySettings.java @@ -1,7 +1,7 @@ /** * ProxySettings * Copyright 2010 by Michael Peter Christen - * First released 25.05.2010 at http://yacy.net + * First released 25.05.2010 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/cora/sorting/AbstractScoreMap.java b/source/net/yacy/cora/sorting/AbstractScoreMap.java index b662925a1..b1412aea4 100644 --- a/source/net/yacy/cora/sorting/AbstractScoreMap.java +++ b/source/net/yacy/cora/sorting/AbstractScoreMap.java @@ -1,7 +1,7 @@ /** * AbstractScoreMap * Copyright 2011 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 28.04.2011 at http://yacy.net + * First released 28.04.2011 at https://yacy.net * * $LastChangedDate: 2011-04-14 00:04:23 +0200 (Do, 14 Apr 2011) $ * $LastChangedRevision: 7653 $ diff --git a/source/net/yacy/cora/sorting/Array.java b/source/net/yacy/cora/sorting/Array.java index 3cb2b7284..a7ce775b9 100644 --- a/source/net/yacy/cora/sorting/Array.java +++ b/source/net/yacy/cora/sorting/Array.java @@ -1,7 +1,7 @@ /** * Array * Copyright 2011 by Michael Peter Christen, mc@yacy.net, Frankfurt a. M., Germany - * First released 16.07.2011 at http://yacy.net + * First released 16.07.2011 at https://yacy.net * * $LastChangedDate: 2011-05-30 10:53:58 +0200 (Mo, 30 Mai 2011) $ * $LastChangedRevision: 7759 $ diff --git a/source/net/yacy/cora/sorting/ClusteredScoreMap.java b/source/net/yacy/cora/sorting/ClusteredScoreMap.java index fb55cda4a..831bbe8e6 100644 --- a/source/net/yacy/cora/sorting/ClusteredScoreMap.java +++ b/source/net/yacy/cora/sorting/ClusteredScoreMap.java @@ -1,7 +1,7 @@ /** * ScoreCluster * Copyright 2004, 2010 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 28.09.2004 at http://yacy.net + * First released 28.09.2004 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/cora/sorting/ConcurrentScoreMap.java b/source/net/yacy/cora/sorting/ConcurrentScoreMap.java index 716e68426..1b9b36d3b 100644 --- a/source/net/yacy/cora/sorting/ConcurrentScoreMap.java +++ b/source/net/yacy/cora/sorting/ConcurrentScoreMap.java @@ -1,7 +1,7 @@ /** * ConcurrentScoreMap * Copyright 2010 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 13.03.2011 at http://yacy.net + * First released 13.03.2011 at https://yacy.net * * $LastChangedDate: 2011-03-08 02:51:51 +0100 (Di, 08 Mrz 2011) $ * $LastChangedRevision: 7567 $ diff --git a/source/net/yacy/cora/sorting/OrderedScoreMap.java b/source/net/yacy/cora/sorting/OrderedScoreMap.java index 9b9453423..dce21af48 100644 --- a/source/net/yacy/cora/sorting/OrderedScoreMap.java +++ b/source/net/yacy/cora/sorting/OrderedScoreMap.java @@ -1,7 +1,7 @@ /** * ScoreMap * Copyright 2010 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 14.10.2010 at http://yacy.net + * First released 14.10.2010 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/cora/sorting/Rating.java b/source/net/yacy/cora/sorting/Rating.java index 9c24427ca..78388a3c1 100644 --- a/source/net/yacy/cora/sorting/Rating.java +++ b/source/net/yacy/cora/sorting/Rating.java @@ -1,7 +1,7 @@ /** * Rating * Copyright 2011 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 25.08.2011 at http://yacy.net + * First released 25.08.2011 at https://yacy.net * * $LastChangedDate: 2011-03-08 02:51:51 +0100 (Di, 08 Mrz 2011) $ * $LastChangedRevision: 7567 $ diff --git a/source/net/yacy/cora/sorting/ReversibleScoreMap.java b/source/net/yacy/cora/sorting/ReversibleScoreMap.java index 09e2fe74a..9185af0d2 100644 --- a/source/net/yacy/cora/sorting/ReversibleScoreMap.java +++ b/source/net/yacy/cora/sorting/ReversibleScoreMap.java @@ -1,7 +1,7 @@ /** * ReversibleScoreMap * Copyright 2010 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 14.10.2010 at http://yacy.net + * First released 14.10.2010 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/cora/sorting/ScoreComparator.java b/source/net/yacy/cora/sorting/ScoreComparator.java index 23919e443..bec863f20 100644 --- a/source/net/yacy/cora/sorting/ScoreComparator.java +++ b/source/net/yacy/cora/sorting/ScoreComparator.java @@ -1,7 +1,7 @@ /** * ScoreComparator * Copyright 2011 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 23.08.2011 at http://yacy.net + * First released 23.08.2011 at https://yacy.net * * $LastChangedDate: 2011-03-08 02:51:51 +0100 (Di, 08 Mrz 2011) $ * $LastChangedRevision: 7567 $ diff --git a/source/net/yacy/cora/sorting/ScoreMap.java b/source/net/yacy/cora/sorting/ScoreMap.java index 52d3a7407..1755e3de2 100644 --- a/source/net/yacy/cora/sorting/ScoreMap.java +++ b/source/net/yacy/cora/sorting/ScoreMap.java @@ -1,7 +1,7 @@ /** * ScoreMap * Copyright 2010 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 14.10.2010 at http://yacy.net + * First released 14.10.2010 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/cora/sorting/Sortable.java b/source/net/yacy/cora/sorting/Sortable.java index d32adc12a..6f0834732 100644 --- a/source/net/yacy/cora/sorting/Sortable.java +++ b/source/net/yacy/cora/sorting/Sortable.java @@ -1,7 +1,7 @@ /** * Sortable * Copyright 2011 by Michael Peter Christen, mc@yacy.net, Frankfurt a. M., Germany - * First released 16.07.2011 at http://yacy.net + * First released 16.07.2011 at https://yacy.net * * $LastChangedDate: 2011-05-30 10:53:58 +0200 (Mo, 30 Mai 2011) $ * $LastChangedRevision: 7759 $ diff --git a/source/net/yacy/cora/sorting/WeakPriorityBlockingQueue.java b/source/net/yacy/cora/sorting/WeakPriorityBlockingQueue.java index 6edf6bfb8..7be4378a9 100644 --- a/source/net/yacy/cora/sorting/WeakPriorityBlockingQueue.java +++ b/source/net/yacy/cora/sorting/WeakPriorityBlockingQueue.java @@ -2,7 +2,7 @@ * WeakPriorityBlockingQueue * an priority blocking queue that drains elements if it gets too large * Copyright 2010 by Michael Peter Christen, mc@yacy.net, Frankfurt a. M., Germany - * First released 09.09.2010 at http://yacy.net + * First released 09.09.2010 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/cora/storage/ARC.java b/source/net/yacy/cora/storage/ARC.java index 8cca976ae..b53216815 100644 --- a/source/net/yacy/cora/storage/ARC.java +++ b/source/net/yacy/cora/storage/ARC.java @@ -2,7 +2,7 @@ * 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 + * First released 29.08.2009 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/cora/storage/ARH.java b/source/net/yacy/cora/storage/ARH.java index 1532f011e..160033269 100644 --- a/source/net/yacy/cora/storage/ARH.java +++ b/source/net/yacy/cora/storage/ARH.java @@ -2,7 +2,7 @@ * ARH * an interface for Adaptive Replacement Handles * Copyright 2014 by Michael Peter Christen, mc@yacy.net, Frankfurt a. M., Germany - * First released 15.01.2014 at http://yacy.net + * First released 15.01.2014 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/storage/AbstractMapStore.java b/source/net/yacy/cora/storage/AbstractMapStore.java index 899a472ad..c9c5cd966 100644 --- a/source/net/yacy/cora/storage/AbstractMapStore.java +++ b/source/net/yacy/cora/storage/AbstractMapStore.java @@ -1,7 +1,7 @@ /** * AbstractMapStore * Copyright 2011 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 16.12.2011 at http://yacy.net + * First released 16.12.2011 at https://yacy.net * * $LastChangedDate: 2011-04-14 00:04:23 +0200 (Do, 14 Apr 2011) $ * $LastChangedRevision: 7653 $ diff --git a/source/net/yacy/cora/storage/ComparableARC.java b/source/net/yacy/cora/storage/ComparableARC.java index 24ed59eff..17f666a72 100644 --- a/source/net/yacy/cora/storage/ComparableARC.java +++ b/source/net/yacy/cora/storage/ComparableARC.java @@ -2,7 +2,7 @@ * ComparableARC * an Adaptive Replacement Cache for comparable objects * Copyright 2010 by Michael Peter Christen, mc@yacy.net, Frankfurt a. M., Germany - * First released 24.08.2010 at http://yacy.net + * First released 24.08.2010 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/cora/storage/ConcurrentARC.java b/source/net/yacy/cora/storage/ConcurrentARC.java index 14786bb6e..1e1ee8237 100644 --- a/source/net/yacy/cora/storage/ConcurrentARC.java +++ b/source/net/yacy/cora/storage/ConcurrentARC.java @@ -1,7 +1,7 @@ /** * ConcurrentARC * Copyright 2009 by Michael Peter Christen, mc@yacy.net, Frankfurt a. M., Germany - * First released 17.04.2009 at http://yacy.net + * First released 17.04.2009 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/cora/storage/ConcurrentARH.java b/source/net/yacy/cora/storage/ConcurrentARH.java index 6225869fd..e7b5d1b99 100644 --- a/source/net/yacy/cora/storage/ConcurrentARH.java +++ b/source/net/yacy/cora/storage/ConcurrentARH.java @@ -2,7 +2,7 @@ * ConcurrentARH * an interface for Adaptive Replacement Handles * Copyright 2014 by Michael Peter Christen, mc@yacy.net, Frankfurt a. M., Germany - * First released 15.01.2014 at http://yacy.net + * First released 15.01.2014 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/storage/Configuration.java b/source/net/yacy/cora/storage/Configuration.java index 64dc3cd6d..787c5677c 100644 --- a/source/net/yacy/cora/storage/Configuration.java +++ b/source/net/yacy/cora/storage/Configuration.java @@ -1,7 +1,7 @@ /** * Configuration * Copyright 2011 by Michael Peter Christen, mc@yacy.net, Frankfurt a. M., Germany - * First released 29.06.2011 at http://yacy.net + * First released 29.06.2011 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/storage/Files.java b/source/net/yacy/cora/storage/Files.java index 89f5e614e..0be7b1d62 100644 --- a/source/net/yacy/cora/storage/Files.java +++ b/source/net/yacy/cora/storage/Files.java @@ -1,7 +1,7 @@ /** * Files * Copyright 2011 by Michael Peter Christen, mc@yacy.net, Frankfurt a. M., Germany - * First released 29.06.2011 at http://yacy.net + * First released 29.06.2011 at https://yacy.net * * $LastChangedDate: 2011-05-30 10:53:58 +0200 (Mo, 30 Mai 2011) $ * $LastChangedRevision: 7759 $ diff --git a/source/net/yacy/cora/storage/HashARC.java b/source/net/yacy/cora/storage/HashARC.java index 3a9f54dd6..d33261b7c 100644 --- a/source/net/yacy/cora/storage/HashARC.java +++ b/source/net/yacy/cora/storage/HashARC.java @@ -2,7 +2,7 @@ * HashARC * an Adaptive Replacement Cache for objects that can be compared using hashing * Copyright 2009 by Michael Peter Christen, mc@yacy.net, Frankfurt a. M., Germany - * First released 17.04.2009 at http://yacy.net + * First released 17.04.2009 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/cora/storage/KeyList.java b/source/net/yacy/cora/storage/KeyList.java index 563056b49..011218375 100644 --- a/source/net/yacy/cora/storage/KeyList.java +++ b/source/net/yacy/cora/storage/KeyList.java @@ -1,7 +1,7 @@ /** * KeyList * Copyright 2011 by Michael Peter Christen, mc@yacy.net, Frankfurt a. M., Germany - * First released 18.4.2011 at http://yacy.net + * First released 18.4.2011 at https://yacy.net * * $LastChangedDate: 2011-03-22 10:34:10 +0100 (Di, 22 Mrz 2011) $ * $LastChangedRevision: 7619 $ diff --git a/source/net/yacy/cora/storage/MapStore.java b/source/net/yacy/cora/storage/MapStore.java index 5a051b40e..f1cdac9fa 100644 --- a/source/net/yacy/cora/storage/MapStore.java +++ b/source/net/yacy/cora/storage/MapStore.java @@ -1,7 +1,7 @@ /** * MapStore * Copyright 2011 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 16.12.2011 at http://yacy.net + * First released 16.12.2011 at https://yacy.net * * $LastChangedDate: 2011-04-14 00:04:23 +0200 (Do, 14 Apr 2011) $ * $LastChangedRevision: 7653 $ diff --git a/source/net/yacy/cora/storage/OutOfLimitsException.java b/source/net/yacy/cora/storage/OutOfLimitsException.java index bc102bcce..73c40141f 100644 --- a/source/net/yacy/cora/storage/OutOfLimitsException.java +++ b/source/net/yacy/cora/storage/OutOfLimitsException.java @@ -1,7 +1,7 @@ /** * OutOfLimitsException * Copyright 2006 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 17.01.2006 at http://yacy.net + * First released 17.01.2006 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/cora/storage/SimpleARC.java b/source/net/yacy/cora/storage/SimpleARC.java index 4977b1f10..0630b824f 100644 --- a/source/net/yacy/cora/storage/SimpleARC.java +++ b/source/net/yacy/cora/storage/SimpleARC.java @@ -2,7 +2,7 @@ * 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 + * First released 17.04.2009 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/cora/storage/SizeLimitedMap.java b/source/net/yacy/cora/storage/SizeLimitedMap.java index 0d15d7a77..bb66737a6 100644 --- a/source/net/yacy/cora/storage/SizeLimitedMap.java +++ b/source/net/yacy/cora/storage/SizeLimitedMap.java @@ -1,7 +1,7 @@ /** * SizeLimitedMap * Copyright 2012 by Michael Peter Christen, mc@yacy.net, Frankfurt a. M., Germany - * First released 04.07.2012 at http://yacy.net + * First released 04.07.2012 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/storage/SizeLimitedSet.java b/source/net/yacy/cora/storage/SizeLimitedSet.java index ecb3701b9..d45497860 100644 --- a/source/net/yacy/cora/storage/SizeLimitedSet.java +++ b/source/net/yacy/cora/storage/SizeLimitedSet.java @@ -1,7 +1,7 @@ /** * SizeLimitedSet * Copyright 2012 by Michael Peter Christen, mc@yacy.net, Frankfurt a. M., Germany - * First released 04.07.2012 at http://yacy.net + * First released 04.07.2012 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/storage/ZIPReader.java b/source/net/yacy/cora/storage/ZIPReader.java index 8062be533..2f3bcce34 100644 --- a/source/net/yacy/cora/storage/ZIPReader.java +++ b/source/net/yacy/cora/storage/ZIPReader.java @@ -1,7 +1,7 @@ /** * ZIPReader * Copyright 2012 by Michael Peter Christen, mc@yacy.net, Frankfurt a. M., Germany - * First released 24.09.2012 at http://yacy.net + * First released 24.09.2012 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/storage/ZIPWriter.java b/source/net/yacy/cora/storage/ZIPWriter.java index 93cc1b69f..47d964b3b 100644 --- a/source/net/yacy/cora/storage/ZIPWriter.java +++ b/source/net/yacy/cora/storage/ZIPWriter.java @@ -1,7 +1,7 @@ /** * ZIPWriter * Copyright 2012 by Michael Peter Christen, mc@yacy.net, Frankfurt a. M., Germany - * First released 24.09.2012 at http://yacy.net + * First released 24.09.2012 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/util/NumberTools.java b/source/net/yacy/cora/util/NumberTools.java index 454e1d094..03799ac9c 100644 --- a/source/net/yacy/cora/util/NumberTools.java +++ b/source/net/yacy/cora/util/NumberTools.java @@ -1,7 +1,7 @@ /** * NumberTools * Copyright 2012 by Sebastian Gaebel - * First released 21.05.2012 at http://yacy.net + * First released 21.05.2012 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/cora/util/StringBuilderComparator.java b/source/net/yacy/cora/util/StringBuilderComparator.java index d82bc5dfe..f2d6eec18 100644 --- a/source/net/yacy/cora/util/StringBuilderComparator.java +++ b/source/net/yacy/cora/util/StringBuilderComparator.java @@ -1,7 +1,7 @@ /** * StringBuilderComparator.java * Copyright 2011 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 09.11.2011 at http://yacy.net + * First released 09.11.2011 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/crawler/Balancer.java b/source/net/yacy/crawler/Balancer.java index 9d106ad46..d68ab8994 100644 --- a/source/net/yacy/crawler/Balancer.java +++ b/source/net/yacy/crawler/Balancer.java @@ -3,7 +3,7 @@ * SPDX-FileCopyrightText: 2014 Michael Peter Christen * SPDX-License-Identifier: GPL-2.0-or-later * Frankfurt am Main, Germany - * First released 14.04.2014 at http://yacy.net + * First released 14.04.2014 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/crawler/HarvestProcess.java b/source/net/yacy/crawler/HarvestProcess.java index ed1270825..6f8f247f4 100644 --- a/source/net/yacy/crawler/HarvestProcess.java +++ b/source/net/yacy/crawler/HarvestProcess.java @@ -2,7 +2,7 @@ * HarvestProcess * SPDX-FileCopyrightText: 2012 Michael Peter Christen * SPDX-License-Identifier: GPL-2.0-or-later - * First released 06.12.2012 at http://yacy.net + * First released 06.12.2012 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/crawler/HostBalancer.java b/source/net/yacy/crawler/HostBalancer.java index a798206f9..c9b8133cf 100644 --- a/source/net/yacy/crawler/HostBalancer.java +++ b/source/net/yacy/crawler/HostBalancer.java @@ -2,7 +2,7 @@ * HostQueues * SPDX-FileCopyrightText: 2013 Michael Peter Christen * SPDX-License-Identifier: GPL-2.0-or-later - * First released 24.09.2013 at http://yacy.net + * First released 24.09.2013 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/crawler/HostQueue.java b/source/net/yacy/crawler/HostQueue.java index 893b2ce2b..cb9135400 100644 --- a/source/net/yacy/crawler/HostQueue.java +++ b/source/net/yacy/crawler/HostQueue.java @@ -2,7 +2,7 @@ * HostQueue * SPDX-FileCopyrightText: 2013 Michael Peter Christen * SPDX-License-Identifier: GPL-2.0-or-later - * First released 24.09.2013 at http://yacy.net + * First released 24.09.2013 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/crawler/RecrawlBusyThread.java b/source/net/yacy/crawler/RecrawlBusyThread.java index 11b3d3a98..3baa56255 100644 --- a/source/net/yacy/crawler/RecrawlBusyThread.java +++ b/source/net/yacy/crawler/RecrawlBusyThread.java @@ -2,7 +2,7 @@ * RecrawlBusyThread.java * SPDX-FileCopyrightText: 2015 by Burkhard Buelte * SPDX-License-Identifier: GPL-2.0-or-later - * First released 15.05.2015 at http://yacy.net + * First released 15.05.2015 at https://yacy.net * * This is a part of YaCy, a peer-to-peer based web search engine * diff --git a/source/net/yacy/crawler/data/Snapshots.java b/source/net/yacy/crawler/data/Snapshots.java index f5dd411a8..0463d0d42 100644 --- a/source/net/yacy/crawler/data/Snapshots.java +++ b/source/net/yacy/crawler/data/Snapshots.java @@ -2,7 +2,7 @@ * DocumentImage * SPDX-FileCopyrightText: 2014 Michael Peter Christen * SPDX-License-Identifier: GPL-2.0-or-later - * First released 29.11.2014 at http://yacy.net + * First released 29.11.2014 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/crawler/data/Transactions.java b/source/net/yacy/crawler/data/Transactions.java index 14969b852..499dae7da 100644 --- a/source/net/yacy/crawler/data/Transactions.java +++ b/source/net/yacy/crawler/data/Transactions.java @@ -2,7 +2,7 @@ * Transactions * SPDX-FileCopyrightText: 2014 Michael Peter Christen * SPDX-License-Identifier: GPL-2.0-or-later - * First released 08.12.2014 at http://yacy.net + * First released 08.12.2014 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/crawler/retrieval/FileLoader.java b/source/net/yacy/crawler/retrieval/FileLoader.java index be5568fb6..010ffa855 100644 --- a/source/net/yacy/crawler/retrieval/FileLoader.java +++ b/source/net/yacy/crawler/retrieval/FileLoader.java @@ -2,7 +2,7 @@ * FileLoader * SPDX-FileCopyrightText: 2010 Michael Peter Christen * SPDX-License-Identifier: GPL-2.0-or-later - * First released 25.5.2010 at http://yacy.net + * First released 25.5.2010 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/crawler/retrieval/RSSLoader.java b/source/net/yacy/crawler/retrieval/RSSLoader.java index 6d1ebd8e9..389913c52 100644 --- a/source/net/yacy/crawler/retrieval/RSSLoader.java +++ b/source/net/yacy/crawler/retrieval/RSSLoader.java @@ -3,7 +3,7 @@ * SPDX-FileCopyrightText: 2010 Michael Peter Christen * SPDX-License-Identifier: GPL-2.0-or-later * Frankfurt a. M., Germany - * First released 27.8.2010 at http://yacy.net + * First released 27.8.2010 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/document/AbstractParser.java b/source/net/yacy/document/AbstractParser.java index f8132be1e..6a8f9eca8 100644 --- a/source/net/yacy/document/AbstractParser.java +++ b/source/net/yacy/document/AbstractParser.java @@ -1,7 +1,7 @@ /** * Parser * Copyright 2010 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 29.6.2010 at http://yacy.net + * First released 29.6.2010 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/document/Condenser.java b/source/net/yacy/document/Condenser.java index ef3b2f748..3c4f73e36 100644 --- a/source/net/yacy/document/Condenser.java +++ b/source/net/yacy/document/Condenser.java @@ -1,7 +1,7 @@ /** * Condenser.java * Copyright 2004 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 09.01.2004 at http://yacy.net + * First released 09.01.2004 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/document/DateDetection.java b/source/net/yacy/document/DateDetection.java index 0b08edd1d..8bf24e56e 100644 --- a/source/net/yacy/document/DateDetection.java +++ b/source/net/yacy/document/DateDetection.java @@ -1,7 +1,7 @@ /** * DateDetection * Copyright 2014 by Michael Peter Christen - * First released 12.12.2014 at http://yacy.net + * First released 12.12.2014 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/document/ImageParser.java b/source/net/yacy/document/ImageParser.java index b66518a37..1a1db97f8 100644 --- a/source/net/yacy/document/ImageParser.java +++ b/source/net/yacy/document/ImageParser.java @@ -1,7 +1,7 @@ /** * ImageParser * Copyright 2010 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 29.6.2010 at http://yacy.net + * First released 29.6.2010 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/document/LargeNumberCache.java b/source/net/yacy/document/LargeNumberCache.java index 9c908b237..c38424550 100644 --- a/source/net/yacy/document/LargeNumberCache.java +++ b/source/net/yacy/document/LargeNumberCache.java @@ -1,7 +1,7 @@ /** * LargeNumberCache.java * Copyright 2010 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 09.10.2010 at http://yacy.net + * First released 09.10.2010 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/document/Parser.java b/source/net/yacy/document/Parser.java index f2940a02c..88904f290 100644 --- a/source/net/yacy/document/Parser.java +++ b/source/net/yacy/document/Parser.java @@ -1,7 +1,7 @@ /** * Parser.java * Copyright 2010 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 29.6.2010 at http://yacy.net + * First released 29.6.2010 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/document/Phrase.java b/source/net/yacy/document/Phrase.java index 36ee22e3c..6b4194fc8 100644 --- a/source/net/yacy/document/Phrase.java +++ b/source/net/yacy/document/Phrase.java @@ -1,7 +1,7 @@ /** * Phrase.java * Copyright 2008 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 26.03.2008 at http://yacy.net + * First released 26.03.2008 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/document/SnippetExtractor.java b/source/net/yacy/document/SnippetExtractor.java index 94a8ca5c1..5daf72f96 100644 --- a/source/net/yacy/document/SnippetExtractor.java +++ b/source/net/yacy/document/SnippetExtractor.java @@ -1,7 +1,7 @@ /** * SnippetExtractor * Copyright 2010 by Michael Peter Christen, mc@yacy.net, Frankfurt a. M., Germany - * First released 22.10.2010 at http://yacy.net + * First released 22.10.2010 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/document/TextParser.java b/source/net/yacy/document/TextParser.java index ae1a001a9..7584ad6dc 100644 --- a/source/net/yacy/document/TextParser.java +++ b/source/net/yacy/document/TextParser.java @@ -1,7 +1,7 @@ /** * TextParser.java * Copyright 2009 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 09.07.2009 at http://yacy.net + * First released 09.07.2009 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/document/Tokenizer.java b/source/net/yacy/document/Tokenizer.java index 8ed219bf4..45ac56940 100644 --- a/source/net/yacy/document/Tokenizer.java +++ b/source/net/yacy/document/Tokenizer.java @@ -1,7 +1,7 @@ /** * Annotation.java * Copyright 2004 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 09.01.2004 at http://yacy.net + * First released 09.01.2004 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General private diff --git a/source/net/yacy/document/VocabularyScraper.java b/source/net/yacy/document/VocabularyScraper.java index 5328166c7..4c8124a91 100644 --- a/source/net/yacy/document/VocabularyScraper.java +++ b/source/net/yacy/document/VocabularyScraper.java @@ -1,7 +1,7 @@ /** * VocabularyScraper * Copyright 2015 by Michael Peter Christen - * First released 30.01.2015 at http://yacy.net + * First released 30.01.2015 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/document/importer/Importer.java b/source/net/yacy/document/importer/Importer.java index 7a83d834d..ba0a2fbfa 100644 --- a/source/net/yacy/document/importer/Importer.java +++ b/source/net/yacy/document/importer/Importer.java @@ -1,7 +1,7 @@ /** * Importer * Copyright 2009 by Michael Peter Christen - * First released 29.04.2010 at http://yacy.net + * First released 29.04.2010 at https://yacy.net * * This is a part of YaCy, a peer-to-peer based web search engine * diff --git a/source/net/yacy/document/importer/MediawikiImporter.java b/source/net/yacy/document/importer/MediawikiImporter.java index b3d75776d..bf2260b97 100644 --- a/source/net/yacy/document/importer/MediawikiImporter.java +++ b/source/net/yacy/document/importer/MediawikiImporter.java @@ -1,7 +1,7 @@ /** * MediawikiImporter * Copyright 2008 by Michael Peter Christen - * First released 20.11.2008 at http://yacy.net + * First released 20.11.2008 at https://yacy.net * * This is a part of YaCy, a peer-to-peer based web search engine * diff --git a/source/net/yacy/document/importer/OAIListFriendsLoader.java b/source/net/yacy/document/importer/OAIListFriendsLoader.java index 651513e9e..8d9c6652b 100644 --- a/source/net/yacy/document/importer/OAIListFriendsLoader.java +++ b/source/net/yacy/document/importer/OAIListFriendsLoader.java @@ -1,7 +1,7 @@ /** * OAIListFriendsLoader * Copyright 2010 by Michael Peter Christen - * First released 29.04.2010 at http://yacy.net + * First released 29.04.2010 at https://yacy.net * * This is a part of YaCy, a peer-to-peer based web search engine * diff --git a/source/net/yacy/document/importer/OAIPMHImporter.java b/source/net/yacy/document/importer/OAIPMHImporter.java index 5f4a8c3ca..eae37b0ae 100644 --- a/source/net/yacy/document/importer/OAIPMHImporter.java +++ b/source/net/yacy/document/importer/OAIPMHImporter.java @@ -1,7 +1,7 @@ /** * OAIPMHImporter * Copyright 2009 by Michael Peter Christen - * First released 30.09.2009 at http://yacy.net + * First released 30.09.2009 at https://yacy.net * * This is a part of YaCy, a peer-to-peer based web search engine * diff --git a/source/net/yacy/document/importer/OAIPMHLoader.java b/source/net/yacy/document/importer/OAIPMHLoader.java index 6e4e77d4b..5afd06d46 100644 --- a/source/net/yacy/document/importer/OAIPMHLoader.java +++ b/source/net/yacy/document/importer/OAIPMHLoader.java @@ -1,7 +1,7 @@ /** * OAIPMHLoader * Copyright 2009 by Michael Peter Christen - * First released 30.09.2009 at http://yacy.net + * First released 30.09.2009 at https://yacy.net * * This is a part of YaCy, a peer-to-peer based web search engine * diff --git a/source/net/yacy/document/importer/ResumptionToken.java b/source/net/yacy/document/importer/ResumptionToken.java index f0c21e6ed..ed69cd2b4 100644 --- a/source/net/yacy/document/importer/ResumptionToken.java +++ b/source/net/yacy/document/importer/ResumptionToken.java @@ -1,7 +1,7 @@ /** * ResumptionToken * Copyright 2009 by Michael Peter Christen - * First released 31.10.2009 at http://yacy.net + * First released 31.10.2009 at https://yacy.net * * This is a part of YaCy, a peer-to-peer based web search engine * diff --git a/source/net/yacy/document/parser/apkParser.java b/source/net/yacy/document/parser/apkParser.java index d14b87768..5f2e507e5 100644 --- a/source/net/yacy/document/parser/apkParser.java +++ b/source/net/yacy/document/parser/apkParser.java @@ -1,7 +1,7 @@ /** * apkParser * Copyright 2014 by Michael Peter Christen - * First released 09.06.2014 at http://yacy.net + * First released 09.06.2014 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/document/parser/audioTagParser.java b/source/net/yacy/document/parser/audioTagParser.java index 925c7fe3e..c4e18adb1 100644 --- a/source/net/yacy/document/parser/audioTagParser.java +++ b/source/net/yacy/document/parser/audioTagParser.java @@ -1,7 +1,7 @@ /** * mp3Parser * Copyright 2012 by Stefan Foerster, Norderstedt, Germany - * First released 01.10.2012 at http://yacy.net + * First released 01.10.2012 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/document/parser/csvParser.java b/source/net/yacy/document/parser/csvParser.java index cfee1758f..cf23bcfab 100644 --- a/source/net/yacy/document/parser/csvParser.java +++ b/source/net/yacy/document/parser/csvParser.java @@ -1,7 +1,7 @@ /** * tarParser * Copyright 2009 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 02.10.2009 at http://yacy.net + * First released 02.10.2009 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/document/parser/genericParser.java b/source/net/yacy/document/parser/genericParser.java index 44d30413a..4fe41ea53 100644 --- a/source/net/yacy/document/parser/genericParser.java +++ b/source/net/yacy/document/parser/genericParser.java @@ -1,7 +1,7 @@ /** * genericParser * Copyright 2010 by Michael Peter Christen, mc@yacy.net, Frankfurt a. M., Germany - * First released 30.11.2010 at http://yacy.net + * First released 30.11.2010 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/document/parser/html/EmbedEntry.java b/source/net/yacy/document/parser/html/EmbedEntry.java index 36134a273..4d01bcf11 100644 --- a/source/net/yacy/document/parser/html/EmbedEntry.java +++ b/source/net/yacy/document/parser/html/EmbedEntry.java @@ -1,7 +1,7 @@ /** * EmbedEntry * Copyright 2012 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 27.04.2012 at http://yacy.net + * First released 27.04.2012 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/document/parser/html/Evaluation.java b/source/net/yacy/document/parser/html/Evaluation.java index 7d2ba74c5..b910fe6b7 100644 --- a/source/net/yacy/document/parser/html/Evaluation.java +++ b/source/net/yacy/document/parser/html/Evaluation.java @@ -1,7 +1,7 @@ /** * Evaluation * Copyright 2011 by Michael Peter Christen - * First released 28.04.2011 at http://yacy.net + * First released 28.04.2011 at https://yacy.net * * $LastChangedDate: 2011-03-08 02:51:51 +0100 (Di, 08 Mrz 2011) $ * $LastChangedRevision: 7567 $ diff --git a/source/net/yacy/document/parser/htmlParser.java b/source/net/yacy/document/parser/htmlParser.java index 960957490..78dce898f 100644 --- a/source/net/yacy/document/parser/htmlParser.java +++ b/source/net/yacy/document/parser/htmlParser.java @@ -1,7 +1,7 @@ /** * htmlParser.java * Copyright 2009 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 09.07.2009 at http://yacy.net + * First released 09.07.2009 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/document/parser/images/svgParser.java b/source/net/yacy/document/parser/images/svgParser.java index 2045e5afb..3c44d6e90 100644 --- a/source/net/yacy/document/parser/images/svgParser.java +++ b/source/net/yacy/document/parser/images/svgParser.java @@ -1,7 +1,7 @@ /** * svgParser.java * Copyright 2015 by Burkhard Buelte - * First released 26.09.2015 at http://yacy.net + * First released 26.09.2015 at https://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 diff --git a/source/net/yacy/document/parser/linkScraperParser.java b/source/net/yacy/document/parser/linkScraperParser.java index dabe3f631..a21e2ea1e 100644 --- a/source/net/yacy/document/parser/linkScraperParser.java +++ b/source/net/yacy/document/parser/linkScraperParser.java @@ -1,7 +1,7 @@ /** * linkScraperParser * Copyright 2014 by Michael Peter Christen, mc@yacy.net, Frankfurt a. M., Germany - * First released 07.07.2014 at http://yacy.net + * First released 07.07.2014 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/document/parser/mmParser.java b/source/net/yacy/document/parser/mmParser.java index aef0f8f8a..849969e17 100644 --- a/source/net/yacy/document/parser/mmParser.java +++ b/source/net/yacy/document/parser/mmParser.java @@ -1,7 +1,7 @@ /** * mmParser * Copyright 2010 by Marc Nause, marc.nause@gmx.de, Braunschweig, Germany - * First released 27.12.2010 at http://yacy.net + * First released 27.12.2010 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/document/parser/rdfParser.java b/source/net/yacy/document/parser/rdfParser.java index c2302f7c2..93237c809 100644 --- a/source/net/yacy/document/parser/rdfParser.java +++ b/source/net/yacy/document/parser/rdfParser.java @@ -1,7 +1,7 @@ /** * rssParser.java * Copyright 2010 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 20.08.2010 at http://yacy.net + * First released 20.08.2010 at https://yacy.net * * $LastChangedDate: 2011-04-21 15:58:49 +0200 (Do, 21 Apr 2011) $ * $LastChangedRevision: 7672 $ diff --git a/source/net/yacy/document/parser/rssParser.java b/source/net/yacy/document/parser/rssParser.java index 2da3e73da..930bf9e3d 100644 --- a/source/net/yacy/document/parser/rssParser.java +++ b/source/net/yacy/document/parser/rssParser.java @@ -1,7 +1,7 @@ /** * rssParser.java * Copyright 2010 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 20.08.2010 at http://yacy.net + * First released 20.08.2010 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/document/parser/sidAudioParser.java b/source/net/yacy/document/parser/sidAudioParser.java index eb64dfaa0..0cc357ddb 100644 --- a/source/net/yacy/document/parser/sidAudioParser.java +++ b/source/net/yacy/document/parser/sidAudioParser.java @@ -1,7 +1,7 @@ /** * sidAudioParser * Copyright 2010 by Marc Nause, marc.nause@gmx.de, Braunschweig, Germany - * First released 28.12.2010 at http://yacy.net + * First released 28.12.2010 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/document/parser/sitemapParser.java b/source/net/yacy/document/parser/sitemapParser.java index bfc49ac90..ed6f6b38a 100644 --- a/source/net/yacy/document/parser/sitemapParser.java +++ b/source/net/yacy/document/parser/sitemapParser.java @@ -1,7 +1,7 @@ /** * sitemapParser.java * Copyright 2010 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 08.09.2010 at http://yacy.net + * First released 08.09.2010 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/document/parser/tarParser.java b/source/net/yacy/document/parser/tarParser.java index f0122c3cb..d8840c639 100644 --- a/source/net/yacy/document/parser/tarParser.java +++ b/source/net/yacy/document/parser/tarParser.java @@ -1,7 +1,7 @@ /** * tarParser * Copyright 2010 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 29.6.2010 at http://yacy.net + * First released 29.6.2010 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/document/parser/torrentParser.java b/source/net/yacy/document/parser/torrentParser.java index 72f82bd0a..6fbc27791 100644 --- a/source/net/yacy/document/parser/torrentParser.java +++ b/source/net/yacy/document/parser/torrentParser.java @@ -1,7 +1,7 @@ /** * torrentParser.java * Copyright 2010 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 03.01.2010 at http://yacy.net + * First released 03.01.2010 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/document/parser/zipParser.java b/source/net/yacy/document/parser/zipParser.java index c994f096f..731b28d2e 100644 --- a/source/net/yacy/document/parser/zipParser.java +++ b/source/net/yacy/document/parser/zipParser.java @@ -1,7 +1,7 @@ /** * zipParser * Copyright 2010 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 29.6.2010 at http://yacy.net + * First released 29.6.2010 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/gui/Audio.java b/source/net/yacy/gui/Audio.java index a0d90c902..7ee6bbd8e 100644 --- a/source/net/yacy/gui/Audio.java +++ b/source/net/yacy/gui/Audio.java @@ -1,7 +1,7 @@ /** * Audio * Copyright 2014 by Michael Peter Christen - * First released 07.10.2014 at http://yacy.net + * First released 07.10.2014 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/gui/InfoPage.java b/source/net/yacy/gui/InfoPage.java index fcfc818a3..4de169c9c 100644 --- a/source/net/yacy/gui/InfoPage.java +++ b/source/net/yacy/gui/InfoPage.java @@ -1,7 +1,7 @@ /** * InfoPage * Copyright 2010 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany - * First released 05.08.2010 at http://yacy.net + * First released 05.08.2010 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/gui/YaCyApp.java b/source/net/yacy/gui/YaCyApp.java index 76f2b3961..591e4c169 100644 --- a/source/net/yacy/gui/YaCyApp.java +++ b/source/net/yacy/gui/YaCyApp.java @@ -1,7 +1,7 @@ /** * YaCyApp * Copyright 2010 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany - * First released 05.08.2010 at http://yacy.net + * First released 05.08.2010 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/gui/framework/Application.java b/source/net/yacy/gui/framework/Application.java index 2c0ad1335..9bb55bccf 100644 --- a/source/net/yacy/gui/framework/Application.java +++ b/source/net/yacy/gui/framework/Application.java @@ -1,7 +1,7 @@ /** * Application * Copyright 2010 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany - * First released 05.08.2010 at http://yacy.net + * First released 05.08.2010 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/gui/framework/Browser.java b/source/net/yacy/gui/framework/Browser.java index 741a30047..80d566127 100644 --- a/source/net/yacy/gui/framework/Browser.java +++ b/source/net/yacy/gui/framework/Browser.java @@ -1,7 +1,7 @@ /** * Browser * Copyright 2010 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany - * First released 05.08.2010 at http://yacy.net + * First released 05.08.2010 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/gui/framework/Layout.java b/source/net/yacy/gui/framework/Layout.java index f0fb3fe7f..ea1393e6f 100644 --- a/source/net/yacy/gui/framework/Layout.java +++ b/source/net/yacy/gui/framework/Layout.java @@ -1,7 +1,7 @@ /** * Layout * Copyright 2010 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany - * First released 05.08.2010 at http://yacy.net + * First released 05.08.2010 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/gui/framework/Operation.java b/source/net/yacy/gui/framework/Operation.java index 274e86266..2f46482e5 100644 --- a/source/net/yacy/gui/framework/Operation.java +++ b/source/net/yacy/gui/framework/Operation.java @@ -1,7 +1,7 @@ /** * Operation * Copyright 2010 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany - * First released 05.08.2010 at http://yacy.net + * First released 05.08.2010 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/gui/framework/Switchboard.java b/source/net/yacy/gui/framework/Switchboard.java index a5720454d..b2d501a63 100644 --- a/source/net/yacy/gui/framework/Switchboard.java +++ b/source/net/yacy/gui/framework/Switchboard.java @@ -1,7 +1,7 @@ /** * Switchboard * Copyright 2010 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany - * First released 05.08.2010 at http://yacy.net + * First released 05.08.2010 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/htroot/AccessGrid_p.java b/source/net/yacy/htroot/AccessGrid_p.java index 3174084b9..299d19a28 100644 --- a/source/net/yacy/htroot/AccessGrid_p.java +++ b/source/net/yacy/htroot/AccessGrid_p.java @@ -1,7 +1,7 @@ /** * AccessGrid_p * Copyright 2011 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany - * First released 18.02.2010 at http://yacy.net + * First released 18.02.2010 at https://yacy.net * * $LastChangedDate: 2010-06-16 17:11:21 +0200 (Mi, 16 Jun 2010) $ * $LastChangedRevision: 6922 $ diff --git a/source/net/yacy/htroot/AccessPicture_p.java b/source/net/yacy/htroot/AccessPicture_p.java index 782815be4..b8be21567 100644 --- a/source/net/yacy/htroot/AccessPicture_p.java +++ b/source/net/yacy/htroot/AccessPicture_p.java @@ -1,7 +1,7 @@ /** * AccessPicture_p * Copyright 2011 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany - * First released 18.02.2010 at http://yacy.net + * First released 18.02.2010 at https://yacy.net * * $LastChangedDate: 2010-06-16 17:11:21 +0200 (Mi, 16 Jun 2010) $ * $LastChangedRevision: 6922 $ diff --git a/source/net/yacy/htroot/ContentAnalysis_p.java b/source/net/yacy/htroot/ContentAnalysis_p.java index a6972cd37..a30c57ed7 100644 --- a/source/net/yacy/htroot/ContentAnalysis_p.java +++ b/source/net/yacy/htroot/ContentAnalysis_p.java @@ -1,7 +1,7 @@ /** * ContentAnalysis_p * Copyright 2013 by Michael Peter Christen - * First released 12.03.2013 at http://yacy.net + * First released 12.03.2013 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/htroot/CrawlCheck_p.java b/source/net/yacy/htroot/CrawlCheck_p.java index 8a55dd466..d32c6f442 100644 --- a/source/net/yacy/htroot/CrawlCheck_p.java +++ b/source/net/yacy/htroot/CrawlCheck_p.java @@ -1,7 +1,7 @@ /** * CrawlCheck_p * Copyright 2012 by Michael Peter Christen - * First released 10.10.2011 at http://yacy.net + * First released 10.10.2011 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General private diff --git a/source/net/yacy/htroot/CrawlStartScanner_p.java b/source/net/yacy/htroot/CrawlStartScanner_p.java index d76cf08b3..e414ede9f 100644 --- a/source/net/yacy/htroot/CrawlStartScanner_p.java +++ b/source/net/yacy/htroot/CrawlStartScanner_p.java @@ -1,7 +1,7 @@ /** * CrawlStartScanner_p * Copyright 2010 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 12.12.2010 at http://yacy.net + * First released 12.12.2010 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/htroot/IndexBrowser_p.java b/source/net/yacy/htroot/IndexBrowser_p.java index 08a7d950e..d15e51e8d 100644 --- a/source/net/yacy/htroot/IndexBrowser_p.java +++ b/source/net/yacy/htroot/IndexBrowser_p.java @@ -1,7 +1,7 @@ /** * IndexBrowser * Copyright 2012 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 27.09.2012 at http://yacy.net + * First released 27.09.2012 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/htroot/IndexDeletion_p.java b/source/net/yacy/htroot/IndexDeletion_p.java index af8597343..e97bb9efb 100644 --- a/source/net/yacy/htroot/IndexDeletion_p.java +++ b/source/net/yacy/htroot/IndexDeletion_p.java @@ -1,7 +1,7 @@ /** * IndexDeletion_p * Copyright 2013 by Michael Peter Christen - * First released 29.04.2013 at http://yacy.net + * First released 29.04.2013 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/htroot/IndexFederated_p.java b/source/net/yacy/htroot/IndexFederated_p.java index ec13fd4d5..bbaba2b3a 100644 --- a/source/net/yacy/htroot/IndexFederated_p.java +++ b/source/net/yacy/htroot/IndexFederated_p.java @@ -1,7 +1,7 @@ /** * IndexFederated_p * Copyright 2011 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 25.05.2011 at http://yacy.net + * First released 25.05.2011 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/htroot/IndexReIndexMonitor_p.java b/source/net/yacy/htroot/IndexReIndexMonitor_p.java index 78e40aac1..ca31064b9 100644 --- a/source/net/yacy/htroot/IndexReIndexMonitor_p.java +++ b/source/net/yacy/htroot/IndexReIndexMonitor_p.java @@ -1,7 +1,7 @@ /** * IndexReIndexMonitor_p Copyright 2013 by Michael Peter Christen First released - * 29.04.2013 at http://yacy.net + * 29.04.2013 at https://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 diff --git a/source/net/yacy/htroot/IndexSchema_p.java b/source/net/yacy/htroot/IndexSchema_p.java index ae00ede54..93ed08cce 100644 --- a/source/net/yacy/htroot/IndexSchema_p.java +++ b/source/net/yacy/htroot/IndexSchema_p.java @@ -1,7 +1,7 @@ /** * IndexSchemaFulltext_p * Copyright 2011 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 13.02.2013 at http://yacy.net + * First released 13.02.2013 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/htroot/Load_RSS_p.java b/source/net/yacy/htroot/Load_RSS_p.java index 05975966c..565b26dc3 100644 --- a/source/net/yacy/htroot/Load_RSS_p.java +++ b/source/net/yacy/htroot/Load_RSS_p.java @@ -1,7 +1,7 @@ /** * Load_RSS_p * Copyright 2010 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 20.08.2010 at http://yacy.net + * First released 20.08.2010 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/htroot/NetworkHistory.java b/source/net/yacy/htroot/NetworkHistory.java index 043ef3b7f..83b981777 100644 --- a/source/net/yacy/htroot/NetworkHistory.java +++ b/source/net/yacy/htroot/NetworkHistory.java @@ -1,7 +1,7 @@ /** * NetworkHistory * Copyright 2014 by Michael Peter Christen - * First released 10.10.2014 at http://yacy.net + * First released 10.10.2014 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/htroot/RankingSolr_p.java b/source/net/yacy/htroot/RankingSolr_p.java index f94480e11..9b8a4187b 100644 --- a/source/net/yacy/htroot/RankingSolr_p.java +++ b/source/net/yacy/htroot/RankingSolr_p.java @@ -1,7 +1,7 @@ /** * RankingSolr_p * Copyright 2012 by Michael Peter Christen - * First released 30.11.2012 at http://yacy.net + * First released 30.11.2012 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/htroot/RegexTest.java b/source/net/yacy/htroot/RegexTest.java index c7a563337..2b40d46ad 100644 --- a/source/net/yacy/htroot/RegexTest.java +++ b/source/net/yacy/htroot/RegexTest.java @@ -1,7 +1,7 @@ /** * RegexTest * Copyright 2012 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 14.09.2011 at http://yacy.net + * First released 14.09.2011 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/htroot/ServerScannerList.java b/source/net/yacy/htroot/ServerScannerList.java index df1defe36..e8182ec90 100644 --- a/source/net/yacy/htroot/ServerScannerList.java +++ b/source/net/yacy/htroot/ServerScannerList.java @@ -1,7 +1,7 @@ /** * CrawlStartScanner_p * Copyright 2010 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 12.08.2011 at http://yacy.net + * First released 12.08.2011 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/htroot/Trails.java b/source/net/yacy/htroot/Trails.java index 77af2d602..abb919adb 100644 --- a/source/net/yacy/htroot/Trails.java +++ b/source/net/yacy/htroot/Trails.java @@ -1,7 +1,7 @@ /** * Trails * Copyright 2012 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 14.09.2011 at http://yacy.net + * First released 14.09.2011 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/htroot/Translator_p.java b/source/net/yacy/htroot/Translator_p.java index 8a7906a4e..872dddd15 100644 --- a/source/net/yacy/htroot/Translator_p.java +++ b/source/net/yacy/htroot/Translator_p.java @@ -2,7 +2,7 @@ /** * Translator_p * Copyright 2012 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 14.09.2011 at http://yacy.net + * First released 14.09.2011 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/htroot/Vocabulary_p.java b/source/net/yacy/htroot/Vocabulary_p.java index 614964eb0..ec4729798 100644 --- a/source/net/yacy/htroot/Vocabulary_p.java +++ b/source/net/yacy/htroot/Vocabulary_p.java @@ -1,7 +1,7 @@ /** * Vocabulary_p * Copyright 2012 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 07.05.2012 at http://yacy.net + * First released 07.05.2012 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/htroot/api/citation.java b/source/net/yacy/htroot/api/citation.java index 355740f23..74ab36767 100644 --- a/source/net/yacy/htroot/api/citation.java +++ b/source/net/yacy/htroot/api/citation.java @@ -1,7 +1,7 @@ /** * citation * Copyright 2013 by Michael Peter Christen - * First released 12.6.2013 at http://yacy.net + * First released 12.6.2013 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/htroot/api/push_p.java b/source/net/yacy/htroot/api/push_p.java index 657a2e15f..02ff14931 100644 --- a/source/net/yacy/htroot/api/push_p.java +++ b/source/net/yacy/htroot/api/push_p.java @@ -1,7 +1,7 @@ /** * push_p * Copyright 2014 by Michael Peter Christen, mc@yacy.net, Frankfurt a. M., Germany - * First released 12.06.2014 at http://yacy.net + * First released 12.06.2014 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/htroot/api/schema.java b/source/net/yacy/htroot/api/schema.java index 875896a43..71564eae6 100644 --- a/source/net/yacy/htroot/api/schema.java +++ b/source/net/yacy/htroot/api/schema.java @@ -1,7 +1,7 @@ /** * schema_p * Copyright 2011 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 13.01.2012 at http://yacy.net + * First released 13.01.2012 at https://yacy.net * * $LastChangedDate: 2011-04-14 00:04:23 +0200 (Do, 14 Apr 2011) $ * $LastChangedRevision: 7653 $ diff --git a/source/net/yacy/htroot/api/share.java b/source/net/yacy/htroot/api/share.java index c2ac5cfb5..74da096dd 100644 --- a/source/net/yacy/htroot/api/share.java +++ b/source/net/yacy/htroot/api/share.java @@ -1,7 +1,7 @@ /** * share * Copyright 2016 by Michael Peter Christen, mc@yacy.net, Frankfurt a. M., Germany - * First released 24.02.2016 at http://yacy.net + * First released 24.02.2016 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/htroot/api/snapshot.java b/source/net/yacy/htroot/api/snapshot.java index 3475052df..9b69e7751 100644 --- a/source/net/yacy/htroot/api/snapshot.java +++ b/source/net/yacy/htroot/api/snapshot.java @@ -1,7 +1,7 @@ /** * snapshot * Copyright 2014 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 02.12.2014 at http://yacy.net + * First released 02.12.2014 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/htroot/osm.java b/source/net/yacy/htroot/osm.java index 1671e8957..d827bbeb7 100644 --- a/source/net/yacy/htroot/osm.java +++ b/source/net/yacy/htroot/osm.java @@ -1,7 +1,7 @@ /** * osm * Copyright 2008 by Michael Peter Christen - * First released 13.02.2011 at http://yacy.net + * First released 13.02.2011 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/htroot/yacy/idx.java b/source/net/yacy/htroot/yacy/idx.java index 44b979e25..281125601 100644 --- a/source/net/yacy/htroot/yacy/idx.java +++ b/source/net/yacy/htroot/yacy/idx.java @@ -1,7 +1,7 @@ /** * idx * Copyright 2011 by Michael Peter Christen - * First released 16.05.2011 at http://yacy.net + * First released 16.05.2011 at https://yacy.net * * $LastChangedDate: 2011-03-08 02:51:51 +0100 (Di, 08 Mrz 2011) $ * $LastChangedRevision: 7567 $ diff --git a/source/net/yacy/http/AbstractRemoteHandler.java b/source/net/yacy/http/AbstractRemoteHandler.java index ed1b89c4a..826162c98 100644 --- a/source/net/yacy/http/AbstractRemoteHandler.java +++ b/source/net/yacy/http/AbstractRemoteHandler.java @@ -1,7 +1,7 @@ // // AbstractRemoteHandler // Copyright 2011 by Florian Richter -// First released 2011 at http://yacy.net +// First released 2011 at https://yacy.net // // $LastChangedDate$ // $LastChangedRevision$ diff --git a/source/net/yacy/http/MonitorHandler.java b/source/net/yacy/http/MonitorHandler.java index 4862f87f1..d859a5c3d 100644 --- a/source/net/yacy/http/MonitorHandler.java +++ b/source/net/yacy/http/MonitorHandler.java @@ -1,7 +1,7 @@ /** * MonitorHandler * Copyright 2014 by Sebastian Gaebel - * First released 15.05.2014 at http://yacy.net + * First released 15.05.2014 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/http/ProxyCacheHandler.java b/source/net/yacy/http/ProxyCacheHandler.java index e2cf4abe0..7c8597795 100644 --- a/source/net/yacy/http/ProxyCacheHandler.java +++ b/source/net/yacy/http/ProxyCacheHandler.java @@ -2,7 +2,7 @@ // ProxyCacheHandler // Copyright 2004 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany // Copyright 2011 by Florian Richter -// First released 2011 at http://yacy.net +// First released 2011 at https://yacy.net // // $LastChangedDate$ // $LastChangedRevision$ diff --git a/source/net/yacy/http/ProxyHandler.java b/source/net/yacy/http/ProxyHandler.java index 2892c0039..95f4dca56 100644 --- a/source/net/yacy/http/ProxyHandler.java +++ b/source/net/yacy/http/ProxyHandler.java @@ -2,7 +2,7 @@ // ProxyHandler // Copyright 2004 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany // Copyright 2011 by Florian Richter -// First released 2011 at http://yacy.net +// First released 2011 at https://yacy.net // // $LastChangedDate$ // $LastChangedRevision$ diff --git a/source/net/yacy/http/YaCyErrorHandler.java b/source/net/yacy/http/YaCyErrorHandler.java index 109600241..c83938855 100644 --- a/source/net/yacy/http/YaCyErrorHandler.java +++ b/source/net/yacy/http/YaCyErrorHandler.java @@ -2,7 +2,7 @@ // YaCyErrorHandler // ---------------- // Copyright 2014 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany -// First released 2014 at http://yacy.net +// First released 2014 at https://yacy.net // // $LastChangedDate$ // $LastChangedRevision$ diff --git a/source/net/yacy/http/YaCyHttpServer.java b/source/net/yacy/http/YaCyHttpServer.java index 0f6beddee..4018b2c17 100644 --- a/source/net/yacy/http/YaCyHttpServer.java +++ b/source/net/yacy/http/YaCyHttpServer.java @@ -1,7 +1,7 @@ // // YaCyHttpServer // Copyright 2011 by Florian Richter -// First released 13.04.2011 at http://yacy.net +// First released 13.04.2011 at https://yacy.net // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/http/YaCyLegacyCredential.java b/source/net/yacy/http/YaCyLegacyCredential.java index 25e96c9c1..840c10630 100644 --- a/source/net/yacy/http/YaCyLegacyCredential.java +++ b/source/net/yacy/http/YaCyLegacyCredential.java @@ -1,7 +1,7 @@ // // YaCyLegacyCredentials // Copyright 2011 by Florian Richter -// First released 16.04.2011 at http://yacy.net +// First released 16.04.2011 at https://yacy.net // // $LastChangedDate$ // $LastChangedRevision$ diff --git a/source/net/yacy/http/YaCyLoginService.java b/source/net/yacy/http/YaCyLoginService.java index cbcd1af92..78b1e1ee9 100644 --- a/source/net/yacy/http/YaCyLoginService.java +++ b/source/net/yacy/http/YaCyLoginService.java @@ -1,7 +1,7 @@ // // YaCyLoginService // Copyright 2011 by Florian Richter -// First released 16.04.2011 at http://yacy.net +// First released 16.04.2011 at https://yacy.net // // $LastChangedDate$ // $LastChangedRevision$ diff --git a/source/net/yacy/http/YaCySecurityHandler.java b/source/net/yacy/http/YaCySecurityHandler.java index 4c1e2e6a5..68948a081 100644 --- a/source/net/yacy/http/YaCySecurityHandler.java +++ b/source/net/yacy/http/YaCySecurityHandler.java @@ -1,7 +1,7 @@ // // YaCySecurityHandler // Copyright 2011 by Florian Richter -// First released 16.04.2011 at http://yacy.net +// First released 16.04.2011 at https://yacy.net // // $LastChangedDate$ // $LastChangedRevision$ diff --git a/source/net/yacy/http/YacyDomainHandler.java b/source/net/yacy/http/YacyDomainHandler.java index 989b99916..e91048d8f 100644 --- a/source/net/yacy/http/YacyDomainHandler.java +++ b/source/net/yacy/http/YacyDomainHandler.java @@ -2,7 +2,7 @@ // YacyDomainHandler // Copyright 2005 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany // Copyright 2011 by Florian Richter -// First released 13.04.2011 at http://yacy.net +// First released 13.04.2011 at https://yacy.net // // $LastChangedDate$ // $LastChangedRevision$ diff --git a/source/net/yacy/http/servlets/RAGProxyServlet.java b/source/net/yacy/http/servlets/RAGProxyServlet.java index aa5c708ab..3dba3cd97 100644 --- a/source/net/yacy/http/servlets/RAGProxyServlet.java +++ b/source/net/yacy/http/servlets/RAGProxyServlet.java @@ -1,7 +1,7 @@ /** * RAGProxyServlet * Copyright 2024 by Michael Peter Christen - * First released 17.05.2024 at http://yacy.net + * First released 17.05.2024 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/http/servlets/SolrSelectServlet.java b/source/net/yacy/http/servlets/SolrSelectServlet.java index ea5590707..74c9fe004 100644 --- a/source/net/yacy/http/servlets/SolrSelectServlet.java +++ b/source/net/yacy/http/servlets/SolrSelectServlet.java @@ -1,7 +1,7 @@ /** * SolrSelectServlet * Copyright 2012 by Michael Peter Christen - * First released 23.08.2012 at http://yacy.net + * First released 23.08.2012 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/http/servlets/SolrServlet.java b/source/net/yacy/http/servlets/SolrServlet.java index 7b2c621a3..7e501df45 100644 --- a/source/net/yacy/http/servlets/SolrServlet.java +++ b/source/net/yacy/http/servlets/SolrServlet.java @@ -1,7 +1,7 @@ /** * SolrServlet * Copyright 2014 by Michael Peter Christen - * First released 23.01.2014 at http://yacy.net + * First released 23.01.2014 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/http/servlets/YaCyDefaultServlet.java b/source/net/yacy/http/servlets/YaCyDefaultServlet.java index 1fd3d6c26..235a3fd18 100644 --- a/source/net/yacy/http/servlets/YaCyDefaultServlet.java +++ b/source/net/yacy/http/servlets/YaCyDefaultServlet.java @@ -1,6 +1,6 @@ // YaCyDefaultServlet // Copyright 2013 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany -// First released 2013 at http://yacy.net +// First released 2013 at https://yacy.net // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/http/servlets/YaCyQoSFilter.java b/source/net/yacy/http/servlets/YaCyQoSFilter.java index e935a3861..b6f9746bf 100644 --- a/source/net/yacy/http/servlets/YaCyQoSFilter.java +++ b/source/net/yacy/http/servlets/YaCyQoSFilter.java @@ -1,7 +1,7 @@ /** * YaCyQoSFilter * Copyright 2015 by Burkhard Buelte - * First released 26.04.2015 at http://yacy.net + * First released 26.04.2015 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/kelondro/blob/BEncodedHeapBag.java b/source/net/yacy/kelondro/blob/BEncodedHeapBag.java index 1c55cb8d3..c152dba7a 100644 --- a/source/net/yacy/kelondro/blob/BEncodedHeapBag.java +++ b/source/net/yacy/kelondro/blob/BEncodedHeapBag.java @@ -1,7 +1,7 @@ /** * BEncodedHeapBag * Copyright 2011 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 16.12.2011 at http://yacy.net + * First released 16.12.2011 at https://yacy.net * * $LastChangedDate: 2011-04-14 00:04:23 +0200 (Do, 14 Apr 2011) $ * $LastChangedRevision: 7653 $ diff --git a/source/net/yacy/kelondro/blob/BEncodedHeapShard.java b/source/net/yacy/kelondro/blob/BEncodedHeapShard.java index 180c46877..b4546ee2f 100644 --- a/source/net/yacy/kelondro/blob/BEncodedHeapShard.java +++ b/source/net/yacy/kelondro/blob/BEncodedHeapShard.java @@ -1,7 +1,7 @@ /** * BEncodedHeapShard * Copyright 2011 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 16.12.2011 at http://yacy.net + * First released 16.12.2011 at https://yacy.net * * $LastChangedDate: 2011-04-14 00:04:23 +0200 (Do, 14 Apr 2011) $ * $LastChangedRevision: 7653 $ diff --git a/source/net/yacy/kelondro/blob/MapColumnIndex.java b/source/net/yacy/kelondro/blob/MapColumnIndex.java index f99d1ce05..be965ae3a 100644 --- a/source/net/yacy/kelondro/blob/MapColumnIndex.java +++ b/source/net/yacy/kelondro/blob/MapColumnIndex.java @@ -1,7 +1,7 @@ /** * MapColumnIndex * Copyright 2012 by Michael Christen - * First released 01.02.2012 at http://yacy.net + * First released 01.02.2012 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/kelondro/data/citation/CitationReference.java b/source/net/yacy/kelondro/data/citation/CitationReference.java index f9be7b728..ac5be1974 100644 --- a/source/net/yacy/kelondro/data/citation/CitationReference.java +++ b/source/net/yacy/kelondro/data/citation/CitationReference.java @@ -1,7 +1,7 @@ /** * CitationReferenceRow * Copyright 2012 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 13.02.2012 at http://yacy.net + * First released 13.02.2012 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/kelondro/data/citation/CitationReferenceFactory.java b/source/net/yacy/kelondro/data/citation/CitationReferenceFactory.java index 12709e2dc..4d106b6c5 100644 --- a/source/net/yacy/kelondro/data/citation/CitationReferenceFactory.java +++ b/source/net/yacy/kelondro/data/citation/CitationReferenceFactory.java @@ -1,7 +1,7 @@ /** * CitationReferenceFactory * Copyright 2012 by Michael Peter Christen, mc@yacy.net, Frankfurt am Main, Germany - * First released 13.02.2012 at http://yacy.net + * First released 13.02.2012 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/kelondro/data/meta/URIMetadataNode.java b/source/net/yacy/kelondro/data/meta/URIMetadataNode.java index 7c2bf2d07..28e3d14b7 100644 --- a/source/net/yacy/kelondro/data/meta/URIMetadataNode.java +++ b/source/net/yacy/kelondro/data/meta/URIMetadataNode.java @@ -1,7 +1,7 @@ /** * URIMetadataNode * Copyright 2012 by Michael Peter Christen - * First released 10.8.2012 at http://yacy.net + * First released 10.8.2012 at https://yacy.net * * This file is part of YaCy Content Integration * diff --git a/source/net/yacy/kelondro/index/BufferedObjectIndex.java b/source/net/yacy/kelondro/index/BufferedObjectIndex.java index 186f95bfc..9a526d5e1 100644 --- a/source/net/yacy/kelondro/index/BufferedObjectIndex.java +++ b/source/net/yacy/kelondro/index/BufferedObjectIndex.java @@ -1,7 +1,7 @@ /** * BufferedObjectIndex * Copyright 2010 by Michael Peter Christen - * First released 18.4.2010 at http://yacy.net + * First released 18.4.2010 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/kelondro/index/Cache.java b/source/net/yacy/kelondro/index/Cache.java index 226d9b459..bbd634f8b 100644 --- a/source/net/yacy/kelondro/index/Cache.java +++ b/source/net/yacy/kelondro/index/Cache.java @@ -1,7 +1,7 @@ /** * Cache.java * Copyright 2006 by Michael Peter Christen - * First released 26.10.2006 at http://yacy.net + * First released 26.10.2006 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/kelondro/index/Index.java b/source/net/yacy/kelondro/index/Index.java index 1dab22376..bc83c9695 100644 --- a/source/net/yacy/kelondro/index/Index.java +++ b/source/net/yacy/kelondro/index/Index.java @@ -1,7 +1,7 @@ /** * Index * Copyright 2005 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany - * First released 26.10.2005 at http://yacy.net + * First released 26.10.2005 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/kelondro/index/OnDemandOpenFileIndex.java b/source/net/yacy/kelondro/index/OnDemandOpenFileIndex.java index db6aa5c8b..2317787f3 100644 --- a/source/net/yacy/kelondro/index/OnDemandOpenFileIndex.java +++ b/source/net/yacy/kelondro/index/OnDemandOpenFileIndex.java @@ -1,7 +1,7 @@ /** * OnDemandOpenFileIndex * Copyright 2014 by Michael Christen - * First released 16.04.2014 at http://yacy.net + * First released 16.04.2014 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/kelondro/index/RAMIndex.java b/source/net/yacy/kelondro/index/RAMIndex.java index 6ac7bde1f..5548e1e08 100644 --- a/source/net/yacy/kelondro/index/RAMIndex.java +++ b/source/net/yacy/kelondro/index/RAMIndex.java @@ -1,7 +1,7 @@ /** * RAMIndex * Copyright 2008 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany - * First released 07.01.2008 at http://yacy.net + * First released 07.01.2008 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/kelondro/index/RAMIndexCluster.java b/source/net/yacy/kelondro/index/RAMIndexCluster.java index 8d952af28..993ecfa1f 100644 --- a/source/net/yacy/kelondro/index/RAMIndexCluster.java +++ b/source/net/yacy/kelondro/index/RAMIndexCluster.java @@ -1,7 +1,7 @@ /** * RAMIndexCluster * Copyright 2009 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany - * First released 12.03.2009 at http://yacy.net + * First released 12.03.2009 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/kelondro/index/RowHandleMap.java b/source/net/yacy/kelondro/index/RowHandleMap.java index 0d7eaf413..555bb0d61 100644 --- a/source/net/yacy/kelondro/index/RowHandleMap.java +++ b/source/net/yacy/kelondro/index/RowHandleMap.java @@ -1,7 +1,7 @@ /** * HandleMap * Copyright 2008 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany - * First released 08.04.2008 at http://yacy.net + * First released 08.04.2008 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/kelondro/index/RowSet.java b/source/net/yacy/kelondro/index/RowSet.java index e286a86a3..aa4fff910 100644 --- a/source/net/yacy/kelondro/index/RowSet.java +++ b/source/net/yacy/kelondro/index/RowSet.java @@ -1,7 +1,7 @@ /** * RowSet * Copyright 2006 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany - * First released 20.06.2006 at http://yacy.net + * First released 20.06.2006 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/kelondro/table/IndexTable.java b/source/net/yacy/kelondro/table/IndexTable.java index cb02fd0d7..208921760 100644 --- a/source/net/yacy/kelondro/table/IndexTable.java +++ b/source/net/yacy/kelondro/table/IndexTable.java @@ -1,7 +1,7 @@ /** * IndexTable * Copyright 2014 by Michael Peter Christen - * First released 11.11.2014 at http://yacy.net + * First released 11.11.2014 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/peers/EventChannel.java b/source/net/yacy/peers/EventChannel.java index 25ac25f9b..513420448 100644 --- a/source/net/yacy/peers/EventChannel.java +++ b/source/net/yacy/peers/EventChannel.java @@ -1,7 +1,7 @@ /** * yacyChannel * Copyright 2010 by Michael Peter Christen - * First released 29.6.2010 at http://yacy.net + * First released 29.6.2010 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/peers/graphics/EncodedImage.java b/source/net/yacy/peers/graphics/EncodedImage.java index c54e96379..f6de55ebd 100644 --- a/source/net/yacy/peers/graphics/EncodedImage.java +++ b/source/net/yacy/peers/graphics/EncodedImage.java @@ -1,7 +1,7 @@ /** * EncodedImage * Copyright 2010 by Michael Christen - * First released 28.07.2010 at http://yacy.net + * First released 28.07.2010 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/peers/graphics/OSMTile.java b/source/net/yacy/peers/graphics/OSMTile.java index 019e9da0a..8dc903764 100644 --- a/source/net/yacy/peers/graphics/OSMTile.java +++ b/source/net/yacy/peers/graphics/OSMTile.java @@ -1,7 +1,7 @@ /** * OSMTile * Copyright 2008 by Michael Peter Christen - * First released 12.02.2008 at http://yacy.net + * First released 12.02.2008 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/search/AutoSearch.java b/source/net/yacy/search/AutoSearch.java index 980de4ce5..524a2e891 100644 --- a/source/net/yacy/search/AutoSearch.java +++ b/source/net/yacy/search/AutoSearch.java @@ -1,7 +1,7 @@ /** * AutoSearch.java * Copyright 2015 by Burkhard Buelte - * First released 09.01.2015 at http://yacy.net + * First released 09.01.2015 at https://yacy.net * * This is a part of YaCy, a peer-to-peer based web search engine * diff --git a/source/net/yacy/search/IndexingQueueEntry.java b/source/net/yacy/search/IndexingQueueEntry.java index 818356a59..0c26cd129 100644 --- a/source/net/yacy/search/IndexingQueueEntry.java +++ b/source/net/yacy/search/IndexingQueueEntry.java @@ -1,7 +1,7 @@ /** * IndexingQueueEntry * Copyright 2012 by Michael Peter Christen - * First released 24.07.2012 at http://yacy.net + * First released 24.07.2012 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/search/Shutdown.java b/source/net/yacy/search/Shutdown.java index 68705c3a4..c303e4e07 100644 --- a/source/net/yacy/search/Shutdown.java +++ b/source/net/yacy/search/Shutdown.java @@ -1,7 +1,7 @@ /** * Shutdown * Copyright 2012 by Michael Peter Christen - * First released 24.07.2012 at http://yacy.net + * First released 24.07.2012 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/search/Switchboard.java b/source/net/yacy/search/Switchboard.java index 0c39b51cf..20778899c 100644 --- a/source/net/yacy/search/Switchboard.java +++ b/source/net/yacy/search/Switchboard.java @@ -103,6 +103,7 @@ import com.cybozu.labs.langdetect.DetectorFactory; import com.cybozu.labs.langdetect.LangDetectException; import com.google.common.io.Files; +import net.yacy.yacy; import net.yacy.cora.date.GenericFormatter; import net.yacy.cora.document.WordCache; import net.yacy.cora.document.analysis.Classification; @@ -260,10 +261,9 @@ public final class Switchboard extends serverSwitch { public static WikiParser wikiParser = null; // storage management - public File htCachePath; public final File dictionariesPath, classificationPath; public File listsPath; - public File htDocsPath; + public File htDocsPath, htRootPath, htCachePath; public File workPath; public File releasePath; public File networkRoot; @@ -373,11 +373,12 @@ public final class Switchboard extends serverSwitch { this.log.config("Index Primary Path: " + indexPath.toString()); final File archivePath = this.getDataPath(SwitchboardConstants.INDEX_ARCHIVE_PATH, SwitchboardConstants.INDEX_ARCHIVE_DEFAULT); this.log.config("Index Archive Path: " + archivePath.toString()); - this.listsPath = - this.getDataPath(SwitchboardConstants.LISTS_PATH, SwitchboardConstants.LISTS_PATH_DEFAULT); + this.listsPath = this.getDataPath(SwitchboardConstants.LISTS_PATH, SwitchboardConstants.LISTS_PATH_DEFAULT); this.log.config("Lists Path: " + this.listsPath.toString()); - this.htDocsPath = - this.getDataPath(SwitchboardConstants.HTDOCS_PATH, SwitchboardConstants.HTDOCS_PATH_DEFAULT); + this.htRootPath = this.getDataPath(SwitchboardConstants.HTROOT_PATH, SwitchboardConstants.HTROOT_PATH_DEFAULT); // path to the servlets + this.log.config("HTROOT Path: " + this.htRootPath.toString()); + this.htDocsPath = this.getDataPath(SwitchboardConstants.HTDOCS_PATH, SwitchboardConstants.HTDOCS_PATH_DEFAULT); // a mirror to htroot + yacy.mkdirIfNeseccary(this.htDocsPath); this.log.config("HTDOCS Path: " + this.htDocsPath.toString()); this.workPath = this.getDataPath(SwitchboardConstants.WORK_PATH, SwitchboardConstants.WORK_PATH_DEFAULT); this.workPath.mkdirs(); @@ -590,658 +591,664 @@ public final class Switchboard extends serverSwitch { final String solrurls = this.getConfig(SwitchboardConstants.FEDERATED_SERVICE_SOLR_INDEXING_URL, "http://127.0.0.1:8983/solr"); final boolean usesolr = this.getConfigBool(SwitchboardConstants.FEDERATED_SERVICE_SOLR_INDEXING_ENABLED, SwitchboardConstants.FEDERATED_SERVICE_SOLR_INDEXING_ENABLED_DEFAULT) & solrurls.length() > 0; - final int solrtimeout = this.getConfigInt(SwitchboardConstants.FEDERATED_SERVICE_SOLR_INDEXING_TIMEOUT, 60000); - final boolean writeEnabled = this.getConfigBool(SwitchboardConstants.FEDERATED_SERVICE_SOLR_INDEXING_WRITEENABLED, true); - final boolean trustSelfSignedOnAuthenticatedServer = Switchboard.getSwitchboard().getConfigBool( - SwitchboardConstants.FEDERATED_SERVICE_SOLR_INDEXING_AUTHENTICATED_ALLOW_SELF_SIGNED, - SwitchboardConstants.FEDERATED_SERVICE_SOLR_INDEXING_AUTHENTICATED_ALLOW_SELF_SIGNED_DEFAULT); + final int solrtimeout = this.getConfigInt(SwitchboardConstants.FEDERATED_SERVICE_SOLR_INDEXING_TIMEOUT, 60000); + final boolean writeEnabled = this.getConfigBool(SwitchboardConstants.FEDERATED_SERVICE_SOLR_INDEXING_WRITEENABLED, true); + final boolean trustSelfSignedOnAuthenticatedServer = Switchboard.getSwitchboard().getConfigBool( + SwitchboardConstants.FEDERATED_SERVICE_SOLR_INDEXING_AUTHENTICATED_ALLOW_SELF_SIGNED, + SwitchboardConstants.FEDERATED_SERVICE_SOLR_INDEXING_AUTHENTICATED_ALLOW_SELF_SIGNED_DEFAULT); - if (usesolr && solrurls != null && solrurls.length() > 0) { - try { - final ArrayList instances = RemoteInstance.getShardInstances(solrurls, null, null, solrtimeout, trustSelfSignedOnAuthenticatedServer); - final String shardMethodName = this.getConfig(SwitchboardConstants.FEDERATED_SERVICE_SOLR_INDEXING_SHARDING, ShardSelection.Method.MODULO_HOST_MD5.name()); - final ShardSelection.Method shardMethod = ShardSelection.Method.valueOf(shardMethodName); - this.index.fulltext().connectRemoteSolr(instances, shardMethod, writeEnabled); - } catch (final IOException e ) { - ConcurrentLog.logException(e); - } + if (usesolr && solrurls != null && solrurls.length() > 0) { + try { + final ArrayList instances = RemoteInstance.getShardInstances(solrurls, null, null, solrtimeout, trustSelfSignedOnAuthenticatedServer); + final String shardMethodName = this.getConfig(SwitchboardConstants.FEDERATED_SERVICE_SOLR_INDEXING_SHARDING, ShardSelection.Method.MODULO_HOST_MD5.name()); + final ShardSelection.Method shardMethod = ShardSelection.Method.valueOf(shardMethodName); + this.index.fulltext().connectRemoteSolr(instances, shardMethod, writeEnabled); + } catch (final IOException e ) { + ConcurrentLog.logException(e); + } + } + + // initialize network database + final File mySeedFile = new File(this.networkRoot, SeedDB.DBFILE_OWN_SEED); + this.peers = + new SeedDB( + this.networkRoot, + "seed.new.heap", + "seed.old.heap", + "seed.pot.heap", + mySeedFile, + redundancy, + partitionExponent, + false, + this.exceed134217727); + final String agent = this.getConfig(SwitchboardConstants.NETWORK_UNIT_AGENT, ""); + if (!agent.isEmpty()) this.peers.setMyName(agent); // this can thus be set using the environment variable yacy.network.unit.agent + + // initialize peer scan + this.localcluster_scan = Collections.newSetFromMap(new ConcurrentHashMap<>()); + if (this.getConfigBool("scan.enabled", false)) { + new OneTimeBusyThread("Switchboard.scanForOtherYaCyInIntranet") { + @Override + public boolean jobImpl() throws Exception { + Switchboard.this.localcluster_scan.addAll(Scanner.scanForOtherYaCyInIntranet()); + return true; } + }.start(); + } - // initialize network database - final File mySeedFile = new File(this.networkRoot, SeedDB.DBFILE_OWN_SEED); - this.peers = - new SeedDB( - this.networkRoot, - "seed.new.heap", - "seed.old.heap", - "seed.pot.heap", - mySeedFile, - redundancy, - partitionExponent, - false, - this.exceed134217727); - final String agent = this.getConfig(SwitchboardConstants.NETWORK_UNIT_AGENT, ""); - if (!agent.isEmpty()) this.peers.setMyName(agent); // this can thus be set using the environment variable yacy.network.unit.agent + // load domainList + try { + this.domainList = null; + if (!this.getConfig("network.unit.domainlist", "").equals("")) { + final Reader r = this.getConfigFileFromWebOrLocally( + this.getConfig("network.unit.domainlist", ""), + this.getAppPath().getAbsolutePath(), + new File(this.networkRoot, "domainlist.txt")); + this.domainList = new FilterEngine(); + final BufferedReader br = new BufferedReader(r); + this.domainList.loadList(br, null); + br.close(); + } + } catch (final FileNotFoundException e ) { + this.log.severe("CONFIG: domainlist not found: " + e.getMessage()); + } catch (final IOException e ) { + this.log.severe("CONFIG: error while retrieving domainlist: " + e.getMessage()); + } - // initialize peer scan - this.localcluster_scan = Collections.newSetFromMap(new ConcurrentHashMap<>()); - if (this.getConfigBool("scan.enabled", false)) { - new OneTimeBusyThread("Switchboard.scanForOtherYaCyInIntranet") { - @Override - public boolean jobImpl() throws Exception { - Switchboard.this.localcluster_scan.addAll(Scanner.scanForOtherYaCyInIntranet()); - return true; - } - }.start(); + // create a crawler + this.crawler = new CrawlSwitchboard(this); + + // start yacy core + this.log.config("Starting YaCy Protocol Core"); + this.yc = new Network(this); + new OneTimeBusyThread("Switchboard.loadSeedLists") { + + @Override + public boolean jobImpl() throws Exception { + Switchboard.this.loadSeedLists(); + return true; + } + }.start(); + //final long startedSeedListAquisition = System.currentTimeMillis(); + + // init a DHT transmission dispatcher + this.dhtDispatcher = (this.peers.sizeConnected() == 0) ? null : new Dispatcher(this, true, 10000); + + // set up local robots.txt + this.robotstxtConfig = RobotsTxtConfig.init(this); + + // setting timestamp of last proxy access + this.proxyLastAccess = System.currentTimeMillis() - 10000; + this.localSearchLastAccess = System.currentTimeMillis() - 10000; + this.remoteSearchLastAccess = System.currentTimeMillis() - 10000; + this.adminAuthenticationLastAccess = 0; // timestamp last admin authentication (as not autenticated here, stamp with 0) + this.optimizeLastRun = System.currentTimeMillis(); + this.webStructure = new WebStructureGraph(new File(this.queuesRoot, "webStructure.map")); + + // configuring list path + if ( !(this.listsPath.exists()) ) { + this.listsPath.mkdirs(); + } + + // load coloured lists + if ( blueList == null ) { + // read only once upon first instantiation of this class + final String f = + this.getConfig(SwitchboardConstants.LIST_BLUE, SwitchboardConstants.LIST_BLUE_DEFAULT); + final File plasmaBlueListFile = new File(f); + if ( f != null ) { + blueList = SetTools.loadList(plasmaBlueListFile, NaturalOrder.naturalComparator); + } else { + blueList = new TreeSet<>(); + } + this.log.config("loaded blue-list from file " + + plasmaBlueListFile.getName() + + ", " + + blueList.size() + + " entries, " + + ppRamString(plasmaBlueListFile.length() / 1024)); + } + + // load blacklist + this.log.config("Loading blacklist ..."); + final File blacklistsPath = + this.getDataPath(SwitchboardConstants.LISTS_PATH, SwitchboardConstants.LISTS_PATH_DEFAULT); + urlBlacklist = new Blacklist(blacklistsPath); + ListManager.switchboard = this; + ListManager.listsPath = blacklistsPath; + ListManager.reloadBlacklists(); + + // Set jvm default locale to match UI language ( + String lng = this.getConfig("locale.language", "en"); + if (!"browser".equals(lng) && !"default".equals(lng)) { + Locale.setDefault(new Locale(lng)); + } else { + lng = "en"; // default = English + } + + // load badwords (to filter the topwords) + if ( badwords == null || badwords.isEmpty() ) { + File badwordsFile = new File(appPath, "DATA/SETTINGS/" + SwitchboardConstants.LIST_BADWORDS_DEFAULT); + if (!badwordsFile.exists()) { + badwordsFile = new File(appPath, "defaults/" + SwitchboardConstants.LIST_BADWORDS_DEFAULT); + } + badwords = SetTools.loadList(badwordsFile, NaturalOrder.naturalComparator); + this.log.config("loaded badwords from file " + + badwordsFile.getName() + + ", " + + badwords.size() + + " entries, " + + ppRamString(badwordsFile.length() / 1024)); + } + + // load stopwords (to filter query and topwords) + if ( stopwords == null || stopwords.isEmpty() ) { + File stopwordsFile = new File(dataPath, "DATA/SETTINGS/" + SwitchboardConstants.LIST_STOPWORDS_DEFAULT); + if (!stopwordsFile.exists()) { + stopwordsFile = new File(appPath, "defaults/"+SwitchboardConstants.LIST_STOPWORDS_DEFAULT); + } + stopwords = SetTools.loadList(stopwordsFile, NaturalOrder.naturalComparator); + // append locale language stopwords using setting of interface language (file yacy.stopwords.xx) + // english is stored as default (needed for locale html file overlay) + File stopwordsFilelocale = new File (dataPath, "DATA/SETTINGS/"+stopwordsFile.getName()+"."+lng); + if (!stopwordsFilelocale.exists()) stopwordsFilelocale = new File (appPath, "defaults/"+stopwordsFile.getName()+"."+lng); + if (stopwordsFilelocale.exists()) { + // load YaCy locale stopword list + stopwords.addAll(SetTools.loadList(stopwordsFilelocale, NaturalOrder.naturalComparator)); + this.log.config("append stopwords from file " + stopwordsFilelocale.getName()); + } else { + // alternatively load/append default solr stopword list + stopwordsFilelocale = new File (appPath, "defaults/solr/lang/stopwords_" + lng + ".txt"); + if (stopwordsFilelocale.exists()) { + stopwords.addAll(SetTools.loadList(stopwordsFilelocale, NaturalOrder.naturalComparator)); + this.log.config("append stopwords from file " + stopwordsFilelocale.getName()); } + } + } - // load domainList + // start a cache manager + this.log.config("Starting HT Cache Manager"); + + // create the cache directory + this.htCachePath = + this.getDataPath(SwitchboardConstants.HTCACHE_PATH, SwitchboardConstants.HTCACHE_PATH_DEFAULT); + this.log.info("HTCACHE Path = " + this.htCachePath.getAbsolutePath()); + final long maxCacheSize = + 1024L * 1024L * Long.parseLong(this.getConfig(SwitchboardConstants.PROXY_CACHE_SIZE, "2")); // this is megabyte + Cache.init(this.htCachePath, this.peers.mySeed().hash, maxCacheSize, + this.getConfigLong(SwitchboardConstants.HTCACHE_SYNC_LOCK_TIMEOUT, + SwitchboardConstants.HTCACHE_SYNC_LOCK_TIMEOUT_DEFAULT), + this.getConfigInt(SwitchboardConstants.HTCACHE_COMPRESSION_LEVEL, + SwitchboardConstants.HTCACHE_COMPRESSION_LEVEL_DEFAULT)); + final File transactiondir = new File(this.htCachePath, "snapshots"); + Transactions.init(transactiondir, this.getConfigLong(SwitchboardConstants.SNAPSHOTS_WKHTMLTOPDF_TIMEOUT, + SwitchboardConstants.SNAPSHOTS_WKHTMLTOPDF_TIMEOUT_DEFAULT)); + + // create the surrogates directories + this.surrogatesInPath = + this.getDataPath( + SwitchboardConstants.SURROGATES_IN_PATH, + SwitchboardConstants.SURROGATES_IN_PATH_DEFAULT); + this.log.info("surrogates.in Path = " + this.surrogatesInPath.getAbsolutePath()); + this.surrogatesInPath.mkdirs(); + this.surrogatesOutPath = + this.getDataPath( + SwitchboardConstants.SURROGATES_OUT_PATH, + SwitchboardConstants.SURROGATES_OUT_PATH_DEFAULT); + this.log.info("surrogates.out Path = " + this.surrogatesOutPath.getAbsolutePath()); + this.surrogatesOutPath.mkdirs(); + + // copy opensearch heuristic config (if not exist) + final File osdConfig = new File(this.getDataPath(), "DATA/SETTINGS/heuristicopensearch.conf"); + if (!osdConfig.exists()) { + final File osdDefaultConfig = new File(appPath, "defaults/heuristicopensearch.conf"); + this.log.info("heuristic.opensearch list Path = " + osdDefaultConfig.getAbsolutePath()); + try { + Files.copy(osdDefaultConfig, osdConfig); + } catch (final IOException ex) { } + } + + // create the release download directory + this.releasePath = + this.getDataPath(SwitchboardConstants.RELEASE_PATH, SwitchboardConstants.RELEASE_PATH_DEFAULT); + this.releasePath.mkdirs(); + this.log.info("RELEASE Path = " + this.releasePath.getAbsolutePath()); + + // starting message board + try { + this.initMessages(); + } catch (final IOException e) { + ConcurrentLog.logException(e); + } + + // starting wiki + try { + this.initWiki(); + } catch (final IOException e) { + ConcurrentLog.logException(e); + } + + //starting blog + try { + this.initBlog(); + } catch (final IOException e) { + ConcurrentLog.logException(e); + } + + // init User DB + this.log.config("Loading User DB"); + final File userDbFile = new File(this.getDataPath(), "DATA/SETTINGS/user.heap"); + try { + this.userDB = new UserDB(userDbFile); + this.log.config("Loaded User DB from file " + + userDbFile.getName() + + ", " + + this.userDB.size() + + " entries" + + ", " + + ppRamString(userDbFile.length() / 1024)); + } catch (final IOException e) { + ConcurrentLog.logException(e); + } + + // init html parser evaluation scheme + File parserPropertiesPath = new File(appPath, "defaults/"); + String[] settingsList = parserPropertiesPath.list(); + for ( final String l : settingsList ) { + if ( l.startsWith("parser.") && l.endsWith(".properties") ) { try { - this.domainList = null; - if (!this.getConfig("network.unit.domainlist", "").equals("")) { - final Reader r = this.getConfigFileFromWebOrLocally( - this.getConfig("network.unit.domainlist", ""), - this.getAppPath().getAbsolutePath(), - new File(this.networkRoot, "domainlist.txt")); - this.domainList = new FilterEngine(); - final BufferedReader br = new BufferedReader(r); - this.domainList.loadList(br, null); - br.close(); - } - } catch (final FileNotFoundException e ) { - this.log.severe("CONFIG: domainlist not found: " + e.getMessage()); - } catch (final IOException e ) { - this.log.severe("CONFIG: error while retrieving domainlist: " + e.getMessage()); + Evaluation.add(new File(parserPropertiesPath, l)); + } catch (final IOException e) { + ConcurrentLog.logException(e); } + } + } + parserPropertiesPath = new File(this.getDataPath(), "DATA/SETTINGS/"); + settingsList = parserPropertiesPath.list(); + for ( final String l : settingsList ) { + if ( l.startsWith("parser.") && l.endsWith(".properties") ) { + try { + Evaluation.add(new File(parserPropertiesPath, l)); + } catch (final IOException e) { + ConcurrentLog.logException(e); + } + } + } - // create a crawler - this.crawler = new CrawlSwitchboard(this); + // init bookmarks DB: needs more time since this does a DNS lookup for each Bookmark. + // Can be started concurrently + new Thread("Switchboard.initBookmarks") { + @Override + public void run() { + try { + Switchboard.this.initBookmarks(); + } catch (final IOException e ) { + ConcurrentLog.logException(e); + } + } + }.start(); - // start yacy core - this.log.config("Starting YaCy Protocol Core"); - this.yc = new Network(this); - new OneTimeBusyThread("Switchboard.loadSeedLists") { + // define a realtime parsable mimetype list + this.log.config("Parser: Initializing Mime Type deny list"); + + final boolean enableAudioTags = this.getConfigBool("parser.enableAudioTags", false); + this.log.config("Parser: parser.enableAudioTags= "+enableAudioTags); + final Set denyExt = this.getConfigSet(SwitchboardConstants.PARSER_EXTENSIONS_DENY); + final Set denyMime = this.getConfigSet(SwitchboardConstants.PARSER_MIME_DENY); + + /* audioTagParser is disabled by default as it needs a temporary file (because of the JAudiotagger implementation) for each parsed document */ + if (!enableAudioTags) { + denyExt.addAll(audioTagParser.SupportedAudioFormat.getAllFileExtensions()); + denyMime.addAll(audioTagParser.SupportedAudioFormat.getAllMediaTypes()); + + this.setConfig(SwitchboardConstants.PARSER_EXTENSIONS_DENY, denyExt); + this.setConfig(SwitchboardConstants.PARSER_MIME_DENY, denyMime); + this.setConfig("parser.enableAudioTags", true); + } + + TextParser.setDenyMime(this.getConfig(SwitchboardConstants.PARSER_MIME_DENY, "")); + TextParser.setDenyExtension(this.getConfig(SwitchboardConstants.PARSER_EXTENSIONS_DENY, "")); + + // start a loader + this.log.config("Starting Crawl Loader"); + this.loader = new LoaderDispatcher(this); + + // load donation frame + new Thread("yacy.importDonationIFrame") { + @Override + public void run() { + final ClientIdentification.Agent agent = ClientIdentification.getAgent(ClientIdentification.yacyInternetCrawlerAgentName); + try { + final Response documentResponse = Switchboard.this.loader.load(Switchboard.this.loader.request(new DigestURL(getConfig("donation.iframesource", "")), false, true), CacheStrategy.NOCACHE, Integer.MAX_VALUE, null, agent); + if (documentResponse != null) FileUtils.copy(documentResponse.getContent(), new File(Switchboard.this.htDocsPath, getConfig("donation.iframetarget", ""))); + } catch (final Exception e) {} + } + }.start(); + + // load oai tables + final Map oaiFriends = + OAIListFriendsLoader.loadListFriendsSources( + new File(appPath, "defaults/oaiListFriendsSource.xml"), + this.getDataPath()); + OAIListFriendsLoader.init(this.loader, oaiFriends, ClientIdentification.yacyInternetCrawlerAgent); + + // load the robots.txt db + this.log.config("Initializing robots.txt DB"); + this.robots = new RobotsTxt(this.tables, this.loader, + this.getConfigInt(SwitchboardConstants.ROBOTS_TXT_THREADS_ACTIVE_MAX, SwitchboardConstants.ROBOTS_TXT_THREADS_ACTIVE_MAX_DEFAULT)); + try { + this.log.config("Loaded robots.txt DB: " + this.robots.size() + " entries"); + } catch (final IOException e) { + ConcurrentLog.logException(e); + } + this.crawlQueues = new CrawlQueues(this, this.queuesRoot); + + // on startup, resume all crawls + this.setConfig(SwitchboardConstants.CRAWLJOB_LOCAL_CRAWL + "_isPaused", "false"); + this.setConfig(SwitchboardConstants.CRAWLJOB_LOCAL_CRAWL + "_isPaused_cause", ""); + this.setConfig(SwitchboardConstants.CRAWLJOB_REMOTE_TRIGGERED_CRAWL + "_isPaused", "false"); + this.setConfig(SwitchboardConstants.CRAWLJOB_REMOTE_TRIGGERED_CRAWL + "_isPaused_cause", ""); + this.setConfig(SwitchboardConstants.CRAWLJOB_REMOTE_CRAWL_LOADER + "_isPaused", "false"); + this.setConfig(SwitchboardConstants.CRAWLJOB_REMOTE_CRAWL_LOADER + "_isPaused_cause", ""); + this.crawlJobsStatus.put(SwitchboardConstants.CRAWLJOB_LOCAL_CRAWL, new Object[] {new Object(), false}); + this.crawlJobsStatus.put(SwitchboardConstants.CRAWLJOB_REMOTE_TRIGGERED_CRAWL, new Object[] {new Object(), false}); + this.crawlJobsStatus.put(SwitchboardConstants.CRAWLJOB_REMOTE_CRAWL_LOADER, new Object[] {new Object(), false}); + + // init cookie-Monitor + this.log.config("Starting Cookie Monitor"); + this.outgoingCookies = new ConcurrentHashMap<>(); + this.incomingCookies = new ConcurrentHashMap<>(); + + // init search history trackers + this.localSearchTracker = new ConcurrentHashMap<>(); // String:TreeSet - IP:set of Long(accessTime) + this.remoteSearchTracker = new ConcurrentHashMap<>(); + + // init messages: clean up message symbol + final File notifierSource = new File(this.htRootPath.getAbsolutePath() + "/env/grafics/empty.gif"); + final File notifierDest = new File(this.htDocsPath, "notifier.gif"); + try { + Files.copy(notifierSource, notifierDest); + } catch (final IOException e ) { + } + + // init nameCacheNoCachingList + try { + Domains.setNoCachingPatterns(this.getConfig(SwitchboardConstants.HTTPC_NAME_CACHE_CACHING_PATTERNS_NO, "")); + } catch (final PatternSyntaxException pse) { + ConcurrentLog.severe("Switchboard", "Invalid regular expression in " + + SwitchboardConstants.HTTPC_NAME_CACHE_CACHING_PATTERNS_NO + + " property: " + pse.getMessage()); + System.exit(-1); + } + + // generate snippets cache + this.log.config("Initializing Snippet Cache"); + + TextSnippet.statistics.setEnabled(this.getConfigBool(SwitchboardConstants.DEBUG_SNIPPETS_STATISTICS_ENABLED, + SwitchboardConstants.DEBUG_SNIPPETS_STATISTICS_ENABLED_DEFAULT)); + + // init the wiki + wikiParser = new WikiCode(); + + // initializing the resourceObserver + this.observer = new ResourceObserver(this); + + final ResourceObserver resourceObserver = this.observer; + new OneTimeBusyThread("ResourceObserver.resourceObserverJob") { + + @Override + public boolean jobImpl() throws Exception { + resourceObserver.resourceObserverJob(); + return true; + } + }.start(); + + // initializing the stackCrawlThread + this.crawlStacker = + new CrawlStacker( + this.robots, + this.crawlQueues, + this.crawler, + this.index, + this.peers, + this.isIntranetMode(), + this.isGlobalMode(), + this.domainList); // Intranet and Global mode may be both true! + + // possibly switch off localIP check + Domains.setNoLocalCheck(this.isAllIPMode()); + + // check status of account configuration: when local url crawling is allowed, it is not allowed + // that an automatic authorization of localhost is done, because in this case crawls from local + // addresses are blocked to prevent attack szenarios where remote pages contain links to localhost + // addresses that can steer a YaCy peer + if ( !this.getConfigBool(SwitchboardConstants.ADMIN_ACCOUNT_FOR_LOCALHOST, false) ) { + if ( this.getConfig(SwitchboardConstants.ADMIN_ACCOUNT_B64MD5, "").startsWith("0000") ) { + // the password was set automatically with a random value. + // We must remove that here to prevent that a user cannot log in any more + this.setConfig(SwitchboardConstants.ADMIN_ACCOUNT_B64MD5, ""); + // after this a message must be generated to alert the user to set a new password + this.log.info("RANDOM PASSWORD REMOVED! User must set a new password"); + } + } + + // initializing dht chunk generation + this.dhtMaxReferenceCount = (int) this.getConfigLong(SwitchboardConstants.INDEX_DIST_CHUNK_SIZE_START, 50); + + // init robinson cluster + // before we do that, we wait some time until the seed list is loaded. + this.clusterhashes = this.peers.clusterHashes(this.getConfig("cluster.peers.yacydomain", "")); + + // deploy blocking threads + this.indexingStorageProcessor = + new WorkflowProcessor<>( + "storeDocumentIndex", + "This is the sequencing step of the indexing queue. Files are written as streams, too much councurrency would destroy IO performance. In this process the words are written to the RWI cache, which flushes if it is full.", + new String[] { + "RWI/Cache/Collections" + }, + in -> { + Switchboard.this.storeDocumentIndex(in); + return null; + }, + 2, + null, + 1); + this.indexingAnalysisProcessor = + new WorkflowProcessor<>( + "webStructureAnalysis", + "This just stores the link structure of the document into a web structure database.", + new String[] { + "storeDocumentIndex" + }, + in -> Switchboard.this.webStructureAnalysis(in), + WorkflowProcessor.availableCPU + 1, + this.indexingStorageProcessor, + WorkflowProcessor.availableCPU); + this.indexingCondensementProcessor = + new WorkflowProcessor<>( + "condenseDocument", + "This does a structural analysis of plain texts: markup of headlines, slicing into phrases (i.e. sentences), markup with position, counting of words, calculation of term frequency.", + new String[] { + "webStructureAnalysis" + }, + in -> Switchboard.this.condenseDocument(in), + WorkflowProcessor.availableCPU + 1, + this.indexingAnalysisProcessor, + WorkflowProcessor.availableCPU); + this.indexingDocumentProcessor = + new WorkflowProcessor<>( + "parseDocument", + "This does the parsing of the newly loaded documents from the web. The result is not only a plain text document, but also a list of URLs that are embedded into the document. The urls are handed over to the CrawlStacker. This process has two child process queues!", + new String[] { + "condenseDocument", "CrawlStacker" + }, + in -> Switchboard.this.parseDocument(in), + Math.max(20, WorkflowProcessor.availableCPU * 2), // it may happen that this is filled with new files from the search process. That means there should be enough place for two result pages + this.indexingCondensementProcessor, + WorkflowProcessor.availableCPU); + + // deploy busy threads + this.log.config("Starting Threads"); + MemoryControl.gc(10000, "plasmaSwitchboard, help for profiler"); // help for profiler - thq + + this.deployThread( + SwitchboardConstants.CLEANUP, + "Cleanup", + "cleaning process", + null, + new InstantBusyThread("Switchboard.cleanupJob", 30000, 10000) { @Override public boolean jobImpl() throws Exception { - Switchboard.this.loadSeedLists(); - return true; + return Switchboard.this.cleanupJob(); } - }.start(); - //final long startedSeedListAquisition = System.currentTimeMillis(); - // init a DHT transmission dispatcher - this.dhtDispatcher = (this.peers.sizeConnected() == 0) ? null : new Dispatcher(this, true, 10000); - - // set up local robots.txt - this.robotstxtConfig = RobotsTxtConfig.init(this); - - // setting timestamp of last proxy access - this.proxyLastAccess = System.currentTimeMillis() - 10000; - this.localSearchLastAccess = System.currentTimeMillis() - 10000; - this.remoteSearchLastAccess = System.currentTimeMillis() - 10000; - this.adminAuthenticationLastAccess = 0; // timestamp last admin authentication (as not autenticated here, stamp with 0) - this.optimizeLastRun = System.currentTimeMillis(); - this.webStructure = new WebStructureGraph(new File(this.queuesRoot, "webStructure.map")); - - // configuring list path - if ( !(this.listsPath.exists()) ) { - this.listsPath.mkdirs(); - } - - // load coloured lists - if ( blueList == null ) { - // read only once upon first instantiation of this class - final String f = - this.getConfig(SwitchboardConstants.LIST_BLUE, SwitchboardConstants.LIST_BLUE_DEFAULT); - final File plasmaBlueListFile = new File(f); - if ( f != null ) { - blueList = SetTools.loadList(plasmaBlueListFile, NaturalOrder.naturalComparator); - } else { - blueList = new TreeSet<>(); - } - this.log.config("loaded blue-list from file " - + plasmaBlueListFile.getName() - + ", " - + blueList.size() - + " entries, " - + ppRamString(plasmaBlueListFile.length() / 1024)); - } - - // load blacklist - this.log.config("Loading blacklist ..."); - final File blacklistsPath = - this.getDataPath(SwitchboardConstants.LISTS_PATH, SwitchboardConstants.LISTS_PATH_DEFAULT); - urlBlacklist = new Blacklist(blacklistsPath); - ListManager.switchboard = this; - ListManager.listsPath = blacklistsPath; - ListManager.reloadBlacklists(); - - // Set jvm default locale to match UI language ( - String lng = this.getConfig("locale.language", "en"); - if (!"browser".equals(lng) && !"default".equals(lng)) { - Locale.setDefault(new Locale(lng)); - } else { - lng = "en"; // default = English - } - - // load badwords (to filter the topwords) - if ( badwords == null || badwords.isEmpty() ) { - File badwordsFile = new File(appPath, "DATA/SETTINGS/" + SwitchboardConstants.LIST_BADWORDS_DEFAULT); - if (!badwordsFile.exists()) { - badwordsFile = new File(appPath, "defaults/" + SwitchboardConstants.LIST_BADWORDS_DEFAULT); - } - badwords = SetTools.loadList(badwordsFile, NaturalOrder.naturalComparator); - this.log.config("loaded badwords from file " - + badwordsFile.getName() - + ", " - + badwords.size() - + " entries, " - + ppRamString(badwordsFile.length() / 1024)); - } - - // load stopwords (to filter query and topwords) - if ( stopwords == null || stopwords.isEmpty() ) { - File stopwordsFile = new File(dataPath, "DATA/SETTINGS/" + SwitchboardConstants.LIST_STOPWORDS_DEFAULT); - if (!stopwordsFile.exists()) { - stopwordsFile = new File(appPath, "defaults/"+SwitchboardConstants.LIST_STOPWORDS_DEFAULT); - } - stopwords = SetTools.loadList(stopwordsFile, NaturalOrder.naturalComparator); - // append locale language stopwords using setting of interface language (file yacy.stopwords.xx) - // english is stored as default (needed for locale html file overlay) - File stopwordsFilelocale = new File (dataPath, "DATA/SETTINGS/"+stopwordsFile.getName()+"."+lng); - if (!stopwordsFilelocale.exists()) stopwordsFilelocale = new File (appPath, "defaults/"+stopwordsFile.getName()+"."+lng); - if (stopwordsFilelocale.exists()) { - // load YaCy locale stopword list - stopwords.addAll(SetTools.loadList(stopwordsFilelocale, NaturalOrder.naturalComparator)); - this.log.config("append stopwords from file " + stopwordsFilelocale.getName()); - } else { - // alternatively load/append default solr stopword list - stopwordsFilelocale = new File (appPath, "defaults/solr/lang/stopwords_" + lng + ".txt"); - if (stopwordsFilelocale.exists()) { - stopwords.addAll(SetTools.loadList(stopwordsFilelocale, NaturalOrder.naturalComparator)); - this.log.config("append stopwords from file " + stopwordsFilelocale.getName()); - } - } - } - - // start a cache manager - this.log.config("Starting HT Cache Manager"); - - // create the cache directory - this.htCachePath = - this.getDataPath(SwitchboardConstants.HTCACHE_PATH, SwitchboardConstants.HTCACHE_PATH_DEFAULT); - this.log.info("HTCACHE Path = " + this.htCachePath.getAbsolutePath()); - final long maxCacheSize = - 1024L * 1024L * Long.parseLong(this.getConfig(SwitchboardConstants.PROXY_CACHE_SIZE, "2")); // this is megabyte - Cache.init(this.htCachePath, this.peers.mySeed().hash, maxCacheSize, - this.getConfigLong(SwitchboardConstants.HTCACHE_SYNC_LOCK_TIMEOUT, - SwitchboardConstants.HTCACHE_SYNC_LOCK_TIMEOUT_DEFAULT), - this.getConfigInt(SwitchboardConstants.HTCACHE_COMPRESSION_LEVEL, - SwitchboardConstants.HTCACHE_COMPRESSION_LEVEL_DEFAULT)); - final File transactiondir = new File(this.htCachePath, "snapshots"); - Transactions.init(transactiondir, this.getConfigLong(SwitchboardConstants.SNAPSHOTS_WKHTMLTOPDF_TIMEOUT, - SwitchboardConstants.SNAPSHOTS_WKHTMLTOPDF_TIMEOUT_DEFAULT)); - - // create the surrogates directories - this.surrogatesInPath = - this.getDataPath( - SwitchboardConstants.SURROGATES_IN_PATH, - SwitchboardConstants.SURROGATES_IN_PATH_DEFAULT); - this.log.info("surrogates.in Path = " + this.surrogatesInPath.getAbsolutePath()); - this.surrogatesInPath.mkdirs(); - this.surrogatesOutPath = - this.getDataPath( - SwitchboardConstants.SURROGATES_OUT_PATH, - SwitchboardConstants.SURROGATES_OUT_PATH_DEFAULT); - this.log.info("surrogates.out Path = " + this.surrogatesOutPath.getAbsolutePath()); - this.surrogatesOutPath.mkdirs(); - - // copy opensearch heuristic config (if not exist) - final File osdConfig = new File(this.getDataPath(), "DATA/SETTINGS/heuristicopensearch.conf"); - if (!osdConfig.exists()) { - final File osdDefaultConfig = new File(appPath, "defaults/heuristicopensearch.conf"); - this.log.info("heuristic.opensearch list Path = " + osdDefaultConfig.getAbsolutePath()); - try { - Files.copy(osdDefaultConfig, osdConfig); - } catch (final IOException ex) { } - } - - // create the release download directory - this.releasePath = - this.getDataPath(SwitchboardConstants.RELEASE_PATH, SwitchboardConstants.RELEASE_PATH_DEFAULT); - this.releasePath.mkdirs(); - this.log.info("RELEASE Path = " + this.releasePath.getAbsolutePath()); - - // starting message board - try { - this.initMessages(); - } catch (final IOException e) { - ConcurrentLog.logException(e); - } - - // starting wiki - try { - this.initWiki(); - } catch (final IOException e) { - ConcurrentLog.logException(e); - } - - //starting blog - try { - this.initBlog(); - } catch (final IOException e) { - ConcurrentLog.logException(e); - } - - // init User DB - this.log.config("Loading User DB"); - final File userDbFile = new File(this.getDataPath(), "DATA/SETTINGS/user.heap"); - try { - this.userDB = new UserDB(userDbFile); - this.log.config("Loaded User DB from file " - + userDbFile.getName() - + ", " - + this.userDB.size() - + " entries" - + ", " - + ppRamString(userDbFile.length() / 1024)); - } catch (final IOException e) { - ConcurrentLog.logException(e); - } - - // init html parser evaluation scheme - File parserPropertiesPath = new File(appPath, "defaults/"); - String[] settingsList = parserPropertiesPath.list(); - for ( final String l : settingsList ) { - if ( l.startsWith("parser.") && l.endsWith(".properties") ) { - try { - Evaluation.add(new File(parserPropertiesPath, l)); - } catch (final IOException e) { - ConcurrentLog.logException(e); - } - } - } - parserPropertiesPath = new File(this.getDataPath(), "DATA/SETTINGS/"); - settingsList = parserPropertiesPath.list(); - for ( final String l : settingsList ) { - if ( l.startsWith("parser.") && l.endsWith(".properties") ) { - try { - Evaluation.add(new File(parserPropertiesPath, l)); - } catch (final IOException e) { - ConcurrentLog.logException(e); - } - } - } - - // init bookmarks DB: needs more time since this does a DNS lookup for each Bookmark. - // Can be started concurrently - new Thread("Switchboard.initBookmarks") { @Override - public void run() { - try { - Switchboard.this.initBookmarks(); - } catch (final IOException e ) { - ConcurrentLog.logException(e); - } + public int getJobCount() { + return Switchboard.this.cleanupJobSize(); } - }.start(); - // define a realtime parsable mimetype list - this.log.config("Parser: Initializing Mime Type deny list"); + @Override + public void freememImpl() { + } - final boolean enableAudioTags = this.getConfigBool("parser.enableAudioTags", false); - this.log.config("Parser: parser.enableAudioTags= "+enableAudioTags); - final Set denyExt = this.getConfigSet(SwitchboardConstants.PARSER_EXTENSIONS_DENY); - final Set denyMime = this.getConfigSet(SwitchboardConstants.PARSER_MIME_DENY); - - /* audioTagParser is disabled by default as it needs a temporary file (because of the JAudiotagger implementation) for each parsed document */ - if (!enableAudioTags) { - denyExt.addAll(audioTagParser.SupportedAudioFormat.getAllFileExtensions()); - denyMime.addAll(audioTagParser.SupportedAudioFormat.getAllMediaTypes()); - - this.setConfig(SwitchboardConstants.PARSER_EXTENSIONS_DENY, denyExt); - this.setConfig(SwitchboardConstants.PARSER_MIME_DENY, denyMime); - this.setConfig("parser.enableAudioTags", true); - } - - TextParser.setDenyMime(this.getConfig(SwitchboardConstants.PARSER_MIME_DENY, "")); - TextParser.setDenyExtension(this.getConfig(SwitchboardConstants.PARSER_EXTENSIONS_DENY, "")); - - // start a loader - this.log.config("Starting Crawl Loader"); - this.loader = new LoaderDispatcher(this); - - // load the robots.txt db - this.log.config("Initializing robots.txt DB"); - this.robots = new RobotsTxt(this.tables, this.loader, - this.getConfigInt(SwitchboardConstants.ROBOTS_TXT_THREADS_ACTIVE_MAX, SwitchboardConstants.ROBOTS_TXT_THREADS_ACTIVE_MAX_DEFAULT)); - try { - this.log.config("Loaded robots.txt DB: " + this.robots.size() + " entries"); - } catch (final IOException e) { - ConcurrentLog.logException(e); - } - - // load oai tables - final Map oaiFriends = - OAIListFriendsLoader.loadListFriendsSources( - new File(appPath, "defaults/oaiListFriendsSource.xml"), - this.getDataPath()); - OAIListFriendsLoader.init(this.loader, oaiFriends, ClientIdentification.yacyInternetCrawlerAgent); - this.crawlQueues = new CrawlQueues(this, this.queuesRoot); - - // on startup, resume all crawls - this.setConfig(SwitchboardConstants.CRAWLJOB_LOCAL_CRAWL + "_isPaused", "false"); - this.setConfig(SwitchboardConstants.CRAWLJOB_LOCAL_CRAWL + "_isPaused_cause", ""); - this.setConfig(SwitchboardConstants.CRAWLJOB_REMOTE_TRIGGERED_CRAWL + "_isPaused", "false"); - this.setConfig(SwitchboardConstants.CRAWLJOB_REMOTE_TRIGGERED_CRAWL + "_isPaused_cause", ""); - this.setConfig(SwitchboardConstants.CRAWLJOB_REMOTE_CRAWL_LOADER + "_isPaused", "false"); - this.setConfig(SwitchboardConstants.CRAWLJOB_REMOTE_CRAWL_LOADER + "_isPaused_cause", ""); - this.crawlJobsStatus.put(SwitchboardConstants.CRAWLJOB_LOCAL_CRAWL, new Object[] {new Object(), false}); - this.crawlJobsStatus.put(SwitchboardConstants.CRAWLJOB_REMOTE_TRIGGERED_CRAWL, new Object[] {new Object(), false}); - this.crawlJobsStatus.put(SwitchboardConstants.CRAWLJOB_REMOTE_CRAWL_LOADER, new Object[] {new Object(), false}); - - // init cookie-Monitor - this.log.config("Starting Cookie Monitor"); - this.outgoingCookies = new ConcurrentHashMap<>(); - this.incomingCookies = new ConcurrentHashMap<>(); - - // init search history trackers - this.localSearchTracker = new ConcurrentHashMap<>(); // String:TreeSet - IP:set of Long(accessTime) - this.remoteSearchTracker = new ConcurrentHashMap<>(); - - // init messages: clean up message symbol - final File notifierSource = - new File(this.getAppPath(), this.getConfig( - SwitchboardConstants.HTROOT_PATH, - SwitchboardConstants.HTROOT_PATH_DEFAULT) + "/env/grafics/empty.gif"); - final File notifierDest = - new File( - this.getDataPath(SwitchboardConstants.HTDOCS_PATH, SwitchboardConstants.HTDOCS_PATH_DEFAULT), - "notifier.gif"); - try { - Files.copy(notifierSource, notifierDest); - } catch (final IOException e ) { - } - - // init nameCacheNoCachingList - try { - Domains.setNoCachingPatterns(this.getConfig(SwitchboardConstants.HTTPC_NAME_CACHE_CACHING_PATTERNS_NO, "")); - } catch (final PatternSyntaxException pse) { - ConcurrentLog.severe("Switchboard", "Invalid regular expression in " - + SwitchboardConstants.HTTPC_NAME_CACHE_CACHING_PATTERNS_NO - + " property: " + pse.getMessage()); - System.exit(-1); - } - - // generate snippets cache - this.log.config("Initializing Snippet Cache"); - - TextSnippet.statistics.setEnabled(this.getConfigBool(SwitchboardConstants.DEBUG_SNIPPETS_STATISTICS_ENABLED, - SwitchboardConstants.DEBUG_SNIPPETS_STATISTICS_ENABLED_DEFAULT)); - - // init the wiki - wikiParser = new WikiCode(); - - // initializing the resourceObserver - this.observer = new ResourceObserver(this); - - final ResourceObserver resourceObserver = this.observer; - new OneTimeBusyThread("ResourceObserver.resourceObserverJob") { + }, + 60000); // all 10 minutes, wait 1 minute until first run + this.deployThread( + SwitchboardConstants.SCHEDULER, + "Scheduler", + "starts scheduled processes from the API Processing table", + null, + new InstantBusyThread("Switchboard.schedulerJob", 30000, 10000) { @Override public boolean jobImpl() throws Exception { - resourceObserver.resourceObserverJob(); + return Switchboard.this.schedulerJob(); + } + + @Override + public int getJobCount() { + return Switchboard.this.schedulerJobSize(); + } + + @Override + public void freememImpl() { + } + }, + 60000); // all 10 minutes, wait 1 minute until first run + + this.deployThread( + SwitchboardConstants.SURROGATES, + "Surrogates", + "A thread that polls the SURROGATES path and puts all Documents in one surroagte file into the indexing queue.", + null, + new InstantBusyThread("Switchboard.surrogateProcess", 20000, 0) { + @Override + public boolean jobImpl() throws Exception { + return Switchboard.this.surrogateProcess(); + } + + @Override + public int getJobCount() { + return Switchboard.this.surrogateQueueSize(); + } + + @Override + public void freememImpl() { + Switchboard.this.surrogateFreeMem(); + } + }, + 10000); + + this.initRemoteCrawler(this.getConfigBool(SwitchboardConstants.CRAWLJOB_REMOTE, false)); + this.initAutocrawl(this.getConfigBool(SwitchboardConstants.AUTOCRAWL, false)); + + final CrawlQueues crawlQueue = this.crawlQueues; + this.deployThread( + SwitchboardConstants.CRAWLJOB_LOCAL_CRAWL, + "Local Crawl", + "thread that performes a single crawl step from the local crawl queue", + "/IndexCreateQueues_p.html?stack=LOCAL", + new InstantBusyThread("CrawlQueues.coreCrawlJob", 0, 0) { + @Override + public boolean jobImpl() throws Exception { + return crawlQueue.coreCrawlJob(); + } + + @Override + public int getJobCount() { + return crawlQueue.coreCrawlJobSize(); + } + + @Override + public void freememImpl() { + crawlQueue.freemem(); + } + }, + 10000); + + final Network net = this.yc; + this.deployThread( + SwitchboardConstants.SEED_UPLOAD, + "Seed-List Upload", + "task that a principal peer performes to generate and upload a seed-list to a ftp account", + null, + new InstantBusyThread("Network.publishSeedList", 600000, 300000) { + @Override + public boolean jobImpl() throws Exception { + net.publishSeedList(); return true; } - }.start(); + }, + 180000); - // initializing the stackCrawlThread - this.crawlStacker = - new CrawlStacker( - this.robots, - this.crawlQueues, - this.crawler, - this.index, - this.peers, - this.isIntranetMode(), - this.isGlobalMode(), - this.domainList); // Intranet and Global mode may be both true! - - // possibly switch off localIP check - Domains.setNoLocalCheck(this.isAllIPMode()); - - // check status of account configuration: when local url crawling is allowed, it is not allowed - // that an automatic authorization of localhost is done, because in this case crawls from local - // addresses are blocked to prevent attack szenarios where remote pages contain links to localhost - // addresses that can steer a YaCy peer - if ( !this.getConfigBool(SwitchboardConstants.ADMIN_ACCOUNT_FOR_LOCALHOST, false) ) { - if ( this.getConfig(SwitchboardConstants.ADMIN_ACCOUNT_B64MD5, "").startsWith("0000") ) { - // the password was set automatically with a random value. - // We must remove that here to prevent that a user cannot log in any more - this.setConfig(SwitchboardConstants.ADMIN_ACCOUNT_B64MD5, ""); - // after this a message must be generated to alert the user to set a new password - this.log.info("RANDOM PASSWORD REMOVED! User must set a new password"); + this.deployThread( + SwitchboardConstants.PEER_PING, + "YaCy Core", + "this is the p2p-control and peer-ping task", + null, + new InstantBusyThread("Network.peerPing", 30000, 30000) { + @Override + public boolean jobImpl() throws Exception { + net.peerPing(); + return true; } - } + }, + 10000); + this.deployThread( + SwitchboardConstants.INDEX_DIST, + "DHT Distribution", + "selection, transfer and deletion of index entries that are not searched on your peer, but on others", + null, + new InstantBusyThread("Switchboard.dhtTransferJob", 10000, 1000) { + @Override + public boolean jobImpl() throws Exception { + return Switchboard.this.dhtTransferJob(); + } + }, + 60000, + Long.parseLong(this.getConfig(SwitchboardConstants.INDEX_DIST_IDLESLEEP, "5000")), + Long.parseLong(this.getConfig(SwitchboardConstants.INDEX_DIST_BUSYSLEEP, "0")), + Long.parseLong(this.getConfig(SwitchboardConstants.INDEX_DIST_MEMPREREQ, "1000000")), + Double.parseDouble(this.getConfig(SwitchboardConstants.INDEX_DIST_LOADPREREQ, "9.0"))); - // initializing dht chunk generation - this.dhtMaxReferenceCount = (int) this.getConfigLong(SwitchboardConstants.INDEX_DIST_CHUNK_SIZE_START, 50); + // set network-specific performance attributes + if ( this.firstInit ) { + this.setRemotecrawlPPM(Math.max(1, (int) this.getConfigLong("network.unit.remotecrawl.speed", 60))); + } - // init robinson cluster - // before we do that, we wait some time until the seed list is loaded. - this.clusterhashes = this.peers.clusterHashes(this.getConfig("cluster.peers.yacydomain", "")); + // test routine for snippet fetch + //Set query = new HashSet(); + //query.add(CrawlSwitchboardEntry.word2hash("Weitergabe")); + //query.add(CrawlSwitchboardEntry.word2hash("Zahl")); + //plasmaSnippetCache.result scr = snippetCache.retrieve(new URL("http://www.heise.de/mobil/newsticker/meldung/mail/54980"), query, true); + //plasmaSnippetCache.result scr = snippetCache.retrieve(new URL("http://www.heise.de/security/news/foren/go.shtml?read=1&msg_id=7301419&forum_id=72721"), query, true); + //plasmaSnippetCache.result scr = snippetCache.retrieve(new URL("http://www.heise.de/kiosk/archiv/ct/2003/4/20"), query, true, 260); - // deploy blocking threads - this.indexingStorageProcessor = - new WorkflowProcessor<>( - "storeDocumentIndex", - "This is the sequencing step of the indexing queue. Files are written as streams, too much councurrency would destroy IO performance. In this process the words are written to the RWI cache, which flushes if it is full.", - new String[] { - "RWI/Cache/Collections" - }, - in -> { - Switchboard.this.storeDocumentIndex(in); - return null; - }, - 2, - null, - 1); - this.indexingAnalysisProcessor = - new WorkflowProcessor<>( - "webStructureAnalysis", - "This just stores the link structure of the document into a web structure database.", - new String[] { - "storeDocumentIndex" - }, - in -> Switchboard.this.webStructureAnalysis(in), - WorkflowProcessor.availableCPU + 1, - this.indexingStorageProcessor, - WorkflowProcessor.availableCPU); - this.indexingCondensementProcessor = - new WorkflowProcessor<>( - "condenseDocument", - "This does a structural analysis of plain texts: markup of headlines, slicing into phrases (i.e. sentences), markup with position, counting of words, calculation of term frequency.", - new String[] { - "webStructureAnalysis" - }, - in -> Switchboard.this.condenseDocument(in), - WorkflowProcessor.availableCPU + 1, - this.indexingAnalysisProcessor, - WorkflowProcessor.availableCPU); - this.indexingDocumentProcessor = - new WorkflowProcessor<>( - "parseDocument", - "This does the parsing of the newly loaded documents from the web. The result is not only a plain text document, but also a list of URLs that are embedded into the document. The urls are handed over to the CrawlStacker. This process has two child process queues!", - new String[] { - "condenseDocument", "CrawlStacker" - }, - in -> Switchboard.this.parseDocument(in), - Math.max(20, WorkflowProcessor.availableCPU * 2), // it may happen that this is filled with new files from the search process. That means there should be enough place for two result pages - this.indexingCondensementProcessor, - WorkflowProcessor.availableCPU); + this.trail = new LinkedBlockingQueue<>(); - // deploy busy threads - this.log.config("Starting Threads"); - MemoryControl.gc(10000, "plasmaSwitchboard, help for profiler"); // help for profiler - thq - - this.deployThread( - SwitchboardConstants.CLEANUP, - "Cleanup", - "cleaning process", - null, - new InstantBusyThread("Switchboard.cleanupJob", 30000, 10000) { - - @Override - public boolean jobImpl() throws Exception { - return Switchboard.this.cleanupJob(); - } - - @Override - public int getJobCount() { - return Switchboard.this.cleanupJobSize(); - } - - @Override - public void freememImpl() { - } - - }, - 60000); // all 10 minutes, wait 1 minute until first run - - this.deployThread( - SwitchboardConstants.SCHEDULER, - "Scheduler", - "starts scheduled processes from the API Processing table", - null, - new InstantBusyThread("Switchboard.schedulerJob", 30000, 10000) { - @Override - public boolean jobImpl() throws Exception { - return Switchboard.this.schedulerJob(); - } - - @Override - public int getJobCount() { - return Switchboard.this.schedulerJobSize(); - } - - @Override - public void freememImpl() { - } - }, - 60000); // all 10 minutes, wait 1 minute until first run - - this.deployThread( - SwitchboardConstants.SURROGATES, - "Surrogates", - "A thread that polls the SURROGATES path and puts all Documents in one surroagte file into the indexing queue.", - null, - new InstantBusyThread("Switchboard.surrogateProcess", 20000, 0) { - @Override - public boolean jobImpl() throws Exception { - return Switchboard.this.surrogateProcess(); - } - - @Override - public int getJobCount() { - return Switchboard.this.surrogateQueueSize(); - } - - @Override - public void freememImpl() { - Switchboard.this.surrogateFreeMem(); - } - }, - 10000); - - this.initRemoteCrawler(this.getConfigBool(SwitchboardConstants.CRAWLJOB_REMOTE, false)); - this.initAutocrawl(this.getConfigBool(SwitchboardConstants.AUTOCRAWL, false)); - - final CrawlQueues crawlQueue = this.crawlQueues; - this.deployThread( - SwitchboardConstants.CRAWLJOB_LOCAL_CRAWL, - "Local Crawl", - "thread that performes a single crawl step from the local crawl queue", - "/IndexCreateQueues_p.html?stack=LOCAL", - new InstantBusyThread("CrawlQueues.coreCrawlJob", 0, 0) { - @Override - public boolean jobImpl() throws Exception { - return crawlQueue.coreCrawlJob(); - } - - @Override - public int getJobCount() { - return crawlQueue.coreCrawlJobSize(); - } - - @Override - public void freememImpl() { - crawlQueue.freemem(); - } - }, - 10000); - - final Network net = this.yc; - this.deployThread( - SwitchboardConstants.SEED_UPLOAD, - "Seed-List Upload", - "task that a principal peer performes to generate and upload a seed-list to a ftp account", - null, - new InstantBusyThread("Network.publishSeedList", 600000, 300000) { - @Override - public boolean jobImpl() throws Exception { - net.publishSeedList(); - return true; - } - }, - 180000); - - this.deployThread( - SwitchboardConstants.PEER_PING, - "YaCy Core", - "this is the p2p-control and peer-ping task", - null, - new InstantBusyThread("Network.peerPing", 30000, 30000) { - @Override - public boolean jobImpl() throws Exception { - net.peerPing(); - return true; - } - }, - 10000); - this.deployThread( - SwitchboardConstants.INDEX_DIST, - "DHT Distribution", - "selection, transfer and deletion of index entries that are not searched on your peer, but on others", - null, - new InstantBusyThread("Switchboard.dhtTransferJob", 10000, 1000) { - @Override - public boolean jobImpl() throws Exception { - return Switchboard.this.dhtTransferJob(); - } - }, - 60000, - Long.parseLong(this.getConfig(SwitchboardConstants.INDEX_DIST_IDLESLEEP, "5000")), - Long.parseLong(this.getConfig(SwitchboardConstants.INDEX_DIST_BUSYSLEEP, "0")), - Long.parseLong(this.getConfig(SwitchboardConstants.INDEX_DIST_MEMPREREQ, "1000000")), - Double.parseDouble(this.getConfig(SwitchboardConstants.INDEX_DIST_LOADPREREQ, "9.0"))); - - // set network-specific performance attributes - if ( this.firstInit ) { - this.setRemotecrawlPPM(Math.max(1, (int) this.getConfigLong("network.unit.remotecrawl.speed", 60))); - } - - // test routine for snippet fetch - //Set query = new HashSet(); - //query.add(CrawlSwitchboardEntry.word2hash("Weitergabe")); - //query.add(CrawlSwitchboardEntry.word2hash("Zahl")); - //plasmaSnippetCache.result scr = snippetCache.retrieve(new URL("http://www.heise.de/mobil/newsticker/meldung/mail/54980"), query, true); - //plasmaSnippetCache.result scr = snippetCache.retrieve(new URL("http://www.heise.de/security/news/foren/go.shtml?read=1&msg_id=7301419&forum_id=72721"), query, true); - //plasmaSnippetCache.result scr = snippetCache.retrieve(new URL("http://www.heise.de/kiosk/archiv/ct/2003/4/20"), query, true, 260); - - this.trail = new LinkedBlockingQueue<>(); - - this.log.config("Finished Switchboard Initialization"); + this.log.config("Finished Switchboard Initialization"); } /** diff --git a/source/net/yacy/search/index/ErrorCache.java b/source/net/yacy/search/index/ErrorCache.java index 3289c6655..bc0ac6751 100644 --- a/source/net/yacy/search/index/ErrorCache.java +++ b/source/net/yacy/search/index/ErrorCache.java @@ -1,7 +1,7 @@ /** * ErrorCache * Copyright 2013 by Michael Peter Christen - * First released 17.10.2013 at http://yacy.net + * First released 17.10.2013 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/search/index/ReindexSolrBusyThread.java b/source/net/yacy/search/index/ReindexSolrBusyThread.java index 4be6d6e95..40f66b2b5 100644 --- a/source/net/yacy/search/index/ReindexSolrBusyThread.java +++ b/source/net/yacy/search/index/ReindexSolrBusyThread.java @@ -2,7 +2,7 @@ package net.yacy.search.index; /** * ReindexSolrBusyThread * Copyright 2013 by Michael Peter Christen - * First released 13.05.2013 at http://yacy.net + * First released 13.05.2013 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/search/query/AccessTracker.java b/source/net/yacy/search/query/AccessTracker.java index df327fd26..4da4c1662 100644 --- a/source/net/yacy/search/query/AccessTracker.java +++ b/source/net/yacy/search/query/AccessTracker.java @@ -2,7 +2,7 @@ * AccessTracker * 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 + * First released 29.08.2009 at https://yacy.net * * $LastChangedDate$ * $LastChangedRevision$ diff --git a/source/net/yacy/search/query/HeuristicResult.java b/source/net/yacy/search/query/HeuristicResult.java index 34b2f4106..5f9050361 100644 --- a/source/net/yacy/search/query/HeuristicResult.java +++ b/source/net/yacy/search/query/HeuristicResult.java @@ -1,7 +1,7 @@ /** * HeuristicResult * Copyright 2012 by Michael Peter Christen, mc@yacy.net, Frankfurt a. M., Germany - * First released 01.11.2012 at http://yacy.net + * First released 01.11.2012 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/search/query/SearchEventType.java b/source/net/yacy/search/query/SearchEventType.java index 927675795..fdfdafecf 100644 --- a/source/net/yacy/search/query/SearchEventType.java +++ b/source/net/yacy/search/query/SearchEventType.java @@ -1,7 +1,7 @@ /** * SearchEventType * Copyright 2012 by Michael Peter Christen, mc@yacy.net, Frankfurt a. M., Germany - * First released 01.11.2012 at http://yacy.net + * First released 01.11.2012 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/search/ranking/BlockRank.java b/source/net/yacy/search/ranking/BlockRank.java index 04371664f..9ccf93ce3 100644 --- a/source/net/yacy/search/ranking/BlockRank.java +++ b/source/net/yacy/search/ranking/BlockRank.java @@ -1,7 +1,7 @@ /** * BlockRankCollector * Copyright 2011 by Michael Christen - * First released 18.05.2011 at http://yacy.net + * First released 18.05.2011 at https://yacy.net * * $LastChangedDate: 2011-04-26 19:39:16 +0200 (Di, 26 Apr 2011) $ * $LastChangedRevision: 7676 $ diff --git a/source/net/yacy/search/schema/CollectionConfiguration.java b/source/net/yacy/search/schema/CollectionConfiguration.java index 60655ba0f..1e5c5b2f6 100644 --- a/source/net/yacy/search/schema/CollectionConfiguration.java +++ b/source/net/yacy/search/schema/CollectionConfiguration.java @@ -1,7 +1,7 @@ /** * CollectionConfiguration * Copyright 2011 by Michael Peter Christen - * First released 14.04.2011 at http://yacy.net + * First released 14.04.2011 at https://yacy.net * * $LastChangedDate: 2011-04-14 22:05:04 +0200 (Do, 14 Apr 2011) $ * $LastChangedRevision: 7654 $ diff --git a/source/net/yacy/search/schema/CollectionSchema.java b/source/net/yacy/search/schema/CollectionSchema.java index 0fa509184..4b9e1d8b9 100644 --- a/source/net/yacy/search/schema/CollectionSchema.java +++ b/source/net/yacy/search/schema/CollectionSchema.java @@ -1,7 +1,7 @@ /** * CollectionSchema * Copyright 2011 by Michael Peter Christen - * First released 14.04.2011 at http://yacy.net + * First released 14.04.2011 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/search/schema/HyperlinkEdge.java b/source/net/yacy/search/schema/HyperlinkEdge.java index 5131ed37c..ef3eceb06 100644 --- a/source/net/yacy/search/schema/HyperlinkEdge.java +++ b/source/net/yacy/search/schema/HyperlinkEdge.java @@ -1,7 +1,7 @@ /** * HyperlinkEdge * Copyright 2014 by Michael Peter Christen - * First released 04.04.2014 at http://yacy.net + * First released 04.04.2014 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/search/schema/HyperlinkGraph.java b/source/net/yacy/search/schema/HyperlinkGraph.java index 9bd4d5d4b..8068992cb 100644 --- a/source/net/yacy/search/schema/HyperlinkGraph.java +++ b/source/net/yacy/search/schema/HyperlinkGraph.java @@ -1,7 +1,7 @@ /** * HyperlinkGraph * Copyright 2014 by Michael Peter Christen - * First released 08.04.2014 at http://yacy.net + * First released 08.04.2014 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/search/schema/HyperlinkType.java b/source/net/yacy/search/schema/HyperlinkType.java index 9c4c941ed..7d80d89e0 100644 --- a/source/net/yacy/search/schema/HyperlinkType.java +++ b/source/net/yacy/search/schema/HyperlinkType.java @@ -1,7 +1,7 @@ /** * HyperlinkType * Copyright 2014 by Michael Peter Christen - * First released 04.04.2014 at http://yacy.net + * First released 04.04.2014 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/search/schema/WebgraphConfiguration.java b/source/net/yacy/search/schema/WebgraphConfiguration.java index 7ee09e4d5..2cc605248 100644 --- a/source/net/yacy/search/schema/WebgraphConfiguration.java +++ b/source/net/yacy/search/schema/WebgraphConfiguration.java @@ -1,7 +1,7 @@ /** * WebgraphConfiguration * Copyright 2011 by Michael Peter Christen - * First released 14.04.2011 at http://yacy.net + * First released 14.04.2011 at https://yacy.net * * $LastChangedDate: 2011-04-14 22:05:04 +0200 (Do, 14 Apr 2011) $ * $LastChangedRevision: 7654 $ diff --git a/source/net/yacy/search/schema/WebgraphSchema.java b/source/net/yacy/search/schema/WebgraphSchema.java index bd16245a1..2d45ed195 100644 --- a/source/net/yacy/search/schema/WebgraphSchema.java +++ b/source/net/yacy/search/schema/WebgraphSchema.java @@ -1,7 +1,7 @@ /** * WebgraphSchema * Copyright 2011 by Michael Peter Christen - * First released 19.02.2013 at http://yacy.net + * First released 19.02.2013 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/visualization/AnimationGIF.java b/source/net/yacy/visualization/AnimationGIF.java index 78ecc4cb6..d39df36e0 100644 --- a/source/net/yacy/visualization/AnimationGIF.java +++ b/source/net/yacy/visualization/AnimationGIF.java @@ -1,7 +1,7 @@ /** * AnimationGIF * Copyright 2010 by Michael Christen - * First released 20.11.2010 at http://yacy.net + * First released 20.11.2010 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/visualization/AnimationPlotter.java b/source/net/yacy/visualization/AnimationPlotter.java index 565fc7019..1c46c25be 100644 --- a/source/net/yacy/visualization/AnimationPlotter.java +++ b/source/net/yacy/visualization/AnimationPlotter.java @@ -1,7 +1,7 @@ /** * AnimationPlotter * Copyright 2013 by Michael Christen - * First released 9.9.2010 at http://yacy.net + * First released 9.9.2010 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/visualization/ChartPlotter.java b/source/net/yacy/visualization/ChartPlotter.java index 2eae51860..603ac1987 100644 --- a/source/net/yacy/visualization/ChartPlotter.java +++ b/source/net/yacy/visualization/ChartPlotter.java @@ -1,7 +1,7 @@ /** * ChartPlotter * Copyright 2005 by Michael Christen - * First released 26.10.2005 at http://yacy.net + * First released 26.10.2005 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/visualization/CircleTool.java b/source/net/yacy/visualization/CircleTool.java index def9c6d51..556396a7f 100644 --- a/source/net/yacy/visualization/CircleTool.java +++ b/source/net/yacy/visualization/CircleTool.java @@ -1,7 +1,7 @@ /** * CircleTool * Copyright 2007 by Michael Christen - * First released 22.05.2007 at http://yacy.net + * First released 22.05.2007 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/visualization/FontGenerator3Pixel.java b/source/net/yacy/visualization/FontGenerator3Pixel.java index 046085a2d..89c1c1a36 100644 --- a/source/net/yacy/visualization/FontGenerator3Pixel.java +++ b/source/net/yacy/visualization/FontGenerator3Pixel.java @@ -1,7 +1,7 @@ /** * FontGenerator3Pixel * Copyright 2014 by Michael Christen - * First released 14.02.2014 at http://yacy.net + * First released 14.02.2014 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/visualization/FontGenerator5Pixel.java b/source/net/yacy/visualization/FontGenerator5Pixel.java index c8cae6849..7d89cccbd 100644 --- a/source/net/yacy/visualization/FontGenerator5Pixel.java +++ b/source/net/yacy/visualization/FontGenerator5Pixel.java @@ -1,7 +1,7 @@ /** * FontGenerator5Pixel * Copyright 2005 by Michael Christen - * First released 31.10.2005 at http://yacy.net + * First released 31.10.2005 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/visualization/GraphPlotter.java b/source/net/yacy/visualization/GraphPlotter.java index ff537da71..6f399157b 100644 --- a/source/net/yacy/visualization/GraphPlotter.java +++ b/source/net/yacy/visualization/GraphPlotter.java @@ -1,7 +1,7 @@ /** * GraphPlotter * Copyright 2007 by Michael Christen - * First released 22.05.2007 at http://yacy.net + * First released 22.05.2007 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/visualization/HexGridPlotter.java b/source/net/yacy/visualization/HexGridPlotter.java index 4269a5dce..17ff08b2e 100644 --- a/source/net/yacy/visualization/HexGridPlotter.java +++ b/source/net/yacy/visualization/HexGridPlotter.java @@ -1,7 +1,7 @@ /** * HexGridPlotter * Copyright 2011 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany - * First released 18.02.2010 at http://yacy.net + * First released 18.02.2010 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/visualization/PrintTool.java b/source/net/yacy/visualization/PrintTool.java index 2b53352cb..6bbfa96b5 100644 --- a/source/net/yacy/visualization/PrintTool.java +++ b/source/net/yacy/visualization/PrintTool.java @@ -1,7 +1,7 @@ /** * PrintTool * Copyright 2007 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany - * First released 22.05.2007 at http://yacy.net + * First released 22.05.2007 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/visualization/RasterPlotter.java b/source/net/yacy/visualization/RasterPlotter.java index 91a78cf2f..f7756a4ff 100644 --- a/source/net/yacy/visualization/RasterPlotter.java +++ b/source/net/yacy/visualization/RasterPlotter.java @@ -1,7 +1,7 @@ /** * RasterPlotter * Copyright 2005 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany - * First released 16.09.2005 at http://yacy.net + * First released 16.09.2005 at https://yacy.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/source/net/yacy/yacy.java b/source/net/yacy/yacy.java index fdf24519d..a7626bac3 100644 --- a/source/net/yacy/yacy.java +++ b/source/net/yacy/yacy.java @@ -35,8 +35,6 @@ import java.io.IOException; import java.io.InputStreamReader; import java.io.PrintWriter; import java.io.RandomAccessFile; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; import java.nio.channels.FileChannel; import java.nio.channels.FileLock; import java.util.ArrayList; @@ -58,7 +56,6 @@ import net.yacy.cora.date.GenericFormatter; import net.yacy.cora.document.encoding.UTF8; import net.yacy.cora.document.id.MultiProtocolURL; import net.yacy.cora.federate.solr.instance.RemoteInstance; -import net.yacy.cora.plugin.ClassProvider; import net.yacy.cora.protocol.ClientIdentification; import net.yacy.cora.protocol.ConnectionInfo; import net.yacy.cora.protocol.HeaderFramework; @@ -196,7 +193,7 @@ public final class yacy { f = new File(dataHome, "DATA/yacy.running"); if (!f.createNewFile()) ConcurrentLog.severe("STARTUP", "WARNING: the file " + f + " can not be created!"); try { - FileOutputStream fos = new FileOutputStream(f); + final FileOutputStream fos = new FileOutputStream(f); fos.write(Integer.toString(OS.getPID()).getBytes()); fos.close(); } catch (final Exception e) { } // write PID @@ -204,7 +201,7 @@ public final class yacy { FileChannel channel = null; FileLock lock = null; try { - RandomAccessFile raf = new RandomAccessFile(f,"rw"); + final RandomAccessFile raf = new RandomAccessFile(f,"rw"); channel = raf.getChannel(); lock = channel.tryLock(); // lock yacy.running raf.close(); @@ -435,7 +432,7 @@ public final class yacy { * @see File#mkdir() * @param path */ - private static void mkdirIfNeseccary(final File path) { + public static void mkdirIfNeseccary(final File path) { if (!(path.exists())) if(!path.mkdir()) ConcurrentLog.warn("STARTUP", "could not create directory "+ path.toString()); diff --git a/startYACY.sh b/startYACY.sh index 33ebefc51..3ee15d88b 100755 --- a/startYACY.sh +++ b/startYACY.sh @@ -247,7 +247,7 @@ if [ $PRINTONLY -eq 1 ];then else echo "****************** YaCy Web Crawler/Indexer & Search Engine *******************" echo "**** (C) by Michael Peter Christen, usage granted under the GPL Version 2 ****" - echo "**** USE AT YOUR OWN RISK! Project home and releases: http://yacy.net/ ****" + echo "**** USE AT YOUR OWN RISK! Project home and releases: https://yacy.net/ ****" echo "** LOG of YaCy: DATA/LOG/yacy00.log (and yacy.log) **" echo "** STOP YaCy: execute stopYACY.sh and wait some seconds **" echo "** GET HELP for YaCy: join our community at https://community.searchlab.eu **" diff --git a/startYACY_debug.bat b/startYACY_debug.bat index 73b705e8c..1ff4ae817 100644 --- a/startYACY_debug.bat +++ b/startYACY_debug.bat @@ -26,7 +26,7 @@ Echo Priority:%priority% Echo ****************** YaCy Web Crawler/Indexer ^& Search Engine ****************** Echo **** (C) by Michael Peter Christen, usage granted under the GPL Version 2 **** -Echo **** USE AT YOUR OWN RISK! Project home and releases: http://yacy.net/ **** +Echo **** USE AT YOUR OWN RISK! Project home and releases: https://yacy.net/ **** Echo ** LOG of YaCy: DATA/LOG/yacy00.log (and yacy^.log) ** Echo ** STOP YaCy: execute stopYACY.bat and wait some seconds ** Echo ** GET HELP for YaCy: join our community at https://community.searchlab.eu ** diff --git a/test/java/net/yacy/cora/document/id/MultiProtocolURLTest.java b/test/java/net/yacy/cora/document/id/MultiProtocolURLTest.java index c189cb67f..4162096c9 100644 --- a/test/java/net/yacy/cora/document/id/MultiProtocolURLTest.java +++ b/test/java/net/yacy/cora/document/id/MultiProtocolURLTest.java @@ -230,11 +230,11 @@ public class MultiProtocolURLTest { // some test url/uri with problems in the past String[][] testStrings = new String[][]{ // teststring , expectedresultkey, expectedresultvalue - new String[]{"http://yacy.net?&test", "test", ""}, + new String[]{"https://yacy.net?&test", "test", ""}, /* Encoded UTF-8 2 bytes characters parameter value */ new String[]{"https://zh.wikipedia.org/w/index.php?search=encodedlatinchars%C3%A0%C3%A4%C3%A2%C3%A9%C3%A8%C3%AF%C3%AE%C3%B4%C3%B6%C3%B9", "search", "encodedlatincharsàäâéèïîôöù"}, /* Non encoded UTF-8 2 bytes characters parameter value */ - new String[]{"http://yacy.net?query=unencodedlatincharsàäâéèïîôöù", "query", "unencodedlatincharsàäâéèïîôöù"}, + new String[]{"https://yacy.net?query=unencodedlatincharsàäâéèïîôöù", "query", "unencodedlatincharsàäâéèïîôöù"}, /* Encoded UTF-8 3 bytes characters parameter value */ new String[]{"https://zh.wikipedia.org/w/index.php?query=%E6%96%B9%E9%87%9D%E8%88%87%E6%8C%87%E5%BC%95", "query", "方針與指引"}, /* Non encoded UTF-8 3 bytes characters parameter value */ @@ -312,12 +312,12 @@ public class MultiProtocolURLTest { public void testToTokens() throws MalformedURLException { String[][] testStrings = new String[][]{ // test string , "expected tokens" - new String[]{"http://yacy.net?&test", "yacy net test"}, + new String[]{"https://yacy.net?&test", "yacy net test"}, new String[]{"http://example.net/camelCased/subpath1/PATH_EXAMPLE", "example net camelCased subpath1 PATH EXAMPLE camel Cased subpath 1"}, /* Encoded UTF-8 2 bytes characters parameter value */ new String[]{"https://zh.wikipedia.org/w/index.php?search=encodedlatinchars%C3%A0%C3%A4%C3%A2%C3%A9%C3%A8%C3%AF%C3%AE%C3%B4%C3%B6%C3%B9", "zh wikipedia org w index php search encodedlatincharsàäâéèïîôöù"}, /* Non encoded UTF-8 2 bytes characters parameter value */ - new String[]{"http://yacy.net?query=unencodedlatincharsàäâéèïîôöù", "yacy net query unencodedlatincharsàäâéèïîôöù"}, + new String[]{"https://yacy.net?query=unencodedlatincharsàäâéèïîôöù", "yacy net query unencodedlatincharsàäâéèïîôöù"}, /* Encoded UTF-8 3 bytes characters parameter value */ new String[]{"https://zh.wikipedia.org/w/index.php?query=%E6%96%B9%E9%87%9D%E8%88%87%E6%8C%87%E5%BC%95", "zh wikipedia org w index php query 方針與指引"}, /* Non encoded UTF-8 3 bytes characters parameter value */ diff --git a/test/java/net/yacy/crawler/data/CacheTest.java b/test/java/net/yacy/crawler/data/CacheTest.java index 3feb29c23..d1d25ad4b 100644 --- a/test/java/net/yacy/crawler/data/CacheTest.java +++ b/test/java/net/yacy/crawler/data/CacheTest.java @@ -99,7 +99,7 @@ public class CacheTest { @Test public void testGetContent() throws MalformedURLException, IOException { final ResponseHeader okResponse = new ResponseHeader(HttpStatus.SC_OK); - DigestURL url = new DigestURL("http://yacy.net"); + DigestURL url = new DigestURL("https://yacy.net"); byte[] urlHash = url.hash(); byte[] fileContent = TEXT_CONTENT.getBytes(StandardCharsets.UTF_8); @@ -129,10 +129,10 @@ public class CacheTest { * Store an entry larger than backend buffer sizes, likely to be flushed * to the file system */ - url = new DigestURL("http://json.org"); + url = new DigestURL("https://json.org"); urlHash = url.hash(); fileContent = generateFlushableContent(); - Cache.store(new DigestURL("http://json.org"), okResponse, fileContent); + Cache.store(new DigestURL("https://json.org"), okResponse, fileContent); Cache.commit(); /* content is in cache */ assertArrayEquals(fileContent, Cache.getContent(urlHash)); @@ -141,7 +141,7 @@ public class CacheTest { @Test public void testDelete() throws MalformedURLException, IOException { final ResponseHeader okResponse = new ResponseHeader(HttpStatus.SC_OK); - final DigestURL url = new DigestURL("http://yacy.net"); + final DigestURL url = new DigestURL("https://yacy.net"); final byte[] urlHash = url.hash(); final byte[] fileContent = TEXT_CONTENT.getBytes(StandardCharsets.UTF_8); @@ -189,7 +189,7 @@ public class CacheTest { @Test public void testClear() throws MalformedURLException, IOException { final ResponseHeader okResponse = new ResponseHeader(HttpStatus.SC_OK); - final DigestURL url = new DigestURL("http://yacy.net"); + final DigestURL url = new DigestURL("https://yacy.net"); final byte[] urlHash = url.hash(); byte[] fileContent = TEXT_CONTENT.getBytes(StandardCharsets.UTF_8); @@ -494,7 +494,7 @@ public class CacheTest { for (int count = 0; count < threads; count++) { List urls = new ArrayList<>(); for (int i = 0; i < urlsPerThread; i++) { - urls.add(new DigestURL("http://yacy.net/" + i + "/" + count)); + urls.add(new DigestURL("https://yacy.net/" + i + "/" + count)); } CacheAccessTask thread = new CacheAccessTask(urls, steps, contentSize, sleepTime); thread.start(); diff --git a/test/java/net/yacy/data/wiki/WikiCodeTest.java b/test/java/net/yacy/data/wiki/WikiCodeTest.java index 1bb7c2fec..8a1d69346 100644 --- a/test/java/net/yacy/data/wiki/WikiCodeTest.java +++ b/test/java/net/yacy/data/wiki/WikiCodeTest.java @@ -169,14 +169,14 @@ public class WikiCodeTest { WikiCode wc = new WikiCode(); /* Unamed link */ - String result = wc.transform("http://wiki:8080", "[http://yacy.net]"); + String result = wc.transform("http://wiki:8080", "[https://yacy.net]"); assertTrue(result.contains("YaCy<")); /* Lua Script array parameter : should not crash the transform process */ diff --git a/test/java/net/yacy/document/parser/GenericXMLParserTest.java b/test/java/net/yacy/document/parser/GenericXMLParserTest.java index 41115b304..9d84ac73a 100644 --- a/test/java/net/yacy/document/parser/GenericXMLParserTest.java +++ b/test/java/net/yacy/document/parser/GenericXMLParserTest.java @@ -279,7 +279,7 @@ public class GenericXMLParserTest { + "" + "" + "" + "XHTML attributes URLs test" + "" + "" - + "Here are YaCyhome page and International Forum." + + "Here are YaCyhome page and International Forum." + "And this is a relative link to a sub document." + "" + ""; @@ -294,8 +294,8 @@ public class GenericXMLParserTest { final Collection detectedAnchors = documents[0].getAnchors(); assertNotNull(detectedAnchors); assertEquals(3, detectedAnchors.size()); - assertTrue(detectedAnchors.contains(new AnchorURL("http://www.w3.org/1999/xhtml"))); - assertTrue(detectedAnchors.contains(new AnchorURL("http://yacy.net"))); + assertTrue(detectedAnchors.contains(new AnchorURL("https://www.w3.org/1999/xhtml"))); + assertTrue(detectedAnchors.contains(new AnchorURL("https://yacy.net"))); assertTrue(detectedAnchors.contains(new AnchorURL("https://community.searchlab.eu"))); } finally { inStream.close(); @@ -315,7 +315,7 @@ public class GenericXMLParserTest { + "" + "" + "" + "XHTML content URLs test" + "" + "" + "Here are some YaCy links:" + "
    " - + "
    Home page
    " + "
    http://yacy.net
    " + "
    International Forum
    " + + "
    Home page
    " + "
    https://yacy.net
    " + "
    International Forum
    " + "
    https://community.searchlab.eu
    " + "
    " + "And this is a mention to a relative link : /document.html " + "" + ""; @@ -330,8 +330,8 @@ public class GenericXMLParserTest { final Collection detectedAnchors = documents[0].getAnchors(); assertNotNull(detectedAnchors); assertEquals(3, detectedAnchors.size()); - assertTrue(detectedAnchors.contains(new AnchorURL("http://www.w3.org/1999/xhtml"))); - assertTrue(detectedAnchors.contains(new AnchorURL("http://yacy.net"))); + assertTrue(detectedAnchors.contains(new AnchorURL("https://www.w3.org/1999/xhtml"))); + assertTrue(detectedAnchors.contains(new AnchorURL("https://yacy.net"))); assertTrue(detectedAnchors.contains(new AnchorURL("https://community.searchlab.eu"))); } finally { inStream.close(); @@ -373,7 +373,7 @@ public class GenericXMLParserTest { + "" + "" + "" + "XHTML content URLs test" + "" + "" + "

    Here are some YaCy URLs: " - + "Home page : http://yacy.net - International Forum : " + + "Home page : https://yacy.net - International Forum : " + "https://community.searchlab.eu " + "and this is a mention to a relative URL : /document.html

    " + "

    Here are YaCybug tracker and Wiki." @@ -395,10 +395,9 @@ public class GenericXMLParserTest { final Collection detectedAnchors = documents[0].getAnchors(); assertNotNull(detectedAnchors); assertEquals(5, detectedAnchors.size()); - assertTrue(detectedAnchors.contains(new AnchorURL("http://www.w3.org/1999/xhtml"))); - assertTrue(detectedAnchors.contains(new AnchorURL("http://yacy.net"))); + assertTrue(detectedAnchors.contains(new AnchorURL("https://www.w3.org/1999/xhtml"))); + assertTrue(detectedAnchors.contains(new AnchorURL("https://yacy.net"))); assertTrue(detectedAnchors.contains(new AnchorURL("https://community.searchlab.eu"))); - assertTrue(detectedAnchors.contains(new AnchorURL("http://mantis.tokeek.de"))); assertTrue(detectedAnchors.contains(new AnchorURL("https://wiki.yacy.net/index.php/"))); } finally { inStream.close(); @@ -418,8 +417,8 @@ public class GenericXMLParserTest { final Collection detectedAnchors = documents[0].getAnchors(); assertNotNull(detectedAnchors); assertEquals(2, detectedAnchors.size()); - assertTrue(detectedAnchors.contains(new AnchorURL("http://www.w3.org/1999/xhtml"))); - assertTrue(detectedAnchors.contains(new AnchorURL("http://yacy.net"))); + assertTrue(detectedAnchors.contains(new AnchorURL("https://www.w3.org/1999/xhtml"))); + assertTrue(detectedAnchors.contains(new AnchorURL("https://yacy.net"))); } finally { inStream.close(); } @@ -433,7 +432,7 @@ public class GenericXMLParserTest { .append("XHTML content URLs test") .append("") .append("

    Here are some YaCy URLs: ") - .append("Home page : http://yacy.net - International Forum : ") + .append("Home page : https://yacy.net - International Forum : ") .append("https://community.searchlab.eu ") .append("and this is a mention to a relative URL : /document.html

    "); @@ -458,8 +457,8 @@ public class GenericXMLParserTest { final Collection detectedAnchors = documents[0].getAnchors(); assertNotNull(detectedAnchors); assertEquals(3, detectedAnchors.size()); - assertTrue(detectedAnchors.contains(new AnchorURL("http://www.w3.org/1999/xhtml"))); - assertTrue(detectedAnchors.contains(new AnchorURL("http://yacy.net"))); + assertTrue(detectedAnchors.contains(new AnchorURL("https://www.w3.org/1999/xhtml"))); + assertTrue(detectedAnchors.contains(new AnchorURL("https://yacy.net"))); assertTrue(detectedAnchors.contains(new AnchorURL("https://community.searchlab.eu"))); } finally { inStream.close(); diff --git a/test/java/net/yacy/document/parser/html/ContentScraperTest.java b/test/java/net/yacy/document/parser/html/ContentScraperTest.java index cdb4f3951..92ecfb072 100644 --- a/test/java/net/yacy/document/parser/html/ContentScraperTest.java +++ b/test/java/net/yacy/document/parser/html/ContentScraperTest.java @@ -173,7 +173,7 @@ public class ContentScraperTest { */ @Test public void testFindAbsoluteURLs() throws MalformedURLException { - final String[] urlStrings = { "http://yacy.net", "https://community.searchlab.eu", "https://en.wikipedia.org" }; + final String[] urlStrings = { "https://yacy.net", "https://community.searchlab.eu", "https://en.wikipedia.org" }; final List urls = new ArrayList<>(); for (final String urlString : urlStrings) { urls.add(new AnchorURL(urlString)); @@ -196,39 +196,39 @@ public class ContentScraperTest { } /* URLs surrounded with parenthesis */ - final String[] texts = { "(http://yacy.net)", "YaCy home page (http://yacy.net)", - "Nested parentheses (YaCy home page (http://yacy.net))", - "Text in parenthesis (example : http://yacy.net)", "A markdown link [YaCy home page](http://yacy.net)", - "A markdown [example](http://yacy.net \"YaCy home page\") inline link" }; + final String[] texts = { "(https://yacy.net)", "YaCy home page (https://yacy.net)", + "Nested parentheses (YaCy home page (https://yacy.net))", + "Text in parenthesis (example : https://yacy.net)", "A markdown link [YaCy home page](https://yacy.net)", + "A markdown [example](https://yacy.net \"YaCy home page\") inline link" }; for (final String text : texts) { final Collection detectedURLs = new ArrayList<>(); ContentScraper.findAbsoluteURLs(text, detectedURLs, null); Assert.assertEquals(1, detectedURLs.size()); - Assert.assertEquals(new AnchorURL("http://yacy.net"), detectedURLs.iterator().next()); + Assert.assertEquals(new AnchorURL("https://yacy.net"), detectedURLs.iterator().next()); } /* URLs surrounded with square brackets */ //http://[abcd:ef01:2345:6789:abcd:ef01:2345:6789]/ - final String[] squareBracketsTexts = { "[http://yacy.net]", "YaCy home page [http://yacy.net]", - "Nested brackets [YaCy home page [http://yacy.net]]", - "A mediawiki external link with different label [http://yacy.net YaCy home page]" }; + final String[] squareBracketsTexts = { "[https://yacy.net]", "YaCy home page [https://yacy.net]", + "Nested brackets [YaCy home page [https://yacy.net]]", + "A mediawiki external link with different label [https://yacy.net YaCy home page]" }; for(final String text : squareBracketsTexts) { final Collection detectedURLs = new ArrayList<>(); ContentScraper.findAbsoluteURLs(text, detectedURLs, null); Assert.assertEquals(1, detectedURLs.size()); - Assert.assertEquals(new AnchorURL("http://yacy.net"), detectedURLs.iterator().next()); + Assert.assertEquals(new AnchorURL("https://yacy.net"), detectedURLs.iterator().next()); } /* URLs surrounded with curly brackets */ //http://[abcd:ef01:2345:6789:abcd:ef01:2345:6789]/ - final String[] curlyBracketsTexts = { "{http://yacy.net}", "YaCy home page {http://yacy.net}", - "Nested brackets {YaCy home page {http://yacy.net}}", - "Text in brackets {example : http://yacy.net}" }; + final String[] curlyBracketsTexts = { "{https://yacy.net}", "YaCy home page {https://yacy.net}", + "Nested brackets {YaCy home page {https://yacy.net}}", + "Text in brackets {example : https://yacy.net}" }; for(final String text : curlyBracketsTexts) { final Collection detectedURLs = new ArrayList<>(); ContentScraper.findAbsoluteURLs(text, detectedURLs, null); Assert.assertEquals(1, detectedURLs.size()); - Assert.assertEquals(new AnchorURL("http://yacy.net"), detectedURLs.iterator().next()); + Assert.assertEquals(new AnchorURL("https://yacy.net"), detectedURLs.iterator().next()); } /* URL with parenthesis */ @@ -277,7 +277,7 @@ public class ContentScraperTest { */ @Test public void testFindAbsoluteURLsMaxURLs() throws MalformedURLException { - final String text = "Some test URLS : http://yacy.net - https://community.searchlab.eu - https://en.wikipedia.org"; + final String text = "Some test URLS : https://yacy.net - https://community.searchlab.eu - https://en.wikipedia.org"; /* No limit */ ArrayList detectedURLs = new ArrayList<>(); diff --git a/test/java/net/yacy/document/parser/html/IconEntryTest.java b/test/java/net/yacy/document/parser/html/IconEntryTest.java index ee4317735..3461cee75 100644 --- a/test/java/net/yacy/document/parser/html/IconEntryTest.java +++ b/test/java/net/yacy/document/parser/html/IconEntryTest.java @@ -81,7 +81,7 @@ public class IconEntryTest { sizes.add(new Dimension(16,16)); Dimension preferredSize = new Dimension(16, 16); - IconEntry icon = new IconEntry(new DigestURL("http://yacy.net"), rels, sizes); + IconEntry icon = new IconEntry(new DigestURL("https://yacy.net"), rels, sizes); Dimension result = icon.getClosestSize(preferredSize); Assert.assertEquals(preferredSize, result); @@ -103,14 +103,14 @@ public class IconEntryTest { /* Sizes set contains only one item */ sizes = new HashSet<>(); sizes.add(new Dimension(128,128)); - icon = new IconEntry(new DigestURL("http://yacy.net"), rels, sizes); + icon = new IconEntry(new DigestURL("https://yacy.net"), rels, sizes); preferredSize = new Dimension(1992, 1024); result = icon.getClosestSize(preferredSize); Assert.assertEquals(new Dimension(128, 128), result); /* Empty sizes set */ sizes = new HashSet<>(); - icon = new IconEntry(new DigestURL("http://yacy.net"), rels, sizes); + icon = new IconEntry(new DigestURL("https://yacy.net"), rels, sizes); preferredSize = new Dimension(16, 16); result = icon.getClosestSize(preferredSize); Assert.assertNull(result); @@ -120,7 +120,7 @@ public class IconEntryTest { sizes.add(new Dimension(128,128)); sizes.add(new Dimension(256,512)); sizes.add(new Dimension(16,16)); - icon = new IconEntry(new DigestURL("http://yacy.net"), rels, sizes); + icon = new IconEntry(new DigestURL("https://yacy.net"), rels, sizes); preferredSize = null; result = icon.getClosestSize(preferredSize); Assert.assertNull(result); @@ -137,7 +137,7 @@ public class IconEntryTest { sizes.add(new Dimension(256,512)); sizes.add(new Dimension(16,16)); - IconEntry icon = new IconEntry(new DigestURL("http://yacy.net"), rels, sizes); + IconEntry icon = new IconEntry(new DigestURL("https://yacy.net"), rels, sizes); String sizesStr = icon.sizesToString(); /* The set is not ordered, only check result contains what we expect */ Assert.assertTrue(sizesStr.contains("128x128")); @@ -149,14 +149,14 @@ public class IconEntryTest { sizes = new HashSet<>(); sizes.add(new Dimension(128,128)); - icon = new IconEntry(new DigestURL("http://yacy.net"), rels, sizes); + icon = new IconEntry(new DigestURL("https://yacy.net"), rels, sizes); sizesStr = icon.sizesToString(); Assert.assertEquals("128x128", sizesStr); /* Empty sizes set */ sizes = new HashSet<>(); - icon = new IconEntry(new DigestURL("http://yacy.net"), rels, sizes); + icon = new IconEntry(new DigestURL("https://yacy.net"), rels, sizes); sizesStr = icon.sizesToString(); Assert.assertTrue(sizesStr.isEmpty()); } @@ -172,7 +172,7 @@ public class IconEntryTest { Set sizes = new HashSet<>(); sizes.add(new Dimension(128,128)); - IconEntry icon = new IconEntry(new DigestURL("http://yacy.net"), rels, sizes); + IconEntry icon = new IconEntry(new DigestURL("https://yacy.net"), rels, sizes); String relStr = icon.relToString(); /* The set is not ordered, only check result contains what we expect */ Assert.assertTrue(relStr.contains(IconLinkRelations.ICON.getRelValue())); @@ -184,7 +184,7 @@ public class IconEntryTest { rels = new HashSet<>(); rels.add(IconLinkRelations.ICON.getRelValue()); - icon = new IconEntry(new DigestURL("http://yacy.net"), rels, sizes); + icon = new IconEntry(new DigestURL("https://yacy.net"), rels, sizes); relStr = icon.relToString(); Assert.assertEquals(IconLinkRelations.ICON.getRelValue(), relStr); } diff --git a/test/java/net/yacy/document/parser/ooxmlParserTest.java b/test/java/net/yacy/document/parser/ooxmlParserTest.java index 12d30dee2..9d3c2a6e9 100644 --- a/test/java/net/yacy/document/parser/ooxmlParserTest.java +++ b/test/java/net/yacy/document/parser/ooxmlParserTest.java @@ -152,7 +152,7 @@ public class ooxmlParserTest { final Collection anchors = docs[0].getAnchors(); assertNotNull("Detected URLs must not be null", anchors); assertEquals("2 URLs should be detected", 2, anchors.size()); - assertTrue("YaCy home page URL should have been parsed: " + anchors.toString(), anchors.contains(new AnchorURL("http://yacy.net/"))); + assertTrue("YaCy home page URL should have been parsed: " + anchors.toString(), anchors.contains(new AnchorURL("https://yacy.net/"))); assertTrue("YaCy forum URL should have been parsed: " + anchors.toString(), anchors.contains(new AnchorURL("https://community.searchlab.eu/"))); } } diff --git a/test/net/yacy/data/URLLicenseConcurrentTest.java b/test/net/yacy/data/URLLicenseConcurrentTest.java index 9bc49e821..1f1c3e9c3 100644 --- a/test/net/yacy/data/URLLicenseConcurrentTest.java +++ b/test/net/yacy/data/URLLicenseConcurrentTest.java @@ -41,7 +41,7 @@ public class URLLicenseConcurrentTest { */ private static class ClientThread extends Thread { - private String testURL = "http://yacy.net"; + private String testURL = "https://yacy.net"; private int steps = 100000;