From 1d342244169fedac70e2d6344e4aadaf6c3f65ac Mon Sep 17 00:00:00 2001 From: Viktor Lofgren Date: Fri, 23 Feb 2024 16:13:40 +0100 Subject: [PATCH] (refac) Remove src/main from all source code paths. Look, this will make the git history look funny, but trimming unnecessary depth from the source tree is a very necessary sanity-preserving measure when dealing with a super-modularized codebase like this one. While it makes the project configuration a bit less conventional, it will save you several clicks every time you jump between modules. Which you'll do a lot, because it's *modul*ar. The src/main/java convention makes a lot of sense for a non-modular project though. This ain't that. --- build.gradle | 33 ++++-------- code/common/config/build.gradle | 2 + .../java/nu/marginalia/IndexLocations.java | 0 .../java/nu/marginalia/LanguageModels.java | 0 .../java/nu/marginalia/UserAgent.java | 0 .../java/nu/marginalia/WebsiteUrl.java | 0 .../java/nu/marginalia/WmsaHome.java | 0 .../nodecfg/NodeConfigurationService.java | 0 .../nodecfg/model/NodeConfiguration.java | 0 .../storage/FileStorageManifest.java | 0 .../storage/FileStorageService.java | 0 .../marginalia/storage/model/FileStorage.java | 0 .../storage/model/FileStorageBase.java | 0 .../storage/model/FileStorageBaseId.java | 0 .../storage/model/FileStorageBaseType.java | 0 .../storage/model/FileStorageId.java | 0 .../storage/model/FileStorageState.java | 0 .../storage/model/FileStorageType.java | 0 .../nodecfg/NodeConfigurationServiceTest.java | 0 .../storage/FileStorageServiceTest.java | 0 code/common/db/build.gradle | 2 + .../nu/marginalia/db/DbDomainQueries.java | 0 .../db/DbDomainStatsExportMultitool.java | 0 .../nu/marginalia/db/DomainBlacklist.java | 0 .../nu/marginalia/db/DomainBlacklistImpl.java | 0 .../db/DomainRankingSetsService.java | 0 .../java/nu/marginalia/db/DomainTypes.java | 0 .../db/migration/V23_06_0_000__base.sql | 0 .../db/migration/V23_06_0_001__blacklist.sql | 0 .../db/migration/V23_06_0_002__dictionary.sql | 0 .../migration/V23_06_0_003__crawl-queue.sql | 0 .../db/migration/V23_06_0_004__screenshot.sql | 0 .../V23_06_0_005__domain_complaint.sql | 0 .../db/migration/V23_06_0_006__api_key.sql | 0 .../db/migration/V23_06_0_007__neighbors.sql | 0 .../V23_06_0_008__random_domains.sql | 0 .../db/migration/V23_06_0_009__news_feed.sql | 0 .../migration/V23_07_0_001__domain_type.sql | 0 .../V23_07_0_002__service_status.sql | 0 .../migration/V23_07_0_003__message_queue.sql | 0 .../migration/V23_07_0_004__file_storage.sql | 0 ..._07_0_005__file_storage_default_values.sql | 0 ...3_07_0_006__message_queue_default_jobs.sql | 0 .../migration/V23_07_0_007__task_status.sql | 0 .../migration/V23_07_0_008__events_index.sql | 0 .../V23_09_0_000__filestorage_livedb.sql | 0 .../db/migration/V23_09_1_000__drop_ecurl.sql | 0 .../V23_09_2_000__filestorage_backup.sql | 0 .../V23_09_2_001__filestorage_no_lexicon.sql | 0 .../V23_11_0_000__file_storage_node.sql | 0 .../V23_11_0_001__heartbeat_node.sql | 0 .../V23_11_0_002__file_storage_state.sql | 0 .../V23_11_0_003__node_configuration.sql | 0 .../V23_11_0_004__file_storage_base_type.sql | 0 .../V23_11_0_005__clean_message_queue.sql | 0 .../migration/V23_11_0_006__clean_stores.sql | 0 .../V23_11_0_007__domain_node_affinity.sql | 0 .../V23_11_0_008__purge_procedure.sql | 0 .../V24_01_0_001__node_config__keep_warc.sql | 0 .../db/migration/V24_01_0_002__domain_set.sql | 0 .../db/migration/V24_01_0_003__mqaudit.sql | 0 .../V24_02_0_000__drop_domain_links.sql | 0 .../V24_02_0_001__drop_ranking_set_algo.sql | 0 .../db/DomainRankingSetsServiceTest.java | 0 .../nu/marginalia/db/DomainTypesTest.java | 0 code/common/linkdb/build.gradle | 2 + .../nu/marginalia/linkdb/LinkdbFileNames.java | 0 .../linkdb/dlinks/DelayingDomainLinkDb.java | 0 .../linkdb/dlinks/DomainLinkDb.java | 0 .../linkdb/dlinks/DomainLinkDbLoader.java | 0 .../linkdb/dlinks/DomainLinkDbWriter.java | 0 .../linkdb/dlinks/FileDomainLinkDb.java | 0 .../linkdb/docs/DocumentDbReader.java | 0 .../linkdb/docs/DocumentDbWriter.java | 0 .../linkdb/model/DocdbUrlDetail.java | 0 .../main => }/resources/db/docdb-document.sql | 0 .../linkdb/DocumentDbWriterTest.java | 0 .../marginalia/linkdb/DomainLinkDbTest.java | 0 code/common/model/build.gradle | 2 + .../java/nu/marginalia/model/EdgeDomain.java | 0 .../java/nu/marginalia/model/EdgeUrl.java | 0 .../model/crawl/DomainIndexingState.java | 0 .../marginalia/model/crawl/HtmlFeature.java | 0 .../nu/marginalia/model/crawl/PubDate.java | 0 .../model/crawl/UrlIndexingState.java | 0 .../nu/marginalia/model/gson/GsonFactory.java | 0 .../marginalia/model/html/HtmlStandard.java | 0 .../nu/marginalia/model/id/UrlIdCodec.java | 0 .../marginalia/model/idx/DocumentFlags.java | 0 .../model/idx/DocumentMetadata.java | 0 .../nu/marginalia/model/idx/WordFlags.java | 0 .../nu/marginalia/model/idx/WordMetadata.java | 0 .../java/nu/marginalia/util/QueryParams.java | 0 .../java/nu/marginalia/util/StringPool.java | 0 .../model/DocumentMetadataTest.java | 0 .../nu/marginalia/model/EdgeDomainTest.java | 0 .../nu/marginalia/model/EdgeUrlTest.java | 0 .../nu/marginalia/model/WordMetadataTest.java | 0 .../marginalia/model/id/UrlIdCodecTest.java | 0 code/common/process/build.gradle | 2 + .../nu/marginalia/ProcessConfiguration.java | 0 .../ProcessConfigurationModule.java | 0 .../process/control/FakeProcessHeartbeat.java | 0 .../control/ProcessAdHocTaskHeartbeat.java | 0 .../ProcessAdHocTaskHeartbeatImpl.java | 0 .../process/control/ProcessHeartbeat.java | 0 .../process/control/ProcessHeartbeatImpl.java | 0 .../process/control/ProcessTaskHeartbeat.java | 0 .../control/ProcessTaskHeartbeatImpl.java | 0 .../process/log/WorkLoadIterable.java | 0 .../nu/marginalia/process/log/WorkLog.java | 0 .../marginalia/process/log/WorkLogEntry.java | 0 .../main => }/resources/log4j2.properties | 0 .../marginalia/process/log/WorkLogTest.java | 0 code/common/renderer/build.gradle | 2 + .../marginalia/renderer/MustacheRenderer.java | 0 .../marginalia/renderer/RendererFactory.java | 0 .../renderer/RenderingException.java | 0 .../config/DefaultHandlebarsConfigurator.java | 0 .../config/HandlebarsConfigurator.java | 0 code/common/service-discovery/build.gradle | 2 + .../service/NodeConfigurationWatcher.java | 0 .../service/ServiceDiscoveryModule.java | 0 .../ServiceHomeNotConfiguredException.java | 0 .../marginalia/service/ServiceMonitors.java | 0 .../client/GrpcChannelPoolFactory.java | 0 .../client/GrpcMultiNodeChannelPool.java | 0 .../client/GrpcSingleNodeChannelPool.java | 0 .../client/ServiceNotAvailableException.java | 0 .../service/discovery/ServiceRegistryIf.java | 0 .../service/discovery/ZkServiceRegistry.java | 0 .../monitor/ServiceChangeMonitor.java | 0 .../discovery/monitor/ServiceMonitorIf.java | 0 .../discovery/property/PartitionTraits.java | 0 .../discovery/property/ServiceEndpoint.java | 0 .../discovery/property/ServiceKey.java | 0 .../discovery/property/ServicePartition.java | 0 .../nu/marginalia/service/id/ServiceId.java | 0 .../discovery/ZkServiceRegistryTest.java | 0 code/common/service/build.gradle | 2 + .../nu/marginalia/service/ConfigLoader.java | 0 .../java/nu/marginalia/service/MainClass.java | 0 .../marginalia/service/ProcessMainClass.java | 0 .../service/control/FakeServiceHeartbeat.java | 0 .../service/control/ServiceEventLog.java | 0 .../service/control/ServiceHeartbeat.java | 0 .../service/control/ServiceHeartbeatImpl.java | 0 .../service/control/ServiceTaskHeartbeat.java | 0 .../control/ServiceTaskHeartbeatImpl.java | 0 .../service/module/DatabaseModule.java | 0 .../service/module/ServiceConfiguration.java | 0 .../module/ServiceConfigurationModule.java | 0 .../service/server/BaseServiceParams.java | 0 .../service/server/Initialization.java | 0 .../service/server/MetricsServer.java | 0 .../service/server/NodeStatusWatcher.java | 0 .../service/server/RateLimiter.java | 0 .../nu/marginalia/service/server/Service.java | 0 .../service/server/StaticResources.java | 0 .../service/server/mq/MqRequest.java | 0 .../server/mq/ServiceMqSubscription.java | 0 .../{src/main => }/resources/log4j2-prod.xml | 0 .../{src/main => }/resources/log4j2-test.xml | 0 code/execution/api/build.gradle | 4 +- .../executor/client/ExecutorClient.java | 0 .../executor/client/ExecutorCrawlClient.java | 0 .../executor/client/ExecutorExportClient.java | 0 .../client/ExecutorRemoteActorFactory.java | 0 .../client/ExecutorSideloadClient.java | 0 .../executor/model/ActorRunState.java | 0 .../executor/model/ActorRunStates.java | 0 .../executor/storage/FileStorageContent.java | 0 .../executor/storage/FileStorageFile.java | 0 .../executor/upload/UploadDirContents.java | 0 .../executor/upload/UploadDirItem.java | 0 code/execution/build.gradle | 2 + .../java/nu/marginalia/actor/ActorApi.java | 0 .../nu/marginalia/actor/ExecutorActor.java | 0 .../actor/ExecutorActorControlService.java | 0 .../actor/ExecutorActorStateMachines.java | 0 .../monitor/AbstractProcessSpawnerActor.java | 0 .../monitor/FileStorageMonitorActor.java | 0 .../actor/proc/ConverterMonitorActor.java | 0 .../actor/proc/CrawlerMonitorActor.java | 0 .../proc/IndexConstructorMonitorActor.java | 0 .../actor/proc/LoaderMonitorActor.java | 0 .../proc/ProcessLivenessMonitorActor.java | 0 .../actor/task/ActorProcessWatcher.java | 0 .../marginalia/actor/task/ConvertActor.java | 0 .../actor/task/ConvertAndLoadActor.java | 0 .../nu/marginalia/actor/task/CrawlActor.java | 0 .../actor/task/CrawlJobExtractorActor.java | 0 .../actor/task/DownloadSampleActor.java | 0 .../actor/task/ExportAtagsActor.java | 0 .../actor/task/ExportDataActor.java | 0 .../actor/task/ExportFeedsActor.java | 0 .../actor/task/ExportSampleDataActor.java | 0 .../actor/task/ExportTermFreqActor.java | 0 .../marginalia/actor/task/RecrawlActor.java | 0 .../actor/task/RestoreBackupActor.java | 0 .../TriggerAdjacencyCalculationActor.java | 0 .../marginalia/execution/ExecutionInit.java | 0 .../execution/ExecutorCrawlGrpcService.java | 0 .../execution/ExecutorExportGrpcService.java | 0 .../execution/ExecutorGrpcService.java | 0 .../ExecutorSideloadGrpcService.java | 0 .../marginalia/process/ProcessOutboxes.java | 0 .../nu/marginalia/process/ProcessService.java | 0 .../sideload/RedditSideloadHelper.java | 0 .../marginalia/sideload/SideloadHelper.java | 0 .../sideload/StackExchangeSideloadHelper.java | 0 .../java/nu/marginalia/svc/BackupService.java | 0 .../svc/DomainListRefreshService.java | 0 .../svc/DomainListRefreshServiceTest.java | 0 code/features-convert/adblock/build.gradle | 2 + .../marginalia/adblock/AdblockSimulator.java | 0 .../adblock/GoogleAnwersSpamDetector.java | 0 .../anchor-keywords/build.gradle | 2 + .../marginalia/atags/AnchorTextKeywords.java | 0 .../marginalia/atags/model/DomainLinks.java | 0 .../java/nu/marginalia/atags/model/Link.java | 0 .../marginalia/atags/model/LinkWithText.java | 0 .../atags/source/AnchorTagsImpl.java | 0 .../atags/source/AnchorTagsSource.java | 0 .../atags/source/AnchorTagsSourceFactory.java | 0 .../{src/main => }/resources/atags-stop-list | 0 .../atags/DomainAnchorTagsImplTest.java | 0 .../marginalia/util/TestLanguageModels.java | 0 .../data-extractors/build.gradle | 2 + .../nu/marginalia/extractor/AtagExporter.java | 0 .../nu/marginalia/extractor/ExporterIf.java | 0 .../nu/marginalia/extractor/FeedExporter.java | 0 .../extractor/SampleDataExporter.java | 0 .../extractor/TermFrequencyExporter.java | 0 .../keyword-extraction/build.gradle | 2 + .../keyword/DocumentKeywordExtractor.java | 0 .../marginalia/keyword/KeywordExtractor.java | 0 .../marginalia/keyword/KeywordMetadata.java | 0 .../java/nu/marginalia/keyword/WordReps.java | 0 .../keyword/extractors/ArtifactKeywords.java | 0 .../extractors/KeywordPositionBitmask.java | 0 .../keyword/extractors/NameLikeKeywords.java | 0 .../extractors/SubjectLikeKeywords.java | 0 .../keyword/extractors/TitleKeywords.java | 0 .../keyword/extractors/UrlKeywords.java | 0 .../keyword/extractors/WordsTfIdfCounts.java | 0 .../keyword/model/DocumentKeywords.java | 0 .../model/DocumentKeywordsBuilder.java | 0 .../model/DocumentKeywordsPointer.java | 0 .../test-data/java.html | 0 .../test-data/keyboards.html | 0 .../test-data/madonna.html | 0 .../test-data/spam.html | 0 .../keyword/DocumentKeywordExtractorTest.java | 0 .../keyword/SentenceExtractorTest.java | 0 .../extractors/ArtifactKeywordsTest.java | 0 .../extractors/NameLikeKeywordsTest.java | 0 .../extractors/SubjectLikeKeywordsTest.java | 0 .../keyword/extractors/TitleKeywordsTest.java | 0 .../keyword/extractors/UrlKeywordsTest.java | 0 .../test/util/TestLanguageModels.java | 0 code/features-convert/pubdate/build.gradle | 2 + .../pubdate/PubDateEffortLevel.java | 0 .../pubdate/PubDateFromHtmlStandard.java | 0 .../marginalia/pubdate/PubDateHeuristic.java | 0 .../nu/marginalia/pubdate/PubDateParser.java | 0 .../nu/marginalia/pubdate/PubDateSniffer.java | 0 .../PubDateHeuristicDOMParsingPass1.java | 0 .../PubDateHeuristicDOMParsingPass2.java | 0 ...PubDateHeuristicGuessFromHtmlStandard.java | 0 .../PubDateHeuristicHtml5AnyTimeTag.java | 0 .../PubDateHeuristicHtml5ArticleDateTag.java | 0 .../PubDateHeuristicHtml5ItempropDateTag.java | 0 .../heuristic/PubDateHeuristicJSONLD.java | 0 .../PubDateHeuristicLastModified.java | 0 .../heuristic/PubDateHeuristicMicrodata.java | 0 .../heuristic/PubDateHeuristicOpenGraph.java | 0 .../heuristic/PubDateHeuristicRDFaTag.java | 0 .../PubDateHeuristicUrlPatternPass1.java | 0 .../PubDateHeuristicUrlPatternPass2.java | 0 .../pubdate/PubDateSnifferTest.java | 0 .../nu/marginalia/pubdate/PubDateTest.java | 0 .../features-convert/reddit-json/build.gradle | 2 + .../integration/reddit/RedditEntryReader.java | 0 .../integration/reddit/db/RedditDb.java | 0 .../model/ProcessableRedditComment.java | 0 .../model/ProcessableRedditSubmission.java | 0 .../reddit/model/RawRedditComment.java | 0 .../reddit/model/RawRedditSubmission.java | 0 .../{src/main => }/resources/db/reddit.sql | 0 .../reddit/RedditEntryReaderTest.java | 0 .../integration/reddit/db/RedditDbTest.java | 0 .../stackexchange-xml/build.gradle | 2 + .../model/StackExchangeComment.java | 0 .../model/StackExchangePost.java | 0 .../sqlite/StackExchangePostsDb.java | 0 .../StackExchange7zXmlEventReaderSource.java | 0 .../xml/StackExchangeXmlCommentReader.java | 0 .../xml/StackExchangeXmlIterator.java | 0 .../xml/StackExchangeXmlPostReader.java | 0 .../xml/XmlEventReaderSource.java | 0 .../main => }/resources/db/stackexchange.sql | 0 .../StackExchangeXmlCommentReaderTest.java | 0 .../xml/StackExchangeXmlPostReaderTest.java | 0 .../xml/StringXmlTestEventReader.java | 0 .../summary-extraction/build.gradle | 2 + .../marginalia/summary/SummaryExtractor.java | 0 .../summary/heuristic/DomFilterHeuristic.java | 0 .../summary/heuristic/FallbackHeuristic.java | 0 .../summary/heuristic/HeuristicTextUtil.java | 0 .../heuristic/MetaDescriptionHeuristic.java | 0 .../OpenGraphDescriptionHeuristic.java | 0 .../heuristic/SummarizingDOMFilter.java | 0 .../summary/heuristic/SummaryHeuristic.java | 0 .../heuristic/TagDensityHeuristic.java | 0 .../html/monadnock.html | 0 .../html/readme.md | 0 .../html/summarization/187.shtml | 0 .../html/summarization/surrey.html | 0 .../html/summarization/surrey.html.1 | 0 .../html/theregister.html | 0 .../html/work-set/index | 0 .../html/work-set/url--1021546012 | 0 .../html/work-set/url--1028592943 | 0 .../html/work-set/url--1081293162 | 0 .../html/work-set/url--1105046394 | 0 .../html/work-set/url--1146923296 | 0 .../html/work-set/url--1194694074 | 0 .../html/work-set/url--1207898281 | 0 .../html/work-set/url--1268145073 | 0 .../html/work-set/url--1294876331 | 0 .../html/work-set/url--1314767420 | 0 .../html/work-set/url--1316269786 | 0 .../html/work-set/url--1316766580 | 0 .../html/work-set/url--1319968043 | 0 .../html/work-set/url--1338576987 | 0 .../html/work-set/url--1341909571 | 0 .../html/work-set/url--1369578579 | 0 .../html/work-set/url--1437315645 | 0 .../html/work-set/url--1458954960 | 0 .../html/work-set/url--1475681345 | 0 .../html/work-set/url--1498328446 | 0 .../html/work-set/url--1507779664 | 0 .../html/work-set/url--1540303379 | 0 .../html/work-set/url--154898476 | 0 .../html/work-set/url--1552059399 | 0 .../html/work-set/url--1557688340 | 0 .../html/work-set/url--1584145751 | 0 .../html/work-set/url--1605151204 | 0 .../html/work-set/url--162269247 | 0 .../html/work-set/url--1624294488 | 0 .../html/work-set/url--164108285 | 0 .../html/work-set/url--1645688243 | 0 .../html/work-set/url--1658004609 | 0 .../html/work-set/url--1658558834 | 0 .../html/work-set/url--1698664879 | 0 .../html/work-set/url--169975195 | 0 .../html/work-set/url--1701203332 | 0 .../html/work-set/url--17281998 | 0 .../html/work-set/url--1742070028 | Bin .../html/work-set/url--1745376814 | 0 .../html/work-set/url--1749889035 | 0 .../html/work-set/url--176177364 | 0 .../html/work-set/url--177014197 | 0 .../html/work-set/url--1794527707 | 0 .../html/work-set/url--1797740201 | 0 .../html/work-set/url--1799098579 | 0 .../html/work-set/url--1959637826 | 0 .../html/work-set/url--1971916964 | 0 .../html/work-set/url--1985840368 | 0 .../html/work-set/url--2012610859 | 0 .../html/work-set/url--202178680 | 0 .../html/work-set/url--2043528727 | 0 .../html/work-set/url--2081757477 | 0 .../html/work-set/url--2103982576 | 0 .../html/work-set/url--2111558769 | 0 .../html/work-set/url--213168798 | 0 .../html/work-set/url--232544032 | 0 .../html/work-set/url--253010011 | 0 .../html/work-set/url--274250994 | 0 .../html/work-set/url--332442790 | 0 .../html/work-set/url--353437903 | 0 .../html/work-set/url--364546777 | 0 .../html/work-set/url--379129416 | 0 .../html/work-set/url--399428149 | 0 .../html/work-set/url--425233170 | 0 .../html/work-set/url--434612307 | 0 .../html/work-set/url--439772328 | 0 .../html/work-set/url--458002611 | 0 .../html/work-set/url--506010305 | 0 .../html/work-set/url--546773534 | 0 .../html/work-set/url--551288516 | 0 .../html/work-set/url--602577763 | 0 .../html/work-set/url--611668054 | 0 .../html/work-set/url--634771245 | 0 .../html/work-set/url--639320493 | 0 .../html/work-set/url--643179018 | 0 .../html/work-set/url--663772351 | 0 .../html/work-set/url--670789152 | 0 .../html/work-set/url--6797317 | 0 .../html/work-set/url--700978490 | 0 .../html/work-set/url--708035332 | 0 .../html/work-set/url--804917062 | 0 .../html/work-set/url--819771302 | 0 .../html/work-set/url--840796372 | 0 .../html/work-set/url--841445362 | 0 .../html/work-set/url--862385354 | 0 .../html/work-set/url--879796466 | 0 .../html/work-set/url--89134993 | 0 .../html/work-set/url--905197876 | 0 .../html/work-set/url--920328354 | 0 .../html/work-set/url--952827759 | 0 .../html/work-set/url--964018507 | 0 .../html/work-set/url--972614909 | 0 .../html/work-set/url-10088520 | 0 .../html/work-set/url-1013281103 | 0 .../html/work-set/url-1019241851 | 0 .../html/work-set/url-1059944953 | 0 .../html/work-set/url-1118681302 | 0 .../html/work-set/url-1179298706 | 0 .../html/work-set/url-1191749784 | 0 .../html/work-set/url-1207094790 | 0 .../html/work-set/url-1213989666 | 0 .../html/work-set/url-1222442301 | 0 .../html/work-set/url-130332455 | 0 .../html/work-set/url-1311055461 | 0 .../html/work-set/url-1391842722 | 0 .../html/work-set/url-1457388763 | 0 .../html/work-set/url-1506356272 | 0 .../html/work-set/url-1511762169 | 0 .../html/work-set/url-1534640058 | 0 .../html/work-set/url-1551513871 | 0 .../html/work-set/url-1567632447 | 0 .../html/work-set/url-1623049502 | 0 .../html/work-set/url-163919330 | 0 .../html/work-set/url-1661398327 | 0 .../html/work-set/url-1724309925 | 0 .../html/work-set/url-1736807128 | 0 .../html/work-set/url-1739031345 | 0 .../html/work-set/url-1755745765 | 0 .../html/work-set/url-1802811100 | 0 .../html/work-set/url-1805364707 | 0 .../html/work-set/url-1832702370 | 0 .../html/work-set/url-1853114311 | 0 .../html/work-set/url-1924872844 | 0 .../html/work-set/url-197772804 | 0 .../html/work-set/url-1984259912 | 0 .../html/work-set/url-1990903988 | 0 .../html/work-set/url-2039310951 | 0 .../html/work-set/url-2040857056 | 0 .../html/work-set/url-2052613093 | 0 .../html/work-set/url-2063899866 | 0 .../html/work-set/url-2115548255 | 0 .../html/work-set/url-2127148436 | 0 .../html/work-set/url-2133781904 | 0 .../html/work-set/url-225690385 | 0 .../html/work-set/url-226401955 | 0 .../html/work-set/url-262970770 | 0 .../html/work-set/url-30106798 | 0 .../html/work-set/url-302167335 | 0 .../html/work-set/url-327999153 | 0 .../html/work-set/url-332568225 | 0 .../html/work-set/url-343223418 | 0 .../html/work-set/url-383103932 | 0 .../html/work-set/url-412929678 | 0 .../html/work-set/url-475213997 | 0 .../html/work-set/url-483403121 | 0 .../html/work-set/url-488667993 | 0 .../html/work-set/url-50815201 | 0 .../html/work-set/url-522685905 | 0 .../html/work-set/url-570714305 | 0 .../html/work-set/url-58733529 | 0 .../html/work-set/url-616518304 | 0 .../html/work-set/url-662169426 | 0 .../html/work-set/url-677278788 | 0 .../html/work-set/url-690486170 | 0 .../html/work-set/url-709693331 | 0 .../html/work-set/url-734531556 | 0 .../html/work-set/url-767530276 | 0 .../html/work-set/url-783154014 | 0 .../html/work-set/url-796905237 | 0 .../html/work-set/url-800099955 | 0 .../html/work-set/url-804101946 | 0 .../html/work-set/url-830664902 | 0 .../html/work-set/url-876060686 | 0 .../html/work-set/url-892584998 | 0 .../html/work-set/url-942458463 | 0 .../html/work-set/url-952036171 | 0 .../html/work-set/url-968207276 | 0 .../summary/SummaryExtractorTest.java | 0 .../heuristic/HeuristicTextUtilTest.java | 0 .../topic-detection/build.gradle | 2 + .../nu/marginalia/topic/RecipeDetector.java | 0 .../topic/TextileCraftDetector.java | 0 .../marginalia/topic/WoodworkingDetector.java | 0 code/features-crawl/content-type/build.gradle | 2 + .../marginalia/contenttype/ContentType.java | 0 .../contenttype/ContentTypeParser.java | 0 .../contenttype/DocumentBodyToString.java | 0 .../contenttype/ContentTypeParserTest.java | 0 .../contenttype/DocumentBodyToStringTest.java | 0 .../crawl-blocklist/build.gradle | 2 + .../ip_blocklist/GeoIpBlocklist.java | 0 .../ip_blocklist/InetAddressCache.java | 0 .../marginalia/ip_blocklist/IpBlockList.java | 0 .../marginalia/ip_blocklist/UrlBlocklist.java | 0 .../ip_blocklist/UrlBlocklistTest.java | 0 code/features-crawl/link-parser/build.gradle | 2 + .../marginalia/link_parser/FeedExtractor.java | 0 .../nu/marginalia/link_parser/LinkParser.java | 0 .../feedlot-client/build.gradle | 2 + .../nu/marginalia/feedlot/FeedlotClient.java | 0 .../nu/marginalia/feedlot/model/FeedItem.java | 0 .../marginalia/feedlot/model/FeedItems.java | 0 .../random-websites/build.gradle | 2 + .../browse/DbBrowseDomainsRandom.java | 0 .../browse/DbBrowseDomainsSimilarCosine.java | 0 .../marginalia/browse/model/BrowseResult.java | 0 .../browse/model/BrowseResultSet.java | 0 code/features-search/screenshots/build.gradle | 2 + .../screenshot/ScreenshotService.java | 0 code/functions/domain-info/api/build.gradle | 9 +--- .../api/domains/DomainInfoClient.java | 0 .../api/domains/DomainsProtobufCodec.java | 0 .../api/domains/model/DomainInformation.java | 0 .../api/domains/model/SimilarDomain.java | 0 code/functions/domain-info/build.gradle | 2 + .../domains/DomainInfoGrpcService.java | 0 .../domains/DomainInformationService.java | 0 .../domains/SimilarDomainsService.java | 0 .../domain-links/aggregate/build.gradle | 2 + .../AggregateDomainLinksService.java | 0 code/functions/domain-links/api/build.gradle | 9 +--- .../AggregateDomainLinksClient.java | 0 .../PartitionDomainLinksClient.java | 0 .../domain-links/partition/build.gradle | 2 + .../PartitionDomainLinksService.java | 0 code/functions/math/api/build.gradle | 9 +--- .../nu/marginalia/api/math/MathClient.java | 0 .../api/math/MathProtobufCodec.java | 0 .../api/math/model/DictionaryEntry.java | 0 .../api/math/model/DictionaryResponse.java | 0 code/functions/math/build.gradle | 2 + .../functions/math/MathGrpcService.java | 0 .../math/dict/DictionaryService.java | 0 .../functions/math/dict/SpellChecker.java | 0 .../functions/math/eval/MathParser.java | 0 .../marginalia/functions/math/eval/Unit.java | 0 .../marginalia/functions/math/eval/Units.java | 0 .../math/{src/main => }/resources/units.csv | 0 .../functions/math/eval/MathParserTest.java | 0 .../functions/math/eval/UnitsTest.java | 0 code/functions/search-query/api/build.gradle | 9 +--- .../api/searchquery/IndexProtobufCodec.java | 0 .../api/searchquery/QueryClient.java | 0 .../api/searchquery/QueryProtobufCodec.java | 0 .../model/query/ProcessedQuery.java | 0 .../searchquery/model/query/QueryParams.java | 0 .../model/query/QueryResponse.java | 0 .../model/query/SearchSetIdentifier.java | 0 .../model/query/SearchSpecification.java | 0 .../model/query/SearchSubquery.java | 0 .../model/results/Bm25Parameters.java | 0 .../results/DecoratedSearchResultItem.java | 0 .../model/results/ResultRankingContext.java | 0 .../results/ResultRankingParameters.java | 0 .../model/results/SearchResultItem.java | 0 .../results/SearchResultKeywordScore.java | 0 .../results/SearchResultPreliminaryScore.java | 0 .../model/results/SearchResultSet.java | 0 .../index/client/IndexProtobufCodecTest.java | 0 code/functions/search-query/build.gradle | 2 + .../searchquery/QueryGRPCService.java | 0 .../searchquery/query_parser/QueryParser.java | 0 .../query_parser/QueryPermutation.java | 0 .../query_parser/QueryTokenizer.java | 0 .../query_parser/QueryVariants.java | 0 .../searchquery/query_parser/token/Token.java | 0 .../query_parser/token/TokenType.java | 0 .../query_parser/token/TokenVisitor.java | 0 .../searchquery/svc/QueryFactory.java | 0 .../svc/QueryLimitsAccumulator.java | 0 .../svc/QuerySearchTermsAccumulator.java | 0 .../util/language/EnglishDictionary.java | 0 .../marginalia/util/ngrams/DenseBitMap.java | 0 .../util/ngrams/NGramBloomFilter.java | 0 .../util/transform_list/TransformList.java | 0 .../query/svc/QueryFactoryTest.java | 0 code/index/api/build.gradle | 2 + .../nu/marginalia/index/api/IndexClient.java | 0 .../marginalia/index/api/IndexMqClient.java | 0 .../index/api/IndexMqEndpoints.java | 0 code/index/build.gradle | 6 ++- .../build.gradle | 2 + .../index/forward/ForwardIndexConverter.java | 0 .../index/forward/ForwardIndexFileNames.java | 0 .../index/forward/ForwardIndexParameters.java | 0 .../index/forward/ForwardIndexReader.java | 0 .../readme.md | 0 .../forward/ForwardIndexConverterTest.java | 0 .../test}/nu/marginalia/test/TestUtil.java | 0 code/index/index-journal/build.gradle | 2 + .../index/journal/IndexJournalFileNames.java | 0 .../journal/model/IndexJournalEntry.java | 0 .../model/IndexJournalEntryBuilder.java | 0 .../journal/model/IndexJournalEntryData.java | 0 .../model/IndexJournalEntryHeader.java | 0 .../journal/model/IndexJournalFileHeader.java | 0 .../journal/reader/IndexJournalReadEntry.java | 0 .../journal/reader/IndexJournalReader.java | 0 .../reader/IndexJournalReaderPagingImpl.java | 0 .../reader/IndexJournalReaderSingleFile.java | 0 .../reader/pointer/IndexJournalPointer.java | 0 .../journal/writer/IndexJournalWriter.java | 0 .../writer/IndexJournalWriterPagingImpl.java | 0 .../IndexJournalWriterSingleFileImpl.java | 0 .../index/journal/IndexJournalTest.java | 0 .../pointer/IndexJournalPointerTest.java | 0 .../build.gradle | 2 + .../index.svg | 0 .../index/ReverseIndexEntrySource.java | 0 .../index/ReverseIndexFullFileNames.java | 0 .../index/ReverseIndexParameters.java | 0 .../index/ReverseIndexPrioFileNames.java | 0 .../marginalia/index/ReverseIndexReader.java | 0 .../index/ReverseIndexSelfTest.java | 0 .../CountToOffsetTransformer.java | 0 .../index/construction/DocIdRewriter.java | 0 .../construction/IndexSizeEstimator.java | 0 .../construction/JournalReaderSource.java | 0 .../ReverseIndexBTreeTransformer.java | 0 .../construction/ReverseIndexConstructor.java | 0 .../index/construction/ReversePreindex.java | 0 .../ReversePreindexDocuments.java | 0 .../ReversePreindexReference.java | 0 .../ReversePreindexWordSegments.java | 0 .../index/query/ReverseIndexRejectFilter.java | 0 .../index/query/ReverseIndexRetainFilter.java | 0 .../merging.svg | 0 .../preindex.svg | 0 .../readme.md | 0 .../index/ReverseIndexDebugTest.java | 0 .../index/ReverseIndexReaderTest.java | 0 .../construction/ReversePreindexDocsTest.java | 0 .../ReversePreindexFinalizeTest.java | 0 .../ReversePreindexMergeTest.java | 0 .../ReversePreindexWordSegmentsTest.java | 0 .../construction/TestJournalFactory.java | 0 .../index/construction/TestSegmentData.java | 0 .../test}/nu/marginalia/test/TestUtil.java | 0 .../index/IndexQueryGrpcService.java | 0 .../index/IndexServicesFactory.java | 0 .../nu/marginalia/index/SearchTermsUtil.java | 0 .../index/index/CombinedIndexReader.java | 0 .../index/index/IndexQueryBuilderImpl.java | 0 .../index/index/IndexQueryService.java | 0 .../marginalia/index/index/StatefulIndex.java | 0 .../index/model/IndexQueryParams.java | 0 .../index/model/IndexSearchParameters.java | 0 .../index/model/IndexSearchTerms.java | 0 .../index/results/IndexMetadataService.java | 0 .../IndexResultDomainDeduplicator.java | 0 .../results/IndexResultValuationContext.java | 0 .../results/IndexResultValuatorService.java | 0 .../index/searchset/DbUpdateRanks.java | 0 .../index/searchset/RankingSearchSet.java | 0 .../marginalia/index/searchset/SearchSet.java | 0 .../index/searchset/SearchSetAny.java | 0 .../index/searchset/SearchSetsService.java | 0 .../index/searchset/SmallSearchSet.java | 0 .../ranking/domains/PageRankDomainRanker.java | 0 .../ranking/domains/RankingAlgorithm.java | 0 .../accumulator/RankingResultAccumulator.java | 0 .../RankingResultBitSetAccumulator.java | 0 .../RankingResultHashMapAccumulator.java | 0 .../RankingResultHashSetAccumulator.java | 0 .../RankingResultListAccumulator.java | 0 .../domains/data/AbstractGraphSource.java | 0 .../ranking/domains/data/GraphSource.java | 0 .../domains/data/InvertedLinkGraphSource.java | 0 .../ranking/domains/data/LinkGraphSource.java | 0 .../domains/data/SimilarityGraphSource.java | 0 .../domains/jgrapht/PersonalizedPageRank.java | 0 .../ranking/results/ResultKeywordSet.java | 0 .../ranking/results/ResultValuator.java | 0 .../ranking/results/factors/Bm25Factor.java | 0 .../results/factors/PriorityTermBonus.java | 0 .../results/factors/TermCoherenceFactor.java | 0 code/index/query/build.gradle | 2 + .../index/domainrankings/DomainRankings.java | 0 .../index/query/EmptyEntrySource.java | 0 .../marginalia/index/query/EntrySource.java | 0 .../nu/marginalia/index/query/IndexQuery.java | 0 .../index/query/IndexQueryBuilder.java | 0 .../index/query/IndexQueryPriority.java | 0 .../index/query/IndexSearchBudget.java | 0 .../index/query/filter/QueryFilterAnyOf.java | 0 .../query/filter/QueryFilterLetThrough.java | 0 .../index/query/filter/QueryFilterNoPass.java | 0 .../QueryFilterStepExcludeFromPredicate.java | 0 .../filter/QueryFilterStepFromPredicate.java | 0 .../index/query/filter/QueryFilterStepIf.java | 0 .../index/query/limit/QueryLimits.java | 0 .../index/query/limit/QueryStrategy.java | 0 .../index/query/limit/SpecificationLimit.java | 0 .../query/limit/SpecificationLimitType.java | 0 .../query/filter/QueryFilterStepIfTest.java | 0 ...IndexQueryServiceIntegrationSmokeTest.java | 0 .../IndexQueryServiceIntegrationTest.java | 0 ...ndexQueryServiceIntegrationTestModule.java | 0 .../IndexResultDomainDeduplicatorTest.java | 0 .../index/searchset/RankingSearchSetTest.java | 0 .../nu/marginalia/index/util/TestUtil.java | 0 .../RankingAlgorithmWithRealDataTest.java | 0 .../RankingAlgorithmsContainerTest.java | 0 .../TestGraphSourceForInvertedLinkData.java | 0 .../domains/TestGraphSourceForLinkData.java | 0 .../TestGraphSourceForSimilarityData.java | 0 .../ranking/results/ResultValuatorTest.java | 0 .../factors/TermCoherenceFactorTest.java | 0 code/libraries/array/build.gradle | 2 + .../marginalia/array/ArrayRangeReference.java | 0 .../java/nu/marginalia/array/IntArray.java | 0 .../java/nu/marginalia/array/LongArray.java | 0 .../nu/marginalia/array/LongArrayFactory.java | 0 .../array/algo/BulkTransferArray.java | 0 .../marginalia/array/algo/IntArrayBase.java | 0 .../marginalia/array/algo/IntArraySearch.java | 0 .../marginalia/array/algo/IntArraySort.java | 0 .../array/algo/IntArrayTransformations.java | 0 .../marginalia/array/algo/LongArrayBase.java | 0 .../array/algo/LongArraySearch.java | 0 .../marginalia/array/algo/LongArraySort.java | 0 .../array/algo/LongArrayTransformations.java | 0 .../array/algo/SortAlgoInsertionSort.java | 0 .../array/algo/SortAlgoMergeSort.java | 0 .../array/algo/SortAlgoQuickSort.java | 0 .../marginalia/array/algo/SortingContext.java | 0 .../array/algo/TwoArrayOperations.java | 0 .../array/buffer/IntQueryBuffer.java | 0 .../array/buffer/LongQueryBuffer.java | 0 .../ReferenceImplIntArrayDelegate.java | 0 .../ReferenceImplLongArrayDelegate.java | 0 .../array/delegate/ShiftedIntArray.java | 0 .../array/delegate/ShiftedLongArray.java | 0 .../array/functional/AddressRangeCall.java | 0 .../array/functional/AddressRangeCallIO.java | 0 .../functional/AddressRangeIntFunction.java | 0 .../functional/AddressRangeLongFunction.java | 0 .../functional/IntBinaryIOOperation.java | 0 .../array/functional/IntBinaryOperation.java | 0 .../array/functional/IntIOTransformer.java | 0 .../array/functional/IntTransformer.java | 0 .../functional/LongBinaryIOOperation.java | 0 .../array/functional/LongBinaryOperation.java | 0 .../array/functional/LongIOTransformer.java | 0 .../array/functional/LongIntConsumer.java | 0 .../array/functional/LongLongConsumer.java | 0 .../array/functional/LongTransformer.java | 0 .../array/page/AbstractPagingArray.java | 0 .../marginalia/array/page/PartitionPage.java | 0 .../array/page/SegmentIntArray.java | 0 .../array/page/SegmentLongArray.java | 0 .../array/page/UnsafeLongArray.java | 0 .../marginalia/array/page/UnsafeProvider.java | 0 .../array/scheme/ArrayPartitioningScheme.java | 0 .../scheme/PowerOf2PartitioningScheme.java | 0 .../scheme/SequentialPartitioningScheme.java | 0 .../IntLowBitPartitioningSchemeTest.java | 0 .../array/algo/IntArraySearchTest.java | 0 .../array/algo/IntArraySortTest.java | 0 .../algo/IntArrayTransformations2Test.java | 0 .../algo/IntArrayTransformationsTest.java | 0 .../array/algo/LongArraySearchTest.java | 0 .../array/algo/LongArraySortNTest.java | 0 .../array/algo/LongArraySortTest.java | 0 .../algo/LongArrayTransformations2Test.java | 0 .../algo/LongArrayTransformationsTest.java | 0 .../array/algo/TwoArrayOperationsTest.java | 0 .../scheme/ArrayPartitioningSchemeTest.java | 0 .../nu/marginalia/util/test/TestUtil.java | 0 code/libraries/big-string/build.gradle | 2 + .../nu/marginalia/bigstring/BigString.java | 0 .../bigstring/CompressedBigString.java | 0 .../bigstring/CompressionBuffer.java | 0 .../bigstring/CompressionBufferPool.java | 0 .../marginalia/bigstring/PlainBigString.java | 0 .../bigstring/CompressedBigStringTest.java | 0 .../blocking-thread-pool/build.gradle | 2 + .../marginalia/util/ProcessingIterator.java | 0 .../util/SimpleBlockingThreadPool.java | 0 .../util/ProcessingIteratorTest.java | 0 .../braille-block-punch-cards/build.gradle | 2 + .../bbpc/BrailleBlockPunchCards.java | 0 .../bbpc/BrailleBlockPunchCardsTest.java | 0 code/libraries/btree/build.gradle | 2 + .../java/nu/marginalia/btree/BTreeDogEar.java | 0 .../java/nu/marginalia/btree/BTreeReader.java | 0 .../marginalia/btree/BTreeWriteCallback.java | 0 .../java/nu/marginalia/btree/BTreeWriter.java | 0 .../btree/model/BTreeBlockSize.java | 0 .../marginalia/btree/model/BTreeContext.java | 0 .../marginalia/btree/model/BTreeHeader.java | 0 .../BTreeReaderQueryDataWithIndexTest.java | 0 .../BTreeReaderQueryDataWithoutIndexTest.java | 0 .../BTreeReaderRejectRetainWithIndexTest.java | 0 ...reeReaderRejectRetainWithoutIndexTest.java | 0 .../nu/marginalia/btree/BTreeWriterTest.java | 0 code/libraries/easy-lsh/build.gradle | 2 + .../java/nu/marginalia/lsh/EasyLSH.java | 0 .../nu/marginalia/lsh/EasyLSHTest.java | 0 code/libraries/geo-ip/build.gradle | 2 + .../nu/marginalia/geoip/GeoIpDictionary.java | 0 .../marginalia/geoip/sources/AsnMapping.java | 0 .../nu/marginalia/geoip/sources/AsnTable.java | 0 .../geoip/sources/IP2LocationMapping.java | 0 .../geoip/sources/IpRangeMapping.java | 0 .../marginalia/geoip/GeoIpDictionaryTest.java | 0 code/libraries/guarded-regex/build.gradle | 2 + .../nu/marginalia/gregex/GuardedRegex.java | 0 .../gregex/GuardedRegexFactory.java | 0 .../language-processing/build.gradle | 2 + .../marginalia/language/WordDictionary.java | 0 .../nu/marginalia/language/WordPatterns.java | 0 .../language/encoding/AsciiFlattener.java | 0 .../language/encoding/UnicodeRanges.java | 0 .../FasttextLanguagePredictionModel.java | 0 .../language/filter/LanguageFilter.java | 0 .../filter/LanguagePredictionModel.java | 0 .../UngaBungaLanguagePredictionModel.java | 0 .../language/model/DocumentLanguageData.java | 0 .../language/model/DocumentSentence.java | 0 .../language/model/WordFrequencyData.java | 0 .../nu/marginalia/language/model/WordRep.java | 0 .../language/model/WordSeparator.java | 0 .../marginalia/language/model/WordSpan.java | 0 .../language/sentence/SentenceExtractor.java | 0 .../SentenceExtractorHtmlTagCleaner.java | 0 .../SentenceExtractorStringUtils.java | 0 .../language/sentence/SentencePreCleaner.java | 0 .../sentence/SentenceSegmentSplitter.java | 0 .../ThreadLocalSentenceExtractorProvider.java | 0 .../main => }/resources/dictionary/en-1000 | 0 .../resources/dictionary/en-stopwords | 0 .../main => }/resources/dictionary/en-words | 0 .../main => }/resources/dictionary/latin-1000 | 0 .../main => }/resources/dictionary/swe-1000 | 0 .../resources/dictionary/word-frequency | 0 .../html/jep.html | 0 .../html/spam.html | 0 .../language/encoding/AsciiFlattenerTest.java | 0 .../SentenceExtractorHtmlTagCleanerTest.java | 0 .../language/filter/LanguageFilterTest.java | 0 .../language/filter/TestLanguageModels.java | 0 .../sentence/SentenceExtractorTest.java | 0 code/libraries/message-queue/build.gradle | 2 + .../marginalia/actor/ActorStateMachine.java | 0 .../nu/marginalia/actor/ExpectedMessage.java | 0 .../actor/prototype/ActorPrototype.java | 0 .../actor/prototype/RecordActorPrototype.java | 0 .../state/ActorControlFlowException.java | 0 .../actor/state/ActorResumeBehavior.java | 0 .../actor/state/ActorStateInstance.java | 0 .../actor/state/ActorStateTransition.java | 0 .../nu/marginalia/actor/state/ActorStep.java | 0 .../nu/marginalia/actor/state/Resume.java | 0 .../nu/marginalia/actor/state/Terminal.java | 0 .../nu/marginalia/mq/MessageQueueFactory.java | 0 .../java/nu/marginalia/mq/MqException.java | 0 .../java/nu/marginalia/mq/MqMessage.java | 0 .../java/nu/marginalia/mq/MqMessageState.java | 0 .../mq/inbox/MqAsynchronousInbox.java | 0 .../nu/marginalia/mq/inbox/MqInboxIf.java | 0 .../marginalia/mq/inbox/MqInboxResponse.java | 0 .../marginalia/mq/inbox/MqInboxShredder.java | 0 .../mq/inbox/MqSingleShotInbox.java | 0 .../marginalia/mq/inbox/MqSubscription.java | 0 .../mq/inbox/MqSynchronousInbox.java | 0 .../nu/marginalia/mq/outbox/MqOutbox.java | 0 .../persistence/MqMessageHandlerRegistry.java | 0 .../mq/persistence/MqPersistence.java | 0 .../actor/ActorRecordMachineTest.java | 0 .../nu/marginalia/mq/MqMessageRow.java | 0 .../nu/marginalia/mq/MqTestUtil.java | 0 .../nu/marginalia/mq/outbox/MqOutboxTest.java | 0 .../mq/persistence/MqPersistenceTest.java | 0 code/libraries/next-prime/build.gradle | 2 + .../nu/marginalia/util/NextPrimeUtil.java | 0 .../nu/marginalia/util/NextPrimeUtilTest.java | 0 .../random-write-funnel/build.gradle | 2 + .../marginalia/rwf/RandomFileAssembler.java | 0 .../nu/marginalia/rwf/RandomWriteFunnel.java | 0 .../rwf/RandomFileAssemblerTest.java | 0 .../marginalia/rwf/RandomWriteFunnelTest.java | 0 .../term-frequency-dict/build.gradle | 2 + .../TermFrequencyDict.java | 0 code/libraries/test-helpers/build.gradle | 2 + .../marginalia/test/TestMigrationLoader.java | 0 code/process-models/crawl-spec/build.gradle | 2 + .../crawlspec/CrawlSpecFileNames.java | 0 .../crawlspec/CrawlSpecGenerator.java | 0 .../CrawlSpecRecordParquetFileReader.java | 0 .../CrawlSpecRecordParquetFileWriter.java | 0 .../model/crawlspec/CrawlSpecRecord.java | 0 .../crawling-model/build.gradle | 2 + .../crawling/body/ContentTypeLogic.java | 0 .../crawling/body/DocumentBodyExtractor.java | 0 .../crawling/body/DocumentBodyResult.java | 0 .../crawling/body/HttpFetchResult.java | 0 .../crawling/io/CrawledDomainReader.java | 0 .../crawling/io/CrawledDomainWriter.java | 0 .../crawling/io/CrawlerOutputFile.java | 0 .../io/SerializableCrawlDataStream.java | 0 ...ibleLegacySerializableCrawlDataStream.java | 0 ...FastLegacySerializableCrawlDataStream.java | 0 .../ParquetSerializableCrawlDataStream.java | 0 .../crawling/model/CrawledDocument.java | 0 .../crawling/model/CrawledDomain.java | 0 .../crawling/model/CrawlerDocumentStatus.java | 0 .../crawling/model/CrawlerDomainStatus.java | 0 .../crawling/model/SerializableCrawlData.java | 0 .../parquet/CrawledDocumentParquetRecord.java | 0 ...rawledDocumentParquetRecordFileReader.java | 0 ...rawledDocumentParquetRecordFileWriter.java | 0 .../jwarc/WarcXCookieInformationHeader.java | 0 .../netpreserve/jwarc/WarcXEntityRefused.java | 0 .../jwarc/WarcXResponseReference.java | 0 .../{src/main => }/java/plan/CrawlPlan.java | 0 .../main => }/java/plan/CrawlPlanLoader.java | 0 .../crawling/model/CrawledDocumentTest.java | 0 ...edDocumentParquetRecordFileWriterTest.java | 0 .../processed-data/build.gradle | 2 + .../DocumentRecordParquetFileReader.java | 0 .../DocumentRecordParquetFileWriter.java | 0 .../DomainLinkRecordParquetFileReader.java | 0 .../DomainLinkRecordParquetFileWriter.java | 0 .../DomainRecordParquetFileReader.java | 0 .../DomainRecordParquetFileWriter.java | 0 .../io/processed/ProcessedDataFileNames.java | 0 .../model/processed/DocumentRecord.java | 0 .../DocumentRecordKeywordsProjection.java | 0 .../DocumentRecordMetadataProjection.java | 0 .../model/processed/DomainLinkRecord.java | 0 .../model/processed/DomainRecord.java | 0 .../model/processed/DomainWithIp.java | 0 .../DocumentRecordParquetFileReaderTest.java | 0 ...DomainLinkRecordParquetFileReaderTest.java | 0 .../DomainRecordParquetFileReaderTest.java | 0 code/process-models/work-log/build.gradle | 2 + .../marginalia/worklog/BatchingWorkLog.java | 0 .../worklog/BatchingWorkLogImpl.java | 0 .../worklog/BatchingWorkLogInspector.java | 0 .../worklog/BatchingWorkLogImplTest.java | 0 code/process-mqapi/build.gradle | 2 + .../marginalia/mqapi/ProcessInboxNames.java | 0 .../mqapi/converting/ConvertAction.java | 0 .../mqapi/converting/ConvertRequest.java | 0 .../mqapi/crawling/CrawlRequest.java | 0 .../mqapi/index/CreateIndexRequest.java | 0 .../nu/marginalia/mqapi/index/IndexName.java | 0 .../marginalia/mqapi/loading/LoadRequest.java | 0 .../processes/converting-process/build.gradle | 2 + .../marginalia/converting/ConverterMain.java | 0 .../converting/ConverterModule.java | 0 .../model/DisqualifiedException.java | 0 .../converting/model/GeneratorType.java | 0 .../converting/model/ProcessedDocument.java | 0 .../model/ProcessedDocumentDetails.java | 0 .../converting/model/ProcessedDomain.java | 0 .../converting/processor/AcceptableAds.java | 0 .../processor/ConverterDomainTypes.java | 0 .../converting/processor/DocumentClass.java | 0 .../processor/DocumentDecorator.java | 0 .../processor/DocumentProcessor.java | 0 .../converting/processor/DomainProcessor.java | 0 .../converting/processor/MetaRobotsTag.java | 0 .../converting/processor/SiteWords.java | 0 .../logic/DocumentGeneratorExtractor.java | 0 .../processor/logic/DocumentLengthLogic.java | 0 .../processor/logic/DocumentValuator.java | 0 .../processor/logic/FeatureExtractor.java | 0 .../logic/HtmlStandardExtractor.java | 0 .../logic/LshDocumentDeduplicator.java | 0 .../processor/logic/PlainTextLogic.java | 0 .../processor/logic/TitleExtractor.java | 0 .../processor/logic/dom/DomPruningFilter.java | 0 .../logic/dom/MeasureLengthVisitor.java | 0 .../logic/links/CommonKeywordExtractor.java | 0 .../processor/logic/links/FileLinks.java | 0 .../processor/logic/links/LinkGraph.java | 0 .../processor/logic/links/LinkProcessor.java | 0 .../processor/logic/links/TopKeywords.java | 0 .../AbstractDocumentProcessorPlugin.java | 0 .../plugin/HtmlDocumentProcessorPlugin.java | 0 .../PlainTextDocumentProcessorPlugin.java | 0 .../specialization/BlogSpecialization.java | 0 .../specialization/DefaultSpecialization.java | 0 .../HtmlProcessorSpecializations.java | 0 .../specialization/JavadocSpecialization.java | 0 .../specialization/LemmySpecialization.java | 0 .../MariadbKbSpecialization.java | 0 .../specialization/PhpBBSpecialization.java | 0 .../specialization/WikiSpecialization.java | 0 .../specialization/XenForoSpecialization.java | 0 .../converting/sideload/SideloadSource.java | 0 .../sideload/SideloadSourceFactory.java | 0 .../sideload/SideloaderProcessing.java | 0 .../sideload/dirtree/DirtreeSideloadSpec.java | 0 .../dirtree/DirtreeSideloadSpecList.java | 0 .../sideload/dirtree/DirtreeSideloader.java | 0 .../dirtree/DirtreeSideloaderFactory.java | 0 .../EncyclopediaMarginaliaNuSideloader.java | 0 .../sideload/reddit/RedditSideloader.java | 0 .../StackexchangeSideloader.java | 0 .../sideload/warc/WarcSideloader.java | 0 .../marginalia/converting/util/LineUtils.java | 0 .../writer/ConverterBatchWritableIf.java | 0 .../writer/ConverterBatchWriter.java | 0 .../writer/ConverterBatchWriterIf.java | 0 .../converting/writer/ConverterWriter.java | 0 .../memex-marginalia/05-test.gmi | 0 .../memex-marginalia/code/index.gmi | 0 .../memex-marginalia/commons/dialogue.gmi | 0 .../commons/search-failure-modes.gmi | 0 .../commons/self-interest.gmi | 0 .../memex-marginalia/dead.gmi | 0 .../debian-laptop-install-log.gmi | 0 .../memex-marginalia/debian-laptop.gmi | 0 .../memex-marginalia/feed.gmi | 0 .../memex-marginalia/fragments-old-web.gmi | 0 .../memex-marginalia/good-video-games.gmi | 0 .../memex-marginalia/guestbook/footer.gmi | 0 .../memex-marginalia/guestbook/header.gmi | 0 .../memex-marginalia/guestbook/index.gmi | 0 .../memex-marginalia/index | 0 .../memex-marginalia/index.gmi | 0 .../memex-marginalia/junk/DedupTest.gmi | 0 .../memex-marginalia/junk/bssl.gmi | 0 .../junk/eldritch-oneliner.gmi | 0 .../memex-marginalia/junk/server.gmi | 0 .../junk/very-old-code.cc.gmi | 0 .../memex-marginalia/links/aggregators.gmi | 0 .../memex-marginalia/links/articles.gmi | 0 .../memex-marginalia/links/bookmarks.gmi | 0 .../links/fragments-old-web.gmi | 0 .../memex-marginalia/links/index.gmi | 0 .../memex-marginalia/links/linkpocalypse.gmi | 0 .../memex-marginalia/log/00-linkpocalypse.gmi | 0 .../memex-marginalia/log/01-astrolabe.gmi | 0 .../memex-marginalia/log/02-re-tests.gmi | 0 .../log/03-writing-for-reading.gmi | 0 .../memex-marginalia/log/04-link-farms.gmi | 0 .../memex-marginalia/log/05-minds-field.gmi | 0 .../memex-marginalia/log/06-optimization.gmi | 0 .../log/07-local-backlinks.gmi | 0 .../log/08-whatever-happened-to-the-memex.gmi | 0 .../log/09-system-upgrade.gmi | 0 .../log/10-astrolabe-2-sampling-bias.gmi | 0 .../log/11-dying-every-day.gmi | 0 .../memex-marginalia/log/12-bye-bye-gmail.gmi | 0 .../memex-marginalia/log/13-static-html.gmi | 0 .../memex-marginalia/log/13-test.gmi | 0 .../log/14-enter-the-circle-of-blame.gmi | 0 .../log/15-stages-of-being.gmi | 0 .../log/16-cursed-motivation.gmi | 0 .../log/17-git-isnt-a-web-service.gmi | 0 .../memex-marginalia/log/18-soaring-high.gmi | 0 .../log/19-website-discoverability-crisis.gmi | 0 .../log/20-dot-com-link-farms.gmi | 0 .../log/21-new-solutions-old-problems.gmi | 0 .../log/22-against-the-flood.gmi | 0 .../log/23-re-software-and-branding.gmi | 0 .../memex-marginalia/log/24-silly-hats.gmi | 0 .../log/25-october-update.gmi | 0 .../log/26-personalized-pagerank.gmi | 0 .../log/27-getting-with-the-times.gmi | 0 .../memex-marginalia/log/28-web-browsing.gmi | 0 .../memex-marginalia/log/29-botnet-ddos.gmi | 0 .../log/30-unintuitive-optimization.gmi | 0 .../memex-marginalia/log/31-ngram-needles.gmi | 0 .../log/32-bot-apologetics.gmi | 0 .../memex-marginalia/log/33-rude-guests.gmi | 0 .../log/34-internet-arguments.gmi | 0 .../log/35-keeping-gemini-difficult.gmi | 0 .../36-localized-programming-languages.gmi | 0 .../log/37-keyword-extraction.gmi | 0 .../memex-marginalia/log/38-old-and-new.gmi | 0 .../log/39-normie-hypothesis.gmi | 0 .../log/40-wasted-resources.gmi | 0 .../log/41-search-result-relevance.gmi | 0 .../memex-marginalia/log/42-dark.gmi | 0 .../memex-marginalia/log/43-pseodonymous.gmi | 0 .../log/44-discovery-and-design.gmi | 0 .../45-unfuck-internet-discoverability.gmi | 0 .../log/46-anatomy-of-search-engine-spam.gmi | 0 .../memex-marginalia/log/47-drive-failure.gmi | 0 .../log/48-i-have-no-capslock.gmi | 0 .../log/49-marginalia-1-year.gmi | 0 .../50-meditation-on-software-correctness.gmi | 0 .../log/51-the-file-startup.gmi | 0 .../memex-marginalia/log/52-growing-pains.gmi | 0 .../log/53-better-hard-drive-metaphor.gmi | 0 .../log/54-bargain-bin-btree.gmi | 0 .../log/55-lexicon-rubberduck.gmi | 0 .../log/56-uncertain-future.gmi | 0 .../57-dont-know-how-to-build-software.gmi | 0 .../log/58-marginalia-open-source.gmi | 0 .../memex-marginalia/log/59-anchor-text.gmi | 0 .../log/60-prescriptive-descriptions.gmi | 0 .../log/61-botspam-apocalypse.gmi | 0 .../log/62-marginaliacoin.gmi | 0 .../log/63-marginalia-crawler.gmi | 0 .../log/64-hundred-million.gmi | 0 .../log/65-scaling-doesnt-scale.gmi | 0 .../memex-marginalia/log/66-carbon-dating.gmi | 0 .../log/67-best-ideas-afk.gmi | 0 .../log/68-wizards-vs-sorcerers.gmi | 0 .../log/69-creepy-website-similarity.gmi | 0 .../log/70-faster-index-joins.gmi | 0 .../memex-marginalia/log/71-memex-design.gmi | 0 .../memex-marginalia/log/72-are-you-ok.gmi | 0 .../log/72-new-approach-to-ranking.gmi | 0 .../log/73-new-approach-to-ranking.gmi | 0 .../log/74-marginalia-2-years.gmi | 0 .../log/bargain-bin-btree.gmi | 0 .../memex-marginalia/log/index.gmi | 0 .../memex-marginalia/log/soaring-high.gmi | 0 .../memex-marginalia/log/todo.gmi | 0 .../memex-marginalia/one-weird-trick.gmi | 0 .../memex-marginalia/pics/index.gmi | 0 .../memex-marginalia/pics/links/index.gmi | 0 .../pics/raster-test/index.gmi | 0 .../memex-marginalia/projects/edge.gmi | 0 .../memex-marginalia/projects/edge/about.gmi | 0 .../memex-marginalia/projects/edge/api.gmi | 0 .../projects/edge/changelog.gmi | 0 .../projects/edge/design-notes.gmi | 0 .../memex-marginalia/projects/edge/faq.gmi | 0 .../projects/edge/for-webmasters.gmi | 0 .../memex-marginalia/projects/edge/index.gmi | 0 .../projects/edge/privacy.gmi | 0 .../projects/edge/search-tips.gmi | 0 .../projects/edge/supporting.gmi | 0 .../memex-marginalia/projects/edge/top-20.gmi | 0 .../projects/encyclopedia/index.gmi | 0 .../projects/gemini-server.gmi | 0 .../memex-marginalia/projects/index.gmi | 0 .../memex-marginalia/projects/memex.gmi | 0 .../memex-marginalia/projects/wmsa.gmi | 0 .../memex-marginalia/readme.md | 0 .../memex-marginalia/recipes/chicken-soup.gmi | 0 .../recipes/french-borscht.gmi | 0 .../memex-marginalia/recipes/index.gmi | 0 .../recipes/omelette-bacon.gmi | 0 .../memex-marginalia/search-about.gmi | 0 .../memex-marginalia/server.gmi | 0 .../memex-marginalia/special/index.gmi | 0 .../memex-marginalia/special/redirect.gmi | 0 .../memex-marginalia/special/tombstone.gmi | 0 .../memex-marginalia/test.gmi | 0 .../memex-marginalia/todo.gmi | 0 .../memex-marginalia/todo/done.gmi | 0 .../memex-marginalia/todo/index.gmi | 0 .../memex-marginalia/todo/todo.gmi | 0 .../memex-marginalia/topic/astrolabe.gmi | 0 .../memex-marginalia/topic/cooking.gmi | 0 .../memex-marginalia/topic/index.gmi | 0 .../topic/moral-philosophy.gmi | 0 .../memex-marginalia/topic/nlnet.gmi | 0 .../memex-marginalia/topic/platforms.gmi | 0 .../memex-marginalia/topic/programming.gmi | 0 .../memex-marginalia/topic/satire.gmi | 0 .../memex-marginalia/topic/server.gmi | 0 .../memex-marginalia/topic/web-design.gmi | 0 .../memex-marginalia/topics.gmi | 0 .../memex-marginalia/worklog.gmi | 0 .../memex-marginalia/writing-topics.gmi | 0 .../converting/ConvertingIntegrationTest.java | 0 .../ConvertingIntegrationTestModule.java | 0 ...CrawlingThenConvertingIntegrationTest.java | 0 .../converting/logic/PlainTextLogicTest.java | 0 .../processor/logic/MetaRobotsTagTest.java | 0 .../logic/dom/MeasureLengthVisitorTest.java | 0 .../BlogSpecializationTest.java | 0 .../JavadocSpecializationTest.java | 0 .../LemmySpecializationTest.java | 0 .../WikiSpecializationTest.java | 0 .../XenForoSpecializationTest.java | 0 ...ncyclopediaMarginaliaNuSideloaderTest.java | 0 .../sideload/reddit/RedditSideloaderTest.java | 0 .../sideload/warc/WarcSideloaderTest.java | 0 .../converting/util/LineUtilsTest.java | 0 .../converting/util/TestLanguageModels.java | 0 code/processes/crawling-process/build.gradle | 2 + .../nu/marginalia/crawl/AbortMonitor.java | 0 .../java/nu/marginalia/crawl/CrawlerMain.java | 0 .../nu/marginalia/crawl/CrawlerModule.java | 0 .../marginalia/crawl/retreival/Cookies.java | 0 .../crawl/retreival/CrawlDataReference.java | 0 .../crawl/retreival/CrawlDelayTimer.java | 0 .../retreival/CrawledDocumentFactory.java | 0 .../crawl/retreival/CrawlerRetreiver.java | 0 .../retreival/CrawlerWarcResynchronizer.java | 0 .../crawl/retreival/DomainCrawlFrontier.java | 0 .../crawl/retreival/DomainProber.java | 0 .../crawl/retreival/LinkFilterSelector.java | 0 .../crawl/retreival/RateLimitException.java | 0 .../crawl/retreival/fetcher/ContentTags.java | 0 .../retreival/fetcher/ContentTypeProber.java | 0 .../crawl/retreival/fetcher/FetchResult.java | 0 .../retreival/fetcher/FetchResultState.java | 0 .../crawl/retreival/fetcher/HttpFetcher.java | 0 .../retreival/fetcher/HttpFetcherImpl.java | 0 .../retreival/fetcher/SitemapRetriever.java | 0 .../socket/FastTerminatingSocketFactory.java | 0 .../IpInterceptingNetworkInterceptor.java | 0 .../fetcher/socket/NoSecuritySSL.java | 0 .../fetcher/warc/WarcDigestBuilder.java | 0 .../fetcher/warc/WarcInputBuffer.java | 0 .../warc/WarcProtocolReconstructor.java | 0 .../retreival/fetcher/warc/WarcRecorder.java | 0 .../retreival/revisit/CrawlerRevisitor.java | 0 .../revisit/DocumentWithReference.java | 0 .../retreival/sitemap/SitemapFetcher.java | 0 .../crawl/spec/CrawlSpecProvider.java | 0 .../crawl/spec/DbCrawlSpecProvider.java | 0 .../crawl/spec/ParquetCrawlSpecProvider.java | 0 .../crawl/warc/WarcArchiverFactory.java | 0 .../marginalia/crawl/warc/WarcArchiverIf.java | 0 .../main => }/resources/ip-banned-cidr.txt | 0 .../CrawlerWarcResynchronizerTest.java | 0 .../retreival/DomainCrawlFrontierTest.java | 0 .../fetcher/ContentTypeProberTest.java | 0 ...edDocumentParquetRecordFileWriterTest.java | 0 .../retreival/fetcher/WarcRecorderTest.java | 0 .../revisit/DocumentWithReferenceTest.java | 0 .../crawling/CrawlPlanLoaderTest.java | 0 .../crawling/DomainCrawlerRobotsTxtTest.java | 0 .../marginalia/crawling/HttpFetcherTest.java | 0 .../marginalia/crawling/LinkParserTest.java | 0 .../marginalia/crawling/RssCrawlerTest.java | 0 .../retreival/CrawlerMockFetcherTest.java | 0 .../retreival/CrawlerRetreiverTest.java | 0 .../index-constructor-process/build.gradle | 6 ++- .../index/IndexConstructorMain.java | 0 .../index/IndexConstructorModule.java | 0 code/processes/loading-process/build.gradle | 2 + .../loading/LoaderIndexJournalWriter.java | 0 .../marginalia/loading/LoaderInputData.java | 0 .../nu/marginalia/loading/LoaderMain.java | 0 .../nu/marginalia/loading/LoaderModule.java | 0 .../documents/DocumentLoaderService.java | 0 .../documents/KeywordLoaderService.java | 0 .../loading/domains/DomainIdRegistry.java | 0 .../loading/domains/DomainLoaderService.java | 0 .../links/DomainLinksLoaderService.java | 0 .../nu/marginalia/loader/DbTestUtil.java | 0 .../domains/DomainLoaderServiceTest.java | 0 .../loader/LoaderIndexJournalWriterTest.java | 0 code/processes/test-data/build.gradle | 2 + .../nu/marginalia/test/CommonTestData.java | 0 .../mock-crawl-data/discourse/grid.html | 0 .../mock-crawl-data/discourse/index.html | 0 .../mock-crawl-data/discourse/telegram.html | 0 .../mock-crawl-data/javadoc/stream.html | 0 .../mock-crawl-data/lemmy/108995.html | 0 .../mock-crawl-data/lemmy/c_startrek.html | 0 .../mock-crawl-data/lemmy/index.html | 0 .../mock-crawl-data/mediawiki/doom1.html | 0 .../mock-crawl-data/mediawiki/doom2.html | 0 .../mock-crawl-data/mediawiki/index.html | 0 .../mock-crawl-data/xenforo/thread.html | 0 .../build.gradle | 2 + .../adjacencies/AdjacenciesData.java | 0 .../adjacencies/AdjacenciesLoader.java | 0 .../marginalia/adjacencies/DomainAliases.java | 0 .../adjacencies/SparseBitVector.java | 0 .../WebsiteAdjacenciesCalculator.java | 0 .../adjacencies/AdjacenciesLoaderTest.java | 0 .../adjacencies/SparseBitVectorTest.java | 0 .../api-service/build.gradle | 2 + .../java/nu/marginalia/api/ApiMain.java | 0 .../nu/marginalia/api/ApiSearchOperator.java | 0 .../java/nu/marginalia/api/ApiService.java | 0 .../nu/marginalia/api/model/ApiLicense.java | 0 .../marginalia/api/model/ApiSearchResult.java | 0 .../model/ApiSearchResultQueryDetails.java | 0 .../api/model/ApiSearchResults.java | 0 .../nu/marginalia/api/svc/LicenseService.java | 0 .../api/svc/RateLimiterService.java | 0 .../nu/marginalia/api/svc/ResponseCache.java | 0 .../api/svc/LicenseServiceTest.java | 0 .../api/svc/RateLimiterServiceTest.java | 0 .../marginalia/api/svc/ResponseCacheTest.java | 0 .../dating-service/build.gradle | 2 + .../java/nu/marginalia/dating/DatingMain.java | 0 .../nu/marginalia/dating/DatingModule.java | 0 .../nu/marginalia/dating/DatingService.java | 0 .../dating/DatingSessionObject.java | 0 .../resources/static/dating/robots.txt | 0 .../templates/dating/dating-view.hdb | 0 .../explorer-service/build.gradle | 2 + .../nu/marginalia/explorer/ExplorerMain.java | 0 .../marginalia/explorer/ExplorerModule.java | 0 .../marginalia/explorer/ExplorerService.java | 0 .../resources/static/explore/robots.txt | 0 .../resources/static/explore/style.css | 0 .../templates/explorer/explorer-about.hdb | 0 .../templates/explorer/explorer-messages.hdb | 0 .../templates/explorer/explorer-results.hdb | 0 .../templates/explorer/explorer-search.hdb | 0 .../resources/templates/explorer/explorer.hdb | 0 .../search-service/build.gradle | 2 + .../search/SearchHandlebarsConfigurator.java | 0 .../java/nu/marginalia/search/SearchMain.java | 0 .../nu/marginalia/search/SearchModule.java | 0 .../nu/marginalia/search/SearchOperator.java | 0 .../search/SearchQueryParamFactory.java | 0 .../search/SearchResultClusterer.java | 0 .../nu/marginalia/search/SearchService.java | 0 .../search/command/CommandEvaluator.java | 0 .../search/command/SearchAdtechParameter.java | 0 .../command/SearchCommandInterface.java | 0 .../search/command/SearchJsParameter.java | 0 .../search/command/SearchParameters.java | 0 .../search/command/SearchRecentParameter.java | 0 .../search/command/SearchTitleParameter.java | 0 .../search/command/commands/BangCommand.java | 0 .../command/commands/BrowseCommand.java | 0 .../command/commands/ConvertCommand.java | 0 .../command/commands/DefinitionCommand.java | 0 .../command/commands/SearchCommand.java | 0 .../command/commands/SiteRedirectCommand.java | 0 .../search/db/DbNearDomainsQuery.java | 0 .../search/exceptions/RedirectException.java | 0 .../search/model/ClusteredUrlDetails.java | 0 .../search/model/DecoratedSearchResults.java | 0 .../search/model/SearchFilters.java | 0 .../search/model/SearchProfile.java | 0 .../marginalia/search/model/UrlDetails.java | 0 .../search/results/BrowseResultCleaner.java | 0 .../search/results/UrlDeduplicator.java | 0 .../svc/SearchAddToCrawlQueueService.java | 0 .../search/svc/SearchBrowseService.java | 0 .../search/svc/SearchCrosstalkService.java | 0 .../search/svc/SearchErrorPageService.java | 0 .../search/svc/SearchFlagSiteService.java | 0 .../search/svc/SearchFrontPageService.java | 0 .../search/svc/SearchQueryCountService.java | 0 .../search/svc/SearchQueryIndexService.java | 0 .../search/svc/SearchQueryService.java | 0 .../search/svc/SearchSiteInfoService.java | 0 .../svc/SearchUnitConversionService.java | 0 .../resources/static/search/crawler-ips.txt | 0 .../resources/static/search/favicon.ico | Bin .../main => }/resources/static/search/main.js | 0 .../main => }/resources/static/search/menu.js | 0 .../resources/static/search/opensearch.xml | 0 .../resources/static/search/robots.txt | 0 .../main => }/resources/static/search/rss.svg | 0 .../resources/static/search/serp.scss | 0 .../resources/static/search/style-new.css | 0 .../main => }/resources/static/search/tts.js | 0 .../templates/search/browse-result.hdb | 0 .../templates/search/browse-results.hdb | 0 .../templates/search/conversion-results.hdb | 0 .../templates/search/dictionary-results.hdb | 0 .../templates/search/error-page-search.hdb | 0 .../resources/templates/search/error-page.hdb | 0 .../templates/search/index/index-about.hdb | 0 .../templates/search/index/index-news.hdb | 0 .../templates/search/index/index-tips.hdb | 0 .../templates/search/index/index.hdb | 0 .../templates/search/parts/search-filters.hdb | 0 .../templates/search/parts/search-footer.hdb | 0 .../templates/search/parts/search-form.hdb | 0 .../templates/search/parts/search-header.hdb | 0 .../search/parts/search-result-rest.hdb | 0 .../templates/search/parts/search-result.hdb | 0 .../templates/search/search-results.hdb | 0 .../search/site-info/site-crosstalk.hdb | 0 .../search/site-info/site-info-feed.hdb | 0 .../site-info/site-info-index-blacklisted.hdb | 0 .../site-info/site-info-index-indexed.hdb | 0 .../site-info/site-info-index-suggest.hdb | 0 .../site-info/site-info-index-unknown.hdb | 0 .../search/site-info/site-info-index.hdb | 0 .../search/site-info/site-info-links.hdb | 0 .../search/site-info/site-info-report.hdb | 0 .../search/site-info/site-info-summary.hdb | 0 .../templates/search/site-info/site-info.hdb | 0 .../command/commands/BangCommandTest.java | 0 .../marginalia/util/TestLanguageModels.java | 0 .../assistant-service/build.gradle | 2 + .../marginalia/assistant/AssistantMain.java | 0 .../marginalia/assistant/AssistantModule.java | 0 .../assistant/AssistantService.java | 0 .../assistant/suggest/Suggestions.java | 0 .../control-service/build.gradle | 2 + .../ControlHandlebarsConfigurator.java | 0 .../nu/marginalia/control/ControlMain.java | 0 .../control/ControlProcessModule.java | 0 .../control/ControlRendererFactory.java | 0 .../nu/marginalia/control/ControlService.java | 0 .../control/ControlValidationError.java | 0 .../marginalia/control/RedirectControl.java | 0 .../java/nu/marginalia/control/Redirects.java | 0 .../control/actor/ControlActor.java | 0 .../control/actor/ControlActorService.java | 0 .../control/actor/PrecessionNodes.java | 0 .../monitor/MessageQueueMonitorActor.java | 0 .../monitor/ServiceHeartbeatMonitorActor.java | 0 .../actor/precession/RecrawlAllActor.java | 0 .../actor/precession/ReindexAllActor.java | 0 .../actor/precession/ReprocessAllActor.java | 0 .../actor/rebalance/RebalanceActor.java | 0 .../control/app/model/ApiKeyModel.java | 0 .../app/model/BlacklistedDomainModel.java | 0 .../app/model/DomainComplaintCategory.java | 0 .../app/model/DomainComplaintModel.java | 0 .../control/app/svc/ApiKeyService.java | 0 .../app/svc/ControlBlacklistService.java | 0 .../app/svc/DomainComplaintService.java | 0 .../app/svc/RandomExplorationService.java | 0 .../control/app/svc/SearchToBanService.java | 0 .../model/FileStorageBaseWithStorage.java | 0 .../node/model/FileStorageFileModel.java | 0 .../node/model/FileStorageWithActions.java | 0 .../model/FileStorageWithRelatedEntries.java | 0 .../control/node/model/IndexNodeStatus.java | 0 .../node/svc/ControlFileStorageService.java | 0 .../node/svc/ControlNodeActionsService.java | 0 .../control/node/svc/ControlNodeService.java | 0 .../control/sys/model/AbortedProcess.java | 0 .../control/sys/model/EventLogEntry.java | 0 .../sys/model/EventLogServiceFilter.java | 0 .../control/sys/model/EventLogTypeFilter.java | 0 .../control/sys/model/MessageQueueEntry.java | 0 .../control/sys/model/ProcessHeartbeat.java | 0 .../control/sys/model/ServiceHeartbeat.java | 0 .../control/sys/model/TaskHeartbeat.java | 0 .../sys/svc/AbortedProcessService.java | 0 .../svc/ControlDomainRankingSetsService.java | 0 .../control/sys/svc/ControlErrorHandler.java | 0 .../sys/svc/ControlSysActionsService.java | 0 .../control/sys/svc/DataSetsService.java | 0 .../control/sys/svc/EventLogService.java | 0 .../control/sys/svc/HeartbeatService.java | 0 .../control/sys/svc/MessageQueueService.java | 0 .../resources/static/control/noanimation.css | 0 .../resources/static/control/refresh.js | 0 .../resources/static/control/tables.css | 0 .../resources/templates/control/actions.hdb | 0 .../templates/control/actor-details.hdb | 0 .../templates/control/app/api-keys.hdb | 0 .../templates/control/app/blacklist.hdb | 0 .../control/app/domain-complaints.hdb | 0 .../control/app/review-random-domains.hdb | 0 .../templates/control/app/search-to-ban.hdb | 0 .../resources/templates/control/error.hdb | 0 .../resources/templates/control/index.hdb | 0 .../actions/partial-download-sample-data.hdb | 0 .../node/actions/partial-export-db-data.hdb | 0 .../partial-export-from-crawl-data.hdb | 0 .../actions/partial-export-sample-data.hdb | 0 .../control/node/actions/partial-load.hdb | 0 .../node/actions/partial-new-crawl-specs.hdb | 0 .../node/actions/partial-new-crawl.hdb | 0 .../control/node/actions/partial-process.hdb | 0 .../control/node/actions/partial-recrawl.hdb | 0 .../node/actions/partial-repartition.hdb | 0 .../node/actions/partial-restore-backup.hdb | 0 .../node/actions/partial-sideload-dirtree.hdb | 0 .../actions/partial-sideload-encyclopedia.hdb | 0 .../node/actions/partial-sideload-reddit.hdb | 0 .../partial-sideload-stackexchange.hdb | 0 .../node/actions/partial-sideload-warc.hdb | 0 .../templates/control/node/node-actions.hdb | 0 .../templates/control/node/node-actors.hdb | 0 .../templates/control/node/node-config.hdb | 0 .../templates/control/node/node-overview.hdb | 0 .../control/node/node-storage-conf.hdb | 0 .../control/node/node-storage-details.hdb | 0 .../control/node/node-storage-list.hdb | 0 .../templates/control/node/nodes-list.hdb | 0 .../control/node/partial-node-nav.hdb | 0 .../control/partials/actor-summary-table.hdb | 0 .../control/partials/actors-table.hdb | 0 .../control/partials/events-table-summary.hdb | 0 .../control/partials/events-table.hdb | 0 .../control/partials/foot-includes.hdb | 0 .../control/partials/head-includes.hdb | 0 .../control/partials/message-queue-table.hdb | 0 .../templates/control/partials/nav.hdb | 0 .../control/partials/nodes-table.hdb | 0 .../control/partials/processes-table.hdb | 0 .../control/partials/services-table.hdb | 0 .../partials/storage-details/files.hdb | 0 .../partials/storage-details/related.hdb | 0 .../control/partials/storage-types.hdb | 0 .../templates/control/redirect-ok.hdb | 0 .../control/sys/aborted-processes.hdb | 0 .../templates/control/sys/data-sets.hdb | 0 .../control/sys/domain-ranking-sets.hdb | 0 .../templates/control/sys/events.hdb | 0 .../templates/control/sys/message-queue.hdb | 0 .../control/sys/new-domain-ranking-set.hdb | 0 .../templates/control/sys/new-message.hdb | 0 .../templates/control/sys/service-by-id.hdb | 0 .../templates/control/sys/sys-actions.hdb | 0 .../control/sys/update-domain-ranking-set.hdb | 0 .../control/sys/update-message-state.hdb | 0 .../templates/control/sys/view-message.hdb | 0 .../control/svc/ApiKeyServiceTest.java | 0 .../control/svc/HeartbeatServiceTest.java | 0 .../executor-service/build.gradle | 2 + .../nu/marginalia/executor/ExecutorMain.java | 0 .../marginalia/executor/ExecutorModule.java | 0 .../nu/marginalia/executor/ExecutorSvc.java | 0 code/services-core/index-service/build.gradle | 2 + .../java/nu/marginalia/index/IndexMain.java | 0 .../java/nu/marginalia/index/IndexModule.java | 0 .../nu/marginalia/index/IndexOpsService.java | 0 .../nu/marginalia/index/IndexService.java | 0 code/services-core/query-service/build.gradle | 2 + .../marginalia/query/QueryBasicInterface.java | 0 .../java/nu/marginalia/query/QueryMain.java | 0 .../java/nu/marginalia/query/QueryModule.java | 0 .../nu/marginalia/query/QueryService.java | 0 .../resources/static/public/index.html | 0 .../main => }/resources/templates/search.hdb | 0 code/tools/crawl-data-unfcker/build.gradle | 2 + .../nu/marginalia/tools/CrawlDataUnfcker.java | 0 code/tools/experiment-runner/build.gradle | 2 + .../java/nu/marginalia/tools/Experiment.java | 0 .../tools/ExperimentRunnerMain.java | 0 .../nu/marginalia/tools/LegacyExperiment.java | 0 .../tools/experiments/AdblockExperiment.java | 0 .../tools/experiments/AtagsExperiment.java | 0 .../experiments/DebugConverterExperiment.java | 0 .../ExportExternalLinksExperiment.java | 0 .../SentenceStatisticsExperiment.java | 0 .../experiments/SiteStatisticsExperiment.java | 0 .../tools/experiments/TestExperiment.java | 0 .../tools/experiments/TopicExperiment.java | 0 code/tools/load-test/build.gradle | 2 + .../nu/marginalia/load_test/LoadTestMain.java | 0 .../screenshot-capture-tool/build.gradle | 2 + .../screenshot/ScreenshotCaptureToolMain.java | 0 .../screenshot/ScreenshotLoaderMain.java | 0 protobuf.gradle | 12 ++++- settings.gradle | 6 +-- srcsets.gradle | 51 ++++++++++++++++++ .../encyclopedia-marginalia-nu/build.gradle | 7 +++ .../encyclopedia/EncyclopediaConverter.java | 51 ++++++++---------- 1555 files changed, 261 insertions(+), 93 deletions(-) rename code/common/config/{src/main => }/java/nu/marginalia/IndexLocations.java (100%) rename code/common/config/{src/main => }/java/nu/marginalia/LanguageModels.java (100%) rename code/common/config/{src/main => }/java/nu/marginalia/UserAgent.java (100%) rename code/common/config/{src/main => }/java/nu/marginalia/WebsiteUrl.java (100%) rename code/common/config/{src/main => }/java/nu/marginalia/WmsaHome.java (100%) rename code/common/config/{src/main => }/java/nu/marginalia/nodecfg/NodeConfigurationService.java (100%) rename code/common/config/{src/main => }/java/nu/marginalia/nodecfg/model/NodeConfiguration.java (100%) rename code/common/config/{src/main => }/java/nu/marginalia/storage/FileStorageManifest.java (100%) rename code/common/config/{src/main => }/java/nu/marginalia/storage/FileStorageService.java (100%) rename code/common/config/{src/main => }/java/nu/marginalia/storage/model/FileStorage.java (100%) rename code/common/config/{src/main => }/java/nu/marginalia/storage/model/FileStorageBase.java (100%) rename code/common/config/{src/main => }/java/nu/marginalia/storage/model/FileStorageBaseId.java (100%) rename code/common/config/{src/main => }/java/nu/marginalia/storage/model/FileStorageBaseType.java (100%) rename code/common/config/{src/main => }/java/nu/marginalia/storage/model/FileStorageId.java (100%) rename code/common/config/{src/main => }/java/nu/marginalia/storage/model/FileStorageState.java (100%) rename code/common/config/{src/main => }/java/nu/marginalia/storage/model/FileStorageType.java (100%) rename code/common/config/{src/test/java => test}/nu/marginalia/nodecfg/NodeConfigurationServiceTest.java (100%) rename code/common/config/{src/test/java => test}/nu/marginalia/storage/FileStorageServiceTest.java (100%) rename code/common/db/{src/main => }/java/nu/marginalia/db/DbDomainQueries.java (100%) rename code/common/db/{src/main => }/java/nu/marginalia/db/DbDomainStatsExportMultitool.java (100%) rename code/common/db/{src/main => }/java/nu/marginalia/db/DomainBlacklist.java (100%) rename code/common/db/{src/main => }/java/nu/marginalia/db/DomainBlacklistImpl.java (100%) rename code/common/db/{src/main => }/java/nu/marginalia/db/DomainRankingSetsService.java (100%) rename code/common/db/{src/main => }/java/nu/marginalia/db/DomainTypes.java (100%) rename code/common/db/{src/main => }/resources/db/migration/V23_06_0_000__base.sql (100%) rename code/common/db/{src/main => }/resources/db/migration/V23_06_0_001__blacklist.sql (100%) rename code/common/db/{src/main => }/resources/db/migration/V23_06_0_002__dictionary.sql (100%) rename code/common/db/{src/main => }/resources/db/migration/V23_06_0_003__crawl-queue.sql (100%) rename code/common/db/{src/main => }/resources/db/migration/V23_06_0_004__screenshot.sql (100%) rename code/common/db/{src/main => }/resources/db/migration/V23_06_0_005__domain_complaint.sql (100%) rename code/common/db/{src/main => }/resources/db/migration/V23_06_0_006__api_key.sql (100%) rename code/common/db/{src/main => }/resources/db/migration/V23_06_0_007__neighbors.sql (100%) rename code/common/db/{src/main => }/resources/db/migration/V23_06_0_008__random_domains.sql (100%) rename code/common/db/{src/main => }/resources/db/migration/V23_06_0_009__news_feed.sql (100%) rename code/common/db/{src/main => }/resources/db/migration/V23_07_0_001__domain_type.sql (100%) rename code/common/db/{src/main => }/resources/db/migration/V23_07_0_002__service_status.sql (100%) rename code/common/db/{src/main => }/resources/db/migration/V23_07_0_003__message_queue.sql (100%) rename code/common/db/{src/main => }/resources/db/migration/V23_07_0_004__file_storage.sql (100%) rename code/common/db/{src/main => }/resources/db/migration/V23_07_0_005__file_storage_default_values.sql (100%) rename code/common/db/{src/main => }/resources/db/migration/V23_07_0_006__message_queue_default_jobs.sql (100%) rename code/common/db/{src/main => }/resources/db/migration/V23_07_0_007__task_status.sql (100%) rename code/common/db/{src/main => }/resources/db/migration/V23_07_0_008__events_index.sql (100%) rename code/common/db/{src/main => }/resources/db/migration/V23_09_0_000__filestorage_livedb.sql (100%) rename code/common/db/{src/main => }/resources/db/migration/V23_09_1_000__drop_ecurl.sql (100%) rename code/common/db/{src/main => }/resources/db/migration/V23_09_2_000__filestorage_backup.sql (100%) rename code/common/db/{src/main => }/resources/db/migration/V23_09_2_001__filestorage_no_lexicon.sql (100%) rename code/common/db/{src/main => }/resources/db/migration/V23_11_0_000__file_storage_node.sql (100%) rename code/common/db/{src/main => }/resources/db/migration/V23_11_0_001__heartbeat_node.sql (100%) rename code/common/db/{src/main => }/resources/db/migration/V23_11_0_002__file_storage_state.sql (100%) rename code/common/db/{src/main => }/resources/db/migration/V23_11_0_003__node_configuration.sql (100%) rename code/common/db/{src/main => }/resources/db/migration/V23_11_0_004__file_storage_base_type.sql (100%) rename code/common/db/{src/main => }/resources/db/migration/V23_11_0_005__clean_message_queue.sql (100%) rename code/common/db/{src/main => }/resources/db/migration/V23_11_0_006__clean_stores.sql (100%) rename code/common/db/{src/main => }/resources/db/migration/V23_11_0_007__domain_node_affinity.sql (100%) rename code/common/db/{src/main => }/resources/db/migration/V23_11_0_008__purge_procedure.sql (100%) rename code/common/db/{src/main => }/resources/db/migration/V24_01_0_001__node_config__keep_warc.sql (100%) rename code/common/db/{src/main => }/resources/db/migration/V24_01_0_002__domain_set.sql (100%) rename code/common/db/{src/main => }/resources/db/migration/V24_01_0_003__mqaudit.sql (100%) rename code/common/db/{src/main => }/resources/db/migration/V24_02_0_000__drop_domain_links.sql (100%) rename code/common/db/{src/main => }/resources/db/migration/V24_02_0_001__drop_ranking_set_algo.sql (100%) rename code/common/db/{src/test/java => test}/nu/marginalia/db/DomainRankingSetsServiceTest.java (100%) rename code/common/db/{src/test/java => test}/nu/marginalia/db/DomainTypesTest.java (100%) rename code/common/linkdb/{src/main => }/java/nu/marginalia/linkdb/LinkdbFileNames.java (100%) rename code/common/linkdb/{src/main => }/java/nu/marginalia/linkdb/dlinks/DelayingDomainLinkDb.java (100%) rename code/common/linkdb/{src/main => }/java/nu/marginalia/linkdb/dlinks/DomainLinkDb.java (100%) rename code/common/linkdb/{src/main => }/java/nu/marginalia/linkdb/dlinks/DomainLinkDbLoader.java (100%) rename code/common/linkdb/{src/main => }/java/nu/marginalia/linkdb/dlinks/DomainLinkDbWriter.java (100%) rename code/common/linkdb/{src/main => }/java/nu/marginalia/linkdb/dlinks/FileDomainLinkDb.java (100%) rename code/common/linkdb/{src/main => }/java/nu/marginalia/linkdb/docs/DocumentDbReader.java (100%) rename code/common/linkdb/{src/main => }/java/nu/marginalia/linkdb/docs/DocumentDbWriter.java (100%) rename code/common/linkdb/{src/main => }/java/nu/marginalia/linkdb/model/DocdbUrlDetail.java (100%) rename code/common/linkdb/{src/main => }/resources/db/docdb-document.sql (100%) rename code/common/linkdb/{src/test/java => test}/nu/marginalia/linkdb/DocumentDbWriterTest.java (100%) rename code/common/linkdb/{src/test/java => test}/nu/marginalia/linkdb/DomainLinkDbTest.java (100%) rename code/common/model/{src/main => }/java/nu/marginalia/model/EdgeDomain.java (100%) rename code/common/model/{src/main => }/java/nu/marginalia/model/EdgeUrl.java (100%) rename code/common/model/{src/main => }/java/nu/marginalia/model/crawl/DomainIndexingState.java (100%) rename code/common/model/{src/main => }/java/nu/marginalia/model/crawl/HtmlFeature.java (100%) rename code/common/model/{src/main => }/java/nu/marginalia/model/crawl/PubDate.java (100%) rename code/common/model/{src/main => }/java/nu/marginalia/model/crawl/UrlIndexingState.java (100%) rename code/common/model/{src/main => }/java/nu/marginalia/model/gson/GsonFactory.java (100%) rename code/common/model/{src/main => }/java/nu/marginalia/model/html/HtmlStandard.java (100%) rename code/common/model/{src/main => }/java/nu/marginalia/model/id/UrlIdCodec.java (100%) rename code/common/model/{src/main => }/java/nu/marginalia/model/idx/DocumentFlags.java (100%) rename code/common/model/{src/main => }/java/nu/marginalia/model/idx/DocumentMetadata.java (100%) rename code/common/model/{src/main => }/java/nu/marginalia/model/idx/WordFlags.java (100%) rename code/common/model/{src/main => }/java/nu/marginalia/model/idx/WordMetadata.java (100%) rename code/common/model/{src/main => }/java/nu/marginalia/util/QueryParams.java (100%) rename code/common/model/{src/main => }/java/nu/marginalia/util/StringPool.java (100%) rename code/common/model/{src/test/java => test}/nu/marginalia/model/DocumentMetadataTest.java (100%) rename code/common/model/{src/test/java => test}/nu/marginalia/model/EdgeDomainTest.java (100%) rename code/common/model/{src/test/java => test}/nu/marginalia/model/EdgeUrlTest.java (100%) rename code/common/model/{src/test/java => test}/nu/marginalia/model/WordMetadataTest.java (100%) rename code/common/model/{src/test/java => test}/nu/marginalia/model/id/UrlIdCodecTest.java (100%) rename code/common/process/{src/main => }/java/nu/marginalia/ProcessConfiguration.java (100%) rename code/common/process/{src/main => }/java/nu/marginalia/ProcessConfigurationModule.java (100%) rename code/common/process/{src/main => }/java/nu/marginalia/process/control/FakeProcessHeartbeat.java (100%) rename code/common/process/{src/main => }/java/nu/marginalia/process/control/ProcessAdHocTaskHeartbeat.java (100%) rename code/common/process/{src/main => }/java/nu/marginalia/process/control/ProcessAdHocTaskHeartbeatImpl.java (100%) rename code/common/process/{src/main => }/java/nu/marginalia/process/control/ProcessHeartbeat.java (100%) rename code/common/process/{src/main => }/java/nu/marginalia/process/control/ProcessHeartbeatImpl.java (100%) rename code/common/process/{src/main => }/java/nu/marginalia/process/control/ProcessTaskHeartbeat.java (100%) rename code/common/process/{src/main => }/java/nu/marginalia/process/control/ProcessTaskHeartbeatImpl.java (100%) rename code/common/process/{src/main => }/java/nu/marginalia/process/log/WorkLoadIterable.java (100%) rename code/common/process/{src/main => }/java/nu/marginalia/process/log/WorkLog.java (100%) rename code/common/process/{src/main => }/java/nu/marginalia/process/log/WorkLogEntry.java (100%) rename code/common/process/{src/main => }/resources/log4j2.properties (100%) rename code/common/process/{src/test/java => test}/nu/marginalia/process/log/WorkLogTest.java (100%) rename code/common/renderer/{src/main => }/java/nu/marginalia/renderer/MustacheRenderer.java (100%) rename code/common/renderer/{src/main => }/java/nu/marginalia/renderer/RendererFactory.java (100%) rename code/common/renderer/{src/main => }/java/nu/marginalia/renderer/RenderingException.java (100%) rename code/common/renderer/{src/main => }/java/nu/marginalia/renderer/config/DefaultHandlebarsConfigurator.java (100%) rename code/common/renderer/{src/main => }/java/nu/marginalia/renderer/config/HandlebarsConfigurator.java (100%) rename code/common/service-discovery/{src/main => }/java/nu/marginalia/service/NodeConfigurationWatcher.java (100%) rename code/common/service-discovery/{src/main => }/java/nu/marginalia/service/ServiceDiscoveryModule.java (100%) rename code/common/service-discovery/{src/main => }/java/nu/marginalia/service/ServiceHomeNotConfiguredException.java (100%) rename code/common/service-discovery/{src/main => }/java/nu/marginalia/service/ServiceMonitors.java (100%) rename code/common/service-discovery/{src/main => }/java/nu/marginalia/service/client/GrpcChannelPoolFactory.java (100%) rename code/common/service-discovery/{src/main => }/java/nu/marginalia/service/client/GrpcMultiNodeChannelPool.java (100%) rename code/common/service-discovery/{src/main => }/java/nu/marginalia/service/client/GrpcSingleNodeChannelPool.java (100%) rename code/common/service-discovery/{src/main => }/java/nu/marginalia/service/client/ServiceNotAvailableException.java (100%) rename code/common/service-discovery/{src/main => }/java/nu/marginalia/service/discovery/ServiceRegistryIf.java (100%) rename code/common/service-discovery/{src/main => }/java/nu/marginalia/service/discovery/ZkServiceRegistry.java (100%) rename code/common/service-discovery/{src/main => }/java/nu/marginalia/service/discovery/monitor/ServiceChangeMonitor.java (100%) rename code/common/service-discovery/{src/main => }/java/nu/marginalia/service/discovery/monitor/ServiceMonitorIf.java (100%) rename code/common/service-discovery/{src/main => }/java/nu/marginalia/service/discovery/property/PartitionTraits.java (100%) rename code/common/service-discovery/{src/main => }/java/nu/marginalia/service/discovery/property/ServiceEndpoint.java (100%) rename code/common/service-discovery/{src/main => }/java/nu/marginalia/service/discovery/property/ServiceKey.java (100%) rename code/common/service-discovery/{src/main => }/java/nu/marginalia/service/discovery/property/ServicePartition.java (100%) rename code/common/service-discovery/{src/main => }/java/nu/marginalia/service/id/ServiceId.java (100%) rename code/common/service-discovery/{src/test/java => test}/nu/marginalia/service/discovery/ZkServiceRegistryTest.java (100%) rename code/common/service/{src/main => }/java/nu/marginalia/service/ConfigLoader.java (100%) rename code/common/service/{src/main => }/java/nu/marginalia/service/MainClass.java (100%) rename code/common/service/{src/main => }/java/nu/marginalia/service/ProcessMainClass.java (100%) rename code/common/service/{src/main => }/java/nu/marginalia/service/control/FakeServiceHeartbeat.java (100%) rename code/common/service/{src/main => }/java/nu/marginalia/service/control/ServiceEventLog.java (100%) rename code/common/service/{src/main => }/java/nu/marginalia/service/control/ServiceHeartbeat.java (100%) rename code/common/service/{src/main => }/java/nu/marginalia/service/control/ServiceHeartbeatImpl.java (100%) rename code/common/service/{src/main => }/java/nu/marginalia/service/control/ServiceTaskHeartbeat.java (100%) rename code/common/service/{src/main => }/java/nu/marginalia/service/control/ServiceTaskHeartbeatImpl.java (100%) rename code/common/service/{src/main => }/java/nu/marginalia/service/module/DatabaseModule.java (100%) rename code/common/service/{src/main => }/java/nu/marginalia/service/module/ServiceConfiguration.java (100%) rename code/common/service/{src/main => }/java/nu/marginalia/service/module/ServiceConfigurationModule.java (100%) rename code/common/service/{src/main => }/java/nu/marginalia/service/server/BaseServiceParams.java (100%) rename code/common/service/{src/main => }/java/nu/marginalia/service/server/Initialization.java (100%) rename code/common/service/{src/main => }/java/nu/marginalia/service/server/MetricsServer.java (100%) rename code/common/service/{src/main => }/java/nu/marginalia/service/server/NodeStatusWatcher.java (100%) rename code/common/service/{src/main => }/java/nu/marginalia/service/server/RateLimiter.java (100%) rename code/common/service/{src/main => }/java/nu/marginalia/service/server/Service.java (100%) rename code/common/service/{src/main => }/java/nu/marginalia/service/server/StaticResources.java (100%) rename code/common/service/{src/main => }/java/nu/marginalia/service/server/mq/MqRequest.java (100%) rename code/common/service/{src/main => }/java/nu/marginalia/service/server/mq/ServiceMqSubscription.java (100%) rename code/common/service/{src/main => }/resources/log4j2-prod.xml (100%) rename code/common/service/{src/main => }/resources/log4j2-test.xml (100%) rename code/execution/api/{src/main => }/java/nu/marginalia/executor/client/ExecutorClient.java (100%) rename code/execution/api/{src/main => }/java/nu/marginalia/executor/client/ExecutorCrawlClient.java (100%) rename code/execution/api/{src/main => }/java/nu/marginalia/executor/client/ExecutorExportClient.java (100%) rename code/execution/api/{src/main => }/java/nu/marginalia/executor/client/ExecutorRemoteActorFactory.java (100%) rename code/execution/api/{src/main => }/java/nu/marginalia/executor/client/ExecutorSideloadClient.java (100%) rename code/execution/api/{src/main => }/java/nu/marginalia/executor/model/ActorRunState.java (100%) rename code/execution/api/{src/main => }/java/nu/marginalia/executor/model/ActorRunStates.java (100%) rename code/execution/api/{src/main => }/java/nu/marginalia/executor/storage/FileStorageContent.java (100%) rename code/execution/api/{src/main => }/java/nu/marginalia/executor/storage/FileStorageFile.java (100%) rename code/execution/api/{src/main => }/java/nu/marginalia/executor/upload/UploadDirContents.java (100%) rename code/execution/api/{src/main => }/java/nu/marginalia/executor/upload/UploadDirItem.java (100%) rename code/execution/{src/main => }/java/nu/marginalia/actor/ActorApi.java (100%) rename code/execution/{src/main => }/java/nu/marginalia/actor/ExecutorActor.java (100%) rename code/execution/{src/main => }/java/nu/marginalia/actor/ExecutorActorControlService.java (100%) rename code/execution/{src/main => }/java/nu/marginalia/actor/ExecutorActorStateMachines.java (100%) rename code/execution/{src/main => }/java/nu/marginalia/actor/monitor/AbstractProcessSpawnerActor.java (100%) rename code/execution/{src/main => }/java/nu/marginalia/actor/monitor/FileStorageMonitorActor.java (100%) rename code/execution/{src/main => }/java/nu/marginalia/actor/proc/ConverterMonitorActor.java (100%) rename code/execution/{src/main => }/java/nu/marginalia/actor/proc/CrawlerMonitorActor.java (100%) rename code/execution/{src/main => }/java/nu/marginalia/actor/proc/IndexConstructorMonitorActor.java (100%) rename code/execution/{src/main => }/java/nu/marginalia/actor/proc/LoaderMonitorActor.java (100%) rename code/execution/{src/main => }/java/nu/marginalia/actor/proc/ProcessLivenessMonitorActor.java (100%) rename code/execution/{src/main => }/java/nu/marginalia/actor/task/ActorProcessWatcher.java (100%) rename code/execution/{src/main => }/java/nu/marginalia/actor/task/ConvertActor.java (100%) rename code/execution/{src/main => }/java/nu/marginalia/actor/task/ConvertAndLoadActor.java (100%) rename code/execution/{src/main => }/java/nu/marginalia/actor/task/CrawlActor.java (100%) rename code/execution/{src/main => }/java/nu/marginalia/actor/task/CrawlJobExtractorActor.java (100%) rename code/execution/{src/main => }/java/nu/marginalia/actor/task/DownloadSampleActor.java (100%) rename code/execution/{src/main => }/java/nu/marginalia/actor/task/ExportAtagsActor.java (100%) rename code/execution/{src/main => }/java/nu/marginalia/actor/task/ExportDataActor.java (100%) rename code/execution/{src/main => }/java/nu/marginalia/actor/task/ExportFeedsActor.java (100%) rename code/execution/{src/main => }/java/nu/marginalia/actor/task/ExportSampleDataActor.java (100%) rename code/execution/{src/main => }/java/nu/marginalia/actor/task/ExportTermFreqActor.java (100%) rename code/execution/{src/main => }/java/nu/marginalia/actor/task/RecrawlActor.java (100%) rename code/execution/{src/main => }/java/nu/marginalia/actor/task/RestoreBackupActor.java (100%) rename code/execution/{src/main => }/java/nu/marginalia/actor/task/TriggerAdjacencyCalculationActor.java (100%) rename code/execution/{src/main => }/java/nu/marginalia/execution/ExecutionInit.java (100%) rename code/execution/{src/main => }/java/nu/marginalia/execution/ExecutorCrawlGrpcService.java (100%) rename code/execution/{src/main => }/java/nu/marginalia/execution/ExecutorExportGrpcService.java (100%) rename code/execution/{src/main => }/java/nu/marginalia/execution/ExecutorGrpcService.java (100%) rename code/execution/{src/main => }/java/nu/marginalia/execution/ExecutorSideloadGrpcService.java (100%) rename code/execution/{src/main => }/java/nu/marginalia/process/ProcessOutboxes.java (100%) rename code/execution/{src/main => }/java/nu/marginalia/process/ProcessService.java (100%) rename code/execution/{src/main => }/java/nu/marginalia/sideload/RedditSideloadHelper.java (100%) rename code/execution/{src/main => }/java/nu/marginalia/sideload/SideloadHelper.java (100%) rename code/execution/{src/main => }/java/nu/marginalia/sideload/StackExchangeSideloadHelper.java (100%) rename code/execution/{src/main => }/java/nu/marginalia/svc/BackupService.java (100%) rename code/execution/{src/main => }/java/nu/marginalia/svc/DomainListRefreshService.java (100%) rename code/execution/{src/test/java => test}/nu/marginalia/svc/DomainListRefreshServiceTest.java (100%) rename code/features-convert/adblock/{src/main => }/java/nu/marginalia/adblock/AdblockSimulator.java (100%) rename code/features-convert/adblock/{src/main => }/java/nu/marginalia/adblock/GoogleAnwersSpamDetector.java (100%) rename code/features-convert/anchor-keywords/{src/main => }/java/nu/marginalia/atags/AnchorTextKeywords.java (100%) rename code/features-convert/anchor-keywords/{src/main => }/java/nu/marginalia/atags/model/DomainLinks.java (100%) rename code/features-convert/anchor-keywords/{src/main => }/java/nu/marginalia/atags/model/Link.java (100%) rename code/features-convert/anchor-keywords/{src/main => }/java/nu/marginalia/atags/model/LinkWithText.java (100%) rename code/features-convert/anchor-keywords/{src/main => }/java/nu/marginalia/atags/source/AnchorTagsImpl.java (100%) rename code/features-convert/anchor-keywords/{src/main => }/java/nu/marginalia/atags/source/AnchorTagsSource.java (100%) rename code/features-convert/anchor-keywords/{src/main => }/java/nu/marginalia/atags/source/AnchorTagsSourceFactory.java (100%) rename code/features-convert/anchor-keywords/{src/main => }/resources/atags-stop-list (100%) rename code/features-convert/anchor-keywords/{src/test/java => test}/nu/marginalia/atags/DomainAnchorTagsImplTest.java (100%) rename code/features-convert/anchor-keywords/{src/test/java => test}/nu/marginalia/util/TestLanguageModels.java (100%) rename code/features-convert/data-extractors/{src/main => }/java/nu/marginalia/extractor/AtagExporter.java (100%) rename code/features-convert/data-extractors/{src/main => }/java/nu/marginalia/extractor/ExporterIf.java (100%) rename code/features-convert/data-extractors/{src/main => }/java/nu/marginalia/extractor/FeedExporter.java (100%) rename code/features-convert/data-extractors/{src/main => }/java/nu/marginalia/extractor/SampleDataExporter.java (100%) rename code/features-convert/data-extractors/{src/main => }/java/nu/marginalia/extractor/TermFrequencyExporter.java (100%) rename code/features-convert/keyword-extraction/{src/main => }/java/nu/marginalia/keyword/DocumentKeywordExtractor.java (100%) rename code/features-convert/keyword-extraction/{src/main => }/java/nu/marginalia/keyword/KeywordExtractor.java (100%) rename code/features-convert/keyword-extraction/{src/main => }/java/nu/marginalia/keyword/KeywordMetadata.java (100%) rename code/features-convert/keyword-extraction/{src/main => }/java/nu/marginalia/keyword/WordReps.java (100%) rename code/features-convert/keyword-extraction/{src/main => }/java/nu/marginalia/keyword/extractors/ArtifactKeywords.java (100%) rename code/features-convert/keyword-extraction/{src/main => }/java/nu/marginalia/keyword/extractors/KeywordPositionBitmask.java (100%) rename code/features-convert/keyword-extraction/{src/main => }/java/nu/marginalia/keyword/extractors/NameLikeKeywords.java (100%) rename code/features-convert/keyword-extraction/{src/main => }/java/nu/marginalia/keyword/extractors/SubjectLikeKeywords.java (100%) rename code/features-convert/keyword-extraction/{src/main => }/java/nu/marginalia/keyword/extractors/TitleKeywords.java (100%) rename code/features-convert/keyword-extraction/{src/main => }/java/nu/marginalia/keyword/extractors/UrlKeywords.java (100%) rename code/features-convert/keyword-extraction/{src/main => }/java/nu/marginalia/keyword/extractors/WordsTfIdfCounts.java (100%) rename code/features-convert/keyword-extraction/{src/main => }/java/nu/marginalia/keyword/model/DocumentKeywords.java (100%) rename code/features-convert/keyword-extraction/{src/main => }/java/nu/marginalia/keyword/model/DocumentKeywordsBuilder.java (100%) rename code/features-convert/keyword-extraction/{src/main => }/java/nu/marginalia/keyword/model/DocumentKeywordsPointer.java (100%) rename code/features-convert/keyword-extraction/{src/test/resources => test-resources}/test-data/java.html (100%) rename code/features-convert/keyword-extraction/{src/test/resources => test-resources}/test-data/keyboards.html (100%) rename code/features-convert/keyword-extraction/{src/test/resources => test-resources}/test-data/madonna.html (100%) rename code/features-convert/keyword-extraction/{src/test/resources => test-resources}/test-data/spam.html (100%) rename code/features-convert/keyword-extraction/{src/test/java => test}/nu/marginalia/keyword/DocumentKeywordExtractorTest.java (100%) rename code/features-convert/keyword-extraction/{src/test/java => test}/nu/marginalia/keyword/SentenceExtractorTest.java (100%) rename code/features-convert/keyword-extraction/{src/test/java => test}/nu/marginalia/keyword/extractors/ArtifactKeywordsTest.java (100%) rename code/features-convert/keyword-extraction/{src/test/java => test}/nu/marginalia/keyword/extractors/NameLikeKeywordsTest.java (100%) rename code/features-convert/keyword-extraction/{src/test/java => test}/nu/marginalia/keyword/extractors/SubjectLikeKeywordsTest.java (100%) rename code/features-convert/keyword-extraction/{src/test/java => test}/nu/marginalia/keyword/extractors/TitleKeywordsTest.java (100%) rename code/features-convert/keyword-extraction/{src/test/java => test}/nu/marginalia/keyword/extractors/UrlKeywordsTest.java (100%) rename code/features-convert/keyword-extraction/{src/test/java => test}/nu/marginalia/test/util/TestLanguageModels.java (100%) rename code/features-convert/pubdate/{src/main => }/java/nu/marginalia/pubdate/PubDateEffortLevel.java (100%) rename code/features-convert/pubdate/{src/main => }/java/nu/marginalia/pubdate/PubDateFromHtmlStandard.java (100%) rename code/features-convert/pubdate/{src/main => }/java/nu/marginalia/pubdate/PubDateHeuristic.java (100%) rename code/features-convert/pubdate/{src/main => }/java/nu/marginalia/pubdate/PubDateParser.java (100%) rename code/features-convert/pubdate/{src/main => }/java/nu/marginalia/pubdate/PubDateSniffer.java (100%) rename code/features-convert/pubdate/{src/main => }/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicDOMParsingPass1.java (100%) rename code/features-convert/pubdate/{src/main => }/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicDOMParsingPass2.java (100%) rename code/features-convert/pubdate/{src/main => }/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicGuessFromHtmlStandard.java (100%) rename code/features-convert/pubdate/{src/main => }/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicHtml5AnyTimeTag.java (100%) rename code/features-convert/pubdate/{src/main => }/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicHtml5ArticleDateTag.java (100%) rename code/features-convert/pubdate/{src/main => }/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicHtml5ItempropDateTag.java (100%) rename code/features-convert/pubdate/{src/main => }/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicJSONLD.java (100%) rename code/features-convert/pubdate/{src/main => }/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicLastModified.java (100%) rename code/features-convert/pubdate/{src/main => }/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicMicrodata.java (100%) rename code/features-convert/pubdate/{src/main => }/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicOpenGraph.java (100%) rename code/features-convert/pubdate/{src/main => }/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicRDFaTag.java (100%) rename code/features-convert/pubdate/{src/main => }/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicUrlPatternPass1.java (100%) rename code/features-convert/pubdate/{src/main => }/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicUrlPatternPass2.java (100%) rename code/features-convert/pubdate/{src/test/java => test}/nu/marginalia/pubdate/PubDateSnifferTest.java (100%) rename code/features-convert/pubdate/{src/test/java => test}/nu/marginalia/pubdate/PubDateTest.java (100%) rename code/features-convert/reddit-json/{src/main => }/java/nu/marginalia/integration/reddit/RedditEntryReader.java (100%) rename code/features-convert/reddit-json/{src/main => }/java/nu/marginalia/integration/reddit/db/RedditDb.java (100%) rename code/features-convert/reddit-json/{src/main => }/java/nu/marginalia/integration/reddit/model/ProcessableRedditComment.java (100%) rename code/features-convert/reddit-json/{src/main => }/java/nu/marginalia/integration/reddit/model/ProcessableRedditSubmission.java (100%) rename code/features-convert/reddit-json/{src/main => }/java/nu/marginalia/integration/reddit/model/RawRedditComment.java (100%) rename code/features-convert/reddit-json/{src/main => }/java/nu/marginalia/integration/reddit/model/RawRedditSubmission.java (100%) rename code/features-convert/reddit-json/{src/main => }/resources/db/reddit.sql (100%) rename code/features-convert/reddit-json/{src/test/java => test}/nu/marginalia/integration/reddit/RedditEntryReaderTest.java (100%) rename code/features-convert/reddit-json/{src/test/java => test}/nu/marginalia/integration/reddit/db/RedditDbTest.java (100%) rename code/features-convert/stackexchange-xml/{src/main => }/java/nu/marginalia/integration/stackexchange/model/StackExchangeComment.java (100%) rename code/features-convert/stackexchange-xml/{src/main => }/java/nu/marginalia/integration/stackexchange/model/StackExchangePost.java (100%) rename code/features-convert/stackexchange-xml/{src/main => }/java/nu/marginalia/integration/stackexchange/sqlite/StackExchangePostsDb.java (100%) rename code/features-convert/stackexchange-xml/{src/main => }/java/nu/marginalia/integration/stackexchange/xml/StackExchange7zXmlEventReaderSource.java (100%) rename code/features-convert/stackexchange-xml/{src/main => }/java/nu/marginalia/integration/stackexchange/xml/StackExchangeXmlCommentReader.java (100%) rename code/features-convert/stackexchange-xml/{src/main => }/java/nu/marginalia/integration/stackexchange/xml/StackExchangeXmlIterator.java (100%) rename code/features-convert/stackexchange-xml/{src/main => }/java/nu/marginalia/integration/stackexchange/xml/StackExchangeXmlPostReader.java (100%) rename code/features-convert/stackexchange-xml/{src/main => }/java/nu/marginalia/integration/stackexchange/xml/XmlEventReaderSource.java (100%) rename code/features-convert/stackexchange-xml/{src/main => }/resources/db/stackexchange.sql (100%) rename code/features-convert/stackexchange-xml/{src/test/java => test}/nu/marginalia/integration/stackexchange/xml/StackExchangeXmlCommentReaderTest.java (100%) rename code/features-convert/stackexchange-xml/{src/test/java => test}/nu/marginalia/integration/stackexchange/xml/StackExchangeXmlPostReaderTest.java (100%) rename code/features-convert/stackexchange-xml/{src/test/java => test}/nu/marginalia/integration/stackexchange/xml/StringXmlTestEventReader.java (100%) rename code/features-convert/summary-extraction/{src/main => }/java/nu/marginalia/summary/SummaryExtractor.java (100%) rename code/features-convert/summary-extraction/{src/main => }/java/nu/marginalia/summary/heuristic/DomFilterHeuristic.java (100%) rename code/features-convert/summary-extraction/{src/main => }/java/nu/marginalia/summary/heuristic/FallbackHeuristic.java (100%) rename code/features-convert/summary-extraction/{src/main => }/java/nu/marginalia/summary/heuristic/HeuristicTextUtil.java (100%) rename code/features-convert/summary-extraction/{src/main => }/java/nu/marginalia/summary/heuristic/MetaDescriptionHeuristic.java (100%) rename code/features-convert/summary-extraction/{src/main => }/java/nu/marginalia/summary/heuristic/OpenGraphDescriptionHeuristic.java (100%) rename code/features-convert/summary-extraction/{src/main => }/java/nu/marginalia/summary/heuristic/SummarizingDOMFilter.java (100%) rename code/features-convert/summary-extraction/{src/main => }/java/nu/marginalia/summary/heuristic/SummaryHeuristic.java (100%) rename code/features-convert/summary-extraction/{src/main => }/java/nu/marginalia/summary/heuristic/TagDensityHeuristic.java (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/monadnock.html (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/readme.md (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/summarization/187.shtml (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/summarization/surrey.html (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/summarization/surrey.html.1 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/theregister.html (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/index (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--1021546012 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--1028592943 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--1081293162 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--1105046394 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--1146923296 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--1194694074 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--1207898281 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--1268145073 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--1294876331 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--1314767420 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--1316269786 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--1316766580 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--1319968043 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--1338576987 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--1341909571 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--1369578579 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--1437315645 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--1458954960 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--1475681345 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--1498328446 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--1507779664 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--1540303379 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--154898476 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--1552059399 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--1557688340 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--1584145751 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--1605151204 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--162269247 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--1624294488 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--164108285 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--1645688243 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--1658004609 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--1658558834 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--1698664879 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--169975195 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--1701203332 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--17281998 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--1742070028 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--1745376814 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--1749889035 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--176177364 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--177014197 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--1794527707 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--1797740201 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--1799098579 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--1959637826 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--1971916964 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--1985840368 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--2012610859 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--202178680 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--2043528727 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--2081757477 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--2103982576 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--2111558769 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--213168798 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--232544032 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--253010011 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--274250994 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--332442790 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--353437903 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--364546777 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--379129416 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--399428149 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--425233170 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--434612307 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--439772328 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--458002611 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--506010305 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--546773534 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--551288516 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--602577763 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--611668054 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--634771245 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--639320493 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--643179018 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--663772351 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--670789152 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--6797317 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--700978490 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--708035332 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--804917062 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--819771302 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--840796372 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--841445362 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--862385354 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--879796466 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--89134993 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--905197876 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--920328354 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--952827759 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--964018507 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url--972614909 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-10088520 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-1013281103 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-1019241851 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-1059944953 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-1118681302 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-1179298706 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-1191749784 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-1207094790 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-1213989666 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-1222442301 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-130332455 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-1311055461 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-1391842722 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-1457388763 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-1506356272 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-1511762169 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-1534640058 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-1551513871 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-1567632447 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-1623049502 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-163919330 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-1661398327 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-1724309925 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-1736807128 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-1739031345 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-1755745765 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-1802811100 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-1805364707 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-1832702370 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-1853114311 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-1924872844 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-197772804 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-1984259912 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-1990903988 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-2039310951 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-2040857056 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-2052613093 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-2063899866 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-2115548255 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-2127148436 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-2133781904 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-225690385 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-226401955 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-262970770 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-30106798 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-302167335 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-327999153 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-332568225 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-343223418 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-383103932 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-412929678 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-475213997 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-483403121 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-488667993 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-50815201 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-522685905 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-570714305 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-58733529 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-616518304 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-662169426 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-677278788 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-690486170 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-709693331 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-734531556 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-767530276 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-783154014 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-796905237 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-800099955 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-804101946 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-830664902 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-876060686 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-892584998 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-942458463 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-952036171 (100%) rename code/features-convert/summary-extraction/{src/test/resources => test-resources}/html/work-set/url-968207276 (100%) rename code/features-convert/summary-extraction/{src/test/java => test}/nu/marginalia/summary/SummaryExtractorTest.java (100%) rename code/features-convert/summary-extraction/{src/test/java => test}/nu/marginalia/summary/heuristic/HeuristicTextUtilTest.java (100%) rename code/features-convert/topic-detection/{src/main => }/java/nu/marginalia/topic/RecipeDetector.java (100%) rename code/features-convert/topic-detection/{src/main => }/java/nu/marginalia/topic/TextileCraftDetector.java (100%) rename code/features-convert/topic-detection/{src/main => }/java/nu/marginalia/topic/WoodworkingDetector.java (100%) rename code/features-crawl/content-type/{src/main => }/java/nu/marginalia/contenttype/ContentType.java (100%) rename code/features-crawl/content-type/{src/main => }/java/nu/marginalia/contenttype/ContentTypeParser.java (100%) rename code/features-crawl/content-type/{src/main => }/java/nu/marginalia/contenttype/DocumentBodyToString.java (100%) rename code/features-crawl/content-type/{src/test/java => test}/nu/marginalia/contenttype/ContentTypeParserTest.java (100%) rename code/features-crawl/content-type/{src/test/java => test}/nu/marginalia/contenttype/DocumentBodyToStringTest.java (100%) rename code/features-crawl/crawl-blocklist/{src/main => }/java/nu/marginalia/ip_blocklist/GeoIpBlocklist.java (100%) rename code/features-crawl/crawl-blocklist/{src/main => }/java/nu/marginalia/ip_blocklist/InetAddressCache.java (100%) rename code/features-crawl/crawl-blocklist/{src/main => }/java/nu/marginalia/ip_blocklist/IpBlockList.java (100%) rename code/features-crawl/crawl-blocklist/{src/main => }/java/nu/marginalia/ip_blocklist/UrlBlocklist.java (100%) rename code/features-crawl/crawl-blocklist/{src/test/java => test}/nu/marginalia/ip_blocklist/UrlBlocklistTest.java (100%) rename code/features-crawl/link-parser/{src/main => }/java/nu/marginalia/link_parser/FeedExtractor.java (100%) rename code/features-crawl/link-parser/{src/main => }/java/nu/marginalia/link_parser/LinkParser.java (100%) rename code/features-search/feedlot-client/{src/main => }/java/nu/marginalia/feedlot/FeedlotClient.java (100%) rename code/features-search/feedlot-client/{src/main => }/java/nu/marginalia/feedlot/model/FeedItem.java (100%) rename code/features-search/feedlot-client/{src/main => }/java/nu/marginalia/feedlot/model/FeedItems.java (100%) rename code/features-search/random-websites/{src/main => }/java/nu/marginalia/browse/DbBrowseDomainsRandom.java (100%) rename code/features-search/random-websites/{src/main => }/java/nu/marginalia/browse/DbBrowseDomainsSimilarCosine.java (100%) rename code/features-search/random-websites/{src/main => }/java/nu/marginalia/browse/model/BrowseResult.java (100%) rename code/features-search/random-websites/{src/main => }/java/nu/marginalia/browse/model/BrowseResultSet.java (100%) rename code/features-search/screenshots/{src/main => }/java/nu/marginalia/screenshot/ScreenshotService.java (100%) rename code/functions/domain-info/api/{src/main => }/java/nu/marginalia/api/domains/DomainInfoClient.java (100%) rename code/functions/domain-info/api/{src/main => }/java/nu/marginalia/api/domains/DomainsProtobufCodec.java (100%) rename code/functions/domain-info/api/{src/main => }/java/nu/marginalia/api/domains/model/DomainInformation.java (100%) rename code/functions/domain-info/api/{src/main => }/java/nu/marginalia/api/domains/model/SimilarDomain.java (100%) rename code/functions/domain-info/{src/main => }/java/nu/marginalia/functions/domains/DomainInfoGrpcService.java (100%) rename code/functions/domain-info/{src/main => }/java/nu/marginalia/functions/domains/DomainInformationService.java (100%) rename code/functions/domain-info/{src/main => }/java/nu/marginalia/functions/domains/SimilarDomainsService.java (100%) rename code/functions/domain-links/aggregate/{src/main => }/java/nu/marginalia/functions/domainlinks/AggregateDomainLinksService.java (100%) rename code/functions/domain-links/api/{src/main => }/java/nu/marginalia/api/indexdomainlinks/AggregateDomainLinksClient.java (100%) rename code/functions/domain-links/api/{src/main => }/java/nu/marginalia/api/indexdomainlinks/PartitionDomainLinksClient.java (100%) rename code/functions/domain-links/partition/{src/main => }/java/nu/marginalia/functions/domainlinks/PartitionDomainLinksService.java (100%) rename code/functions/math/api/{src/main => }/java/nu/marginalia/api/math/MathClient.java (100%) rename code/functions/math/api/{src/main => }/java/nu/marginalia/api/math/MathProtobufCodec.java (100%) rename code/functions/math/api/{src/main => }/java/nu/marginalia/api/math/model/DictionaryEntry.java (100%) rename code/functions/math/api/{src/main => }/java/nu/marginalia/api/math/model/DictionaryResponse.java (100%) rename code/functions/math/{src/main => }/java/nu/marginalia/functions/math/MathGrpcService.java (100%) rename code/functions/math/{src/main => }/java/nu/marginalia/functions/math/dict/DictionaryService.java (100%) rename code/functions/math/{src/main => }/java/nu/marginalia/functions/math/dict/SpellChecker.java (100%) rename code/functions/math/{src/main => }/java/nu/marginalia/functions/math/eval/MathParser.java (100%) rename code/functions/math/{src/main => }/java/nu/marginalia/functions/math/eval/Unit.java (100%) rename code/functions/math/{src/main => }/java/nu/marginalia/functions/math/eval/Units.java (100%) rename code/functions/math/{src/main => }/resources/units.csv (100%) rename code/functions/math/{src/test/java => test}/nu/marginalia/functions/math/eval/MathParserTest.java (100%) rename code/functions/math/{src/test/java => test}/nu/marginalia/functions/math/eval/UnitsTest.java (100%) rename code/functions/search-query/api/{src/main => }/java/nu/marginalia/api/searchquery/IndexProtobufCodec.java (100%) rename code/functions/search-query/api/{src/main => }/java/nu/marginalia/api/searchquery/QueryClient.java (100%) rename code/functions/search-query/api/{src/main => }/java/nu/marginalia/api/searchquery/QueryProtobufCodec.java (100%) rename code/functions/search-query/api/{src/main => }/java/nu/marginalia/api/searchquery/model/query/ProcessedQuery.java (100%) rename code/functions/search-query/api/{src/main => }/java/nu/marginalia/api/searchquery/model/query/QueryParams.java (100%) rename code/functions/search-query/api/{src/main => }/java/nu/marginalia/api/searchquery/model/query/QueryResponse.java (100%) rename code/functions/search-query/api/{src/main => }/java/nu/marginalia/api/searchquery/model/query/SearchSetIdentifier.java (100%) rename code/functions/search-query/api/{src/main => }/java/nu/marginalia/api/searchquery/model/query/SearchSpecification.java (100%) rename code/functions/search-query/api/{src/main => }/java/nu/marginalia/api/searchquery/model/query/SearchSubquery.java (100%) rename code/functions/search-query/api/{src/main => }/java/nu/marginalia/api/searchquery/model/results/Bm25Parameters.java (100%) rename code/functions/search-query/api/{src/main => }/java/nu/marginalia/api/searchquery/model/results/DecoratedSearchResultItem.java (100%) rename code/functions/search-query/api/{src/main => }/java/nu/marginalia/api/searchquery/model/results/ResultRankingContext.java (100%) rename code/functions/search-query/api/{src/main => }/java/nu/marginalia/api/searchquery/model/results/ResultRankingParameters.java (100%) rename code/functions/search-query/api/{src/main => }/java/nu/marginalia/api/searchquery/model/results/SearchResultItem.java (100%) rename code/functions/search-query/api/{src/main => }/java/nu/marginalia/api/searchquery/model/results/SearchResultKeywordScore.java (100%) rename code/functions/search-query/api/{src/main => }/java/nu/marginalia/api/searchquery/model/results/SearchResultPreliminaryScore.java (100%) rename code/functions/search-query/api/{src/main => }/java/nu/marginalia/api/searchquery/model/results/SearchResultSet.java (100%) rename code/functions/search-query/api/{src/test/java => test}/nu/marginalia/index/client/IndexProtobufCodecTest.java (100%) rename code/functions/search-query/{src/main => }/java/nu/marginalia/functions/searchquery/QueryGRPCService.java (100%) rename code/functions/search-query/{src/main => }/java/nu/marginalia/functions/searchquery/query_parser/QueryParser.java (100%) rename code/functions/search-query/{src/main => }/java/nu/marginalia/functions/searchquery/query_parser/QueryPermutation.java (100%) rename code/functions/search-query/{src/main => }/java/nu/marginalia/functions/searchquery/query_parser/QueryTokenizer.java (100%) rename code/functions/search-query/{src/main => }/java/nu/marginalia/functions/searchquery/query_parser/QueryVariants.java (100%) rename code/functions/search-query/{src/main => }/java/nu/marginalia/functions/searchquery/query_parser/token/Token.java (100%) rename code/functions/search-query/{src/main => }/java/nu/marginalia/functions/searchquery/query_parser/token/TokenType.java (100%) rename code/functions/search-query/{src/main => }/java/nu/marginalia/functions/searchquery/query_parser/token/TokenVisitor.java (100%) rename code/functions/search-query/{src/main => }/java/nu/marginalia/functions/searchquery/svc/QueryFactory.java (100%) rename code/functions/search-query/{src/main => }/java/nu/marginalia/functions/searchquery/svc/QueryLimitsAccumulator.java (100%) rename code/functions/search-query/{src/main => }/java/nu/marginalia/functions/searchquery/svc/QuerySearchTermsAccumulator.java (100%) rename code/functions/search-query/{src/main => }/java/nu/marginalia/util/language/EnglishDictionary.java (100%) rename code/functions/search-query/{src/main => }/java/nu/marginalia/util/ngrams/DenseBitMap.java (100%) rename code/functions/search-query/{src/main => }/java/nu/marginalia/util/ngrams/NGramBloomFilter.java (100%) rename code/functions/search-query/{src/main => }/java/nu/marginalia/util/transform_list/TransformList.java (100%) rename code/functions/search-query/{src/test/java => test}/nu/marginalia/query/svc/QueryFactoryTest.java (100%) rename code/index/api/{src/main => }/java/nu/marginalia/index/api/IndexClient.java (100%) rename code/index/api/{src/main => }/java/nu/marginalia/index/api/IndexMqClient.java (100%) rename code/index/api/{src/main => }/java/nu/marginalia/index/api/IndexMqEndpoints.java (100%) rename code/index/{forward-index => index-forward}/build.gradle (93%) rename code/index/{forward-index/src/main => index-forward}/java/nu/marginalia/index/forward/ForwardIndexConverter.java (100%) rename code/index/{forward-index/src/main => index-forward}/java/nu/marginalia/index/forward/ForwardIndexFileNames.java (100%) rename code/index/{forward-index/src/main => index-forward}/java/nu/marginalia/index/forward/ForwardIndexParameters.java (100%) rename code/index/{forward-index/src/main => index-forward}/java/nu/marginalia/index/forward/ForwardIndexReader.java (100%) rename code/index/{forward-index => index-forward}/readme.md (100%) rename code/index/{forward-index/src/test/java => index-forward/test}/nu/marginalia/index/forward/ForwardIndexConverterTest.java (100%) rename code/index/{forward-index/src/test/java => index-forward/test}/nu/marginalia/test/TestUtil.java (100%) rename code/index/index-journal/{src/main => }/java/nu/marginalia/index/journal/IndexJournalFileNames.java (100%) rename code/index/index-journal/{src/main => }/java/nu/marginalia/index/journal/model/IndexJournalEntry.java (100%) rename code/index/index-journal/{src/main => }/java/nu/marginalia/index/journal/model/IndexJournalEntryBuilder.java (100%) rename code/index/index-journal/{src/main => }/java/nu/marginalia/index/journal/model/IndexJournalEntryData.java (100%) rename code/index/index-journal/{src/main => }/java/nu/marginalia/index/journal/model/IndexJournalEntryHeader.java (100%) rename code/index/index-journal/{src/main => }/java/nu/marginalia/index/journal/model/IndexJournalFileHeader.java (100%) rename code/index/index-journal/{src/main => }/java/nu/marginalia/index/journal/reader/IndexJournalReadEntry.java (100%) rename code/index/index-journal/{src/main => }/java/nu/marginalia/index/journal/reader/IndexJournalReader.java (100%) rename code/index/index-journal/{src/main => }/java/nu/marginalia/index/journal/reader/IndexJournalReaderPagingImpl.java (100%) rename code/index/index-journal/{src/main => }/java/nu/marginalia/index/journal/reader/IndexJournalReaderSingleFile.java (100%) rename code/index/index-journal/{src/main => }/java/nu/marginalia/index/journal/reader/pointer/IndexJournalPointer.java (100%) rename code/index/index-journal/{src/main => }/java/nu/marginalia/index/journal/writer/IndexJournalWriter.java (100%) rename code/index/index-journal/{src/main => }/java/nu/marginalia/index/journal/writer/IndexJournalWriterPagingImpl.java (100%) rename code/index/index-journal/{src/main => }/java/nu/marginalia/index/journal/writer/IndexJournalWriterSingleFileImpl.java (100%) rename code/index/index-journal/{src/test/java => test}/nu/marginalia/index/journal/IndexJournalTest.java (100%) rename code/index/index-journal/{src/test/java => test}/nu/marginalia/index/journal/reader/pointer/IndexJournalPointerTest.java (100%) rename code/index/{reverse-index => index-reverse}/build.gradle (93%) rename code/index/{reverse-index => index-reverse}/index.svg (100%) rename code/index/{reverse-index/src/main => index-reverse}/java/nu/marginalia/index/ReverseIndexEntrySource.java (100%) rename code/index/{reverse-index/src/main => index-reverse}/java/nu/marginalia/index/ReverseIndexFullFileNames.java (100%) rename code/index/{reverse-index/src/main => index-reverse}/java/nu/marginalia/index/ReverseIndexParameters.java (100%) rename code/index/{reverse-index/src/main => index-reverse}/java/nu/marginalia/index/ReverseIndexPrioFileNames.java (100%) rename code/index/{reverse-index/src/main => index-reverse}/java/nu/marginalia/index/ReverseIndexReader.java (100%) rename code/index/{reverse-index/src/main => index-reverse}/java/nu/marginalia/index/ReverseIndexSelfTest.java (100%) rename code/index/{reverse-index/src/main => index-reverse}/java/nu/marginalia/index/construction/CountToOffsetTransformer.java (100%) rename code/index/{reverse-index/src/main => index-reverse}/java/nu/marginalia/index/construction/DocIdRewriter.java (100%) rename code/index/{reverse-index/src/main => index-reverse}/java/nu/marginalia/index/construction/IndexSizeEstimator.java (100%) rename code/index/{reverse-index/src/main => index-reverse}/java/nu/marginalia/index/construction/JournalReaderSource.java (100%) rename code/index/{reverse-index/src/main => index-reverse}/java/nu/marginalia/index/construction/ReverseIndexBTreeTransformer.java (100%) rename code/index/{reverse-index/src/main => index-reverse}/java/nu/marginalia/index/construction/ReverseIndexConstructor.java (100%) rename code/index/{reverse-index/src/main => index-reverse}/java/nu/marginalia/index/construction/ReversePreindex.java (100%) rename code/index/{reverse-index/src/main => index-reverse}/java/nu/marginalia/index/construction/ReversePreindexDocuments.java (100%) rename code/index/{reverse-index/src/main => index-reverse}/java/nu/marginalia/index/construction/ReversePreindexReference.java (100%) rename code/index/{reverse-index/src/main => index-reverse}/java/nu/marginalia/index/construction/ReversePreindexWordSegments.java (100%) rename code/index/{reverse-index/src/main => index-reverse}/java/nu/marginalia/index/query/ReverseIndexRejectFilter.java (100%) rename code/index/{reverse-index/src/main => index-reverse}/java/nu/marginalia/index/query/ReverseIndexRetainFilter.java (100%) rename code/index/{reverse-index => index-reverse}/merging.svg (100%) rename code/index/{reverse-index => index-reverse}/preindex.svg (100%) rename code/index/{reverse-index => index-reverse}/readme.md (100%) rename code/index/{reverse-index/src/test/java => index-reverse/test}/nu/marginalia/index/ReverseIndexDebugTest.java (100%) rename code/index/{reverse-index/src/test/java => index-reverse/test}/nu/marginalia/index/ReverseIndexReaderTest.java (100%) rename code/index/{reverse-index/src/test/java => index-reverse/test}/nu/marginalia/index/construction/ReversePreindexDocsTest.java (100%) rename code/index/{reverse-index/src/test/java => index-reverse/test}/nu/marginalia/index/construction/ReversePreindexFinalizeTest.java (100%) rename code/index/{reverse-index/src/test/java => index-reverse/test}/nu/marginalia/index/construction/ReversePreindexMergeTest.java (100%) rename code/index/{reverse-index/src/test/java => index-reverse/test}/nu/marginalia/index/construction/ReversePreindexWordSegmentsTest.java (100%) rename code/index/{reverse-index/src/test/java => index-reverse/test}/nu/marginalia/index/construction/TestJournalFactory.java (100%) rename code/index/{reverse-index/src/test/java => index-reverse/test}/nu/marginalia/index/construction/TestSegmentData.java (100%) rename code/index/{reverse-index/src/test/java => index-reverse/test}/nu/marginalia/test/TestUtil.java (100%) rename code/index/{src/main => }/java/nu/marginalia/index/IndexQueryGrpcService.java (100%) rename code/index/{src/main => }/java/nu/marginalia/index/IndexServicesFactory.java (100%) rename code/index/{src/main => }/java/nu/marginalia/index/SearchTermsUtil.java (100%) rename code/index/{src/main => }/java/nu/marginalia/index/index/CombinedIndexReader.java (100%) rename code/index/{src/main => }/java/nu/marginalia/index/index/IndexQueryBuilderImpl.java (100%) rename code/index/{src/main => }/java/nu/marginalia/index/index/IndexQueryService.java (100%) rename code/index/{src/main => }/java/nu/marginalia/index/index/StatefulIndex.java (100%) rename code/index/{src/main => }/java/nu/marginalia/index/model/IndexQueryParams.java (100%) rename code/index/{src/main => }/java/nu/marginalia/index/model/IndexSearchParameters.java (100%) rename code/index/{src/main => }/java/nu/marginalia/index/model/IndexSearchTerms.java (100%) rename code/index/{src/main => }/java/nu/marginalia/index/results/IndexMetadataService.java (100%) rename code/index/{src/main => }/java/nu/marginalia/index/results/IndexResultDomainDeduplicator.java (100%) rename code/index/{src/main => }/java/nu/marginalia/index/results/IndexResultValuationContext.java (100%) rename code/index/{src/main => }/java/nu/marginalia/index/results/IndexResultValuatorService.java (100%) rename code/index/{src/main => }/java/nu/marginalia/index/searchset/DbUpdateRanks.java (100%) rename code/index/{src/main => }/java/nu/marginalia/index/searchset/RankingSearchSet.java (100%) rename code/index/{src/main => }/java/nu/marginalia/index/searchset/SearchSet.java (100%) rename code/index/{src/main => }/java/nu/marginalia/index/searchset/SearchSetAny.java (100%) rename code/index/{src/main => }/java/nu/marginalia/index/searchset/SearchSetsService.java (100%) rename code/index/{src/main => }/java/nu/marginalia/index/searchset/SmallSearchSet.java (100%) rename code/index/{src/main => }/java/nu/marginalia/ranking/domains/PageRankDomainRanker.java (100%) rename code/index/{src/main => }/java/nu/marginalia/ranking/domains/RankingAlgorithm.java (100%) rename code/index/{src/main => }/java/nu/marginalia/ranking/domains/accumulator/RankingResultAccumulator.java (100%) rename code/index/{src/main => }/java/nu/marginalia/ranking/domains/accumulator/RankingResultBitSetAccumulator.java (100%) rename code/index/{src/main => }/java/nu/marginalia/ranking/domains/accumulator/RankingResultHashMapAccumulator.java (100%) rename code/index/{src/main => }/java/nu/marginalia/ranking/domains/accumulator/RankingResultHashSetAccumulator.java (100%) rename code/index/{src/main => }/java/nu/marginalia/ranking/domains/accumulator/RankingResultListAccumulator.java (100%) rename code/index/{src/main => }/java/nu/marginalia/ranking/domains/data/AbstractGraphSource.java (100%) rename code/index/{src/main => }/java/nu/marginalia/ranking/domains/data/GraphSource.java (100%) rename code/index/{src/main => }/java/nu/marginalia/ranking/domains/data/InvertedLinkGraphSource.java (100%) rename code/index/{src/main => }/java/nu/marginalia/ranking/domains/data/LinkGraphSource.java (100%) rename code/index/{src/main => }/java/nu/marginalia/ranking/domains/data/SimilarityGraphSource.java (100%) rename code/index/{src/main => }/java/nu/marginalia/ranking/domains/jgrapht/PersonalizedPageRank.java (100%) rename code/index/{src/main => }/java/nu/marginalia/ranking/results/ResultKeywordSet.java (100%) rename code/index/{src/main => }/java/nu/marginalia/ranking/results/ResultValuator.java (100%) rename code/index/{src/main => }/java/nu/marginalia/ranking/results/factors/Bm25Factor.java (100%) rename code/index/{src/main => }/java/nu/marginalia/ranking/results/factors/PriorityTermBonus.java (100%) rename code/index/{src/main => }/java/nu/marginalia/ranking/results/factors/TermCoherenceFactor.java (100%) rename code/index/query/{src/main => }/java/nu/marginalia/index/domainrankings/DomainRankings.java (100%) rename code/index/query/{src/main => }/java/nu/marginalia/index/query/EmptyEntrySource.java (100%) rename code/index/query/{src/main => }/java/nu/marginalia/index/query/EntrySource.java (100%) rename code/index/query/{src/main => }/java/nu/marginalia/index/query/IndexQuery.java (100%) rename code/index/query/{src/main => }/java/nu/marginalia/index/query/IndexQueryBuilder.java (100%) rename code/index/query/{src/main => }/java/nu/marginalia/index/query/IndexQueryPriority.java (100%) rename code/index/query/{src/main => }/java/nu/marginalia/index/query/IndexSearchBudget.java (100%) rename code/index/query/{src/main => }/java/nu/marginalia/index/query/filter/QueryFilterAnyOf.java (100%) rename code/index/query/{src/main => }/java/nu/marginalia/index/query/filter/QueryFilterLetThrough.java (100%) rename code/index/query/{src/main => }/java/nu/marginalia/index/query/filter/QueryFilterNoPass.java (100%) rename code/index/query/{src/main => }/java/nu/marginalia/index/query/filter/QueryFilterStepExcludeFromPredicate.java (100%) rename code/index/query/{src/main => }/java/nu/marginalia/index/query/filter/QueryFilterStepFromPredicate.java (100%) rename code/index/query/{src/main => }/java/nu/marginalia/index/query/filter/QueryFilterStepIf.java (100%) rename code/index/query/{src/main => }/java/nu/marginalia/index/query/limit/QueryLimits.java (100%) rename code/index/query/{src/main => }/java/nu/marginalia/index/query/limit/QueryStrategy.java (100%) rename code/index/query/{src/main => }/java/nu/marginalia/index/query/limit/SpecificationLimit.java (100%) rename code/index/query/{src/main => }/java/nu/marginalia/index/query/limit/SpecificationLimitType.java (100%) rename code/index/query/{src/test/java => test}/nu/marginalia/index/query/filter/QueryFilterStepIfTest.java (100%) rename code/index/{src/test/java => test}/nu/marginalia/index/IndexQueryServiceIntegrationSmokeTest.java (100%) rename code/index/{src/test/java => test}/nu/marginalia/index/IndexQueryServiceIntegrationTest.java (100%) rename code/index/{src/test/java => test}/nu/marginalia/index/IndexQueryServiceIntegrationTestModule.java (100%) rename code/index/{src/test/java => test}/nu/marginalia/index/results/IndexResultDomainDeduplicatorTest.java (100%) rename code/index/{src/test/java => test}/nu/marginalia/index/searchset/RankingSearchSetTest.java (100%) rename code/index/{src/test/java => test}/nu/marginalia/index/util/TestUtil.java (100%) rename code/index/{src/test/java => test}/nu/marginalia/ranking/domains/RankingAlgorithmWithRealDataTest.java (100%) rename code/index/{src/test/java => test}/nu/marginalia/ranking/domains/RankingAlgorithmsContainerTest.java (100%) rename code/index/{src/test/java => test}/nu/marginalia/ranking/domains/TestGraphSourceForInvertedLinkData.java (100%) rename code/index/{src/test/java => test}/nu/marginalia/ranking/domains/TestGraphSourceForLinkData.java (100%) rename code/index/{src/test/java => test}/nu/marginalia/ranking/domains/TestGraphSourceForSimilarityData.java (100%) rename code/index/{src/test/java => test}/nu/marginalia/ranking/results/ResultValuatorTest.java (100%) rename code/index/{src/test/java => test}/nu/marginalia/ranking/results/factors/TermCoherenceFactorTest.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/ArrayRangeReference.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/IntArray.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/LongArray.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/LongArrayFactory.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/algo/BulkTransferArray.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/algo/IntArrayBase.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/algo/IntArraySearch.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/algo/IntArraySort.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/algo/IntArrayTransformations.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/algo/LongArrayBase.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/algo/LongArraySearch.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/algo/LongArraySort.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/algo/LongArrayTransformations.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/algo/SortAlgoInsertionSort.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/algo/SortAlgoMergeSort.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/algo/SortAlgoQuickSort.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/algo/SortingContext.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/algo/TwoArrayOperations.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/buffer/IntQueryBuffer.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/buffer/LongQueryBuffer.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/delegate/ReferenceImplIntArrayDelegate.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/delegate/ReferenceImplLongArrayDelegate.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/delegate/ShiftedIntArray.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/delegate/ShiftedLongArray.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/functional/AddressRangeCall.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/functional/AddressRangeCallIO.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/functional/AddressRangeIntFunction.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/functional/AddressRangeLongFunction.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/functional/IntBinaryIOOperation.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/functional/IntBinaryOperation.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/functional/IntIOTransformer.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/functional/IntTransformer.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/functional/LongBinaryIOOperation.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/functional/LongBinaryOperation.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/functional/LongIOTransformer.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/functional/LongIntConsumer.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/functional/LongLongConsumer.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/functional/LongTransformer.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/page/AbstractPagingArray.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/page/PartitionPage.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/page/SegmentIntArray.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/page/SegmentLongArray.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/page/UnsafeLongArray.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/page/UnsafeProvider.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/scheme/ArrayPartitioningScheme.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/scheme/PowerOf2PartitioningScheme.java (100%) rename code/libraries/array/{src/main => }/java/nu/marginalia/array/scheme/SequentialPartitioningScheme.java (100%) rename code/libraries/array/{src/test/java => test}/nu/marginalia/array/IntLowBitPartitioningSchemeTest.java (100%) rename code/libraries/array/{src/test/java => test}/nu/marginalia/array/algo/IntArraySearchTest.java (100%) rename code/libraries/array/{src/test/java => test}/nu/marginalia/array/algo/IntArraySortTest.java (100%) rename code/libraries/array/{src/test/java => test}/nu/marginalia/array/algo/IntArrayTransformations2Test.java (100%) rename code/libraries/array/{src/test/java => test}/nu/marginalia/array/algo/IntArrayTransformationsTest.java (100%) rename code/libraries/array/{src/test/java => test}/nu/marginalia/array/algo/LongArraySearchTest.java (100%) rename code/libraries/array/{src/test/java => test}/nu/marginalia/array/algo/LongArraySortNTest.java (100%) rename code/libraries/array/{src/test/java => test}/nu/marginalia/array/algo/LongArraySortTest.java (100%) rename code/libraries/array/{src/test/java => test}/nu/marginalia/array/algo/LongArrayTransformations2Test.java (100%) rename code/libraries/array/{src/test/java => test}/nu/marginalia/array/algo/LongArrayTransformationsTest.java (100%) rename code/libraries/array/{src/test/java => test}/nu/marginalia/array/algo/TwoArrayOperationsTest.java (100%) rename code/libraries/array/{src/test/java => test}/nu/marginalia/array/scheme/ArrayPartitioningSchemeTest.java (100%) rename code/libraries/array/{src/test/java => test}/nu/marginalia/util/test/TestUtil.java (100%) rename code/libraries/big-string/{src/main => }/java/nu/marginalia/bigstring/BigString.java (100%) rename code/libraries/big-string/{src/main => }/java/nu/marginalia/bigstring/CompressedBigString.java (100%) rename code/libraries/big-string/{src/main => }/java/nu/marginalia/bigstring/CompressionBuffer.java (100%) rename code/libraries/big-string/{src/main => }/java/nu/marginalia/bigstring/CompressionBufferPool.java (100%) rename code/libraries/big-string/{src/main => }/java/nu/marginalia/bigstring/PlainBigString.java (100%) rename code/libraries/big-string/{src/test/java => test}/nu/marginalia/bigstring/CompressedBigStringTest.java (100%) rename code/libraries/blocking-thread-pool/{src/main => }/java/nu/marginalia/util/ProcessingIterator.java (100%) rename code/libraries/blocking-thread-pool/{src/main => }/java/nu/marginalia/util/SimpleBlockingThreadPool.java (100%) rename code/libraries/blocking-thread-pool/{src/test/java => test}/nu/marginalia/util/ProcessingIteratorTest.java (100%) rename code/libraries/braille-block-punch-cards/{src/main => }/java/nu/marginalia/bbpc/BrailleBlockPunchCards.java (100%) rename code/libraries/braille-block-punch-cards/{src/test/java => test}/nu/marginalia/bbpc/BrailleBlockPunchCardsTest.java (100%) rename code/libraries/btree/{src/main => }/java/nu/marginalia/btree/BTreeDogEar.java (100%) rename code/libraries/btree/{src/main => }/java/nu/marginalia/btree/BTreeReader.java (100%) rename code/libraries/btree/{src/main => }/java/nu/marginalia/btree/BTreeWriteCallback.java (100%) rename code/libraries/btree/{src/main => }/java/nu/marginalia/btree/BTreeWriter.java (100%) rename code/libraries/btree/{src/main => }/java/nu/marginalia/btree/model/BTreeBlockSize.java (100%) rename code/libraries/btree/{src/main => }/java/nu/marginalia/btree/model/BTreeContext.java (100%) rename code/libraries/btree/{src/main => }/java/nu/marginalia/btree/model/BTreeHeader.java (100%) rename code/libraries/btree/{src/test/java => test}/nu/marginalia/btree/BTreeReaderQueryDataWithIndexTest.java (100%) rename code/libraries/btree/{src/test/java => test}/nu/marginalia/btree/BTreeReaderQueryDataWithoutIndexTest.java (100%) rename code/libraries/btree/{src/test/java => test}/nu/marginalia/btree/BTreeReaderRejectRetainWithIndexTest.java (100%) rename code/libraries/btree/{src/test/java => test}/nu/marginalia/btree/BTreeReaderRejectRetainWithoutIndexTest.java (100%) rename code/libraries/btree/{src/test/java => test}/nu/marginalia/btree/BTreeWriterTest.java (100%) rename code/libraries/easy-lsh/{src/main => }/java/nu/marginalia/lsh/EasyLSH.java (100%) rename code/libraries/easy-lsh/{src/test/java => test}/nu/marginalia/lsh/EasyLSHTest.java (100%) rename code/libraries/geo-ip/{src/main => }/java/nu/marginalia/geoip/GeoIpDictionary.java (100%) rename code/libraries/geo-ip/{src/main => }/java/nu/marginalia/geoip/sources/AsnMapping.java (100%) rename code/libraries/geo-ip/{src/main => }/java/nu/marginalia/geoip/sources/AsnTable.java (100%) rename code/libraries/geo-ip/{src/main => }/java/nu/marginalia/geoip/sources/IP2LocationMapping.java (100%) rename code/libraries/geo-ip/{src/main => }/java/nu/marginalia/geoip/sources/IpRangeMapping.java (100%) rename code/libraries/geo-ip/{src/test/java => test}/nu/marginalia/geoip/GeoIpDictionaryTest.java (100%) rename code/libraries/guarded-regex/{src/main => }/java/nu/marginalia/gregex/GuardedRegex.java (100%) rename code/libraries/guarded-regex/{src/main => }/java/nu/marginalia/gregex/GuardedRegexFactory.java (100%) rename code/libraries/language-processing/{src/main => }/java/nu/marginalia/language/WordDictionary.java (100%) rename code/libraries/language-processing/{src/main => }/java/nu/marginalia/language/WordPatterns.java (100%) rename code/libraries/language-processing/{src/main => }/java/nu/marginalia/language/encoding/AsciiFlattener.java (100%) rename code/libraries/language-processing/{src/main => }/java/nu/marginalia/language/encoding/UnicodeRanges.java (100%) rename code/libraries/language-processing/{src/main => }/java/nu/marginalia/language/filter/FasttextLanguagePredictionModel.java (100%) rename code/libraries/language-processing/{src/main => }/java/nu/marginalia/language/filter/LanguageFilter.java (100%) rename code/libraries/language-processing/{src/main => }/java/nu/marginalia/language/filter/LanguagePredictionModel.java (100%) rename code/libraries/language-processing/{src/main => }/java/nu/marginalia/language/filter/UngaBungaLanguagePredictionModel.java (100%) rename code/libraries/language-processing/{src/main => }/java/nu/marginalia/language/model/DocumentLanguageData.java (100%) rename code/libraries/language-processing/{src/main => }/java/nu/marginalia/language/model/DocumentSentence.java (100%) rename code/libraries/language-processing/{src/main => }/java/nu/marginalia/language/model/WordFrequencyData.java (100%) rename code/libraries/language-processing/{src/main => }/java/nu/marginalia/language/model/WordRep.java (100%) rename code/libraries/language-processing/{src/main => }/java/nu/marginalia/language/model/WordSeparator.java (100%) rename code/libraries/language-processing/{src/main => }/java/nu/marginalia/language/model/WordSpan.java (100%) rename code/libraries/language-processing/{src/main => }/java/nu/marginalia/language/sentence/SentenceExtractor.java (100%) rename code/libraries/language-processing/{src/main => }/java/nu/marginalia/language/sentence/SentenceExtractorHtmlTagCleaner.java (100%) rename code/libraries/language-processing/{src/main => }/java/nu/marginalia/language/sentence/SentenceExtractorStringUtils.java (100%) rename code/libraries/language-processing/{src/main => }/java/nu/marginalia/language/sentence/SentencePreCleaner.java (100%) rename code/libraries/language-processing/{src/main => }/java/nu/marginalia/language/sentence/SentenceSegmentSplitter.java (100%) rename code/libraries/language-processing/{src/main => }/java/nu/marginalia/language/sentence/ThreadLocalSentenceExtractorProvider.java (100%) rename code/libraries/language-processing/{src/main => }/resources/dictionary/en-1000 (100%) rename code/libraries/language-processing/{src/main => }/resources/dictionary/en-stopwords (100%) rename code/libraries/language-processing/{src/main => }/resources/dictionary/en-words (100%) rename code/libraries/language-processing/{src/main => }/resources/dictionary/latin-1000 (100%) rename code/libraries/language-processing/{src/main => }/resources/dictionary/swe-1000 (100%) rename code/libraries/language-processing/{src/main => }/resources/dictionary/word-frequency (100%) rename code/libraries/language-processing/{src/test/resources => test-resources}/html/jep.html (100%) rename code/libraries/language-processing/{src/test/resources => test-resources}/html/spam.html (100%) rename code/libraries/language-processing/{src/test/java => test}/nu/marginalia/language/encoding/AsciiFlattenerTest.java (100%) rename code/libraries/language-processing/{src/test/java => test}/nu/marginalia/language/encoding/SentenceExtractorHtmlTagCleanerTest.java (100%) rename code/libraries/language-processing/{src/test/java => test}/nu/marginalia/language/filter/LanguageFilterTest.java (100%) rename code/libraries/language-processing/{src/test/java => test}/nu/marginalia/language/filter/TestLanguageModels.java (100%) rename code/libraries/language-processing/{src/test/java => test}/nu/marginalia/language/sentence/SentenceExtractorTest.java (100%) rename code/libraries/message-queue/{src/main => }/java/nu/marginalia/actor/ActorStateMachine.java (100%) rename code/libraries/message-queue/{src/main => }/java/nu/marginalia/actor/ExpectedMessage.java (100%) rename code/libraries/message-queue/{src/main => }/java/nu/marginalia/actor/prototype/ActorPrototype.java (100%) rename code/libraries/message-queue/{src/main => }/java/nu/marginalia/actor/prototype/RecordActorPrototype.java (100%) rename code/libraries/message-queue/{src/main => }/java/nu/marginalia/actor/state/ActorControlFlowException.java (100%) rename code/libraries/message-queue/{src/main => }/java/nu/marginalia/actor/state/ActorResumeBehavior.java (100%) rename code/libraries/message-queue/{src/main => }/java/nu/marginalia/actor/state/ActorStateInstance.java (100%) rename code/libraries/message-queue/{src/main => }/java/nu/marginalia/actor/state/ActorStateTransition.java (100%) rename code/libraries/message-queue/{src/main => }/java/nu/marginalia/actor/state/ActorStep.java (100%) rename code/libraries/message-queue/{src/main => }/java/nu/marginalia/actor/state/Resume.java (100%) rename code/libraries/message-queue/{src/main => }/java/nu/marginalia/actor/state/Terminal.java (100%) rename code/libraries/message-queue/{src/main => }/java/nu/marginalia/mq/MessageQueueFactory.java (100%) rename code/libraries/message-queue/{src/main => }/java/nu/marginalia/mq/MqException.java (100%) rename code/libraries/message-queue/{src/main => }/java/nu/marginalia/mq/MqMessage.java (100%) rename code/libraries/message-queue/{src/main => }/java/nu/marginalia/mq/MqMessageState.java (100%) rename code/libraries/message-queue/{src/main => }/java/nu/marginalia/mq/inbox/MqAsynchronousInbox.java (100%) rename code/libraries/message-queue/{src/main => }/java/nu/marginalia/mq/inbox/MqInboxIf.java (100%) rename code/libraries/message-queue/{src/main => }/java/nu/marginalia/mq/inbox/MqInboxResponse.java (100%) rename code/libraries/message-queue/{src/main => }/java/nu/marginalia/mq/inbox/MqInboxShredder.java (100%) rename code/libraries/message-queue/{src/main => }/java/nu/marginalia/mq/inbox/MqSingleShotInbox.java (100%) rename code/libraries/message-queue/{src/main => }/java/nu/marginalia/mq/inbox/MqSubscription.java (100%) rename code/libraries/message-queue/{src/main => }/java/nu/marginalia/mq/inbox/MqSynchronousInbox.java (100%) rename code/libraries/message-queue/{src/main => }/java/nu/marginalia/mq/outbox/MqOutbox.java (100%) rename code/libraries/message-queue/{src/main => }/java/nu/marginalia/mq/persistence/MqMessageHandlerRegistry.java (100%) rename code/libraries/message-queue/{src/main => }/java/nu/marginalia/mq/persistence/MqPersistence.java (100%) rename code/libraries/message-queue/{src/test/java => test}/nu/marginalia/actor/ActorRecordMachineTest.java (100%) rename code/libraries/message-queue/{src/test/java => test}/nu/marginalia/mq/MqMessageRow.java (100%) rename code/libraries/message-queue/{src/test/java => test}/nu/marginalia/mq/MqTestUtil.java (100%) rename code/libraries/message-queue/{src/test/java => test}/nu/marginalia/mq/outbox/MqOutboxTest.java (100%) rename code/libraries/message-queue/{src/test/java => test}/nu/marginalia/mq/persistence/MqPersistenceTest.java (100%) rename code/libraries/next-prime/{src/main => }/java/nu/marginalia/util/NextPrimeUtil.java (100%) rename code/libraries/next-prime/{src/test/java => test}/nu/marginalia/util/NextPrimeUtilTest.java (100%) rename code/libraries/random-write-funnel/{src/main => }/java/nu/marginalia/rwf/RandomFileAssembler.java (100%) rename code/libraries/random-write-funnel/{src/main => }/java/nu/marginalia/rwf/RandomWriteFunnel.java (100%) rename code/libraries/random-write-funnel/{src/test/java => test}/nu/marginalia/rwf/RandomFileAssemblerTest.java (100%) rename code/libraries/random-write-funnel/{src/test/java => test}/nu/marginalia/rwf/RandomWriteFunnelTest.java (100%) rename code/libraries/term-frequency-dict/{src/main => }/java/nu/marginalia/term_frequency_dict/TermFrequencyDict.java (100%) rename code/libraries/test-helpers/{src/main => }/java/nu/marginalia/test/TestMigrationLoader.java (100%) rename code/process-models/crawl-spec/{src/main => }/java/nu/marginalia/crawlspec/CrawlSpecFileNames.java (100%) rename code/process-models/crawl-spec/{src/main => }/java/nu/marginalia/crawlspec/CrawlSpecGenerator.java (100%) rename code/process-models/crawl-spec/{src/main => }/java/nu/marginalia/io/crawlspec/CrawlSpecRecordParquetFileReader.java (100%) rename code/process-models/crawl-spec/{src/main => }/java/nu/marginalia/io/crawlspec/CrawlSpecRecordParquetFileWriter.java (100%) rename code/process-models/crawl-spec/{src/main => }/java/nu/marginalia/model/crawlspec/CrawlSpecRecord.java (100%) rename code/process-models/crawling-model/{src/main => }/java/nu/marginalia/crawling/body/ContentTypeLogic.java (100%) rename code/process-models/crawling-model/{src/main => }/java/nu/marginalia/crawling/body/DocumentBodyExtractor.java (100%) rename code/process-models/crawling-model/{src/main => }/java/nu/marginalia/crawling/body/DocumentBodyResult.java (100%) rename code/process-models/crawling-model/{src/main => }/java/nu/marginalia/crawling/body/HttpFetchResult.java (100%) rename code/process-models/crawling-model/{src/main => }/java/nu/marginalia/crawling/io/CrawledDomainReader.java (100%) rename code/process-models/crawling-model/{src/main => }/java/nu/marginalia/crawling/io/CrawledDomainWriter.java (100%) rename code/process-models/crawling-model/{src/main => }/java/nu/marginalia/crawling/io/CrawlerOutputFile.java (100%) rename code/process-models/crawling-model/{src/main => }/java/nu/marginalia/crawling/io/SerializableCrawlDataStream.java (100%) rename code/process-models/crawling-model/{src/main => }/java/nu/marginalia/crawling/io/format/CompatibleLegacySerializableCrawlDataStream.java (100%) rename code/process-models/crawling-model/{src/main => }/java/nu/marginalia/crawling/io/format/FastLegacySerializableCrawlDataStream.java (100%) rename code/process-models/crawling-model/{src/main => }/java/nu/marginalia/crawling/io/format/ParquetSerializableCrawlDataStream.java (100%) rename code/process-models/crawling-model/{src/main => }/java/nu/marginalia/crawling/model/CrawledDocument.java (100%) rename code/process-models/crawling-model/{src/main => }/java/nu/marginalia/crawling/model/CrawledDomain.java (100%) rename code/process-models/crawling-model/{src/main => }/java/nu/marginalia/crawling/model/CrawlerDocumentStatus.java (100%) rename code/process-models/crawling-model/{src/main => }/java/nu/marginalia/crawling/model/CrawlerDomainStatus.java (100%) rename code/process-models/crawling-model/{src/main => }/java/nu/marginalia/crawling/model/SerializableCrawlData.java (100%) rename code/process-models/crawling-model/{src/main => }/java/nu/marginalia/crawling/parquet/CrawledDocumentParquetRecord.java (100%) rename code/process-models/crawling-model/{src/main => }/java/nu/marginalia/crawling/parquet/CrawledDocumentParquetRecordFileReader.java (100%) rename code/process-models/crawling-model/{src/main => }/java/nu/marginalia/crawling/parquet/CrawledDocumentParquetRecordFileWriter.java (100%) rename code/process-models/crawling-model/{src/main => }/java/org/netpreserve/jwarc/WarcXCookieInformationHeader.java (100%) rename code/process-models/crawling-model/{src/main => }/java/org/netpreserve/jwarc/WarcXEntityRefused.java (100%) rename code/process-models/crawling-model/{src/main => }/java/org/netpreserve/jwarc/WarcXResponseReference.java (100%) rename code/process-models/crawling-model/{src/main => }/java/plan/CrawlPlan.java (100%) rename code/process-models/crawling-model/{src/main => }/java/plan/CrawlPlanLoader.java (100%) rename code/process-models/crawling-model/{src/test/java => test}/nu/marginalia/crawling/model/CrawledDocumentTest.java (100%) rename code/process-models/crawling-model/{src/test/java => test}/nu/marginalia/crawling/parquet/CrawledDocumentParquetRecordFileWriterTest.java (100%) rename code/process-models/processed-data/{src/main => }/java/nu/marginalia/io/processed/DocumentRecordParquetFileReader.java (100%) rename code/process-models/processed-data/{src/main => }/java/nu/marginalia/io/processed/DocumentRecordParquetFileWriter.java (100%) rename code/process-models/processed-data/{src/main => }/java/nu/marginalia/io/processed/DomainLinkRecordParquetFileReader.java (100%) rename code/process-models/processed-data/{src/main => }/java/nu/marginalia/io/processed/DomainLinkRecordParquetFileWriter.java (100%) rename code/process-models/processed-data/{src/main => }/java/nu/marginalia/io/processed/DomainRecordParquetFileReader.java (100%) rename code/process-models/processed-data/{src/main => }/java/nu/marginalia/io/processed/DomainRecordParquetFileWriter.java (100%) rename code/process-models/processed-data/{src/main => }/java/nu/marginalia/io/processed/ProcessedDataFileNames.java (100%) rename code/process-models/processed-data/{src/main => }/java/nu/marginalia/model/processed/DocumentRecord.java (100%) rename code/process-models/processed-data/{src/main => }/java/nu/marginalia/model/processed/DocumentRecordKeywordsProjection.java (100%) rename code/process-models/processed-data/{src/main => }/java/nu/marginalia/model/processed/DocumentRecordMetadataProjection.java (100%) rename code/process-models/processed-data/{src/main => }/java/nu/marginalia/model/processed/DomainLinkRecord.java (100%) rename code/process-models/processed-data/{src/main => }/java/nu/marginalia/model/processed/DomainRecord.java (100%) rename code/process-models/processed-data/{src/main => }/java/nu/marginalia/model/processed/DomainWithIp.java (100%) rename code/process-models/processed-data/{src/test/java => test}/nu/marginalia/io/processed/DocumentRecordParquetFileReaderTest.java (100%) rename code/process-models/processed-data/{src/test/java => test}/nu/marginalia/io/processed/DomainLinkRecordParquetFileReaderTest.java (100%) rename code/process-models/processed-data/{src/test/java => test}/nu/marginalia/io/processed/DomainRecordParquetFileReaderTest.java (100%) rename code/process-models/work-log/{src/main => }/java/nu/marginalia/worklog/BatchingWorkLog.java (100%) rename code/process-models/work-log/{src/main => }/java/nu/marginalia/worklog/BatchingWorkLogImpl.java (100%) rename code/process-models/work-log/{src/main => }/java/nu/marginalia/worklog/BatchingWorkLogInspector.java (100%) rename code/process-models/work-log/{src/test/java => test}/nu/marginalia/worklog/BatchingWorkLogImplTest.java (100%) rename code/process-mqapi/{src/main => }/java/nu/marginalia/mqapi/ProcessInboxNames.java (100%) rename code/process-mqapi/{src/main => }/java/nu/marginalia/mqapi/converting/ConvertAction.java (100%) rename code/process-mqapi/{src/main => }/java/nu/marginalia/mqapi/converting/ConvertRequest.java (100%) rename code/process-mqapi/{src/main => }/java/nu/marginalia/mqapi/crawling/CrawlRequest.java (100%) rename code/process-mqapi/{src/main => }/java/nu/marginalia/mqapi/index/CreateIndexRequest.java (100%) rename code/process-mqapi/{src/main => }/java/nu/marginalia/mqapi/index/IndexName.java (100%) rename code/process-mqapi/{src/main => }/java/nu/marginalia/mqapi/loading/LoadRequest.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/ConverterMain.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/ConverterModule.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/model/DisqualifiedException.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/model/GeneratorType.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/model/ProcessedDocument.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/model/ProcessedDocumentDetails.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/model/ProcessedDomain.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/processor/AcceptableAds.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/processor/ConverterDomainTypes.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/processor/DocumentClass.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/processor/DocumentDecorator.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/processor/DocumentProcessor.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/processor/DomainProcessor.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/processor/MetaRobotsTag.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/processor/SiteWords.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/processor/logic/DocumentGeneratorExtractor.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/processor/logic/DocumentLengthLogic.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/processor/logic/DocumentValuator.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/processor/logic/FeatureExtractor.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/processor/logic/HtmlStandardExtractor.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/processor/logic/LshDocumentDeduplicator.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/processor/logic/PlainTextLogic.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/processor/logic/TitleExtractor.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/processor/logic/dom/DomPruningFilter.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/processor/logic/dom/MeasureLengthVisitor.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/processor/logic/links/CommonKeywordExtractor.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/processor/logic/links/FileLinks.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/processor/logic/links/LinkGraph.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/processor/logic/links/LinkProcessor.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/processor/logic/links/TopKeywords.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/processor/plugin/AbstractDocumentProcessorPlugin.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/processor/plugin/HtmlDocumentProcessorPlugin.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/processor/plugin/PlainTextDocumentProcessorPlugin.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/processor/plugin/specialization/BlogSpecialization.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/processor/plugin/specialization/DefaultSpecialization.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/processor/plugin/specialization/HtmlProcessorSpecializations.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/processor/plugin/specialization/JavadocSpecialization.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/processor/plugin/specialization/LemmySpecialization.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/processor/plugin/specialization/MariadbKbSpecialization.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/processor/plugin/specialization/PhpBBSpecialization.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/processor/plugin/specialization/WikiSpecialization.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/processor/plugin/specialization/XenForoSpecialization.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/sideload/SideloadSource.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/sideload/SideloadSourceFactory.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/sideload/SideloaderProcessing.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/sideload/dirtree/DirtreeSideloadSpec.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/sideload/dirtree/DirtreeSideloadSpecList.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/sideload/dirtree/DirtreeSideloader.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/sideload/dirtree/DirtreeSideloaderFactory.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/sideload/encyclopedia/EncyclopediaMarginaliaNuSideloader.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/sideload/reddit/RedditSideloader.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/sideload/stackexchange/StackexchangeSideloader.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/sideload/warc/WarcSideloader.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/util/LineUtils.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/writer/ConverterBatchWritableIf.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/writer/ConverterBatchWriter.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/writer/ConverterBatchWriterIf.java (100%) rename code/processes/converting-process/{src/main => }/java/nu/marginalia/converting/writer/ConverterWriter.java (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/05-test.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/code/index.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/commons/dialogue.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/commons/search-failure-modes.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/commons/self-interest.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/dead.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/debian-laptop-install-log.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/debian-laptop.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/feed.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/fragments-old-web.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/good-video-games.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/guestbook/footer.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/guestbook/header.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/guestbook/index.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/index (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/index.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/junk/DedupTest.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/junk/bssl.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/junk/eldritch-oneliner.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/junk/server.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/junk/very-old-code.cc.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/links/aggregators.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/links/articles.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/links/bookmarks.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/links/fragments-old-web.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/links/index.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/links/linkpocalypse.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/00-linkpocalypse.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/01-astrolabe.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/02-re-tests.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/03-writing-for-reading.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/04-link-farms.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/05-minds-field.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/06-optimization.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/07-local-backlinks.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/08-whatever-happened-to-the-memex.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/09-system-upgrade.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/10-astrolabe-2-sampling-bias.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/11-dying-every-day.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/12-bye-bye-gmail.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/13-static-html.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/13-test.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/14-enter-the-circle-of-blame.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/15-stages-of-being.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/16-cursed-motivation.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/17-git-isnt-a-web-service.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/18-soaring-high.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/19-website-discoverability-crisis.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/20-dot-com-link-farms.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/21-new-solutions-old-problems.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/22-against-the-flood.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/23-re-software-and-branding.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/24-silly-hats.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/25-october-update.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/26-personalized-pagerank.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/27-getting-with-the-times.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/28-web-browsing.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/29-botnet-ddos.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/30-unintuitive-optimization.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/31-ngram-needles.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/32-bot-apologetics.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/33-rude-guests.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/34-internet-arguments.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/35-keeping-gemini-difficult.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/36-localized-programming-languages.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/37-keyword-extraction.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/38-old-and-new.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/39-normie-hypothesis.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/40-wasted-resources.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/41-search-result-relevance.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/42-dark.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/43-pseodonymous.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/44-discovery-and-design.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/45-unfuck-internet-discoverability.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/46-anatomy-of-search-engine-spam.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/47-drive-failure.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/48-i-have-no-capslock.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/49-marginalia-1-year.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/50-meditation-on-software-correctness.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/51-the-file-startup.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/52-growing-pains.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/53-better-hard-drive-metaphor.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/54-bargain-bin-btree.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/55-lexicon-rubberduck.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/56-uncertain-future.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/57-dont-know-how-to-build-software.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/58-marginalia-open-source.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/59-anchor-text.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/60-prescriptive-descriptions.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/61-botspam-apocalypse.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/62-marginaliacoin.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/63-marginalia-crawler.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/64-hundred-million.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/65-scaling-doesnt-scale.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/66-carbon-dating.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/67-best-ideas-afk.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/68-wizards-vs-sorcerers.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/69-creepy-website-similarity.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/70-faster-index-joins.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/71-memex-design.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/72-are-you-ok.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/72-new-approach-to-ranking.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/73-new-approach-to-ranking.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/74-marginalia-2-years.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/bargain-bin-btree.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/index.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/soaring-high.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/log/todo.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/one-weird-trick.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/pics/index.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/pics/links/index.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/pics/raster-test/index.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/projects/edge.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/projects/edge/about.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/projects/edge/api.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/projects/edge/changelog.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/projects/edge/design-notes.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/projects/edge/faq.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/projects/edge/for-webmasters.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/projects/edge/index.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/projects/edge/privacy.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/projects/edge/search-tips.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/projects/edge/supporting.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/projects/edge/top-20.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/projects/encyclopedia/index.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/projects/gemini-server.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/projects/index.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/projects/memex.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/projects/wmsa.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/readme.md (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/recipes/chicken-soup.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/recipes/french-borscht.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/recipes/index.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/recipes/omelette-bacon.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/search-about.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/server.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/special/index.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/special/redirect.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/special/tombstone.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/test.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/todo.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/todo/done.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/todo/index.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/todo/todo.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/topic/astrolabe.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/topic/cooking.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/topic/index.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/topic/moral-philosophy.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/topic/nlnet.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/topic/platforms.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/topic/programming.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/topic/satire.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/topic/server.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/topic/web-design.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/topics.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/worklog.gmi (100%) rename code/processes/converting-process/{src/test/resources => test-resources}/memex-marginalia/writing-topics.gmi (100%) rename code/processes/converting-process/{src/test/java => test}/nu/marginalia/converting/ConvertingIntegrationTest.java (100%) rename code/processes/converting-process/{src/test/java => test}/nu/marginalia/converting/ConvertingIntegrationTestModule.java (100%) rename code/processes/converting-process/{src/test/java => test}/nu/marginalia/converting/CrawlingThenConvertingIntegrationTest.java (100%) rename code/processes/converting-process/{src/test/java => test}/nu/marginalia/converting/logic/PlainTextLogicTest.java (100%) rename code/processes/converting-process/{src/test/java => test}/nu/marginalia/converting/processor/logic/MetaRobotsTagTest.java (100%) rename code/processes/converting-process/{src/test/java => test}/nu/marginalia/converting/processor/logic/dom/MeasureLengthVisitorTest.java (100%) rename code/processes/converting-process/{src/test/java => test}/nu/marginalia/converting/processor/plugin/specialization/BlogSpecializationTest.java (100%) rename code/processes/converting-process/{src/test/java => test}/nu/marginalia/converting/processor/plugin/specialization/JavadocSpecializationTest.java (100%) rename code/processes/converting-process/{src/test/java => test}/nu/marginalia/converting/processor/plugin/specialization/LemmySpecializationTest.java (100%) rename code/processes/converting-process/{src/test/java => test}/nu/marginalia/converting/processor/plugin/specialization/WikiSpecializationTest.java (100%) rename code/processes/converting-process/{src/test/java => test}/nu/marginalia/converting/processor/plugin/specialization/XenForoSpecializationTest.java (100%) rename code/processes/converting-process/{src/test/java => test}/nu/marginalia/converting/sideload/encyclopedia/EncyclopediaMarginaliaNuSideloaderTest.java (100%) rename code/processes/converting-process/{src/test/java => test}/nu/marginalia/converting/sideload/reddit/RedditSideloaderTest.java (100%) rename code/processes/converting-process/{src/test/java => test}/nu/marginalia/converting/sideload/warc/WarcSideloaderTest.java (100%) rename code/processes/converting-process/{src/test/java => test}/nu/marginalia/converting/util/LineUtilsTest.java (100%) rename code/processes/converting-process/{src/test/java => test}/nu/marginalia/converting/util/TestLanguageModels.java (100%) rename code/processes/crawling-process/{src/main => }/java/nu/marginalia/crawl/AbortMonitor.java (100%) rename code/processes/crawling-process/{src/main => }/java/nu/marginalia/crawl/CrawlerMain.java (100%) rename code/processes/crawling-process/{src/main => }/java/nu/marginalia/crawl/CrawlerModule.java (100%) rename code/processes/crawling-process/{src/main => }/java/nu/marginalia/crawl/retreival/Cookies.java (100%) rename code/processes/crawling-process/{src/main => }/java/nu/marginalia/crawl/retreival/CrawlDataReference.java (100%) rename code/processes/crawling-process/{src/main => }/java/nu/marginalia/crawl/retreival/CrawlDelayTimer.java (100%) rename code/processes/crawling-process/{src/main => }/java/nu/marginalia/crawl/retreival/CrawledDocumentFactory.java (100%) rename code/processes/crawling-process/{src/main => }/java/nu/marginalia/crawl/retreival/CrawlerRetreiver.java (100%) rename code/processes/crawling-process/{src/main => }/java/nu/marginalia/crawl/retreival/CrawlerWarcResynchronizer.java (100%) rename code/processes/crawling-process/{src/main => }/java/nu/marginalia/crawl/retreival/DomainCrawlFrontier.java (100%) rename code/processes/crawling-process/{src/main => }/java/nu/marginalia/crawl/retreival/DomainProber.java (100%) rename code/processes/crawling-process/{src/main => }/java/nu/marginalia/crawl/retreival/LinkFilterSelector.java (100%) rename code/processes/crawling-process/{src/main => }/java/nu/marginalia/crawl/retreival/RateLimitException.java (100%) rename code/processes/crawling-process/{src/main => }/java/nu/marginalia/crawl/retreival/fetcher/ContentTags.java (100%) rename code/processes/crawling-process/{src/main => }/java/nu/marginalia/crawl/retreival/fetcher/ContentTypeProber.java (100%) rename code/processes/crawling-process/{src/main => }/java/nu/marginalia/crawl/retreival/fetcher/FetchResult.java (100%) rename code/processes/crawling-process/{src/main => }/java/nu/marginalia/crawl/retreival/fetcher/FetchResultState.java (100%) rename code/processes/crawling-process/{src/main => }/java/nu/marginalia/crawl/retreival/fetcher/HttpFetcher.java (100%) rename code/processes/crawling-process/{src/main => }/java/nu/marginalia/crawl/retreival/fetcher/HttpFetcherImpl.java (100%) rename code/processes/crawling-process/{src/main => }/java/nu/marginalia/crawl/retreival/fetcher/SitemapRetriever.java (100%) rename code/processes/crawling-process/{src/main => }/java/nu/marginalia/crawl/retreival/fetcher/socket/FastTerminatingSocketFactory.java (100%) rename code/processes/crawling-process/{src/main => }/java/nu/marginalia/crawl/retreival/fetcher/socket/IpInterceptingNetworkInterceptor.java (100%) rename code/processes/crawling-process/{src/main => }/java/nu/marginalia/crawl/retreival/fetcher/socket/NoSecuritySSL.java (100%) rename code/processes/crawling-process/{src/main => }/java/nu/marginalia/crawl/retreival/fetcher/warc/WarcDigestBuilder.java (100%) rename code/processes/crawling-process/{src/main => }/java/nu/marginalia/crawl/retreival/fetcher/warc/WarcInputBuffer.java (100%) rename code/processes/crawling-process/{src/main => }/java/nu/marginalia/crawl/retreival/fetcher/warc/WarcProtocolReconstructor.java (100%) rename code/processes/crawling-process/{src/main => }/java/nu/marginalia/crawl/retreival/fetcher/warc/WarcRecorder.java (100%) rename code/processes/crawling-process/{src/main => }/java/nu/marginalia/crawl/retreival/revisit/CrawlerRevisitor.java (100%) rename code/processes/crawling-process/{src/main => }/java/nu/marginalia/crawl/retreival/revisit/DocumentWithReference.java (100%) rename code/processes/crawling-process/{src/main => }/java/nu/marginalia/crawl/retreival/sitemap/SitemapFetcher.java (100%) rename code/processes/crawling-process/{src/main => }/java/nu/marginalia/crawl/spec/CrawlSpecProvider.java (100%) rename code/processes/crawling-process/{src/main => }/java/nu/marginalia/crawl/spec/DbCrawlSpecProvider.java (100%) rename code/processes/crawling-process/{src/main => }/java/nu/marginalia/crawl/spec/ParquetCrawlSpecProvider.java (100%) rename code/processes/crawling-process/{src/main => }/java/nu/marginalia/crawl/warc/WarcArchiverFactory.java (100%) rename code/processes/crawling-process/{src/main => }/java/nu/marginalia/crawl/warc/WarcArchiverIf.java (100%) rename code/processes/crawling-process/{src/main => }/resources/ip-banned-cidr.txt (100%) rename code/processes/crawling-process/{src/test/java => test}/nu/marginalia/crawl/retreival/CrawlerWarcResynchronizerTest.java (100%) rename code/processes/crawling-process/{src/test/java => test}/nu/marginalia/crawl/retreival/DomainCrawlFrontierTest.java (100%) rename code/processes/crawling-process/{src/test/java => test}/nu/marginalia/crawl/retreival/fetcher/ContentTypeProberTest.java (100%) rename code/processes/crawling-process/{src/test/java => test}/nu/marginalia/crawl/retreival/fetcher/CrawledDocumentParquetRecordFileWriterTest.java (100%) rename code/processes/crawling-process/{src/test/java => test}/nu/marginalia/crawl/retreival/fetcher/WarcRecorderTest.java (100%) rename code/processes/crawling-process/{src/test/java => test}/nu/marginalia/crawl/retreival/revisit/DocumentWithReferenceTest.java (100%) rename code/processes/crawling-process/{src/test/java => test}/nu/marginalia/crawling/CrawlPlanLoaderTest.java (100%) rename code/processes/crawling-process/{src/test/java => test}/nu/marginalia/crawling/DomainCrawlerRobotsTxtTest.java (100%) rename code/processes/crawling-process/{src/test/java => test}/nu/marginalia/crawling/HttpFetcherTest.java (100%) rename code/processes/crawling-process/{src/test/java => test}/nu/marginalia/crawling/LinkParserTest.java (100%) rename code/processes/crawling-process/{src/test/java => test}/nu/marginalia/crawling/RssCrawlerTest.java (100%) rename code/processes/crawling-process/{src/test/java => test}/nu/marginalia/crawling/retreival/CrawlerMockFetcherTest.java (100%) rename code/processes/crawling-process/{src/test/java => test}/nu/marginalia/crawling/retreival/CrawlerRetreiverTest.java (100%) rename code/processes/index-constructor-process/{src/main => }/java/nu/marginalia/index/IndexConstructorMain.java (100%) rename code/processes/index-constructor-process/{src/main => }/java/nu/marginalia/index/IndexConstructorModule.java (100%) rename code/processes/loading-process/{src/main => }/java/nu/marginalia/loading/LoaderIndexJournalWriter.java (100%) rename code/processes/loading-process/{src/main => }/java/nu/marginalia/loading/LoaderInputData.java (100%) rename code/processes/loading-process/{src/main => }/java/nu/marginalia/loading/LoaderMain.java (100%) rename code/processes/loading-process/{src/main => }/java/nu/marginalia/loading/LoaderModule.java (100%) rename code/processes/loading-process/{src/main => }/java/nu/marginalia/loading/documents/DocumentLoaderService.java (100%) rename code/processes/loading-process/{src/main => }/java/nu/marginalia/loading/documents/KeywordLoaderService.java (100%) rename code/processes/loading-process/{src/main => }/java/nu/marginalia/loading/domains/DomainIdRegistry.java (100%) rename code/processes/loading-process/{src/main => }/java/nu/marginalia/loading/domains/DomainLoaderService.java (100%) rename code/processes/loading-process/{src/main => }/java/nu/marginalia/loading/links/DomainLinksLoaderService.java (100%) rename code/processes/loading-process/{src/test/java => test}/nu/marginalia/loader/DbTestUtil.java (100%) rename code/processes/loading-process/{src/test/java => test}/nu/marginalia/loading/domains/DomainLoaderServiceTest.java (100%) rename code/processes/loading-process/{src/test/java => test}/nu/marginalia/loading/loader/LoaderIndexJournalWriterTest.java (100%) rename code/processes/test-data/{src/main => }/java/nu/marginalia/test/CommonTestData.java (100%) rename code/processes/test-data/{src/main => }/resources/mock-crawl-data/discourse/grid.html (100%) rename code/processes/test-data/{src/main => }/resources/mock-crawl-data/discourse/index.html (100%) rename code/processes/test-data/{src/main => }/resources/mock-crawl-data/discourse/telegram.html (100%) rename code/processes/test-data/{src/main => }/resources/mock-crawl-data/javadoc/stream.html (100%) rename code/processes/test-data/{src/main => }/resources/mock-crawl-data/lemmy/108995.html (100%) rename code/processes/test-data/{src/main => }/resources/mock-crawl-data/lemmy/c_startrek.html (100%) rename code/processes/test-data/{src/main => }/resources/mock-crawl-data/lemmy/index.html (100%) rename code/processes/test-data/{src/main => }/resources/mock-crawl-data/mediawiki/doom1.html (100%) rename code/processes/test-data/{src/main => }/resources/mock-crawl-data/mediawiki/doom2.html (100%) rename code/processes/test-data/{src/main => }/resources/mock-crawl-data/mediawiki/index.html (100%) rename code/processes/test-data/{src/main => }/resources/mock-crawl-data/xenforo/thread.html (100%) rename code/processes/website-adjacencies-calculator/{src/main => }/java/nu/marginalia/adjacencies/AdjacenciesData.java (100%) rename code/processes/website-adjacencies-calculator/{src/main => }/java/nu/marginalia/adjacencies/AdjacenciesLoader.java (100%) rename code/processes/website-adjacencies-calculator/{src/main => }/java/nu/marginalia/adjacencies/DomainAliases.java (100%) rename code/processes/website-adjacencies-calculator/{src/main => }/java/nu/marginalia/adjacencies/SparseBitVector.java (100%) rename code/processes/website-adjacencies-calculator/{src/main => }/java/nu/marginalia/adjacencies/WebsiteAdjacenciesCalculator.java (100%) rename code/processes/website-adjacencies-calculator/{src/test/java => test}/nu/marginalia/adjacencies/AdjacenciesLoaderTest.java (100%) rename code/processes/website-adjacencies-calculator/{src/test/java => test}/nu/marginalia/adjacencies/SparseBitVectorTest.java (100%) rename code/services-application/api-service/{src/main => }/java/nu/marginalia/api/ApiMain.java (100%) rename code/services-application/api-service/{src/main => }/java/nu/marginalia/api/ApiSearchOperator.java (100%) rename code/services-application/api-service/{src/main => }/java/nu/marginalia/api/ApiService.java (100%) rename code/services-application/api-service/{src/main => }/java/nu/marginalia/api/model/ApiLicense.java (100%) rename code/services-application/api-service/{src/main => }/java/nu/marginalia/api/model/ApiSearchResult.java (100%) rename code/services-application/api-service/{src/main => }/java/nu/marginalia/api/model/ApiSearchResultQueryDetails.java (100%) rename code/services-application/api-service/{src/main => }/java/nu/marginalia/api/model/ApiSearchResults.java (100%) rename code/services-application/api-service/{src/main => }/java/nu/marginalia/api/svc/LicenseService.java (100%) rename code/services-application/api-service/{src/main => }/java/nu/marginalia/api/svc/RateLimiterService.java (100%) rename code/services-application/api-service/{src/main => }/java/nu/marginalia/api/svc/ResponseCache.java (100%) rename code/services-application/api-service/{src/test/java => test}/nu/marginalia/api/svc/LicenseServiceTest.java (100%) rename code/services-application/api-service/{src/test/java => test}/nu/marginalia/api/svc/RateLimiterServiceTest.java (100%) rename code/services-application/api-service/{src/test/java => test}/nu/marginalia/api/svc/ResponseCacheTest.java (100%) rename code/services-application/dating-service/{src/main => }/java/nu/marginalia/dating/DatingMain.java (100%) rename code/services-application/dating-service/{src/main => }/java/nu/marginalia/dating/DatingModule.java (100%) rename code/services-application/dating-service/{src/main => }/java/nu/marginalia/dating/DatingService.java (100%) rename code/services-application/dating-service/{src/main => }/java/nu/marginalia/dating/DatingSessionObject.java (100%) rename code/services-application/dating-service/{src/main => }/resources/static/dating/robots.txt (100%) rename code/services-application/dating-service/{src/main => }/resources/templates/dating/dating-view.hdb (100%) rename code/services-application/explorer-service/{src/main => }/java/nu/marginalia/explorer/ExplorerMain.java (100%) rename code/services-application/explorer-service/{src/main => }/java/nu/marginalia/explorer/ExplorerModule.java (100%) rename code/services-application/explorer-service/{src/main => }/java/nu/marginalia/explorer/ExplorerService.java (100%) rename code/services-application/explorer-service/{src/main => }/resources/static/explore/robots.txt (100%) rename code/services-application/explorer-service/{src/main => }/resources/static/explore/style.css (100%) rename code/services-application/explorer-service/{src/main => }/resources/templates/explorer/explorer-about.hdb (100%) rename code/services-application/explorer-service/{src/main => }/resources/templates/explorer/explorer-messages.hdb (100%) rename code/services-application/explorer-service/{src/main => }/resources/templates/explorer/explorer-results.hdb (100%) rename code/services-application/explorer-service/{src/main => }/resources/templates/explorer/explorer-search.hdb (100%) rename code/services-application/explorer-service/{src/main => }/resources/templates/explorer/explorer.hdb (100%) rename code/services-application/search-service/{src/main => }/java/nu/marginalia/search/SearchHandlebarsConfigurator.java (100%) rename code/services-application/search-service/{src/main => }/java/nu/marginalia/search/SearchMain.java (100%) rename code/services-application/search-service/{src/main => }/java/nu/marginalia/search/SearchModule.java (100%) rename code/services-application/search-service/{src/main => }/java/nu/marginalia/search/SearchOperator.java (100%) rename code/services-application/search-service/{src/main => }/java/nu/marginalia/search/SearchQueryParamFactory.java (100%) rename code/services-application/search-service/{src/main => }/java/nu/marginalia/search/SearchResultClusterer.java (100%) rename code/services-application/search-service/{src/main => }/java/nu/marginalia/search/SearchService.java (100%) rename code/services-application/search-service/{src/main => }/java/nu/marginalia/search/command/CommandEvaluator.java (100%) rename code/services-application/search-service/{src/main => }/java/nu/marginalia/search/command/SearchAdtechParameter.java (100%) rename code/services-application/search-service/{src/main => }/java/nu/marginalia/search/command/SearchCommandInterface.java (100%) rename code/services-application/search-service/{src/main => }/java/nu/marginalia/search/command/SearchJsParameter.java (100%) rename code/services-application/search-service/{src/main => }/java/nu/marginalia/search/command/SearchParameters.java (100%) rename code/services-application/search-service/{src/main => }/java/nu/marginalia/search/command/SearchRecentParameter.java (100%) rename code/services-application/search-service/{src/main => }/java/nu/marginalia/search/command/SearchTitleParameter.java (100%) rename code/services-application/search-service/{src/main => }/java/nu/marginalia/search/command/commands/BangCommand.java (100%) rename code/services-application/search-service/{src/main => }/java/nu/marginalia/search/command/commands/BrowseCommand.java (100%) rename code/services-application/search-service/{src/main => }/java/nu/marginalia/search/command/commands/ConvertCommand.java (100%) rename code/services-application/search-service/{src/main => }/java/nu/marginalia/search/command/commands/DefinitionCommand.java (100%) rename code/services-application/search-service/{src/main => }/java/nu/marginalia/search/command/commands/SearchCommand.java (100%) rename code/services-application/search-service/{src/main => }/java/nu/marginalia/search/command/commands/SiteRedirectCommand.java (100%) rename code/services-application/search-service/{src/main => }/java/nu/marginalia/search/db/DbNearDomainsQuery.java (100%) rename code/services-application/search-service/{src/main => }/java/nu/marginalia/search/exceptions/RedirectException.java (100%) rename code/services-application/search-service/{src/main => }/java/nu/marginalia/search/model/ClusteredUrlDetails.java (100%) rename code/services-application/search-service/{src/main => }/java/nu/marginalia/search/model/DecoratedSearchResults.java (100%) rename code/services-application/search-service/{src/main => }/java/nu/marginalia/search/model/SearchFilters.java (100%) rename code/services-application/search-service/{src/main => }/java/nu/marginalia/search/model/SearchProfile.java (100%) rename code/services-application/search-service/{src/main => }/java/nu/marginalia/search/model/UrlDetails.java (100%) rename code/services-application/search-service/{src/main => }/java/nu/marginalia/search/results/BrowseResultCleaner.java (100%) rename code/services-application/search-service/{src/main => }/java/nu/marginalia/search/results/UrlDeduplicator.java (100%) rename code/services-application/search-service/{src/main => }/java/nu/marginalia/search/svc/SearchAddToCrawlQueueService.java (100%) rename code/services-application/search-service/{src/main => }/java/nu/marginalia/search/svc/SearchBrowseService.java (100%) rename code/services-application/search-service/{src/main => }/java/nu/marginalia/search/svc/SearchCrosstalkService.java (100%) rename code/services-application/search-service/{src/main => }/java/nu/marginalia/search/svc/SearchErrorPageService.java (100%) rename code/services-application/search-service/{src/main => }/java/nu/marginalia/search/svc/SearchFlagSiteService.java (100%) rename code/services-application/search-service/{src/main => }/java/nu/marginalia/search/svc/SearchFrontPageService.java (100%) rename code/services-application/search-service/{src/main => }/java/nu/marginalia/search/svc/SearchQueryCountService.java (100%) rename code/services-application/search-service/{src/main => }/java/nu/marginalia/search/svc/SearchQueryIndexService.java (100%) rename code/services-application/search-service/{src/main => }/java/nu/marginalia/search/svc/SearchQueryService.java (100%) rename code/services-application/search-service/{src/main => }/java/nu/marginalia/search/svc/SearchSiteInfoService.java (100%) rename code/services-application/search-service/{src/main => }/java/nu/marginalia/search/svc/SearchUnitConversionService.java (100%) rename code/services-application/search-service/{src/main => }/resources/static/search/crawler-ips.txt (100%) rename code/services-application/search-service/{src/main => }/resources/static/search/favicon.ico (100%) rename code/services-application/search-service/{src/main => }/resources/static/search/main.js (100%) rename code/services-application/search-service/{src/main => }/resources/static/search/menu.js (100%) rename code/services-application/search-service/{src/main => }/resources/static/search/opensearch.xml (100%) rename code/services-application/search-service/{src/main => }/resources/static/search/robots.txt (100%) rename code/services-application/search-service/{src/main => }/resources/static/search/rss.svg (100%) rename code/services-application/search-service/{src/main => }/resources/static/search/serp.scss (100%) rename code/services-application/search-service/{src/main => }/resources/static/search/style-new.css (100%) rename code/services-application/search-service/{src/main => }/resources/static/search/tts.js (100%) rename code/services-application/search-service/{src/main => }/resources/templates/search/browse-result.hdb (100%) rename code/services-application/search-service/{src/main => }/resources/templates/search/browse-results.hdb (100%) rename code/services-application/search-service/{src/main => }/resources/templates/search/conversion-results.hdb (100%) rename code/services-application/search-service/{src/main => }/resources/templates/search/dictionary-results.hdb (100%) rename code/services-application/search-service/{src/main => }/resources/templates/search/error-page-search.hdb (100%) rename code/services-application/search-service/{src/main => }/resources/templates/search/error-page.hdb (100%) rename code/services-application/search-service/{src/main => }/resources/templates/search/index/index-about.hdb (100%) rename code/services-application/search-service/{src/main => }/resources/templates/search/index/index-news.hdb (100%) rename code/services-application/search-service/{src/main => }/resources/templates/search/index/index-tips.hdb (100%) rename code/services-application/search-service/{src/main => }/resources/templates/search/index/index.hdb (100%) rename code/services-application/search-service/{src/main => }/resources/templates/search/parts/search-filters.hdb (100%) rename code/services-application/search-service/{src/main => }/resources/templates/search/parts/search-footer.hdb (100%) rename code/services-application/search-service/{src/main => }/resources/templates/search/parts/search-form.hdb (100%) rename code/services-application/search-service/{src/main => }/resources/templates/search/parts/search-header.hdb (100%) rename code/services-application/search-service/{src/main => }/resources/templates/search/parts/search-result-rest.hdb (100%) rename code/services-application/search-service/{src/main => }/resources/templates/search/parts/search-result.hdb (100%) rename code/services-application/search-service/{src/main => }/resources/templates/search/search-results.hdb (100%) rename code/services-application/search-service/{src/main => }/resources/templates/search/site-info/site-crosstalk.hdb (100%) rename code/services-application/search-service/{src/main => }/resources/templates/search/site-info/site-info-feed.hdb (100%) rename code/services-application/search-service/{src/main => }/resources/templates/search/site-info/site-info-index-blacklisted.hdb (100%) rename code/services-application/search-service/{src/main => }/resources/templates/search/site-info/site-info-index-indexed.hdb (100%) rename code/services-application/search-service/{src/main => }/resources/templates/search/site-info/site-info-index-suggest.hdb (100%) rename code/services-application/search-service/{src/main => }/resources/templates/search/site-info/site-info-index-unknown.hdb (100%) rename code/services-application/search-service/{src/main => }/resources/templates/search/site-info/site-info-index.hdb (100%) rename code/services-application/search-service/{src/main => }/resources/templates/search/site-info/site-info-links.hdb (100%) rename code/services-application/search-service/{src/main => }/resources/templates/search/site-info/site-info-report.hdb (100%) rename code/services-application/search-service/{src/main => }/resources/templates/search/site-info/site-info-summary.hdb (100%) rename code/services-application/search-service/{src/main => }/resources/templates/search/site-info/site-info.hdb (100%) rename code/services-application/search-service/{src/test/java => test}/nu/marginalia/search/command/commands/BangCommandTest.java (100%) rename code/services-application/search-service/{src/test/java => test}/nu/marginalia/util/TestLanguageModels.java (100%) rename code/services-core/assistant-service/{src/main => }/java/nu/marginalia/assistant/AssistantMain.java (100%) rename code/services-core/assistant-service/{src/main => }/java/nu/marginalia/assistant/AssistantModule.java (100%) rename code/services-core/assistant-service/{src/main => }/java/nu/marginalia/assistant/AssistantService.java (100%) rename code/services-core/assistant-service/{src/main => }/java/nu/marginalia/assistant/suggest/Suggestions.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/ControlHandlebarsConfigurator.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/ControlMain.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/ControlProcessModule.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/ControlRendererFactory.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/ControlService.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/ControlValidationError.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/RedirectControl.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/Redirects.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/actor/ControlActor.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/actor/ControlActorService.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/actor/PrecessionNodes.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/actor/monitor/MessageQueueMonitorActor.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/actor/monitor/ServiceHeartbeatMonitorActor.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/actor/precession/RecrawlAllActor.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/actor/precession/ReindexAllActor.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/actor/precession/ReprocessAllActor.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/actor/rebalance/RebalanceActor.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/app/model/ApiKeyModel.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/app/model/BlacklistedDomainModel.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/app/model/DomainComplaintCategory.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/app/model/DomainComplaintModel.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/app/svc/ApiKeyService.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/app/svc/ControlBlacklistService.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/app/svc/DomainComplaintService.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/app/svc/RandomExplorationService.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/app/svc/SearchToBanService.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/node/model/FileStorageBaseWithStorage.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/node/model/FileStorageFileModel.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/node/model/FileStorageWithActions.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/node/model/FileStorageWithRelatedEntries.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/node/model/IndexNodeStatus.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/node/svc/ControlFileStorageService.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/node/svc/ControlNodeActionsService.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/node/svc/ControlNodeService.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/sys/model/AbortedProcess.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/sys/model/EventLogEntry.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/sys/model/EventLogServiceFilter.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/sys/model/EventLogTypeFilter.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/sys/model/MessageQueueEntry.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/sys/model/ProcessHeartbeat.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/sys/model/ServiceHeartbeat.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/sys/model/TaskHeartbeat.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/sys/svc/AbortedProcessService.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/sys/svc/ControlDomainRankingSetsService.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/sys/svc/ControlErrorHandler.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/sys/svc/ControlSysActionsService.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/sys/svc/DataSetsService.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/sys/svc/EventLogService.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/sys/svc/HeartbeatService.java (100%) rename code/services-core/control-service/{src/main => }/java/nu/marginalia/control/sys/svc/MessageQueueService.java (100%) rename code/services-core/control-service/{src/main => }/resources/static/control/noanimation.css (100%) rename code/services-core/control-service/{src/main => }/resources/static/control/refresh.js (100%) rename code/services-core/control-service/{src/main => }/resources/static/control/tables.css (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/actions.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/actor-details.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/app/api-keys.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/app/blacklist.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/app/domain-complaints.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/app/review-random-domains.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/app/search-to-ban.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/error.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/index.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/node/actions/partial-download-sample-data.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/node/actions/partial-export-db-data.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/node/actions/partial-export-from-crawl-data.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/node/actions/partial-export-sample-data.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/node/actions/partial-load.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/node/actions/partial-new-crawl-specs.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/node/actions/partial-new-crawl.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/node/actions/partial-process.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/node/actions/partial-recrawl.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/node/actions/partial-repartition.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/node/actions/partial-restore-backup.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/node/actions/partial-sideload-dirtree.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/node/actions/partial-sideload-encyclopedia.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/node/actions/partial-sideload-reddit.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/node/actions/partial-sideload-stackexchange.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/node/actions/partial-sideload-warc.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/node/node-actions.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/node/node-actors.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/node/node-config.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/node/node-overview.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/node/node-storage-conf.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/node/node-storage-details.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/node/node-storage-list.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/node/nodes-list.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/node/partial-node-nav.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/partials/actor-summary-table.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/partials/actors-table.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/partials/events-table-summary.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/partials/events-table.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/partials/foot-includes.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/partials/head-includes.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/partials/message-queue-table.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/partials/nav.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/partials/nodes-table.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/partials/processes-table.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/partials/services-table.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/partials/storage-details/files.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/partials/storage-details/related.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/partials/storage-types.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/redirect-ok.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/sys/aborted-processes.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/sys/data-sets.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/sys/domain-ranking-sets.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/sys/events.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/sys/message-queue.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/sys/new-domain-ranking-set.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/sys/new-message.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/sys/service-by-id.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/sys/sys-actions.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/sys/update-domain-ranking-set.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/sys/update-message-state.hdb (100%) rename code/services-core/control-service/{src/main => }/resources/templates/control/sys/view-message.hdb (100%) rename code/services-core/control-service/{src/test/java => test}/nu/marginalia/control/svc/ApiKeyServiceTest.java (100%) rename code/services-core/control-service/{src/test/java => test}/nu/marginalia/control/svc/HeartbeatServiceTest.java (100%) rename code/services-core/executor-service/{src/main => }/java/nu/marginalia/executor/ExecutorMain.java (100%) rename code/services-core/executor-service/{src/main => }/java/nu/marginalia/executor/ExecutorModule.java (100%) rename code/services-core/executor-service/{src/main => }/java/nu/marginalia/executor/ExecutorSvc.java (100%) rename code/services-core/index-service/{src/main => }/java/nu/marginalia/index/IndexMain.java (100%) rename code/services-core/index-service/{src/main => }/java/nu/marginalia/index/IndexModule.java (100%) rename code/services-core/index-service/{src/main => }/java/nu/marginalia/index/IndexOpsService.java (100%) rename code/services-core/index-service/{src/main => }/java/nu/marginalia/index/IndexService.java (100%) rename code/services-core/query-service/{src/main => }/java/nu/marginalia/query/QueryBasicInterface.java (100%) rename code/services-core/query-service/{src/main => }/java/nu/marginalia/query/QueryMain.java (100%) rename code/services-core/query-service/{src/main => }/java/nu/marginalia/query/QueryModule.java (100%) rename code/services-core/query-service/{src/main => }/java/nu/marginalia/query/QueryService.java (100%) rename code/services-core/query-service/{src/main => }/resources/static/public/index.html (100%) rename code/services-core/query-service/{src/main => }/resources/templates/search.hdb (100%) rename code/tools/crawl-data-unfcker/{src/main => }/java/nu/marginalia/tools/CrawlDataUnfcker.java (100%) rename code/tools/experiment-runner/{src/main => }/java/nu/marginalia/tools/Experiment.java (100%) rename code/tools/experiment-runner/{src/main => }/java/nu/marginalia/tools/ExperimentRunnerMain.java (100%) rename code/tools/experiment-runner/{src/main => }/java/nu/marginalia/tools/LegacyExperiment.java (100%) rename code/tools/experiment-runner/{src/main => }/java/nu/marginalia/tools/experiments/AdblockExperiment.java (100%) rename code/tools/experiment-runner/{src/main => }/java/nu/marginalia/tools/experiments/AtagsExperiment.java (100%) rename code/tools/experiment-runner/{src/main => }/java/nu/marginalia/tools/experiments/DebugConverterExperiment.java (100%) rename code/tools/experiment-runner/{src/main => }/java/nu/marginalia/tools/experiments/ExportExternalLinksExperiment.java (100%) rename code/tools/experiment-runner/{src/main => }/java/nu/marginalia/tools/experiments/SentenceStatisticsExperiment.java (100%) rename code/tools/experiment-runner/{src/main => }/java/nu/marginalia/tools/experiments/SiteStatisticsExperiment.java (100%) rename code/tools/experiment-runner/{src/main => }/java/nu/marginalia/tools/experiments/TestExperiment.java (100%) rename code/tools/experiment-runner/{src/main => }/java/nu/marginalia/tools/experiments/TopicExperiment.java (100%) rename code/tools/load-test/{src/main => }/java/nu/marginalia/load_test/LoadTestMain.java (100%) rename code/tools/screenshot-capture-tool/{src/main => }/java/nu/marginalia/screenshot/ScreenshotCaptureToolMain.java (100%) rename code/tools/screenshot-capture-tool/{src/main => }/java/nu/marginalia/screenshot/ScreenshotLoaderMain.java (100%) create mode 100644 srcsets.gradle diff --git a/build.gradle b/build.gradle index 12ab5b31..3e4e8c99 100644 --- a/build.gradle +++ b/build.gradle @@ -17,6 +17,14 @@ compileTestJava.options.encoding = "UTF-8" subprojects.forEach {it -> // Enable preview features for the entire project + + if (it.path.contains(':code:')) { + sourceSets.main.java.srcDirs += file('java') + sourceSets.main.resources.srcDirs += file('resources') + sourceSets.test.java.srcDirs += file('test') + sourceSets.test.resources.srcDirs += file('test-resources') + } + it.tasks.withType(JavaCompile).configureEach { options.compilerArgs += ['--enable-preview'] } @@ -32,34 +40,11 @@ subprojects.forEach {it -> preserveFileTimestamps = false reproducibleFileOrder = true } + } ext { dockerImageBase='container-registry.oracle.com/graalvm/jdk:21@sha256:1fd33d4d4eba3a9e1a41a728e39ea217178d257694eea1214fec68d2ed4d3d9b' } -allprojects { - apply plugin: 'java' - apply plugin: 'io.freefair.lombok' - dependencies { - implementation libs.lombok - testImplementation libs.lombok - annotationProcessor libs.lombok - - lombok libs.lombok // prevent plugin from downgrading the version to something incompatible with '19 - } - - test { - maxHeapSize = "8G" - useJUnitPlatform() - } - - tasks.register('fastTests', Test) { - maxHeapSize = "8G" - useJUnitPlatform { - excludeTags "slow" - } - } - -} idea { module { diff --git a/code/common/config/build.gradle b/code/common/config/build.gradle index 5d4b5ecc..66a984d4 100644 --- a/code/common/config/build.gradle +++ b/code/common/config/build.gradle @@ -11,6 +11,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':code:common:service-discovery') implementation project(':code:common:db') diff --git a/code/common/config/src/main/java/nu/marginalia/IndexLocations.java b/code/common/config/java/nu/marginalia/IndexLocations.java similarity index 100% rename from code/common/config/src/main/java/nu/marginalia/IndexLocations.java rename to code/common/config/java/nu/marginalia/IndexLocations.java diff --git a/code/common/config/src/main/java/nu/marginalia/LanguageModels.java b/code/common/config/java/nu/marginalia/LanguageModels.java similarity index 100% rename from code/common/config/src/main/java/nu/marginalia/LanguageModels.java rename to code/common/config/java/nu/marginalia/LanguageModels.java diff --git a/code/common/config/src/main/java/nu/marginalia/UserAgent.java b/code/common/config/java/nu/marginalia/UserAgent.java similarity index 100% rename from code/common/config/src/main/java/nu/marginalia/UserAgent.java rename to code/common/config/java/nu/marginalia/UserAgent.java diff --git a/code/common/config/src/main/java/nu/marginalia/WebsiteUrl.java b/code/common/config/java/nu/marginalia/WebsiteUrl.java similarity index 100% rename from code/common/config/src/main/java/nu/marginalia/WebsiteUrl.java rename to code/common/config/java/nu/marginalia/WebsiteUrl.java diff --git a/code/common/config/src/main/java/nu/marginalia/WmsaHome.java b/code/common/config/java/nu/marginalia/WmsaHome.java similarity index 100% rename from code/common/config/src/main/java/nu/marginalia/WmsaHome.java rename to code/common/config/java/nu/marginalia/WmsaHome.java diff --git a/code/common/config/src/main/java/nu/marginalia/nodecfg/NodeConfigurationService.java b/code/common/config/java/nu/marginalia/nodecfg/NodeConfigurationService.java similarity index 100% rename from code/common/config/src/main/java/nu/marginalia/nodecfg/NodeConfigurationService.java rename to code/common/config/java/nu/marginalia/nodecfg/NodeConfigurationService.java diff --git a/code/common/config/src/main/java/nu/marginalia/nodecfg/model/NodeConfiguration.java b/code/common/config/java/nu/marginalia/nodecfg/model/NodeConfiguration.java similarity index 100% rename from code/common/config/src/main/java/nu/marginalia/nodecfg/model/NodeConfiguration.java rename to code/common/config/java/nu/marginalia/nodecfg/model/NodeConfiguration.java diff --git a/code/common/config/src/main/java/nu/marginalia/storage/FileStorageManifest.java b/code/common/config/java/nu/marginalia/storage/FileStorageManifest.java similarity index 100% rename from code/common/config/src/main/java/nu/marginalia/storage/FileStorageManifest.java rename to code/common/config/java/nu/marginalia/storage/FileStorageManifest.java diff --git a/code/common/config/src/main/java/nu/marginalia/storage/FileStorageService.java b/code/common/config/java/nu/marginalia/storage/FileStorageService.java similarity index 100% rename from code/common/config/src/main/java/nu/marginalia/storage/FileStorageService.java rename to code/common/config/java/nu/marginalia/storage/FileStorageService.java diff --git a/code/common/config/src/main/java/nu/marginalia/storage/model/FileStorage.java b/code/common/config/java/nu/marginalia/storage/model/FileStorage.java similarity index 100% rename from code/common/config/src/main/java/nu/marginalia/storage/model/FileStorage.java rename to code/common/config/java/nu/marginalia/storage/model/FileStorage.java diff --git a/code/common/config/src/main/java/nu/marginalia/storage/model/FileStorageBase.java b/code/common/config/java/nu/marginalia/storage/model/FileStorageBase.java similarity index 100% rename from code/common/config/src/main/java/nu/marginalia/storage/model/FileStorageBase.java rename to code/common/config/java/nu/marginalia/storage/model/FileStorageBase.java diff --git a/code/common/config/src/main/java/nu/marginalia/storage/model/FileStorageBaseId.java b/code/common/config/java/nu/marginalia/storage/model/FileStorageBaseId.java similarity index 100% rename from code/common/config/src/main/java/nu/marginalia/storage/model/FileStorageBaseId.java rename to code/common/config/java/nu/marginalia/storage/model/FileStorageBaseId.java diff --git a/code/common/config/src/main/java/nu/marginalia/storage/model/FileStorageBaseType.java b/code/common/config/java/nu/marginalia/storage/model/FileStorageBaseType.java similarity index 100% rename from code/common/config/src/main/java/nu/marginalia/storage/model/FileStorageBaseType.java rename to code/common/config/java/nu/marginalia/storage/model/FileStorageBaseType.java diff --git a/code/common/config/src/main/java/nu/marginalia/storage/model/FileStorageId.java b/code/common/config/java/nu/marginalia/storage/model/FileStorageId.java similarity index 100% rename from code/common/config/src/main/java/nu/marginalia/storage/model/FileStorageId.java rename to code/common/config/java/nu/marginalia/storage/model/FileStorageId.java diff --git a/code/common/config/src/main/java/nu/marginalia/storage/model/FileStorageState.java b/code/common/config/java/nu/marginalia/storage/model/FileStorageState.java similarity index 100% rename from code/common/config/src/main/java/nu/marginalia/storage/model/FileStorageState.java rename to code/common/config/java/nu/marginalia/storage/model/FileStorageState.java diff --git a/code/common/config/src/main/java/nu/marginalia/storage/model/FileStorageType.java b/code/common/config/java/nu/marginalia/storage/model/FileStorageType.java similarity index 100% rename from code/common/config/src/main/java/nu/marginalia/storage/model/FileStorageType.java rename to code/common/config/java/nu/marginalia/storage/model/FileStorageType.java diff --git a/code/common/config/src/test/java/nu/marginalia/nodecfg/NodeConfigurationServiceTest.java b/code/common/config/test/nu/marginalia/nodecfg/NodeConfigurationServiceTest.java similarity index 100% rename from code/common/config/src/test/java/nu/marginalia/nodecfg/NodeConfigurationServiceTest.java rename to code/common/config/test/nu/marginalia/nodecfg/NodeConfigurationServiceTest.java diff --git a/code/common/config/src/test/java/nu/marginalia/storage/FileStorageServiceTest.java b/code/common/config/test/nu/marginalia/storage/FileStorageServiceTest.java similarity index 100% rename from code/common/config/src/test/java/nu/marginalia/storage/FileStorageServiceTest.java rename to code/common/config/test/nu/marginalia/storage/FileStorageServiceTest.java diff --git a/code/common/db/build.gradle b/code/common/db/build.gradle index a31e21fb..85ab7dba 100644 --- a/code/common/db/build.gradle +++ b/code/common/db/build.gradle @@ -26,6 +26,8 @@ configurations { flywayMigration.extendsFrom(implementation) } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':code:common:model') diff --git a/code/common/db/src/main/java/nu/marginalia/db/DbDomainQueries.java b/code/common/db/java/nu/marginalia/db/DbDomainQueries.java similarity index 100% rename from code/common/db/src/main/java/nu/marginalia/db/DbDomainQueries.java rename to code/common/db/java/nu/marginalia/db/DbDomainQueries.java diff --git a/code/common/db/src/main/java/nu/marginalia/db/DbDomainStatsExportMultitool.java b/code/common/db/java/nu/marginalia/db/DbDomainStatsExportMultitool.java similarity index 100% rename from code/common/db/src/main/java/nu/marginalia/db/DbDomainStatsExportMultitool.java rename to code/common/db/java/nu/marginalia/db/DbDomainStatsExportMultitool.java diff --git a/code/common/db/src/main/java/nu/marginalia/db/DomainBlacklist.java b/code/common/db/java/nu/marginalia/db/DomainBlacklist.java similarity index 100% rename from code/common/db/src/main/java/nu/marginalia/db/DomainBlacklist.java rename to code/common/db/java/nu/marginalia/db/DomainBlacklist.java diff --git a/code/common/db/src/main/java/nu/marginalia/db/DomainBlacklistImpl.java b/code/common/db/java/nu/marginalia/db/DomainBlacklistImpl.java similarity index 100% rename from code/common/db/src/main/java/nu/marginalia/db/DomainBlacklistImpl.java rename to code/common/db/java/nu/marginalia/db/DomainBlacklistImpl.java diff --git a/code/common/db/src/main/java/nu/marginalia/db/DomainRankingSetsService.java b/code/common/db/java/nu/marginalia/db/DomainRankingSetsService.java similarity index 100% rename from code/common/db/src/main/java/nu/marginalia/db/DomainRankingSetsService.java rename to code/common/db/java/nu/marginalia/db/DomainRankingSetsService.java diff --git a/code/common/db/src/main/java/nu/marginalia/db/DomainTypes.java b/code/common/db/java/nu/marginalia/db/DomainTypes.java similarity index 100% rename from code/common/db/src/main/java/nu/marginalia/db/DomainTypes.java rename to code/common/db/java/nu/marginalia/db/DomainTypes.java diff --git a/code/common/db/src/main/resources/db/migration/V23_06_0_000__base.sql b/code/common/db/resources/db/migration/V23_06_0_000__base.sql similarity index 100% rename from code/common/db/src/main/resources/db/migration/V23_06_0_000__base.sql rename to code/common/db/resources/db/migration/V23_06_0_000__base.sql diff --git a/code/common/db/src/main/resources/db/migration/V23_06_0_001__blacklist.sql b/code/common/db/resources/db/migration/V23_06_0_001__blacklist.sql similarity index 100% rename from code/common/db/src/main/resources/db/migration/V23_06_0_001__blacklist.sql rename to code/common/db/resources/db/migration/V23_06_0_001__blacklist.sql diff --git a/code/common/db/src/main/resources/db/migration/V23_06_0_002__dictionary.sql b/code/common/db/resources/db/migration/V23_06_0_002__dictionary.sql similarity index 100% rename from code/common/db/src/main/resources/db/migration/V23_06_0_002__dictionary.sql rename to code/common/db/resources/db/migration/V23_06_0_002__dictionary.sql diff --git a/code/common/db/src/main/resources/db/migration/V23_06_0_003__crawl-queue.sql b/code/common/db/resources/db/migration/V23_06_0_003__crawl-queue.sql similarity index 100% rename from code/common/db/src/main/resources/db/migration/V23_06_0_003__crawl-queue.sql rename to code/common/db/resources/db/migration/V23_06_0_003__crawl-queue.sql diff --git a/code/common/db/src/main/resources/db/migration/V23_06_0_004__screenshot.sql b/code/common/db/resources/db/migration/V23_06_0_004__screenshot.sql similarity index 100% rename from code/common/db/src/main/resources/db/migration/V23_06_0_004__screenshot.sql rename to code/common/db/resources/db/migration/V23_06_0_004__screenshot.sql diff --git a/code/common/db/src/main/resources/db/migration/V23_06_0_005__domain_complaint.sql b/code/common/db/resources/db/migration/V23_06_0_005__domain_complaint.sql similarity index 100% rename from code/common/db/src/main/resources/db/migration/V23_06_0_005__domain_complaint.sql rename to code/common/db/resources/db/migration/V23_06_0_005__domain_complaint.sql diff --git a/code/common/db/src/main/resources/db/migration/V23_06_0_006__api_key.sql b/code/common/db/resources/db/migration/V23_06_0_006__api_key.sql similarity index 100% rename from code/common/db/src/main/resources/db/migration/V23_06_0_006__api_key.sql rename to code/common/db/resources/db/migration/V23_06_0_006__api_key.sql diff --git a/code/common/db/src/main/resources/db/migration/V23_06_0_007__neighbors.sql b/code/common/db/resources/db/migration/V23_06_0_007__neighbors.sql similarity index 100% rename from code/common/db/src/main/resources/db/migration/V23_06_0_007__neighbors.sql rename to code/common/db/resources/db/migration/V23_06_0_007__neighbors.sql diff --git a/code/common/db/src/main/resources/db/migration/V23_06_0_008__random_domains.sql b/code/common/db/resources/db/migration/V23_06_0_008__random_domains.sql similarity index 100% rename from code/common/db/src/main/resources/db/migration/V23_06_0_008__random_domains.sql rename to code/common/db/resources/db/migration/V23_06_0_008__random_domains.sql diff --git a/code/common/db/src/main/resources/db/migration/V23_06_0_009__news_feed.sql b/code/common/db/resources/db/migration/V23_06_0_009__news_feed.sql similarity index 100% rename from code/common/db/src/main/resources/db/migration/V23_06_0_009__news_feed.sql rename to code/common/db/resources/db/migration/V23_06_0_009__news_feed.sql diff --git a/code/common/db/src/main/resources/db/migration/V23_07_0_001__domain_type.sql b/code/common/db/resources/db/migration/V23_07_0_001__domain_type.sql similarity index 100% rename from code/common/db/src/main/resources/db/migration/V23_07_0_001__domain_type.sql rename to code/common/db/resources/db/migration/V23_07_0_001__domain_type.sql diff --git a/code/common/db/src/main/resources/db/migration/V23_07_0_002__service_status.sql b/code/common/db/resources/db/migration/V23_07_0_002__service_status.sql similarity index 100% rename from code/common/db/src/main/resources/db/migration/V23_07_0_002__service_status.sql rename to code/common/db/resources/db/migration/V23_07_0_002__service_status.sql diff --git a/code/common/db/src/main/resources/db/migration/V23_07_0_003__message_queue.sql b/code/common/db/resources/db/migration/V23_07_0_003__message_queue.sql similarity index 100% rename from code/common/db/src/main/resources/db/migration/V23_07_0_003__message_queue.sql rename to code/common/db/resources/db/migration/V23_07_0_003__message_queue.sql diff --git a/code/common/db/src/main/resources/db/migration/V23_07_0_004__file_storage.sql b/code/common/db/resources/db/migration/V23_07_0_004__file_storage.sql similarity index 100% rename from code/common/db/src/main/resources/db/migration/V23_07_0_004__file_storage.sql rename to code/common/db/resources/db/migration/V23_07_0_004__file_storage.sql diff --git a/code/common/db/src/main/resources/db/migration/V23_07_0_005__file_storage_default_values.sql b/code/common/db/resources/db/migration/V23_07_0_005__file_storage_default_values.sql similarity index 100% rename from code/common/db/src/main/resources/db/migration/V23_07_0_005__file_storage_default_values.sql rename to code/common/db/resources/db/migration/V23_07_0_005__file_storage_default_values.sql diff --git a/code/common/db/src/main/resources/db/migration/V23_07_0_006__message_queue_default_jobs.sql b/code/common/db/resources/db/migration/V23_07_0_006__message_queue_default_jobs.sql similarity index 100% rename from code/common/db/src/main/resources/db/migration/V23_07_0_006__message_queue_default_jobs.sql rename to code/common/db/resources/db/migration/V23_07_0_006__message_queue_default_jobs.sql diff --git a/code/common/db/src/main/resources/db/migration/V23_07_0_007__task_status.sql b/code/common/db/resources/db/migration/V23_07_0_007__task_status.sql similarity index 100% rename from code/common/db/src/main/resources/db/migration/V23_07_0_007__task_status.sql rename to code/common/db/resources/db/migration/V23_07_0_007__task_status.sql diff --git a/code/common/db/src/main/resources/db/migration/V23_07_0_008__events_index.sql b/code/common/db/resources/db/migration/V23_07_0_008__events_index.sql similarity index 100% rename from code/common/db/src/main/resources/db/migration/V23_07_0_008__events_index.sql rename to code/common/db/resources/db/migration/V23_07_0_008__events_index.sql diff --git a/code/common/db/src/main/resources/db/migration/V23_09_0_000__filestorage_livedb.sql b/code/common/db/resources/db/migration/V23_09_0_000__filestorage_livedb.sql similarity index 100% rename from code/common/db/src/main/resources/db/migration/V23_09_0_000__filestorage_livedb.sql rename to code/common/db/resources/db/migration/V23_09_0_000__filestorage_livedb.sql diff --git a/code/common/db/src/main/resources/db/migration/V23_09_1_000__drop_ecurl.sql b/code/common/db/resources/db/migration/V23_09_1_000__drop_ecurl.sql similarity index 100% rename from code/common/db/src/main/resources/db/migration/V23_09_1_000__drop_ecurl.sql rename to code/common/db/resources/db/migration/V23_09_1_000__drop_ecurl.sql diff --git a/code/common/db/src/main/resources/db/migration/V23_09_2_000__filestorage_backup.sql b/code/common/db/resources/db/migration/V23_09_2_000__filestorage_backup.sql similarity index 100% rename from code/common/db/src/main/resources/db/migration/V23_09_2_000__filestorage_backup.sql rename to code/common/db/resources/db/migration/V23_09_2_000__filestorage_backup.sql diff --git a/code/common/db/src/main/resources/db/migration/V23_09_2_001__filestorage_no_lexicon.sql b/code/common/db/resources/db/migration/V23_09_2_001__filestorage_no_lexicon.sql similarity index 100% rename from code/common/db/src/main/resources/db/migration/V23_09_2_001__filestorage_no_lexicon.sql rename to code/common/db/resources/db/migration/V23_09_2_001__filestorage_no_lexicon.sql diff --git a/code/common/db/src/main/resources/db/migration/V23_11_0_000__file_storage_node.sql b/code/common/db/resources/db/migration/V23_11_0_000__file_storage_node.sql similarity index 100% rename from code/common/db/src/main/resources/db/migration/V23_11_0_000__file_storage_node.sql rename to code/common/db/resources/db/migration/V23_11_0_000__file_storage_node.sql diff --git a/code/common/db/src/main/resources/db/migration/V23_11_0_001__heartbeat_node.sql b/code/common/db/resources/db/migration/V23_11_0_001__heartbeat_node.sql similarity index 100% rename from code/common/db/src/main/resources/db/migration/V23_11_0_001__heartbeat_node.sql rename to code/common/db/resources/db/migration/V23_11_0_001__heartbeat_node.sql diff --git a/code/common/db/src/main/resources/db/migration/V23_11_0_002__file_storage_state.sql b/code/common/db/resources/db/migration/V23_11_0_002__file_storage_state.sql similarity index 100% rename from code/common/db/src/main/resources/db/migration/V23_11_0_002__file_storage_state.sql rename to code/common/db/resources/db/migration/V23_11_0_002__file_storage_state.sql diff --git a/code/common/db/src/main/resources/db/migration/V23_11_0_003__node_configuration.sql b/code/common/db/resources/db/migration/V23_11_0_003__node_configuration.sql similarity index 100% rename from code/common/db/src/main/resources/db/migration/V23_11_0_003__node_configuration.sql rename to code/common/db/resources/db/migration/V23_11_0_003__node_configuration.sql diff --git a/code/common/db/src/main/resources/db/migration/V23_11_0_004__file_storage_base_type.sql b/code/common/db/resources/db/migration/V23_11_0_004__file_storage_base_type.sql similarity index 100% rename from code/common/db/src/main/resources/db/migration/V23_11_0_004__file_storage_base_type.sql rename to code/common/db/resources/db/migration/V23_11_0_004__file_storage_base_type.sql diff --git a/code/common/db/src/main/resources/db/migration/V23_11_0_005__clean_message_queue.sql b/code/common/db/resources/db/migration/V23_11_0_005__clean_message_queue.sql similarity index 100% rename from code/common/db/src/main/resources/db/migration/V23_11_0_005__clean_message_queue.sql rename to code/common/db/resources/db/migration/V23_11_0_005__clean_message_queue.sql diff --git a/code/common/db/src/main/resources/db/migration/V23_11_0_006__clean_stores.sql b/code/common/db/resources/db/migration/V23_11_0_006__clean_stores.sql similarity index 100% rename from code/common/db/src/main/resources/db/migration/V23_11_0_006__clean_stores.sql rename to code/common/db/resources/db/migration/V23_11_0_006__clean_stores.sql diff --git a/code/common/db/src/main/resources/db/migration/V23_11_0_007__domain_node_affinity.sql b/code/common/db/resources/db/migration/V23_11_0_007__domain_node_affinity.sql similarity index 100% rename from code/common/db/src/main/resources/db/migration/V23_11_0_007__domain_node_affinity.sql rename to code/common/db/resources/db/migration/V23_11_0_007__domain_node_affinity.sql diff --git a/code/common/db/src/main/resources/db/migration/V23_11_0_008__purge_procedure.sql b/code/common/db/resources/db/migration/V23_11_0_008__purge_procedure.sql similarity index 100% rename from code/common/db/src/main/resources/db/migration/V23_11_0_008__purge_procedure.sql rename to code/common/db/resources/db/migration/V23_11_0_008__purge_procedure.sql diff --git a/code/common/db/src/main/resources/db/migration/V24_01_0_001__node_config__keep_warc.sql b/code/common/db/resources/db/migration/V24_01_0_001__node_config__keep_warc.sql similarity index 100% rename from code/common/db/src/main/resources/db/migration/V24_01_0_001__node_config__keep_warc.sql rename to code/common/db/resources/db/migration/V24_01_0_001__node_config__keep_warc.sql diff --git a/code/common/db/src/main/resources/db/migration/V24_01_0_002__domain_set.sql b/code/common/db/resources/db/migration/V24_01_0_002__domain_set.sql similarity index 100% rename from code/common/db/src/main/resources/db/migration/V24_01_0_002__domain_set.sql rename to code/common/db/resources/db/migration/V24_01_0_002__domain_set.sql diff --git a/code/common/db/src/main/resources/db/migration/V24_01_0_003__mqaudit.sql b/code/common/db/resources/db/migration/V24_01_0_003__mqaudit.sql similarity index 100% rename from code/common/db/src/main/resources/db/migration/V24_01_0_003__mqaudit.sql rename to code/common/db/resources/db/migration/V24_01_0_003__mqaudit.sql diff --git a/code/common/db/src/main/resources/db/migration/V24_02_0_000__drop_domain_links.sql b/code/common/db/resources/db/migration/V24_02_0_000__drop_domain_links.sql similarity index 100% rename from code/common/db/src/main/resources/db/migration/V24_02_0_000__drop_domain_links.sql rename to code/common/db/resources/db/migration/V24_02_0_000__drop_domain_links.sql diff --git a/code/common/db/src/main/resources/db/migration/V24_02_0_001__drop_ranking_set_algo.sql b/code/common/db/resources/db/migration/V24_02_0_001__drop_ranking_set_algo.sql similarity index 100% rename from code/common/db/src/main/resources/db/migration/V24_02_0_001__drop_ranking_set_algo.sql rename to code/common/db/resources/db/migration/V24_02_0_001__drop_ranking_set_algo.sql diff --git a/code/common/db/src/test/java/nu/marginalia/db/DomainRankingSetsServiceTest.java b/code/common/db/test/nu/marginalia/db/DomainRankingSetsServiceTest.java similarity index 100% rename from code/common/db/src/test/java/nu/marginalia/db/DomainRankingSetsServiceTest.java rename to code/common/db/test/nu/marginalia/db/DomainRankingSetsServiceTest.java diff --git a/code/common/db/src/test/java/nu/marginalia/db/DomainTypesTest.java b/code/common/db/test/nu/marginalia/db/DomainTypesTest.java similarity index 100% rename from code/common/db/src/test/java/nu/marginalia/db/DomainTypesTest.java rename to code/common/db/test/nu/marginalia/db/DomainTypesTest.java diff --git a/code/common/linkdb/build.gradle b/code/common/linkdb/build.gradle index 41ec618d..811aa577 100644 --- a/code/common/linkdb/build.gradle +++ b/code/common/linkdb/build.gradle @@ -14,6 +14,8 @@ configurations { flywayMigration.extendsFrom(implementation) } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':code:common:model') implementation project(':code:common:service') diff --git a/code/common/linkdb/src/main/java/nu/marginalia/linkdb/LinkdbFileNames.java b/code/common/linkdb/java/nu/marginalia/linkdb/LinkdbFileNames.java similarity index 100% rename from code/common/linkdb/src/main/java/nu/marginalia/linkdb/LinkdbFileNames.java rename to code/common/linkdb/java/nu/marginalia/linkdb/LinkdbFileNames.java diff --git a/code/common/linkdb/src/main/java/nu/marginalia/linkdb/dlinks/DelayingDomainLinkDb.java b/code/common/linkdb/java/nu/marginalia/linkdb/dlinks/DelayingDomainLinkDb.java similarity index 100% rename from code/common/linkdb/src/main/java/nu/marginalia/linkdb/dlinks/DelayingDomainLinkDb.java rename to code/common/linkdb/java/nu/marginalia/linkdb/dlinks/DelayingDomainLinkDb.java diff --git a/code/common/linkdb/src/main/java/nu/marginalia/linkdb/dlinks/DomainLinkDb.java b/code/common/linkdb/java/nu/marginalia/linkdb/dlinks/DomainLinkDb.java similarity index 100% rename from code/common/linkdb/src/main/java/nu/marginalia/linkdb/dlinks/DomainLinkDb.java rename to code/common/linkdb/java/nu/marginalia/linkdb/dlinks/DomainLinkDb.java diff --git a/code/common/linkdb/src/main/java/nu/marginalia/linkdb/dlinks/DomainLinkDbLoader.java b/code/common/linkdb/java/nu/marginalia/linkdb/dlinks/DomainLinkDbLoader.java similarity index 100% rename from code/common/linkdb/src/main/java/nu/marginalia/linkdb/dlinks/DomainLinkDbLoader.java rename to code/common/linkdb/java/nu/marginalia/linkdb/dlinks/DomainLinkDbLoader.java diff --git a/code/common/linkdb/src/main/java/nu/marginalia/linkdb/dlinks/DomainLinkDbWriter.java b/code/common/linkdb/java/nu/marginalia/linkdb/dlinks/DomainLinkDbWriter.java similarity index 100% rename from code/common/linkdb/src/main/java/nu/marginalia/linkdb/dlinks/DomainLinkDbWriter.java rename to code/common/linkdb/java/nu/marginalia/linkdb/dlinks/DomainLinkDbWriter.java diff --git a/code/common/linkdb/src/main/java/nu/marginalia/linkdb/dlinks/FileDomainLinkDb.java b/code/common/linkdb/java/nu/marginalia/linkdb/dlinks/FileDomainLinkDb.java similarity index 100% rename from code/common/linkdb/src/main/java/nu/marginalia/linkdb/dlinks/FileDomainLinkDb.java rename to code/common/linkdb/java/nu/marginalia/linkdb/dlinks/FileDomainLinkDb.java diff --git a/code/common/linkdb/src/main/java/nu/marginalia/linkdb/docs/DocumentDbReader.java b/code/common/linkdb/java/nu/marginalia/linkdb/docs/DocumentDbReader.java similarity index 100% rename from code/common/linkdb/src/main/java/nu/marginalia/linkdb/docs/DocumentDbReader.java rename to code/common/linkdb/java/nu/marginalia/linkdb/docs/DocumentDbReader.java diff --git a/code/common/linkdb/src/main/java/nu/marginalia/linkdb/docs/DocumentDbWriter.java b/code/common/linkdb/java/nu/marginalia/linkdb/docs/DocumentDbWriter.java similarity index 100% rename from code/common/linkdb/src/main/java/nu/marginalia/linkdb/docs/DocumentDbWriter.java rename to code/common/linkdb/java/nu/marginalia/linkdb/docs/DocumentDbWriter.java diff --git a/code/common/linkdb/src/main/java/nu/marginalia/linkdb/model/DocdbUrlDetail.java b/code/common/linkdb/java/nu/marginalia/linkdb/model/DocdbUrlDetail.java similarity index 100% rename from code/common/linkdb/src/main/java/nu/marginalia/linkdb/model/DocdbUrlDetail.java rename to code/common/linkdb/java/nu/marginalia/linkdb/model/DocdbUrlDetail.java diff --git a/code/common/linkdb/src/main/resources/db/docdb-document.sql b/code/common/linkdb/resources/db/docdb-document.sql similarity index 100% rename from code/common/linkdb/src/main/resources/db/docdb-document.sql rename to code/common/linkdb/resources/db/docdb-document.sql diff --git a/code/common/linkdb/src/test/java/nu/marginalia/linkdb/DocumentDbWriterTest.java b/code/common/linkdb/test/nu/marginalia/linkdb/DocumentDbWriterTest.java similarity index 100% rename from code/common/linkdb/src/test/java/nu/marginalia/linkdb/DocumentDbWriterTest.java rename to code/common/linkdb/test/nu/marginalia/linkdb/DocumentDbWriterTest.java diff --git a/code/common/linkdb/src/test/java/nu/marginalia/linkdb/DomainLinkDbTest.java b/code/common/linkdb/test/nu/marginalia/linkdb/DomainLinkDbTest.java similarity index 100% rename from code/common/linkdb/src/test/java/nu/marginalia/linkdb/DomainLinkDbTest.java rename to code/common/linkdb/test/nu/marginalia/linkdb/DomainLinkDbTest.java diff --git a/code/common/model/build.gradle b/code/common/model/build.gradle index 9a3b81d8..80d9f247 100644 --- a/code/common/model/build.gradle +++ b/code/common/model/build.gradle @@ -10,6 +10,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':code:common:service-discovery') implementation project(':code:libraries:big-string') diff --git a/code/common/model/src/main/java/nu/marginalia/model/EdgeDomain.java b/code/common/model/java/nu/marginalia/model/EdgeDomain.java similarity index 100% rename from code/common/model/src/main/java/nu/marginalia/model/EdgeDomain.java rename to code/common/model/java/nu/marginalia/model/EdgeDomain.java diff --git a/code/common/model/src/main/java/nu/marginalia/model/EdgeUrl.java b/code/common/model/java/nu/marginalia/model/EdgeUrl.java similarity index 100% rename from code/common/model/src/main/java/nu/marginalia/model/EdgeUrl.java rename to code/common/model/java/nu/marginalia/model/EdgeUrl.java diff --git a/code/common/model/src/main/java/nu/marginalia/model/crawl/DomainIndexingState.java b/code/common/model/java/nu/marginalia/model/crawl/DomainIndexingState.java similarity index 100% rename from code/common/model/src/main/java/nu/marginalia/model/crawl/DomainIndexingState.java rename to code/common/model/java/nu/marginalia/model/crawl/DomainIndexingState.java diff --git a/code/common/model/src/main/java/nu/marginalia/model/crawl/HtmlFeature.java b/code/common/model/java/nu/marginalia/model/crawl/HtmlFeature.java similarity index 100% rename from code/common/model/src/main/java/nu/marginalia/model/crawl/HtmlFeature.java rename to code/common/model/java/nu/marginalia/model/crawl/HtmlFeature.java diff --git a/code/common/model/src/main/java/nu/marginalia/model/crawl/PubDate.java b/code/common/model/java/nu/marginalia/model/crawl/PubDate.java similarity index 100% rename from code/common/model/src/main/java/nu/marginalia/model/crawl/PubDate.java rename to code/common/model/java/nu/marginalia/model/crawl/PubDate.java diff --git a/code/common/model/src/main/java/nu/marginalia/model/crawl/UrlIndexingState.java b/code/common/model/java/nu/marginalia/model/crawl/UrlIndexingState.java similarity index 100% rename from code/common/model/src/main/java/nu/marginalia/model/crawl/UrlIndexingState.java rename to code/common/model/java/nu/marginalia/model/crawl/UrlIndexingState.java diff --git a/code/common/model/src/main/java/nu/marginalia/model/gson/GsonFactory.java b/code/common/model/java/nu/marginalia/model/gson/GsonFactory.java similarity index 100% rename from code/common/model/src/main/java/nu/marginalia/model/gson/GsonFactory.java rename to code/common/model/java/nu/marginalia/model/gson/GsonFactory.java diff --git a/code/common/model/src/main/java/nu/marginalia/model/html/HtmlStandard.java b/code/common/model/java/nu/marginalia/model/html/HtmlStandard.java similarity index 100% rename from code/common/model/src/main/java/nu/marginalia/model/html/HtmlStandard.java rename to code/common/model/java/nu/marginalia/model/html/HtmlStandard.java diff --git a/code/common/model/src/main/java/nu/marginalia/model/id/UrlIdCodec.java b/code/common/model/java/nu/marginalia/model/id/UrlIdCodec.java similarity index 100% rename from code/common/model/src/main/java/nu/marginalia/model/id/UrlIdCodec.java rename to code/common/model/java/nu/marginalia/model/id/UrlIdCodec.java diff --git a/code/common/model/src/main/java/nu/marginalia/model/idx/DocumentFlags.java b/code/common/model/java/nu/marginalia/model/idx/DocumentFlags.java similarity index 100% rename from code/common/model/src/main/java/nu/marginalia/model/idx/DocumentFlags.java rename to code/common/model/java/nu/marginalia/model/idx/DocumentFlags.java diff --git a/code/common/model/src/main/java/nu/marginalia/model/idx/DocumentMetadata.java b/code/common/model/java/nu/marginalia/model/idx/DocumentMetadata.java similarity index 100% rename from code/common/model/src/main/java/nu/marginalia/model/idx/DocumentMetadata.java rename to code/common/model/java/nu/marginalia/model/idx/DocumentMetadata.java diff --git a/code/common/model/src/main/java/nu/marginalia/model/idx/WordFlags.java b/code/common/model/java/nu/marginalia/model/idx/WordFlags.java similarity index 100% rename from code/common/model/src/main/java/nu/marginalia/model/idx/WordFlags.java rename to code/common/model/java/nu/marginalia/model/idx/WordFlags.java diff --git a/code/common/model/src/main/java/nu/marginalia/model/idx/WordMetadata.java b/code/common/model/java/nu/marginalia/model/idx/WordMetadata.java similarity index 100% rename from code/common/model/src/main/java/nu/marginalia/model/idx/WordMetadata.java rename to code/common/model/java/nu/marginalia/model/idx/WordMetadata.java diff --git a/code/common/model/src/main/java/nu/marginalia/util/QueryParams.java b/code/common/model/java/nu/marginalia/util/QueryParams.java similarity index 100% rename from code/common/model/src/main/java/nu/marginalia/util/QueryParams.java rename to code/common/model/java/nu/marginalia/util/QueryParams.java diff --git a/code/common/model/src/main/java/nu/marginalia/util/StringPool.java b/code/common/model/java/nu/marginalia/util/StringPool.java similarity index 100% rename from code/common/model/src/main/java/nu/marginalia/util/StringPool.java rename to code/common/model/java/nu/marginalia/util/StringPool.java diff --git a/code/common/model/src/test/java/nu/marginalia/model/DocumentMetadataTest.java b/code/common/model/test/nu/marginalia/model/DocumentMetadataTest.java similarity index 100% rename from code/common/model/src/test/java/nu/marginalia/model/DocumentMetadataTest.java rename to code/common/model/test/nu/marginalia/model/DocumentMetadataTest.java diff --git a/code/common/model/src/test/java/nu/marginalia/model/EdgeDomainTest.java b/code/common/model/test/nu/marginalia/model/EdgeDomainTest.java similarity index 100% rename from code/common/model/src/test/java/nu/marginalia/model/EdgeDomainTest.java rename to code/common/model/test/nu/marginalia/model/EdgeDomainTest.java diff --git a/code/common/model/src/test/java/nu/marginalia/model/EdgeUrlTest.java b/code/common/model/test/nu/marginalia/model/EdgeUrlTest.java similarity index 100% rename from code/common/model/src/test/java/nu/marginalia/model/EdgeUrlTest.java rename to code/common/model/test/nu/marginalia/model/EdgeUrlTest.java diff --git a/code/common/model/src/test/java/nu/marginalia/model/WordMetadataTest.java b/code/common/model/test/nu/marginalia/model/WordMetadataTest.java similarity index 100% rename from code/common/model/src/test/java/nu/marginalia/model/WordMetadataTest.java rename to code/common/model/test/nu/marginalia/model/WordMetadataTest.java diff --git a/code/common/model/src/test/java/nu/marginalia/model/id/UrlIdCodecTest.java b/code/common/model/test/nu/marginalia/model/id/UrlIdCodecTest.java similarity index 100% rename from code/common/model/src/test/java/nu/marginalia/model/id/UrlIdCodecTest.java rename to code/common/model/test/nu/marginalia/model/id/UrlIdCodecTest.java diff --git a/code/common/process/build.gradle b/code/common/process/build.gradle index fb68b32f..7fcff1ab 100644 --- a/code/common/process/build.gradle +++ b/code/common/process/build.gradle @@ -10,6 +10,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation libs.notnull diff --git a/code/common/process/src/main/java/nu/marginalia/ProcessConfiguration.java b/code/common/process/java/nu/marginalia/ProcessConfiguration.java similarity index 100% rename from code/common/process/src/main/java/nu/marginalia/ProcessConfiguration.java rename to code/common/process/java/nu/marginalia/ProcessConfiguration.java diff --git a/code/common/process/src/main/java/nu/marginalia/ProcessConfigurationModule.java b/code/common/process/java/nu/marginalia/ProcessConfigurationModule.java similarity index 100% rename from code/common/process/src/main/java/nu/marginalia/ProcessConfigurationModule.java rename to code/common/process/java/nu/marginalia/ProcessConfigurationModule.java diff --git a/code/common/process/src/main/java/nu/marginalia/process/control/FakeProcessHeartbeat.java b/code/common/process/java/nu/marginalia/process/control/FakeProcessHeartbeat.java similarity index 100% rename from code/common/process/src/main/java/nu/marginalia/process/control/FakeProcessHeartbeat.java rename to code/common/process/java/nu/marginalia/process/control/FakeProcessHeartbeat.java diff --git a/code/common/process/src/main/java/nu/marginalia/process/control/ProcessAdHocTaskHeartbeat.java b/code/common/process/java/nu/marginalia/process/control/ProcessAdHocTaskHeartbeat.java similarity index 100% rename from code/common/process/src/main/java/nu/marginalia/process/control/ProcessAdHocTaskHeartbeat.java rename to code/common/process/java/nu/marginalia/process/control/ProcessAdHocTaskHeartbeat.java diff --git a/code/common/process/src/main/java/nu/marginalia/process/control/ProcessAdHocTaskHeartbeatImpl.java b/code/common/process/java/nu/marginalia/process/control/ProcessAdHocTaskHeartbeatImpl.java similarity index 100% rename from code/common/process/src/main/java/nu/marginalia/process/control/ProcessAdHocTaskHeartbeatImpl.java rename to code/common/process/java/nu/marginalia/process/control/ProcessAdHocTaskHeartbeatImpl.java diff --git a/code/common/process/src/main/java/nu/marginalia/process/control/ProcessHeartbeat.java b/code/common/process/java/nu/marginalia/process/control/ProcessHeartbeat.java similarity index 100% rename from code/common/process/src/main/java/nu/marginalia/process/control/ProcessHeartbeat.java rename to code/common/process/java/nu/marginalia/process/control/ProcessHeartbeat.java diff --git a/code/common/process/src/main/java/nu/marginalia/process/control/ProcessHeartbeatImpl.java b/code/common/process/java/nu/marginalia/process/control/ProcessHeartbeatImpl.java similarity index 100% rename from code/common/process/src/main/java/nu/marginalia/process/control/ProcessHeartbeatImpl.java rename to code/common/process/java/nu/marginalia/process/control/ProcessHeartbeatImpl.java diff --git a/code/common/process/src/main/java/nu/marginalia/process/control/ProcessTaskHeartbeat.java b/code/common/process/java/nu/marginalia/process/control/ProcessTaskHeartbeat.java similarity index 100% rename from code/common/process/src/main/java/nu/marginalia/process/control/ProcessTaskHeartbeat.java rename to code/common/process/java/nu/marginalia/process/control/ProcessTaskHeartbeat.java diff --git a/code/common/process/src/main/java/nu/marginalia/process/control/ProcessTaskHeartbeatImpl.java b/code/common/process/java/nu/marginalia/process/control/ProcessTaskHeartbeatImpl.java similarity index 100% rename from code/common/process/src/main/java/nu/marginalia/process/control/ProcessTaskHeartbeatImpl.java rename to code/common/process/java/nu/marginalia/process/control/ProcessTaskHeartbeatImpl.java diff --git a/code/common/process/src/main/java/nu/marginalia/process/log/WorkLoadIterable.java b/code/common/process/java/nu/marginalia/process/log/WorkLoadIterable.java similarity index 100% rename from code/common/process/src/main/java/nu/marginalia/process/log/WorkLoadIterable.java rename to code/common/process/java/nu/marginalia/process/log/WorkLoadIterable.java diff --git a/code/common/process/src/main/java/nu/marginalia/process/log/WorkLog.java b/code/common/process/java/nu/marginalia/process/log/WorkLog.java similarity index 100% rename from code/common/process/src/main/java/nu/marginalia/process/log/WorkLog.java rename to code/common/process/java/nu/marginalia/process/log/WorkLog.java diff --git a/code/common/process/src/main/java/nu/marginalia/process/log/WorkLogEntry.java b/code/common/process/java/nu/marginalia/process/log/WorkLogEntry.java similarity index 100% rename from code/common/process/src/main/java/nu/marginalia/process/log/WorkLogEntry.java rename to code/common/process/java/nu/marginalia/process/log/WorkLogEntry.java diff --git a/code/common/process/src/main/resources/log4j2.properties b/code/common/process/resources/log4j2.properties similarity index 100% rename from code/common/process/src/main/resources/log4j2.properties rename to code/common/process/resources/log4j2.properties diff --git a/code/common/process/src/test/java/nu/marginalia/process/log/WorkLogTest.java b/code/common/process/test/nu/marginalia/process/log/WorkLogTest.java similarity index 100% rename from code/common/process/src/test/java/nu/marginalia/process/log/WorkLogTest.java rename to code/common/process/test/nu/marginalia/process/log/WorkLogTest.java diff --git a/code/common/renderer/build.gradle b/code/common/renderer/build.gradle index b40aaee2..83957546 100644 --- a/code/common/renderer/build.gradle +++ b/code/common/renderer/build.gradle @@ -11,6 +11,8 @@ java { languageVersion.set(JavaLanguageVersion.of(21)) } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation libs.bundles.slf4j diff --git a/code/common/renderer/src/main/java/nu/marginalia/renderer/MustacheRenderer.java b/code/common/renderer/java/nu/marginalia/renderer/MustacheRenderer.java similarity index 100% rename from code/common/renderer/src/main/java/nu/marginalia/renderer/MustacheRenderer.java rename to code/common/renderer/java/nu/marginalia/renderer/MustacheRenderer.java diff --git a/code/common/renderer/src/main/java/nu/marginalia/renderer/RendererFactory.java b/code/common/renderer/java/nu/marginalia/renderer/RendererFactory.java similarity index 100% rename from code/common/renderer/src/main/java/nu/marginalia/renderer/RendererFactory.java rename to code/common/renderer/java/nu/marginalia/renderer/RendererFactory.java diff --git a/code/common/renderer/src/main/java/nu/marginalia/renderer/RenderingException.java b/code/common/renderer/java/nu/marginalia/renderer/RenderingException.java similarity index 100% rename from code/common/renderer/src/main/java/nu/marginalia/renderer/RenderingException.java rename to code/common/renderer/java/nu/marginalia/renderer/RenderingException.java diff --git a/code/common/renderer/src/main/java/nu/marginalia/renderer/config/DefaultHandlebarsConfigurator.java b/code/common/renderer/java/nu/marginalia/renderer/config/DefaultHandlebarsConfigurator.java similarity index 100% rename from code/common/renderer/src/main/java/nu/marginalia/renderer/config/DefaultHandlebarsConfigurator.java rename to code/common/renderer/java/nu/marginalia/renderer/config/DefaultHandlebarsConfigurator.java diff --git a/code/common/renderer/src/main/java/nu/marginalia/renderer/config/HandlebarsConfigurator.java b/code/common/renderer/java/nu/marginalia/renderer/config/HandlebarsConfigurator.java similarity index 100% rename from code/common/renderer/src/main/java/nu/marginalia/renderer/config/HandlebarsConfigurator.java rename to code/common/renderer/java/nu/marginalia/renderer/config/HandlebarsConfigurator.java diff --git a/code/common/service-discovery/build.gradle b/code/common/service-discovery/build.gradle index d86ef9f4..db87eb95 100644 --- a/code/common/service-discovery/build.gradle +++ b/code/common/service-discovery/build.gradle @@ -18,6 +18,8 @@ java { languageVersion.set(JavaLanguageVersion.of(21)) } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation libs.bundles.slf4j diff --git a/code/common/service-discovery/src/main/java/nu/marginalia/service/NodeConfigurationWatcher.java b/code/common/service-discovery/java/nu/marginalia/service/NodeConfigurationWatcher.java similarity index 100% rename from code/common/service-discovery/src/main/java/nu/marginalia/service/NodeConfigurationWatcher.java rename to code/common/service-discovery/java/nu/marginalia/service/NodeConfigurationWatcher.java diff --git a/code/common/service-discovery/src/main/java/nu/marginalia/service/ServiceDiscoveryModule.java b/code/common/service-discovery/java/nu/marginalia/service/ServiceDiscoveryModule.java similarity index 100% rename from code/common/service-discovery/src/main/java/nu/marginalia/service/ServiceDiscoveryModule.java rename to code/common/service-discovery/java/nu/marginalia/service/ServiceDiscoveryModule.java diff --git a/code/common/service-discovery/src/main/java/nu/marginalia/service/ServiceHomeNotConfiguredException.java b/code/common/service-discovery/java/nu/marginalia/service/ServiceHomeNotConfiguredException.java similarity index 100% rename from code/common/service-discovery/src/main/java/nu/marginalia/service/ServiceHomeNotConfiguredException.java rename to code/common/service-discovery/java/nu/marginalia/service/ServiceHomeNotConfiguredException.java diff --git a/code/common/service-discovery/src/main/java/nu/marginalia/service/ServiceMonitors.java b/code/common/service-discovery/java/nu/marginalia/service/ServiceMonitors.java similarity index 100% rename from code/common/service-discovery/src/main/java/nu/marginalia/service/ServiceMonitors.java rename to code/common/service-discovery/java/nu/marginalia/service/ServiceMonitors.java diff --git a/code/common/service-discovery/src/main/java/nu/marginalia/service/client/GrpcChannelPoolFactory.java b/code/common/service-discovery/java/nu/marginalia/service/client/GrpcChannelPoolFactory.java similarity index 100% rename from code/common/service-discovery/src/main/java/nu/marginalia/service/client/GrpcChannelPoolFactory.java rename to code/common/service-discovery/java/nu/marginalia/service/client/GrpcChannelPoolFactory.java diff --git a/code/common/service-discovery/src/main/java/nu/marginalia/service/client/GrpcMultiNodeChannelPool.java b/code/common/service-discovery/java/nu/marginalia/service/client/GrpcMultiNodeChannelPool.java similarity index 100% rename from code/common/service-discovery/src/main/java/nu/marginalia/service/client/GrpcMultiNodeChannelPool.java rename to code/common/service-discovery/java/nu/marginalia/service/client/GrpcMultiNodeChannelPool.java diff --git a/code/common/service-discovery/src/main/java/nu/marginalia/service/client/GrpcSingleNodeChannelPool.java b/code/common/service-discovery/java/nu/marginalia/service/client/GrpcSingleNodeChannelPool.java similarity index 100% rename from code/common/service-discovery/src/main/java/nu/marginalia/service/client/GrpcSingleNodeChannelPool.java rename to code/common/service-discovery/java/nu/marginalia/service/client/GrpcSingleNodeChannelPool.java diff --git a/code/common/service-discovery/src/main/java/nu/marginalia/service/client/ServiceNotAvailableException.java b/code/common/service-discovery/java/nu/marginalia/service/client/ServiceNotAvailableException.java similarity index 100% rename from code/common/service-discovery/src/main/java/nu/marginalia/service/client/ServiceNotAvailableException.java rename to code/common/service-discovery/java/nu/marginalia/service/client/ServiceNotAvailableException.java diff --git a/code/common/service-discovery/src/main/java/nu/marginalia/service/discovery/ServiceRegistryIf.java b/code/common/service-discovery/java/nu/marginalia/service/discovery/ServiceRegistryIf.java similarity index 100% rename from code/common/service-discovery/src/main/java/nu/marginalia/service/discovery/ServiceRegistryIf.java rename to code/common/service-discovery/java/nu/marginalia/service/discovery/ServiceRegistryIf.java diff --git a/code/common/service-discovery/src/main/java/nu/marginalia/service/discovery/ZkServiceRegistry.java b/code/common/service-discovery/java/nu/marginalia/service/discovery/ZkServiceRegistry.java similarity index 100% rename from code/common/service-discovery/src/main/java/nu/marginalia/service/discovery/ZkServiceRegistry.java rename to code/common/service-discovery/java/nu/marginalia/service/discovery/ZkServiceRegistry.java diff --git a/code/common/service-discovery/src/main/java/nu/marginalia/service/discovery/monitor/ServiceChangeMonitor.java b/code/common/service-discovery/java/nu/marginalia/service/discovery/monitor/ServiceChangeMonitor.java similarity index 100% rename from code/common/service-discovery/src/main/java/nu/marginalia/service/discovery/monitor/ServiceChangeMonitor.java rename to code/common/service-discovery/java/nu/marginalia/service/discovery/monitor/ServiceChangeMonitor.java diff --git a/code/common/service-discovery/src/main/java/nu/marginalia/service/discovery/monitor/ServiceMonitorIf.java b/code/common/service-discovery/java/nu/marginalia/service/discovery/monitor/ServiceMonitorIf.java similarity index 100% rename from code/common/service-discovery/src/main/java/nu/marginalia/service/discovery/monitor/ServiceMonitorIf.java rename to code/common/service-discovery/java/nu/marginalia/service/discovery/monitor/ServiceMonitorIf.java diff --git a/code/common/service-discovery/src/main/java/nu/marginalia/service/discovery/property/PartitionTraits.java b/code/common/service-discovery/java/nu/marginalia/service/discovery/property/PartitionTraits.java similarity index 100% rename from code/common/service-discovery/src/main/java/nu/marginalia/service/discovery/property/PartitionTraits.java rename to code/common/service-discovery/java/nu/marginalia/service/discovery/property/PartitionTraits.java diff --git a/code/common/service-discovery/src/main/java/nu/marginalia/service/discovery/property/ServiceEndpoint.java b/code/common/service-discovery/java/nu/marginalia/service/discovery/property/ServiceEndpoint.java similarity index 100% rename from code/common/service-discovery/src/main/java/nu/marginalia/service/discovery/property/ServiceEndpoint.java rename to code/common/service-discovery/java/nu/marginalia/service/discovery/property/ServiceEndpoint.java diff --git a/code/common/service-discovery/src/main/java/nu/marginalia/service/discovery/property/ServiceKey.java b/code/common/service-discovery/java/nu/marginalia/service/discovery/property/ServiceKey.java similarity index 100% rename from code/common/service-discovery/src/main/java/nu/marginalia/service/discovery/property/ServiceKey.java rename to code/common/service-discovery/java/nu/marginalia/service/discovery/property/ServiceKey.java diff --git a/code/common/service-discovery/src/main/java/nu/marginalia/service/discovery/property/ServicePartition.java b/code/common/service-discovery/java/nu/marginalia/service/discovery/property/ServicePartition.java similarity index 100% rename from code/common/service-discovery/src/main/java/nu/marginalia/service/discovery/property/ServicePartition.java rename to code/common/service-discovery/java/nu/marginalia/service/discovery/property/ServicePartition.java diff --git a/code/common/service-discovery/src/main/java/nu/marginalia/service/id/ServiceId.java b/code/common/service-discovery/java/nu/marginalia/service/id/ServiceId.java similarity index 100% rename from code/common/service-discovery/src/main/java/nu/marginalia/service/id/ServiceId.java rename to code/common/service-discovery/java/nu/marginalia/service/id/ServiceId.java diff --git a/code/common/service-discovery/src/test/java/nu/marginalia/service/discovery/ZkServiceRegistryTest.java b/code/common/service-discovery/test/nu/marginalia/service/discovery/ZkServiceRegistryTest.java similarity index 100% rename from code/common/service-discovery/src/test/java/nu/marginalia/service/discovery/ZkServiceRegistryTest.java rename to code/common/service-discovery/test/nu/marginalia/service/discovery/ZkServiceRegistryTest.java diff --git a/code/common/service/build.gradle b/code/common/service/build.gradle index 4e4e8ed1..75fab4ca 100644 --- a/code/common/service/build.gradle +++ b/code/common/service/build.gradle @@ -9,6 +9,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':code:common:service-discovery') implementation project(':code:libraries:message-queue') diff --git a/code/common/service/src/main/java/nu/marginalia/service/ConfigLoader.java b/code/common/service/java/nu/marginalia/service/ConfigLoader.java similarity index 100% rename from code/common/service/src/main/java/nu/marginalia/service/ConfigLoader.java rename to code/common/service/java/nu/marginalia/service/ConfigLoader.java diff --git a/code/common/service/src/main/java/nu/marginalia/service/MainClass.java b/code/common/service/java/nu/marginalia/service/MainClass.java similarity index 100% rename from code/common/service/src/main/java/nu/marginalia/service/MainClass.java rename to code/common/service/java/nu/marginalia/service/MainClass.java diff --git a/code/common/service/src/main/java/nu/marginalia/service/ProcessMainClass.java b/code/common/service/java/nu/marginalia/service/ProcessMainClass.java similarity index 100% rename from code/common/service/src/main/java/nu/marginalia/service/ProcessMainClass.java rename to code/common/service/java/nu/marginalia/service/ProcessMainClass.java diff --git a/code/common/service/src/main/java/nu/marginalia/service/control/FakeServiceHeartbeat.java b/code/common/service/java/nu/marginalia/service/control/FakeServiceHeartbeat.java similarity index 100% rename from code/common/service/src/main/java/nu/marginalia/service/control/FakeServiceHeartbeat.java rename to code/common/service/java/nu/marginalia/service/control/FakeServiceHeartbeat.java diff --git a/code/common/service/src/main/java/nu/marginalia/service/control/ServiceEventLog.java b/code/common/service/java/nu/marginalia/service/control/ServiceEventLog.java similarity index 100% rename from code/common/service/src/main/java/nu/marginalia/service/control/ServiceEventLog.java rename to code/common/service/java/nu/marginalia/service/control/ServiceEventLog.java diff --git a/code/common/service/src/main/java/nu/marginalia/service/control/ServiceHeartbeat.java b/code/common/service/java/nu/marginalia/service/control/ServiceHeartbeat.java similarity index 100% rename from code/common/service/src/main/java/nu/marginalia/service/control/ServiceHeartbeat.java rename to code/common/service/java/nu/marginalia/service/control/ServiceHeartbeat.java diff --git a/code/common/service/src/main/java/nu/marginalia/service/control/ServiceHeartbeatImpl.java b/code/common/service/java/nu/marginalia/service/control/ServiceHeartbeatImpl.java similarity index 100% rename from code/common/service/src/main/java/nu/marginalia/service/control/ServiceHeartbeatImpl.java rename to code/common/service/java/nu/marginalia/service/control/ServiceHeartbeatImpl.java diff --git a/code/common/service/src/main/java/nu/marginalia/service/control/ServiceTaskHeartbeat.java b/code/common/service/java/nu/marginalia/service/control/ServiceTaskHeartbeat.java similarity index 100% rename from code/common/service/src/main/java/nu/marginalia/service/control/ServiceTaskHeartbeat.java rename to code/common/service/java/nu/marginalia/service/control/ServiceTaskHeartbeat.java diff --git a/code/common/service/src/main/java/nu/marginalia/service/control/ServiceTaskHeartbeatImpl.java b/code/common/service/java/nu/marginalia/service/control/ServiceTaskHeartbeatImpl.java similarity index 100% rename from code/common/service/src/main/java/nu/marginalia/service/control/ServiceTaskHeartbeatImpl.java rename to code/common/service/java/nu/marginalia/service/control/ServiceTaskHeartbeatImpl.java diff --git a/code/common/service/src/main/java/nu/marginalia/service/module/DatabaseModule.java b/code/common/service/java/nu/marginalia/service/module/DatabaseModule.java similarity index 100% rename from code/common/service/src/main/java/nu/marginalia/service/module/DatabaseModule.java rename to code/common/service/java/nu/marginalia/service/module/DatabaseModule.java diff --git a/code/common/service/src/main/java/nu/marginalia/service/module/ServiceConfiguration.java b/code/common/service/java/nu/marginalia/service/module/ServiceConfiguration.java similarity index 100% rename from code/common/service/src/main/java/nu/marginalia/service/module/ServiceConfiguration.java rename to code/common/service/java/nu/marginalia/service/module/ServiceConfiguration.java diff --git a/code/common/service/src/main/java/nu/marginalia/service/module/ServiceConfigurationModule.java b/code/common/service/java/nu/marginalia/service/module/ServiceConfigurationModule.java similarity index 100% rename from code/common/service/src/main/java/nu/marginalia/service/module/ServiceConfigurationModule.java rename to code/common/service/java/nu/marginalia/service/module/ServiceConfigurationModule.java diff --git a/code/common/service/src/main/java/nu/marginalia/service/server/BaseServiceParams.java b/code/common/service/java/nu/marginalia/service/server/BaseServiceParams.java similarity index 100% rename from code/common/service/src/main/java/nu/marginalia/service/server/BaseServiceParams.java rename to code/common/service/java/nu/marginalia/service/server/BaseServiceParams.java diff --git a/code/common/service/src/main/java/nu/marginalia/service/server/Initialization.java b/code/common/service/java/nu/marginalia/service/server/Initialization.java similarity index 100% rename from code/common/service/src/main/java/nu/marginalia/service/server/Initialization.java rename to code/common/service/java/nu/marginalia/service/server/Initialization.java diff --git a/code/common/service/src/main/java/nu/marginalia/service/server/MetricsServer.java b/code/common/service/java/nu/marginalia/service/server/MetricsServer.java similarity index 100% rename from code/common/service/src/main/java/nu/marginalia/service/server/MetricsServer.java rename to code/common/service/java/nu/marginalia/service/server/MetricsServer.java diff --git a/code/common/service/src/main/java/nu/marginalia/service/server/NodeStatusWatcher.java b/code/common/service/java/nu/marginalia/service/server/NodeStatusWatcher.java similarity index 100% rename from code/common/service/src/main/java/nu/marginalia/service/server/NodeStatusWatcher.java rename to code/common/service/java/nu/marginalia/service/server/NodeStatusWatcher.java diff --git a/code/common/service/src/main/java/nu/marginalia/service/server/RateLimiter.java b/code/common/service/java/nu/marginalia/service/server/RateLimiter.java similarity index 100% rename from code/common/service/src/main/java/nu/marginalia/service/server/RateLimiter.java rename to code/common/service/java/nu/marginalia/service/server/RateLimiter.java diff --git a/code/common/service/src/main/java/nu/marginalia/service/server/Service.java b/code/common/service/java/nu/marginalia/service/server/Service.java similarity index 100% rename from code/common/service/src/main/java/nu/marginalia/service/server/Service.java rename to code/common/service/java/nu/marginalia/service/server/Service.java diff --git a/code/common/service/src/main/java/nu/marginalia/service/server/StaticResources.java b/code/common/service/java/nu/marginalia/service/server/StaticResources.java similarity index 100% rename from code/common/service/src/main/java/nu/marginalia/service/server/StaticResources.java rename to code/common/service/java/nu/marginalia/service/server/StaticResources.java diff --git a/code/common/service/src/main/java/nu/marginalia/service/server/mq/MqRequest.java b/code/common/service/java/nu/marginalia/service/server/mq/MqRequest.java similarity index 100% rename from code/common/service/src/main/java/nu/marginalia/service/server/mq/MqRequest.java rename to code/common/service/java/nu/marginalia/service/server/mq/MqRequest.java diff --git a/code/common/service/src/main/java/nu/marginalia/service/server/mq/ServiceMqSubscription.java b/code/common/service/java/nu/marginalia/service/server/mq/ServiceMqSubscription.java similarity index 100% rename from code/common/service/src/main/java/nu/marginalia/service/server/mq/ServiceMqSubscription.java rename to code/common/service/java/nu/marginalia/service/server/mq/ServiceMqSubscription.java diff --git a/code/common/service/src/main/resources/log4j2-prod.xml b/code/common/service/resources/log4j2-prod.xml similarity index 100% rename from code/common/service/src/main/resources/log4j2-prod.xml rename to code/common/service/resources/log4j2-prod.xml diff --git a/code/common/service/src/main/resources/log4j2-test.xml b/code/common/service/resources/log4j2-test.xml similarity index 100% rename from code/common/service/src/main/resources/log4j2-test.xml rename to code/common/service/resources/log4j2-test.xml diff --git a/code/execution/api/build.gradle b/code/execution/api/build.gradle index 58343ecf..b31d87d3 100644 --- a/code/execution/api/build.gradle +++ b/code/execution/api/build.gradle @@ -19,11 +19,13 @@ apply from: "$rootProject.projectDir/protobuf.gradle" sourceSets { main { proto { - srcDir 'src/main/protobuf' + srcDir 'protobuf' } } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':code:common:model') implementation project(':code:index:api') diff --git a/code/execution/api/src/main/java/nu/marginalia/executor/client/ExecutorClient.java b/code/execution/api/java/nu/marginalia/executor/client/ExecutorClient.java similarity index 100% rename from code/execution/api/src/main/java/nu/marginalia/executor/client/ExecutorClient.java rename to code/execution/api/java/nu/marginalia/executor/client/ExecutorClient.java diff --git a/code/execution/api/src/main/java/nu/marginalia/executor/client/ExecutorCrawlClient.java b/code/execution/api/java/nu/marginalia/executor/client/ExecutorCrawlClient.java similarity index 100% rename from code/execution/api/src/main/java/nu/marginalia/executor/client/ExecutorCrawlClient.java rename to code/execution/api/java/nu/marginalia/executor/client/ExecutorCrawlClient.java diff --git a/code/execution/api/src/main/java/nu/marginalia/executor/client/ExecutorExportClient.java b/code/execution/api/java/nu/marginalia/executor/client/ExecutorExportClient.java similarity index 100% rename from code/execution/api/src/main/java/nu/marginalia/executor/client/ExecutorExportClient.java rename to code/execution/api/java/nu/marginalia/executor/client/ExecutorExportClient.java diff --git a/code/execution/api/src/main/java/nu/marginalia/executor/client/ExecutorRemoteActorFactory.java b/code/execution/api/java/nu/marginalia/executor/client/ExecutorRemoteActorFactory.java similarity index 100% rename from code/execution/api/src/main/java/nu/marginalia/executor/client/ExecutorRemoteActorFactory.java rename to code/execution/api/java/nu/marginalia/executor/client/ExecutorRemoteActorFactory.java diff --git a/code/execution/api/src/main/java/nu/marginalia/executor/client/ExecutorSideloadClient.java b/code/execution/api/java/nu/marginalia/executor/client/ExecutorSideloadClient.java similarity index 100% rename from code/execution/api/src/main/java/nu/marginalia/executor/client/ExecutorSideloadClient.java rename to code/execution/api/java/nu/marginalia/executor/client/ExecutorSideloadClient.java diff --git a/code/execution/api/src/main/java/nu/marginalia/executor/model/ActorRunState.java b/code/execution/api/java/nu/marginalia/executor/model/ActorRunState.java similarity index 100% rename from code/execution/api/src/main/java/nu/marginalia/executor/model/ActorRunState.java rename to code/execution/api/java/nu/marginalia/executor/model/ActorRunState.java diff --git a/code/execution/api/src/main/java/nu/marginalia/executor/model/ActorRunStates.java b/code/execution/api/java/nu/marginalia/executor/model/ActorRunStates.java similarity index 100% rename from code/execution/api/src/main/java/nu/marginalia/executor/model/ActorRunStates.java rename to code/execution/api/java/nu/marginalia/executor/model/ActorRunStates.java diff --git a/code/execution/api/src/main/java/nu/marginalia/executor/storage/FileStorageContent.java b/code/execution/api/java/nu/marginalia/executor/storage/FileStorageContent.java similarity index 100% rename from code/execution/api/src/main/java/nu/marginalia/executor/storage/FileStorageContent.java rename to code/execution/api/java/nu/marginalia/executor/storage/FileStorageContent.java diff --git a/code/execution/api/src/main/java/nu/marginalia/executor/storage/FileStorageFile.java b/code/execution/api/java/nu/marginalia/executor/storage/FileStorageFile.java similarity index 100% rename from code/execution/api/src/main/java/nu/marginalia/executor/storage/FileStorageFile.java rename to code/execution/api/java/nu/marginalia/executor/storage/FileStorageFile.java diff --git a/code/execution/api/src/main/java/nu/marginalia/executor/upload/UploadDirContents.java b/code/execution/api/java/nu/marginalia/executor/upload/UploadDirContents.java similarity index 100% rename from code/execution/api/src/main/java/nu/marginalia/executor/upload/UploadDirContents.java rename to code/execution/api/java/nu/marginalia/executor/upload/UploadDirContents.java diff --git a/code/execution/api/src/main/java/nu/marginalia/executor/upload/UploadDirItem.java b/code/execution/api/java/nu/marginalia/executor/upload/UploadDirItem.java similarity index 100% rename from code/execution/api/src/main/java/nu/marginalia/executor/upload/UploadDirItem.java rename to code/execution/api/java/nu/marginalia/executor/upload/UploadDirItem.java diff --git a/code/execution/build.gradle b/code/execution/build.gradle index 79eb9c68..842bcab7 100644 --- a/code/execution/build.gradle +++ b/code/execution/build.gradle @@ -9,6 +9,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { // These look weird but they're needed to be able to spawn the processes // from the executor service diff --git a/code/execution/src/main/java/nu/marginalia/actor/ActorApi.java b/code/execution/java/nu/marginalia/actor/ActorApi.java similarity index 100% rename from code/execution/src/main/java/nu/marginalia/actor/ActorApi.java rename to code/execution/java/nu/marginalia/actor/ActorApi.java diff --git a/code/execution/src/main/java/nu/marginalia/actor/ExecutorActor.java b/code/execution/java/nu/marginalia/actor/ExecutorActor.java similarity index 100% rename from code/execution/src/main/java/nu/marginalia/actor/ExecutorActor.java rename to code/execution/java/nu/marginalia/actor/ExecutorActor.java diff --git a/code/execution/src/main/java/nu/marginalia/actor/ExecutorActorControlService.java b/code/execution/java/nu/marginalia/actor/ExecutorActorControlService.java similarity index 100% rename from code/execution/src/main/java/nu/marginalia/actor/ExecutorActorControlService.java rename to code/execution/java/nu/marginalia/actor/ExecutorActorControlService.java diff --git a/code/execution/src/main/java/nu/marginalia/actor/ExecutorActorStateMachines.java b/code/execution/java/nu/marginalia/actor/ExecutorActorStateMachines.java similarity index 100% rename from code/execution/src/main/java/nu/marginalia/actor/ExecutorActorStateMachines.java rename to code/execution/java/nu/marginalia/actor/ExecutorActorStateMachines.java diff --git a/code/execution/src/main/java/nu/marginalia/actor/monitor/AbstractProcessSpawnerActor.java b/code/execution/java/nu/marginalia/actor/monitor/AbstractProcessSpawnerActor.java similarity index 100% rename from code/execution/src/main/java/nu/marginalia/actor/monitor/AbstractProcessSpawnerActor.java rename to code/execution/java/nu/marginalia/actor/monitor/AbstractProcessSpawnerActor.java diff --git a/code/execution/src/main/java/nu/marginalia/actor/monitor/FileStorageMonitorActor.java b/code/execution/java/nu/marginalia/actor/monitor/FileStorageMonitorActor.java similarity index 100% rename from code/execution/src/main/java/nu/marginalia/actor/monitor/FileStorageMonitorActor.java rename to code/execution/java/nu/marginalia/actor/monitor/FileStorageMonitorActor.java diff --git a/code/execution/src/main/java/nu/marginalia/actor/proc/ConverterMonitorActor.java b/code/execution/java/nu/marginalia/actor/proc/ConverterMonitorActor.java similarity index 100% rename from code/execution/src/main/java/nu/marginalia/actor/proc/ConverterMonitorActor.java rename to code/execution/java/nu/marginalia/actor/proc/ConverterMonitorActor.java diff --git a/code/execution/src/main/java/nu/marginalia/actor/proc/CrawlerMonitorActor.java b/code/execution/java/nu/marginalia/actor/proc/CrawlerMonitorActor.java similarity index 100% rename from code/execution/src/main/java/nu/marginalia/actor/proc/CrawlerMonitorActor.java rename to code/execution/java/nu/marginalia/actor/proc/CrawlerMonitorActor.java diff --git a/code/execution/src/main/java/nu/marginalia/actor/proc/IndexConstructorMonitorActor.java b/code/execution/java/nu/marginalia/actor/proc/IndexConstructorMonitorActor.java similarity index 100% rename from code/execution/src/main/java/nu/marginalia/actor/proc/IndexConstructorMonitorActor.java rename to code/execution/java/nu/marginalia/actor/proc/IndexConstructorMonitorActor.java diff --git a/code/execution/src/main/java/nu/marginalia/actor/proc/LoaderMonitorActor.java b/code/execution/java/nu/marginalia/actor/proc/LoaderMonitorActor.java similarity index 100% rename from code/execution/src/main/java/nu/marginalia/actor/proc/LoaderMonitorActor.java rename to code/execution/java/nu/marginalia/actor/proc/LoaderMonitorActor.java diff --git a/code/execution/src/main/java/nu/marginalia/actor/proc/ProcessLivenessMonitorActor.java b/code/execution/java/nu/marginalia/actor/proc/ProcessLivenessMonitorActor.java similarity index 100% rename from code/execution/src/main/java/nu/marginalia/actor/proc/ProcessLivenessMonitorActor.java rename to code/execution/java/nu/marginalia/actor/proc/ProcessLivenessMonitorActor.java diff --git a/code/execution/src/main/java/nu/marginalia/actor/task/ActorProcessWatcher.java b/code/execution/java/nu/marginalia/actor/task/ActorProcessWatcher.java similarity index 100% rename from code/execution/src/main/java/nu/marginalia/actor/task/ActorProcessWatcher.java rename to code/execution/java/nu/marginalia/actor/task/ActorProcessWatcher.java diff --git a/code/execution/src/main/java/nu/marginalia/actor/task/ConvertActor.java b/code/execution/java/nu/marginalia/actor/task/ConvertActor.java similarity index 100% rename from code/execution/src/main/java/nu/marginalia/actor/task/ConvertActor.java rename to code/execution/java/nu/marginalia/actor/task/ConvertActor.java diff --git a/code/execution/src/main/java/nu/marginalia/actor/task/ConvertAndLoadActor.java b/code/execution/java/nu/marginalia/actor/task/ConvertAndLoadActor.java similarity index 100% rename from code/execution/src/main/java/nu/marginalia/actor/task/ConvertAndLoadActor.java rename to code/execution/java/nu/marginalia/actor/task/ConvertAndLoadActor.java diff --git a/code/execution/src/main/java/nu/marginalia/actor/task/CrawlActor.java b/code/execution/java/nu/marginalia/actor/task/CrawlActor.java similarity index 100% rename from code/execution/src/main/java/nu/marginalia/actor/task/CrawlActor.java rename to code/execution/java/nu/marginalia/actor/task/CrawlActor.java diff --git a/code/execution/src/main/java/nu/marginalia/actor/task/CrawlJobExtractorActor.java b/code/execution/java/nu/marginalia/actor/task/CrawlJobExtractorActor.java similarity index 100% rename from code/execution/src/main/java/nu/marginalia/actor/task/CrawlJobExtractorActor.java rename to code/execution/java/nu/marginalia/actor/task/CrawlJobExtractorActor.java diff --git a/code/execution/src/main/java/nu/marginalia/actor/task/DownloadSampleActor.java b/code/execution/java/nu/marginalia/actor/task/DownloadSampleActor.java similarity index 100% rename from code/execution/src/main/java/nu/marginalia/actor/task/DownloadSampleActor.java rename to code/execution/java/nu/marginalia/actor/task/DownloadSampleActor.java diff --git a/code/execution/src/main/java/nu/marginalia/actor/task/ExportAtagsActor.java b/code/execution/java/nu/marginalia/actor/task/ExportAtagsActor.java similarity index 100% rename from code/execution/src/main/java/nu/marginalia/actor/task/ExportAtagsActor.java rename to code/execution/java/nu/marginalia/actor/task/ExportAtagsActor.java diff --git a/code/execution/src/main/java/nu/marginalia/actor/task/ExportDataActor.java b/code/execution/java/nu/marginalia/actor/task/ExportDataActor.java similarity index 100% rename from code/execution/src/main/java/nu/marginalia/actor/task/ExportDataActor.java rename to code/execution/java/nu/marginalia/actor/task/ExportDataActor.java diff --git a/code/execution/src/main/java/nu/marginalia/actor/task/ExportFeedsActor.java b/code/execution/java/nu/marginalia/actor/task/ExportFeedsActor.java similarity index 100% rename from code/execution/src/main/java/nu/marginalia/actor/task/ExportFeedsActor.java rename to code/execution/java/nu/marginalia/actor/task/ExportFeedsActor.java diff --git a/code/execution/src/main/java/nu/marginalia/actor/task/ExportSampleDataActor.java b/code/execution/java/nu/marginalia/actor/task/ExportSampleDataActor.java similarity index 100% rename from code/execution/src/main/java/nu/marginalia/actor/task/ExportSampleDataActor.java rename to code/execution/java/nu/marginalia/actor/task/ExportSampleDataActor.java diff --git a/code/execution/src/main/java/nu/marginalia/actor/task/ExportTermFreqActor.java b/code/execution/java/nu/marginalia/actor/task/ExportTermFreqActor.java similarity index 100% rename from code/execution/src/main/java/nu/marginalia/actor/task/ExportTermFreqActor.java rename to code/execution/java/nu/marginalia/actor/task/ExportTermFreqActor.java diff --git a/code/execution/src/main/java/nu/marginalia/actor/task/RecrawlActor.java b/code/execution/java/nu/marginalia/actor/task/RecrawlActor.java similarity index 100% rename from code/execution/src/main/java/nu/marginalia/actor/task/RecrawlActor.java rename to code/execution/java/nu/marginalia/actor/task/RecrawlActor.java diff --git a/code/execution/src/main/java/nu/marginalia/actor/task/RestoreBackupActor.java b/code/execution/java/nu/marginalia/actor/task/RestoreBackupActor.java similarity index 100% rename from code/execution/src/main/java/nu/marginalia/actor/task/RestoreBackupActor.java rename to code/execution/java/nu/marginalia/actor/task/RestoreBackupActor.java diff --git a/code/execution/src/main/java/nu/marginalia/actor/task/TriggerAdjacencyCalculationActor.java b/code/execution/java/nu/marginalia/actor/task/TriggerAdjacencyCalculationActor.java similarity index 100% rename from code/execution/src/main/java/nu/marginalia/actor/task/TriggerAdjacencyCalculationActor.java rename to code/execution/java/nu/marginalia/actor/task/TriggerAdjacencyCalculationActor.java diff --git a/code/execution/src/main/java/nu/marginalia/execution/ExecutionInit.java b/code/execution/java/nu/marginalia/execution/ExecutionInit.java similarity index 100% rename from code/execution/src/main/java/nu/marginalia/execution/ExecutionInit.java rename to code/execution/java/nu/marginalia/execution/ExecutionInit.java diff --git a/code/execution/src/main/java/nu/marginalia/execution/ExecutorCrawlGrpcService.java b/code/execution/java/nu/marginalia/execution/ExecutorCrawlGrpcService.java similarity index 100% rename from code/execution/src/main/java/nu/marginalia/execution/ExecutorCrawlGrpcService.java rename to code/execution/java/nu/marginalia/execution/ExecutorCrawlGrpcService.java diff --git a/code/execution/src/main/java/nu/marginalia/execution/ExecutorExportGrpcService.java b/code/execution/java/nu/marginalia/execution/ExecutorExportGrpcService.java similarity index 100% rename from code/execution/src/main/java/nu/marginalia/execution/ExecutorExportGrpcService.java rename to code/execution/java/nu/marginalia/execution/ExecutorExportGrpcService.java diff --git a/code/execution/src/main/java/nu/marginalia/execution/ExecutorGrpcService.java b/code/execution/java/nu/marginalia/execution/ExecutorGrpcService.java similarity index 100% rename from code/execution/src/main/java/nu/marginalia/execution/ExecutorGrpcService.java rename to code/execution/java/nu/marginalia/execution/ExecutorGrpcService.java diff --git a/code/execution/src/main/java/nu/marginalia/execution/ExecutorSideloadGrpcService.java b/code/execution/java/nu/marginalia/execution/ExecutorSideloadGrpcService.java similarity index 100% rename from code/execution/src/main/java/nu/marginalia/execution/ExecutorSideloadGrpcService.java rename to code/execution/java/nu/marginalia/execution/ExecutorSideloadGrpcService.java diff --git a/code/execution/src/main/java/nu/marginalia/process/ProcessOutboxes.java b/code/execution/java/nu/marginalia/process/ProcessOutboxes.java similarity index 100% rename from code/execution/src/main/java/nu/marginalia/process/ProcessOutboxes.java rename to code/execution/java/nu/marginalia/process/ProcessOutboxes.java diff --git a/code/execution/src/main/java/nu/marginalia/process/ProcessService.java b/code/execution/java/nu/marginalia/process/ProcessService.java similarity index 100% rename from code/execution/src/main/java/nu/marginalia/process/ProcessService.java rename to code/execution/java/nu/marginalia/process/ProcessService.java diff --git a/code/execution/src/main/java/nu/marginalia/sideload/RedditSideloadHelper.java b/code/execution/java/nu/marginalia/sideload/RedditSideloadHelper.java similarity index 100% rename from code/execution/src/main/java/nu/marginalia/sideload/RedditSideloadHelper.java rename to code/execution/java/nu/marginalia/sideload/RedditSideloadHelper.java diff --git a/code/execution/src/main/java/nu/marginalia/sideload/SideloadHelper.java b/code/execution/java/nu/marginalia/sideload/SideloadHelper.java similarity index 100% rename from code/execution/src/main/java/nu/marginalia/sideload/SideloadHelper.java rename to code/execution/java/nu/marginalia/sideload/SideloadHelper.java diff --git a/code/execution/src/main/java/nu/marginalia/sideload/StackExchangeSideloadHelper.java b/code/execution/java/nu/marginalia/sideload/StackExchangeSideloadHelper.java similarity index 100% rename from code/execution/src/main/java/nu/marginalia/sideload/StackExchangeSideloadHelper.java rename to code/execution/java/nu/marginalia/sideload/StackExchangeSideloadHelper.java diff --git a/code/execution/src/main/java/nu/marginalia/svc/BackupService.java b/code/execution/java/nu/marginalia/svc/BackupService.java similarity index 100% rename from code/execution/src/main/java/nu/marginalia/svc/BackupService.java rename to code/execution/java/nu/marginalia/svc/BackupService.java diff --git a/code/execution/src/main/java/nu/marginalia/svc/DomainListRefreshService.java b/code/execution/java/nu/marginalia/svc/DomainListRefreshService.java similarity index 100% rename from code/execution/src/main/java/nu/marginalia/svc/DomainListRefreshService.java rename to code/execution/java/nu/marginalia/svc/DomainListRefreshService.java diff --git a/code/execution/src/test/java/nu/marginalia/svc/DomainListRefreshServiceTest.java b/code/execution/test/nu/marginalia/svc/DomainListRefreshServiceTest.java similarity index 100% rename from code/execution/src/test/java/nu/marginalia/svc/DomainListRefreshServiceTest.java rename to code/execution/test/nu/marginalia/svc/DomainListRefreshServiceTest.java diff --git a/code/features-convert/adblock/build.gradle b/code/features-convert/adblock/build.gradle index 90e3e205..f28fe998 100644 --- a/code/features-convert/adblock/build.gradle +++ b/code/features-convert/adblock/build.gradle @@ -13,6 +13,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':code:common:config') diff --git a/code/features-convert/adblock/src/main/java/nu/marginalia/adblock/AdblockSimulator.java b/code/features-convert/adblock/java/nu/marginalia/adblock/AdblockSimulator.java similarity index 100% rename from code/features-convert/adblock/src/main/java/nu/marginalia/adblock/AdblockSimulator.java rename to code/features-convert/adblock/java/nu/marginalia/adblock/AdblockSimulator.java diff --git a/code/features-convert/adblock/src/main/java/nu/marginalia/adblock/GoogleAnwersSpamDetector.java b/code/features-convert/adblock/java/nu/marginalia/adblock/GoogleAnwersSpamDetector.java similarity index 100% rename from code/features-convert/adblock/src/main/java/nu/marginalia/adblock/GoogleAnwersSpamDetector.java rename to code/features-convert/adblock/java/nu/marginalia/adblock/GoogleAnwersSpamDetector.java diff --git a/code/features-convert/anchor-keywords/build.gradle b/code/features-convert/anchor-keywords/build.gradle index 122046f8..23e415b9 100644 --- a/code/features-convert/anchor-keywords/build.gradle +++ b/code/features-convert/anchor-keywords/build.gradle @@ -10,6 +10,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':code:common:config') implementation project(':code:common:model') diff --git a/code/features-convert/anchor-keywords/src/main/java/nu/marginalia/atags/AnchorTextKeywords.java b/code/features-convert/anchor-keywords/java/nu/marginalia/atags/AnchorTextKeywords.java similarity index 100% rename from code/features-convert/anchor-keywords/src/main/java/nu/marginalia/atags/AnchorTextKeywords.java rename to code/features-convert/anchor-keywords/java/nu/marginalia/atags/AnchorTextKeywords.java diff --git a/code/features-convert/anchor-keywords/src/main/java/nu/marginalia/atags/model/DomainLinks.java b/code/features-convert/anchor-keywords/java/nu/marginalia/atags/model/DomainLinks.java similarity index 100% rename from code/features-convert/anchor-keywords/src/main/java/nu/marginalia/atags/model/DomainLinks.java rename to code/features-convert/anchor-keywords/java/nu/marginalia/atags/model/DomainLinks.java diff --git a/code/features-convert/anchor-keywords/src/main/java/nu/marginalia/atags/model/Link.java b/code/features-convert/anchor-keywords/java/nu/marginalia/atags/model/Link.java similarity index 100% rename from code/features-convert/anchor-keywords/src/main/java/nu/marginalia/atags/model/Link.java rename to code/features-convert/anchor-keywords/java/nu/marginalia/atags/model/Link.java diff --git a/code/features-convert/anchor-keywords/src/main/java/nu/marginalia/atags/model/LinkWithText.java b/code/features-convert/anchor-keywords/java/nu/marginalia/atags/model/LinkWithText.java similarity index 100% rename from code/features-convert/anchor-keywords/src/main/java/nu/marginalia/atags/model/LinkWithText.java rename to code/features-convert/anchor-keywords/java/nu/marginalia/atags/model/LinkWithText.java diff --git a/code/features-convert/anchor-keywords/src/main/java/nu/marginalia/atags/source/AnchorTagsImpl.java b/code/features-convert/anchor-keywords/java/nu/marginalia/atags/source/AnchorTagsImpl.java similarity index 100% rename from code/features-convert/anchor-keywords/src/main/java/nu/marginalia/atags/source/AnchorTagsImpl.java rename to code/features-convert/anchor-keywords/java/nu/marginalia/atags/source/AnchorTagsImpl.java diff --git a/code/features-convert/anchor-keywords/src/main/java/nu/marginalia/atags/source/AnchorTagsSource.java b/code/features-convert/anchor-keywords/java/nu/marginalia/atags/source/AnchorTagsSource.java similarity index 100% rename from code/features-convert/anchor-keywords/src/main/java/nu/marginalia/atags/source/AnchorTagsSource.java rename to code/features-convert/anchor-keywords/java/nu/marginalia/atags/source/AnchorTagsSource.java diff --git a/code/features-convert/anchor-keywords/src/main/java/nu/marginalia/atags/source/AnchorTagsSourceFactory.java b/code/features-convert/anchor-keywords/java/nu/marginalia/atags/source/AnchorTagsSourceFactory.java similarity index 100% rename from code/features-convert/anchor-keywords/src/main/java/nu/marginalia/atags/source/AnchorTagsSourceFactory.java rename to code/features-convert/anchor-keywords/java/nu/marginalia/atags/source/AnchorTagsSourceFactory.java diff --git a/code/features-convert/anchor-keywords/src/main/resources/atags-stop-list b/code/features-convert/anchor-keywords/resources/atags-stop-list similarity index 100% rename from code/features-convert/anchor-keywords/src/main/resources/atags-stop-list rename to code/features-convert/anchor-keywords/resources/atags-stop-list diff --git a/code/features-convert/anchor-keywords/src/test/java/nu/marginalia/atags/DomainAnchorTagsImplTest.java b/code/features-convert/anchor-keywords/test/nu/marginalia/atags/DomainAnchorTagsImplTest.java similarity index 100% rename from code/features-convert/anchor-keywords/src/test/java/nu/marginalia/atags/DomainAnchorTagsImplTest.java rename to code/features-convert/anchor-keywords/test/nu/marginalia/atags/DomainAnchorTagsImplTest.java diff --git a/code/features-convert/anchor-keywords/src/test/java/nu/marginalia/util/TestLanguageModels.java b/code/features-convert/anchor-keywords/test/nu/marginalia/util/TestLanguageModels.java similarity index 100% rename from code/features-convert/anchor-keywords/src/test/java/nu/marginalia/util/TestLanguageModels.java rename to code/features-convert/anchor-keywords/test/nu/marginalia/util/TestLanguageModels.java diff --git a/code/features-convert/data-extractors/build.gradle b/code/features-convert/data-extractors/build.gradle index 67c42633..6fd5671d 100644 --- a/code/features-convert/data-extractors/build.gradle +++ b/code/features-convert/data-extractors/build.gradle @@ -13,6 +13,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':code:common:config') implementation project(':code:common:process') diff --git a/code/features-convert/data-extractors/src/main/java/nu/marginalia/extractor/AtagExporter.java b/code/features-convert/data-extractors/java/nu/marginalia/extractor/AtagExporter.java similarity index 100% rename from code/features-convert/data-extractors/src/main/java/nu/marginalia/extractor/AtagExporter.java rename to code/features-convert/data-extractors/java/nu/marginalia/extractor/AtagExporter.java diff --git a/code/features-convert/data-extractors/src/main/java/nu/marginalia/extractor/ExporterIf.java b/code/features-convert/data-extractors/java/nu/marginalia/extractor/ExporterIf.java similarity index 100% rename from code/features-convert/data-extractors/src/main/java/nu/marginalia/extractor/ExporterIf.java rename to code/features-convert/data-extractors/java/nu/marginalia/extractor/ExporterIf.java diff --git a/code/features-convert/data-extractors/src/main/java/nu/marginalia/extractor/FeedExporter.java b/code/features-convert/data-extractors/java/nu/marginalia/extractor/FeedExporter.java similarity index 100% rename from code/features-convert/data-extractors/src/main/java/nu/marginalia/extractor/FeedExporter.java rename to code/features-convert/data-extractors/java/nu/marginalia/extractor/FeedExporter.java diff --git a/code/features-convert/data-extractors/src/main/java/nu/marginalia/extractor/SampleDataExporter.java b/code/features-convert/data-extractors/java/nu/marginalia/extractor/SampleDataExporter.java similarity index 100% rename from code/features-convert/data-extractors/src/main/java/nu/marginalia/extractor/SampleDataExporter.java rename to code/features-convert/data-extractors/java/nu/marginalia/extractor/SampleDataExporter.java diff --git a/code/features-convert/data-extractors/src/main/java/nu/marginalia/extractor/TermFrequencyExporter.java b/code/features-convert/data-extractors/java/nu/marginalia/extractor/TermFrequencyExporter.java similarity index 100% rename from code/features-convert/data-extractors/src/main/java/nu/marginalia/extractor/TermFrequencyExporter.java rename to code/features-convert/data-extractors/java/nu/marginalia/extractor/TermFrequencyExporter.java diff --git a/code/features-convert/keyword-extraction/build.gradle b/code/features-convert/keyword-extraction/build.gradle index 9afcc61c..7912e246 100644 --- a/code/features-convert/keyword-extraction/build.gradle +++ b/code/features-convert/keyword-extraction/build.gradle @@ -10,6 +10,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':third-party:porterstemmer') implementation project(':code:common:model') diff --git a/code/features-convert/keyword-extraction/src/main/java/nu/marginalia/keyword/DocumentKeywordExtractor.java b/code/features-convert/keyword-extraction/java/nu/marginalia/keyword/DocumentKeywordExtractor.java similarity index 100% rename from code/features-convert/keyword-extraction/src/main/java/nu/marginalia/keyword/DocumentKeywordExtractor.java rename to code/features-convert/keyword-extraction/java/nu/marginalia/keyword/DocumentKeywordExtractor.java diff --git a/code/features-convert/keyword-extraction/src/main/java/nu/marginalia/keyword/KeywordExtractor.java b/code/features-convert/keyword-extraction/java/nu/marginalia/keyword/KeywordExtractor.java similarity index 100% rename from code/features-convert/keyword-extraction/src/main/java/nu/marginalia/keyword/KeywordExtractor.java rename to code/features-convert/keyword-extraction/java/nu/marginalia/keyword/KeywordExtractor.java diff --git a/code/features-convert/keyword-extraction/src/main/java/nu/marginalia/keyword/KeywordMetadata.java b/code/features-convert/keyword-extraction/java/nu/marginalia/keyword/KeywordMetadata.java similarity index 100% rename from code/features-convert/keyword-extraction/src/main/java/nu/marginalia/keyword/KeywordMetadata.java rename to code/features-convert/keyword-extraction/java/nu/marginalia/keyword/KeywordMetadata.java diff --git a/code/features-convert/keyword-extraction/src/main/java/nu/marginalia/keyword/WordReps.java b/code/features-convert/keyword-extraction/java/nu/marginalia/keyword/WordReps.java similarity index 100% rename from code/features-convert/keyword-extraction/src/main/java/nu/marginalia/keyword/WordReps.java rename to code/features-convert/keyword-extraction/java/nu/marginalia/keyword/WordReps.java diff --git a/code/features-convert/keyword-extraction/src/main/java/nu/marginalia/keyword/extractors/ArtifactKeywords.java b/code/features-convert/keyword-extraction/java/nu/marginalia/keyword/extractors/ArtifactKeywords.java similarity index 100% rename from code/features-convert/keyword-extraction/src/main/java/nu/marginalia/keyword/extractors/ArtifactKeywords.java rename to code/features-convert/keyword-extraction/java/nu/marginalia/keyword/extractors/ArtifactKeywords.java diff --git a/code/features-convert/keyword-extraction/src/main/java/nu/marginalia/keyword/extractors/KeywordPositionBitmask.java b/code/features-convert/keyword-extraction/java/nu/marginalia/keyword/extractors/KeywordPositionBitmask.java similarity index 100% rename from code/features-convert/keyword-extraction/src/main/java/nu/marginalia/keyword/extractors/KeywordPositionBitmask.java rename to code/features-convert/keyword-extraction/java/nu/marginalia/keyword/extractors/KeywordPositionBitmask.java diff --git a/code/features-convert/keyword-extraction/src/main/java/nu/marginalia/keyword/extractors/NameLikeKeywords.java b/code/features-convert/keyword-extraction/java/nu/marginalia/keyword/extractors/NameLikeKeywords.java similarity index 100% rename from code/features-convert/keyword-extraction/src/main/java/nu/marginalia/keyword/extractors/NameLikeKeywords.java rename to code/features-convert/keyword-extraction/java/nu/marginalia/keyword/extractors/NameLikeKeywords.java diff --git a/code/features-convert/keyword-extraction/src/main/java/nu/marginalia/keyword/extractors/SubjectLikeKeywords.java b/code/features-convert/keyword-extraction/java/nu/marginalia/keyword/extractors/SubjectLikeKeywords.java similarity index 100% rename from code/features-convert/keyword-extraction/src/main/java/nu/marginalia/keyword/extractors/SubjectLikeKeywords.java rename to code/features-convert/keyword-extraction/java/nu/marginalia/keyword/extractors/SubjectLikeKeywords.java diff --git a/code/features-convert/keyword-extraction/src/main/java/nu/marginalia/keyword/extractors/TitleKeywords.java b/code/features-convert/keyword-extraction/java/nu/marginalia/keyword/extractors/TitleKeywords.java similarity index 100% rename from code/features-convert/keyword-extraction/src/main/java/nu/marginalia/keyword/extractors/TitleKeywords.java rename to code/features-convert/keyword-extraction/java/nu/marginalia/keyword/extractors/TitleKeywords.java diff --git a/code/features-convert/keyword-extraction/src/main/java/nu/marginalia/keyword/extractors/UrlKeywords.java b/code/features-convert/keyword-extraction/java/nu/marginalia/keyword/extractors/UrlKeywords.java similarity index 100% rename from code/features-convert/keyword-extraction/src/main/java/nu/marginalia/keyword/extractors/UrlKeywords.java rename to code/features-convert/keyword-extraction/java/nu/marginalia/keyword/extractors/UrlKeywords.java diff --git a/code/features-convert/keyword-extraction/src/main/java/nu/marginalia/keyword/extractors/WordsTfIdfCounts.java b/code/features-convert/keyword-extraction/java/nu/marginalia/keyword/extractors/WordsTfIdfCounts.java similarity index 100% rename from code/features-convert/keyword-extraction/src/main/java/nu/marginalia/keyword/extractors/WordsTfIdfCounts.java rename to code/features-convert/keyword-extraction/java/nu/marginalia/keyword/extractors/WordsTfIdfCounts.java diff --git a/code/features-convert/keyword-extraction/src/main/java/nu/marginalia/keyword/model/DocumentKeywords.java b/code/features-convert/keyword-extraction/java/nu/marginalia/keyword/model/DocumentKeywords.java similarity index 100% rename from code/features-convert/keyword-extraction/src/main/java/nu/marginalia/keyword/model/DocumentKeywords.java rename to code/features-convert/keyword-extraction/java/nu/marginalia/keyword/model/DocumentKeywords.java diff --git a/code/features-convert/keyword-extraction/src/main/java/nu/marginalia/keyword/model/DocumentKeywordsBuilder.java b/code/features-convert/keyword-extraction/java/nu/marginalia/keyword/model/DocumentKeywordsBuilder.java similarity index 100% rename from code/features-convert/keyword-extraction/src/main/java/nu/marginalia/keyword/model/DocumentKeywordsBuilder.java rename to code/features-convert/keyword-extraction/java/nu/marginalia/keyword/model/DocumentKeywordsBuilder.java diff --git a/code/features-convert/keyword-extraction/src/main/java/nu/marginalia/keyword/model/DocumentKeywordsPointer.java b/code/features-convert/keyword-extraction/java/nu/marginalia/keyword/model/DocumentKeywordsPointer.java similarity index 100% rename from code/features-convert/keyword-extraction/src/main/java/nu/marginalia/keyword/model/DocumentKeywordsPointer.java rename to code/features-convert/keyword-extraction/java/nu/marginalia/keyword/model/DocumentKeywordsPointer.java diff --git a/code/features-convert/keyword-extraction/src/test/resources/test-data/java.html b/code/features-convert/keyword-extraction/test-resources/test-data/java.html similarity index 100% rename from code/features-convert/keyword-extraction/src/test/resources/test-data/java.html rename to code/features-convert/keyword-extraction/test-resources/test-data/java.html diff --git a/code/features-convert/keyword-extraction/src/test/resources/test-data/keyboards.html b/code/features-convert/keyword-extraction/test-resources/test-data/keyboards.html similarity index 100% rename from code/features-convert/keyword-extraction/src/test/resources/test-data/keyboards.html rename to code/features-convert/keyword-extraction/test-resources/test-data/keyboards.html diff --git a/code/features-convert/keyword-extraction/src/test/resources/test-data/madonna.html b/code/features-convert/keyword-extraction/test-resources/test-data/madonna.html similarity index 100% rename from code/features-convert/keyword-extraction/src/test/resources/test-data/madonna.html rename to code/features-convert/keyword-extraction/test-resources/test-data/madonna.html diff --git a/code/features-convert/keyword-extraction/src/test/resources/test-data/spam.html b/code/features-convert/keyword-extraction/test-resources/test-data/spam.html similarity index 100% rename from code/features-convert/keyword-extraction/src/test/resources/test-data/spam.html rename to code/features-convert/keyword-extraction/test-resources/test-data/spam.html diff --git a/code/features-convert/keyword-extraction/src/test/java/nu/marginalia/keyword/DocumentKeywordExtractorTest.java b/code/features-convert/keyword-extraction/test/nu/marginalia/keyword/DocumentKeywordExtractorTest.java similarity index 100% rename from code/features-convert/keyword-extraction/src/test/java/nu/marginalia/keyword/DocumentKeywordExtractorTest.java rename to code/features-convert/keyword-extraction/test/nu/marginalia/keyword/DocumentKeywordExtractorTest.java diff --git a/code/features-convert/keyword-extraction/src/test/java/nu/marginalia/keyword/SentenceExtractorTest.java b/code/features-convert/keyword-extraction/test/nu/marginalia/keyword/SentenceExtractorTest.java similarity index 100% rename from code/features-convert/keyword-extraction/src/test/java/nu/marginalia/keyword/SentenceExtractorTest.java rename to code/features-convert/keyword-extraction/test/nu/marginalia/keyword/SentenceExtractorTest.java diff --git a/code/features-convert/keyword-extraction/src/test/java/nu/marginalia/keyword/extractors/ArtifactKeywordsTest.java b/code/features-convert/keyword-extraction/test/nu/marginalia/keyword/extractors/ArtifactKeywordsTest.java similarity index 100% rename from code/features-convert/keyword-extraction/src/test/java/nu/marginalia/keyword/extractors/ArtifactKeywordsTest.java rename to code/features-convert/keyword-extraction/test/nu/marginalia/keyword/extractors/ArtifactKeywordsTest.java diff --git a/code/features-convert/keyword-extraction/src/test/java/nu/marginalia/keyword/extractors/NameLikeKeywordsTest.java b/code/features-convert/keyword-extraction/test/nu/marginalia/keyword/extractors/NameLikeKeywordsTest.java similarity index 100% rename from code/features-convert/keyword-extraction/src/test/java/nu/marginalia/keyword/extractors/NameLikeKeywordsTest.java rename to code/features-convert/keyword-extraction/test/nu/marginalia/keyword/extractors/NameLikeKeywordsTest.java diff --git a/code/features-convert/keyword-extraction/src/test/java/nu/marginalia/keyword/extractors/SubjectLikeKeywordsTest.java b/code/features-convert/keyword-extraction/test/nu/marginalia/keyword/extractors/SubjectLikeKeywordsTest.java similarity index 100% rename from code/features-convert/keyword-extraction/src/test/java/nu/marginalia/keyword/extractors/SubjectLikeKeywordsTest.java rename to code/features-convert/keyword-extraction/test/nu/marginalia/keyword/extractors/SubjectLikeKeywordsTest.java diff --git a/code/features-convert/keyword-extraction/src/test/java/nu/marginalia/keyword/extractors/TitleKeywordsTest.java b/code/features-convert/keyword-extraction/test/nu/marginalia/keyword/extractors/TitleKeywordsTest.java similarity index 100% rename from code/features-convert/keyword-extraction/src/test/java/nu/marginalia/keyword/extractors/TitleKeywordsTest.java rename to code/features-convert/keyword-extraction/test/nu/marginalia/keyword/extractors/TitleKeywordsTest.java diff --git a/code/features-convert/keyword-extraction/src/test/java/nu/marginalia/keyword/extractors/UrlKeywordsTest.java b/code/features-convert/keyword-extraction/test/nu/marginalia/keyword/extractors/UrlKeywordsTest.java similarity index 100% rename from code/features-convert/keyword-extraction/src/test/java/nu/marginalia/keyword/extractors/UrlKeywordsTest.java rename to code/features-convert/keyword-extraction/test/nu/marginalia/keyword/extractors/UrlKeywordsTest.java diff --git a/code/features-convert/keyword-extraction/src/test/java/nu/marginalia/test/util/TestLanguageModels.java b/code/features-convert/keyword-extraction/test/nu/marginalia/test/util/TestLanguageModels.java similarity index 100% rename from code/features-convert/keyword-extraction/src/test/java/nu/marginalia/test/util/TestLanguageModels.java rename to code/features-convert/keyword-extraction/test/nu/marginalia/test/util/TestLanguageModels.java diff --git a/code/features-convert/pubdate/build.gradle b/code/features-convert/pubdate/build.gradle index 0a08ea74..bebd3d8e 100644 --- a/code/features-convert/pubdate/build.gradle +++ b/code/features-convert/pubdate/build.gradle @@ -13,6 +13,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':code:common:model') diff --git a/code/features-convert/pubdate/src/main/java/nu/marginalia/pubdate/PubDateEffortLevel.java b/code/features-convert/pubdate/java/nu/marginalia/pubdate/PubDateEffortLevel.java similarity index 100% rename from code/features-convert/pubdate/src/main/java/nu/marginalia/pubdate/PubDateEffortLevel.java rename to code/features-convert/pubdate/java/nu/marginalia/pubdate/PubDateEffortLevel.java diff --git a/code/features-convert/pubdate/src/main/java/nu/marginalia/pubdate/PubDateFromHtmlStandard.java b/code/features-convert/pubdate/java/nu/marginalia/pubdate/PubDateFromHtmlStandard.java similarity index 100% rename from code/features-convert/pubdate/src/main/java/nu/marginalia/pubdate/PubDateFromHtmlStandard.java rename to code/features-convert/pubdate/java/nu/marginalia/pubdate/PubDateFromHtmlStandard.java diff --git a/code/features-convert/pubdate/src/main/java/nu/marginalia/pubdate/PubDateHeuristic.java b/code/features-convert/pubdate/java/nu/marginalia/pubdate/PubDateHeuristic.java similarity index 100% rename from code/features-convert/pubdate/src/main/java/nu/marginalia/pubdate/PubDateHeuristic.java rename to code/features-convert/pubdate/java/nu/marginalia/pubdate/PubDateHeuristic.java diff --git a/code/features-convert/pubdate/src/main/java/nu/marginalia/pubdate/PubDateParser.java b/code/features-convert/pubdate/java/nu/marginalia/pubdate/PubDateParser.java similarity index 100% rename from code/features-convert/pubdate/src/main/java/nu/marginalia/pubdate/PubDateParser.java rename to code/features-convert/pubdate/java/nu/marginalia/pubdate/PubDateParser.java diff --git a/code/features-convert/pubdate/src/main/java/nu/marginalia/pubdate/PubDateSniffer.java b/code/features-convert/pubdate/java/nu/marginalia/pubdate/PubDateSniffer.java similarity index 100% rename from code/features-convert/pubdate/src/main/java/nu/marginalia/pubdate/PubDateSniffer.java rename to code/features-convert/pubdate/java/nu/marginalia/pubdate/PubDateSniffer.java diff --git a/code/features-convert/pubdate/src/main/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicDOMParsingPass1.java b/code/features-convert/pubdate/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicDOMParsingPass1.java similarity index 100% rename from code/features-convert/pubdate/src/main/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicDOMParsingPass1.java rename to code/features-convert/pubdate/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicDOMParsingPass1.java diff --git a/code/features-convert/pubdate/src/main/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicDOMParsingPass2.java b/code/features-convert/pubdate/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicDOMParsingPass2.java similarity index 100% rename from code/features-convert/pubdate/src/main/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicDOMParsingPass2.java rename to code/features-convert/pubdate/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicDOMParsingPass2.java diff --git a/code/features-convert/pubdate/src/main/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicGuessFromHtmlStandard.java b/code/features-convert/pubdate/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicGuessFromHtmlStandard.java similarity index 100% rename from code/features-convert/pubdate/src/main/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicGuessFromHtmlStandard.java rename to code/features-convert/pubdate/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicGuessFromHtmlStandard.java diff --git a/code/features-convert/pubdate/src/main/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicHtml5AnyTimeTag.java b/code/features-convert/pubdate/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicHtml5AnyTimeTag.java similarity index 100% rename from code/features-convert/pubdate/src/main/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicHtml5AnyTimeTag.java rename to code/features-convert/pubdate/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicHtml5AnyTimeTag.java diff --git a/code/features-convert/pubdate/src/main/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicHtml5ArticleDateTag.java b/code/features-convert/pubdate/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicHtml5ArticleDateTag.java similarity index 100% rename from code/features-convert/pubdate/src/main/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicHtml5ArticleDateTag.java rename to code/features-convert/pubdate/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicHtml5ArticleDateTag.java diff --git a/code/features-convert/pubdate/src/main/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicHtml5ItempropDateTag.java b/code/features-convert/pubdate/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicHtml5ItempropDateTag.java similarity index 100% rename from code/features-convert/pubdate/src/main/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicHtml5ItempropDateTag.java rename to code/features-convert/pubdate/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicHtml5ItempropDateTag.java diff --git a/code/features-convert/pubdate/src/main/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicJSONLD.java b/code/features-convert/pubdate/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicJSONLD.java similarity index 100% rename from code/features-convert/pubdate/src/main/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicJSONLD.java rename to code/features-convert/pubdate/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicJSONLD.java diff --git a/code/features-convert/pubdate/src/main/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicLastModified.java b/code/features-convert/pubdate/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicLastModified.java similarity index 100% rename from code/features-convert/pubdate/src/main/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicLastModified.java rename to code/features-convert/pubdate/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicLastModified.java diff --git a/code/features-convert/pubdate/src/main/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicMicrodata.java b/code/features-convert/pubdate/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicMicrodata.java similarity index 100% rename from code/features-convert/pubdate/src/main/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicMicrodata.java rename to code/features-convert/pubdate/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicMicrodata.java diff --git a/code/features-convert/pubdate/src/main/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicOpenGraph.java b/code/features-convert/pubdate/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicOpenGraph.java similarity index 100% rename from code/features-convert/pubdate/src/main/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicOpenGraph.java rename to code/features-convert/pubdate/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicOpenGraph.java diff --git a/code/features-convert/pubdate/src/main/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicRDFaTag.java b/code/features-convert/pubdate/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicRDFaTag.java similarity index 100% rename from code/features-convert/pubdate/src/main/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicRDFaTag.java rename to code/features-convert/pubdate/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicRDFaTag.java diff --git a/code/features-convert/pubdate/src/main/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicUrlPatternPass1.java b/code/features-convert/pubdate/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicUrlPatternPass1.java similarity index 100% rename from code/features-convert/pubdate/src/main/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicUrlPatternPass1.java rename to code/features-convert/pubdate/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicUrlPatternPass1.java diff --git a/code/features-convert/pubdate/src/main/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicUrlPatternPass2.java b/code/features-convert/pubdate/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicUrlPatternPass2.java similarity index 100% rename from code/features-convert/pubdate/src/main/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicUrlPatternPass2.java rename to code/features-convert/pubdate/java/nu/marginalia/pubdate/heuristic/PubDateHeuristicUrlPatternPass2.java diff --git a/code/features-convert/pubdate/src/test/java/nu/marginalia/pubdate/PubDateSnifferTest.java b/code/features-convert/pubdate/test/nu/marginalia/pubdate/PubDateSnifferTest.java similarity index 100% rename from code/features-convert/pubdate/src/test/java/nu/marginalia/pubdate/PubDateSnifferTest.java rename to code/features-convert/pubdate/test/nu/marginalia/pubdate/PubDateSnifferTest.java diff --git a/code/features-convert/pubdate/src/test/java/nu/marginalia/pubdate/PubDateTest.java b/code/features-convert/pubdate/test/nu/marginalia/pubdate/PubDateTest.java similarity index 100% rename from code/features-convert/pubdate/src/test/java/nu/marginalia/pubdate/PubDateTest.java rename to code/features-convert/pubdate/test/nu/marginalia/pubdate/PubDateTest.java diff --git a/code/features-convert/reddit-json/build.gradle b/code/features-convert/reddit-json/build.gradle index 08420127..a9aa3bd6 100644 --- a/code/features-convert/reddit-json/build.gradle +++ b/code/features-convert/reddit-json/build.gradle @@ -10,6 +10,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation libs.bundles.slf4j diff --git a/code/features-convert/reddit-json/src/main/java/nu/marginalia/integration/reddit/RedditEntryReader.java b/code/features-convert/reddit-json/java/nu/marginalia/integration/reddit/RedditEntryReader.java similarity index 100% rename from code/features-convert/reddit-json/src/main/java/nu/marginalia/integration/reddit/RedditEntryReader.java rename to code/features-convert/reddit-json/java/nu/marginalia/integration/reddit/RedditEntryReader.java diff --git a/code/features-convert/reddit-json/src/main/java/nu/marginalia/integration/reddit/db/RedditDb.java b/code/features-convert/reddit-json/java/nu/marginalia/integration/reddit/db/RedditDb.java similarity index 100% rename from code/features-convert/reddit-json/src/main/java/nu/marginalia/integration/reddit/db/RedditDb.java rename to code/features-convert/reddit-json/java/nu/marginalia/integration/reddit/db/RedditDb.java diff --git a/code/features-convert/reddit-json/src/main/java/nu/marginalia/integration/reddit/model/ProcessableRedditComment.java b/code/features-convert/reddit-json/java/nu/marginalia/integration/reddit/model/ProcessableRedditComment.java similarity index 100% rename from code/features-convert/reddit-json/src/main/java/nu/marginalia/integration/reddit/model/ProcessableRedditComment.java rename to code/features-convert/reddit-json/java/nu/marginalia/integration/reddit/model/ProcessableRedditComment.java diff --git a/code/features-convert/reddit-json/src/main/java/nu/marginalia/integration/reddit/model/ProcessableRedditSubmission.java b/code/features-convert/reddit-json/java/nu/marginalia/integration/reddit/model/ProcessableRedditSubmission.java similarity index 100% rename from code/features-convert/reddit-json/src/main/java/nu/marginalia/integration/reddit/model/ProcessableRedditSubmission.java rename to code/features-convert/reddit-json/java/nu/marginalia/integration/reddit/model/ProcessableRedditSubmission.java diff --git a/code/features-convert/reddit-json/src/main/java/nu/marginalia/integration/reddit/model/RawRedditComment.java b/code/features-convert/reddit-json/java/nu/marginalia/integration/reddit/model/RawRedditComment.java similarity index 100% rename from code/features-convert/reddit-json/src/main/java/nu/marginalia/integration/reddit/model/RawRedditComment.java rename to code/features-convert/reddit-json/java/nu/marginalia/integration/reddit/model/RawRedditComment.java diff --git a/code/features-convert/reddit-json/src/main/java/nu/marginalia/integration/reddit/model/RawRedditSubmission.java b/code/features-convert/reddit-json/java/nu/marginalia/integration/reddit/model/RawRedditSubmission.java similarity index 100% rename from code/features-convert/reddit-json/src/main/java/nu/marginalia/integration/reddit/model/RawRedditSubmission.java rename to code/features-convert/reddit-json/java/nu/marginalia/integration/reddit/model/RawRedditSubmission.java diff --git a/code/features-convert/reddit-json/src/main/resources/db/reddit.sql b/code/features-convert/reddit-json/resources/db/reddit.sql similarity index 100% rename from code/features-convert/reddit-json/src/main/resources/db/reddit.sql rename to code/features-convert/reddit-json/resources/db/reddit.sql diff --git a/code/features-convert/reddit-json/src/test/java/nu/marginalia/integration/reddit/RedditEntryReaderTest.java b/code/features-convert/reddit-json/test/nu/marginalia/integration/reddit/RedditEntryReaderTest.java similarity index 100% rename from code/features-convert/reddit-json/src/test/java/nu/marginalia/integration/reddit/RedditEntryReaderTest.java rename to code/features-convert/reddit-json/test/nu/marginalia/integration/reddit/RedditEntryReaderTest.java diff --git a/code/features-convert/reddit-json/src/test/java/nu/marginalia/integration/reddit/db/RedditDbTest.java b/code/features-convert/reddit-json/test/nu/marginalia/integration/reddit/db/RedditDbTest.java similarity index 100% rename from code/features-convert/reddit-json/src/test/java/nu/marginalia/integration/reddit/db/RedditDbTest.java rename to code/features-convert/reddit-json/test/nu/marginalia/integration/reddit/db/RedditDbTest.java diff --git a/code/features-convert/stackexchange-xml/build.gradle b/code/features-convert/stackexchange-xml/build.gradle index 8126187d..d693047b 100644 --- a/code/features-convert/stackexchange-xml/build.gradle +++ b/code/features-convert/stackexchange-xml/build.gradle @@ -10,6 +10,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation libs.bundles.slf4j diff --git a/code/features-convert/stackexchange-xml/src/main/java/nu/marginalia/integration/stackexchange/model/StackExchangeComment.java b/code/features-convert/stackexchange-xml/java/nu/marginalia/integration/stackexchange/model/StackExchangeComment.java similarity index 100% rename from code/features-convert/stackexchange-xml/src/main/java/nu/marginalia/integration/stackexchange/model/StackExchangeComment.java rename to code/features-convert/stackexchange-xml/java/nu/marginalia/integration/stackexchange/model/StackExchangeComment.java diff --git a/code/features-convert/stackexchange-xml/src/main/java/nu/marginalia/integration/stackexchange/model/StackExchangePost.java b/code/features-convert/stackexchange-xml/java/nu/marginalia/integration/stackexchange/model/StackExchangePost.java similarity index 100% rename from code/features-convert/stackexchange-xml/src/main/java/nu/marginalia/integration/stackexchange/model/StackExchangePost.java rename to code/features-convert/stackexchange-xml/java/nu/marginalia/integration/stackexchange/model/StackExchangePost.java diff --git a/code/features-convert/stackexchange-xml/src/main/java/nu/marginalia/integration/stackexchange/sqlite/StackExchangePostsDb.java b/code/features-convert/stackexchange-xml/java/nu/marginalia/integration/stackexchange/sqlite/StackExchangePostsDb.java similarity index 100% rename from code/features-convert/stackexchange-xml/src/main/java/nu/marginalia/integration/stackexchange/sqlite/StackExchangePostsDb.java rename to code/features-convert/stackexchange-xml/java/nu/marginalia/integration/stackexchange/sqlite/StackExchangePostsDb.java diff --git a/code/features-convert/stackexchange-xml/src/main/java/nu/marginalia/integration/stackexchange/xml/StackExchange7zXmlEventReaderSource.java b/code/features-convert/stackexchange-xml/java/nu/marginalia/integration/stackexchange/xml/StackExchange7zXmlEventReaderSource.java similarity index 100% rename from code/features-convert/stackexchange-xml/src/main/java/nu/marginalia/integration/stackexchange/xml/StackExchange7zXmlEventReaderSource.java rename to code/features-convert/stackexchange-xml/java/nu/marginalia/integration/stackexchange/xml/StackExchange7zXmlEventReaderSource.java diff --git a/code/features-convert/stackexchange-xml/src/main/java/nu/marginalia/integration/stackexchange/xml/StackExchangeXmlCommentReader.java b/code/features-convert/stackexchange-xml/java/nu/marginalia/integration/stackexchange/xml/StackExchangeXmlCommentReader.java similarity index 100% rename from code/features-convert/stackexchange-xml/src/main/java/nu/marginalia/integration/stackexchange/xml/StackExchangeXmlCommentReader.java rename to code/features-convert/stackexchange-xml/java/nu/marginalia/integration/stackexchange/xml/StackExchangeXmlCommentReader.java diff --git a/code/features-convert/stackexchange-xml/src/main/java/nu/marginalia/integration/stackexchange/xml/StackExchangeXmlIterator.java b/code/features-convert/stackexchange-xml/java/nu/marginalia/integration/stackexchange/xml/StackExchangeXmlIterator.java similarity index 100% rename from code/features-convert/stackexchange-xml/src/main/java/nu/marginalia/integration/stackexchange/xml/StackExchangeXmlIterator.java rename to code/features-convert/stackexchange-xml/java/nu/marginalia/integration/stackexchange/xml/StackExchangeXmlIterator.java diff --git a/code/features-convert/stackexchange-xml/src/main/java/nu/marginalia/integration/stackexchange/xml/StackExchangeXmlPostReader.java b/code/features-convert/stackexchange-xml/java/nu/marginalia/integration/stackexchange/xml/StackExchangeXmlPostReader.java similarity index 100% rename from code/features-convert/stackexchange-xml/src/main/java/nu/marginalia/integration/stackexchange/xml/StackExchangeXmlPostReader.java rename to code/features-convert/stackexchange-xml/java/nu/marginalia/integration/stackexchange/xml/StackExchangeXmlPostReader.java diff --git a/code/features-convert/stackexchange-xml/src/main/java/nu/marginalia/integration/stackexchange/xml/XmlEventReaderSource.java b/code/features-convert/stackexchange-xml/java/nu/marginalia/integration/stackexchange/xml/XmlEventReaderSource.java similarity index 100% rename from code/features-convert/stackexchange-xml/src/main/java/nu/marginalia/integration/stackexchange/xml/XmlEventReaderSource.java rename to code/features-convert/stackexchange-xml/java/nu/marginalia/integration/stackexchange/xml/XmlEventReaderSource.java diff --git a/code/features-convert/stackexchange-xml/src/main/resources/db/stackexchange.sql b/code/features-convert/stackexchange-xml/resources/db/stackexchange.sql similarity index 100% rename from code/features-convert/stackexchange-xml/src/main/resources/db/stackexchange.sql rename to code/features-convert/stackexchange-xml/resources/db/stackexchange.sql diff --git a/code/features-convert/stackexchange-xml/src/test/java/nu/marginalia/integration/stackexchange/xml/StackExchangeXmlCommentReaderTest.java b/code/features-convert/stackexchange-xml/test/nu/marginalia/integration/stackexchange/xml/StackExchangeXmlCommentReaderTest.java similarity index 100% rename from code/features-convert/stackexchange-xml/src/test/java/nu/marginalia/integration/stackexchange/xml/StackExchangeXmlCommentReaderTest.java rename to code/features-convert/stackexchange-xml/test/nu/marginalia/integration/stackexchange/xml/StackExchangeXmlCommentReaderTest.java diff --git a/code/features-convert/stackexchange-xml/src/test/java/nu/marginalia/integration/stackexchange/xml/StackExchangeXmlPostReaderTest.java b/code/features-convert/stackexchange-xml/test/nu/marginalia/integration/stackexchange/xml/StackExchangeXmlPostReaderTest.java similarity index 100% rename from code/features-convert/stackexchange-xml/src/test/java/nu/marginalia/integration/stackexchange/xml/StackExchangeXmlPostReaderTest.java rename to code/features-convert/stackexchange-xml/test/nu/marginalia/integration/stackexchange/xml/StackExchangeXmlPostReaderTest.java diff --git a/code/features-convert/stackexchange-xml/src/test/java/nu/marginalia/integration/stackexchange/xml/StringXmlTestEventReader.java b/code/features-convert/stackexchange-xml/test/nu/marginalia/integration/stackexchange/xml/StringXmlTestEventReader.java similarity index 100% rename from code/features-convert/stackexchange-xml/src/test/java/nu/marginalia/integration/stackexchange/xml/StringXmlTestEventReader.java rename to code/features-convert/stackexchange-xml/test/nu/marginalia/integration/stackexchange/xml/StringXmlTestEventReader.java diff --git a/code/features-convert/summary-extraction/build.gradle b/code/features-convert/summary-extraction/build.gradle index 7ff4f23c..bf6a87c5 100644 --- a/code/features-convert/summary-extraction/build.gradle +++ b/code/features-convert/summary-extraction/build.gradle @@ -10,6 +10,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation libs.bundles.slf4j diff --git a/code/features-convert/summary-extraction/src/main/java/nu/marginalia/summary/SummaryExtractor.java b/code/features-convert/summary-extraction/java/nu/marginalia/summary/SummaryExtractor.java similarity index 100% rename from code/features-convert/summary-extraction/src/main/java/nu/marginalia/summary/SummaryExtractor.java rename to code/features-convert/summary-extraction/java/nu/marginalia/summary/SummaryExtractor.java diff --git a/code/features-convert/summary-extraction/src/main/java/nu/marginalia/summary/heuristic/DomFilterHeuristic.java b/code/features-convert/summary-extraction/java/nu/marginalia/summary/heuristic/DomFilterHeuristic.java similarity index 100% rename from code/features-convert/summary-extraction/src/main/java/nu/marginalia/summary/heuristic/DomFilterHeuristic.java rename to code/features-convert/summary-extraction/java/nu/marginalia/summary/heuristic/DomFilterHeuristic.java diff --git a/code/features-convert/summary-extraction/src/main/java/nu/marginalia/summary/heuristic/FallbackHeuristic.java b/code/features-convert/summary-extraction/java/nu/marginalia/summary/heuristic/FallbackHeuristic.java similarity index 100% rename from code/features-convert/summary-extraction/src/main/java/nu/marginalia/summary/heuristic/FallbackHeuristic.java rename to code/features-convert/summary-extraction/java/nu/marginalia/summary/heuristic/FallbackHeuristic.java diff --git a/code/features-convert/summary-extraction/src/main/java/nu/marginalia/summary/heuristic/HeuristicTextUtil.java b/code/features-convert/summary-extraction/java/nu/marginalia/summary/heuristic/HeuristicTextUtil.java similarity index 100% rename from code/features-convert/summary-extraction/src/main/java/nu/marginalia/summary/heuristic/HeuristicTextUtil.java rename to code/features-convert/summary-extraction/java/nu/marginalia/summary/heuristic/HeuristicTextUtil.java diff --git a/code/features-convert/summary-extraction/src/main/java/nu/marginalia/summary/heuristic/MetaDescriptionHeuristic.java b/code/features-convert/summary-extraction/java/nu/marginalia/summary/heuristic/MetaDescriptionHeuristic.java similarity index 100% rename from code/features-convert/summary-extraction/src/main/java/nu/marginalia/summary/heuristic/MetaDescriptionHeuristic.java rename to code/features-convert/summary-extraction/java/nu/marginalia/summary/heuristic/MetaDescriptionHeuristic.java diff --git a/code/features-convert/summary-extraction/src/main/java/nu/marginalia/summary/heuristic/OpenGraphDescriptionHeuristic.java b/code/features-convert/summary-extraction/java/nu/marginalia/summary/heuristic/OpenGraphDescriptionHeuristic.java similarity index 100% rename from code/features-convert/summary-extraction/src/main/java/nu/marginalia/summary/heuristic/OpenGraphDescriptionHeuristic.java rename to code/features-convert/summary-extraction/java/nu/marginalia/summary/heuristic/OpenGraphDescriptionHeuristic.java diff --git a/code/features-convert/summary-extraction/src/main/java/nu/marginalia/summary/heuristic/SummarizingDOMFilter.java b/code/features-convert/summary-extraction/java/nu/marginalia/summary/heuristic/SummarizingDOMFilter.java similarity index 100% rename from code/features-convert/summary-extraction/src/main/java/nu/marginalia/summary/heuristic/SummarizingDOMFilter.java rename to code/features-convert/summary-extraction/java/nu/marginalia/summary/heuristic/SummarizingDOMFilter.java diff --git a/code/features-convert/summary-extraction/src/main/java/nu/marginalia/summary/heuristic/SummaryHeuristic.java b/code/features-convert/summary-extraction/java/nu/marginalia/summary/heuristic/SummaryHeuristic.java similarity index 100% rename from code/features-convert/summary-extraction/src/main/java/nu/marginalia/summary/heuristic/SummaryHeuristic.java rename to code/features-convert/summary-extraction/java/nu/marginalia/summary/heuristic/SummaryHeuristic.java diff --git a/code/features-convert/summary-extraction/src/main/java/nu/marginalia/summary/heuristic/TagDensityHeuristic.java b/code/features-convert/summary-extraction/java/nu/marginalia/summary/heuristic/TagDensityHeuristic.java similarity index 100% rename from code/features-convert/summary-extraction/src/main/java/nu/marginalia/summary/heuristic/TagDensityHeuristic.java rename to code/features-convert/summary-extraction/java/nu/marginalia/summary/heuristic/TagDensityHeuristic.java diff --git a/code/features-convert/summary-extraction/src/test/resources/html/monadnock.html b/code/features-convert/summary-extraction/test-resources/html/monadnock.html similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/monadnock.html rename to code/features-convert/summary-extraction/test-resources/html/monadnock.html diff --git a/code/features-convert/summary-extraction/src/test/resources/html/readme.md b/code/features-convert/summary-extraction/test-resources/html/readme.md similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/readme.md rename to code/features-convert/summary-extraction/test-resources/html/readme.md diff --git a/code/features-convert/summary-extraction/src/test/resources/html/summarization/187.shtml b/code/features-convert/summary-extraction/test-resources/html/summarization/187.shtml similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/summarization/187.shtml rename to code/features-convert/summary-extraction/test-resources/html/summarization/187.shtml diff --git a/code/features-convert/summary-extraction/src/test/resources/html/summarization/surrey.html b/code/features-convert/summary-extraction/test-resources/html/summarization/surrey.html similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/summarization/surrey.html rename to code/features-convert/summary-extraction/test-resources/html/summarization/surrey.html diff --git a/code/features-convert/summary-extraction/src/test/resources/html/summarization/surrey.html.1 b/code/features-convert/summary-extraction/test-resources/html/summarization/surrey.html.1 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/summarization/surrey.html.1 rename to code/features-convert/summary-extraction/test-resources/html/summarization/surrey.html.1 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/theregister.html b/code/features-convert/summary-extraction/test-resources/html/theregister.html similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/theregister.html rename to code/features-convert/summary-extraction/test-resources/html/theregister.html diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/index b/code/features-convert/summary-extraction/test-resources/html/work-set/index similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/index rename to code/features-convert/summary-extraction/test-resources/html/work-set/index diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1021546012 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--1021546012 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1021546012 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--1021546012 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1028592943 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--1028592943 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1028592943 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--1028592943 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1081293162 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--1081293162 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1081293162 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--1081293162 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1105046394 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--1105046394 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1105046394 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--1105046394 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1146923296 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--1146923296 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1146923296 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--1146923296 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1194694074 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--1194694074 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1194694074 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--1194694074 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1207898281 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--1207898281 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1207898281 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--1207898281 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1268145073 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--1268145073 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1268145073 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--1268145073 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1294876331 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--1294876331 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1294876331 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--1294876331 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1314767420 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--1314767420 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1314767420 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--1314767420 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1316269786 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--1316269786 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1316269786 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--1316269786 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1316766580 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--1316766580 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1316766580 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--1316766580 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1319968043 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--1319968043 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1319968043 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--1319968043 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1338576987 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--1338576987 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1338576987 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--1338576987 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1341909571 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--1341909571 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1341909571 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--1341909571 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1369578579 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--1369578579 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1369578579 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--1369578579 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1437315645 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--1437315645 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1437315645 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--1437315645 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1458954960 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--1458954960 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1458954960 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--1458954960 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1475681345 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--1475681345 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1475681345 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--1475681345 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1498328446 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--1498328446 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1498328446 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--1498328446 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1507779664 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--1507779664 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1507779664 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--1507779664 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1540303379 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--1540303379 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1540303379 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--1540303379 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--154898476 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--154898476 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--154898476 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--154898476 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1552059399 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--1552059399 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1552059399 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--1552059399 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1557688340 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--1557688340 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1557688340 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--1557688340 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1584145751 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--1584145751 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1584145751 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--1584145751 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1605151204 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--1605151204 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1605151204 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--1605151204 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--162269247 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--162269247 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--162269247 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--162269247 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1624294488 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--1624294488 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1624294488 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--1624294488 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--164108285 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--164108285 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--164108285 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--164108285 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1645688243 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--1645688243 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1645688243 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--1645688243 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1658004609 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--1658004609 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1658004609 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--1658004609 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1658558834 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--1658558834 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1658558834 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--1658558834 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1698664879 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--1698664879 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1698664879 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--1698664879 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--169975195 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--169975195 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--169975195 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--169975195 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1701203332 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--1701203332 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1701203332 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--1701203332 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--17281998 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--17281998 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--17281998 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--17281998 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1742070028 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--1742070028 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1742070028 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--1742070028 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1745376814 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--1745376814 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1745376814 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--1745376814 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1749889035 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--1749889035 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1749889035 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--1749889035 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--176177364 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--176177364 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--176177364 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--176177364 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--177014197 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--177014197 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--177014197 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--177014197 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1794527707 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--1794527707 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1794527707 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--1794527707 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1797740201 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--1797740201 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1797740201 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--1797740201 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1799098579 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--1799098579 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1799098579 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--1799098579 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1959637826 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--1959637826 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1959637826 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--1959637826 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1971916964 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--1971916964 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1971916964 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--1971916964 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1985840368 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--1985840368 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--1985840368 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--1985840368 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--2012610859 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--2012610859 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--2012610859 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--2012610859 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--202178680 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--202178680 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--202178680 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--202178680 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--2043528727 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--2043528727 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--2043528727 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--2043528727 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--2081757477 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--2081757477 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--2081757477 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--2081757477 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--2103982576 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--2103982576 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--2103982576 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--2103982576 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--2111558769 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--2111558769 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--2111558769 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--2111558769 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--213168798 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--213168798 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--213168798 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--213168798 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--232544032 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--232544032 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--232544032 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--232544032 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--253010011 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--253010011 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--253010011 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--253010011 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--274250994 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--274250994 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--274250994 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--274250994 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--332442790 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--332442790 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--332442790 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--332442790 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--353437903 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--353437903 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--353437903 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--353437903 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--364546777 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--364546777 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--364546777 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--364546777 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--379129416 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--379129416 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--379129416 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--379129416 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--399428149 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--399428149 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--399428149 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--399428149 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--425233170 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--425233170 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--425233170 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--425233170 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--434612307 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--434612307 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--434612307 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--434612307 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--439772328 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--439772328 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--439772328 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--439772328 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--458002611 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--458002611 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--458002611 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--458002611 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--506010305 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--506010305 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--506010305 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--506010305 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--546773534 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--546773534 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--546773534 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--546773534 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--551288516 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--551288516 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--551288516 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--551288516 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--602577763 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--602577763 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--602577763 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--602577763 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--611668054 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--611668054 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--611668054 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--611668054 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--634771245 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--634771245 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--634771245 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--634771245 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--639320493 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--639320493 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--639320493 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--639320493 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--643179018 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--643179018 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--643179018 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--643179018 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--663772351 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--663772351 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--663772351 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--663772351 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--670789152 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--670789152 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--670789152 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--670789152 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--6797317 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--6797317 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--6797317 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--6797317 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--700978490 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--700978490 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--700978490 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--700978490 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--708035332 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--708035332 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--708035332 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--708035332 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--804917062 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--804917062 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--804917062 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--804917062 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--819771302 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--819771302 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--819771302 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--819771302 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--840796372 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--840796372 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--840796372 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--840796372 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--841445362 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--841445362 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--841445362 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--841445362 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--862385354 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--862385354 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--862385354 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--862385354 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--879796466 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--879796466 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--879796466 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--879796466 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--89134993 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--89134993 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--89134993 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--89134993 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--905197876 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--905197876 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--905197876 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--905197876 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--920328354 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--920328354 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--920328354 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--920328354 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--952827759 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--952827759 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--952827759 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--952827759 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--964018507 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--964018507 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--964018507 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--964018507 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url--972614909 b/code/features-convert/summary-extraction/test-resources/html/work-set/url--972614909 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url--972614909 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url--972614909 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-10088520 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-10088520 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-10088520 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-10088520 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1013281103 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-1013281103 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1013281103 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-1013281103 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1019241851 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-1019241851 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1019241851 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-1019241851 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1059944953 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-1059944953 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1059944953 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-1059944953 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1118681302 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-1118681302 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1118681302 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-1118681302 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1179298706 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-1179298706 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1179298706 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-1179298706 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1191749784 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-1191749784 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1191749784 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-1191749784 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1207094790 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-1207094790 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1207094790 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-1207094790 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1213989666 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-1213989666 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1213989666 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-1213989666 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1222442301 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-1222442301 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1222442301 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-1222442301 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-130332455 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-130332455 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-130332455 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-130332455 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1311055461 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-1311055461 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1311055461 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-1311055461 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1391842722 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-1391842722 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1391842722 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-1391842722 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1457388763 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-1457388763 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1457388763 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-1457388763 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1506356272 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-1506356272 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1506356272 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-1506356272 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1511762169 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-1511762169 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1511762169 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-1511762169 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1534640058 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-1534640058 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1534640058 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-1534640058 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1551513871 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-1551513871 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1551513871 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-1551513871 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1567632447 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-1567632447 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1567632447 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-1567632447 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1623049502 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-1623049502 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1623049502 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-1623049502 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-163919330 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-163919330 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-163919330 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-163919330 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1661398327 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-1661398327 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1661398327 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-1661398327 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1724309925 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-1724309925 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1724309925 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-1724309925 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1736807128 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-1736807128 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1736807128 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-1736807128 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1739031345 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-1739031345 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1739031345 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-1739031345 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1755745765 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-1755745765 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1755745765 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-1755745765 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1802811100 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-1802811100 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1802811100 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-1802811100 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1805364707 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-1805364707 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1805364707 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-1805364707 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1832702370 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-1832702370 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1832702370 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-1832702370 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1853114311 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-1853114311 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1853114311 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-1853114311 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1924872844 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-1924872844 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1924872844 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-1924872844 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-197772804 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-197772804 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-197772804 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-197772804 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1984259912 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-1984259912 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1984259912 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-1984259912 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1990903988 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-1990903988 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-1990903988 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-1990903988 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-2039310951 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-2039310951 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-2039310951 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-2039310951 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-2040857056 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-2040857056 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-2040857056 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-2040857056 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-2052613093 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-2052613093 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-2052613093 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-2052613093 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-2063899866 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-2063899866 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-2063899866 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-2063899866 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-2115548255 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-2115548255 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-2115548255 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-2115548255 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-2127148436 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-2127148436 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-2127148436 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-2127148436 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-2133781904 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-2133781904 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-2133781904 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-2133781904 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-225690385 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-225690385 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-225690385 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-225690385 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-226401955 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-226401955 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-226401955 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-226401955 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-262970770 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-262970770 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-262970770 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-262970770 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-30106798 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-30106798 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-30106798 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-30106798 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-302167335 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-302167335 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-302167335 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-302167335 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-327999153 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-327999153 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-327999153 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-327999153 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-332568225 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-332568225 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-332568225 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-332568225 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-343223418 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-343223418 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-343223418 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-343223418 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-383103932 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-383103932 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-383103932 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-383103932 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-412929678 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-412929678 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-412929678 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-412929678 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-475213997 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-475213997 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-475213997 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-475213997 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-483403121 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-483403121 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-483403121 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-483403121 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-488667993 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-488667993 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-488667993 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-488667993 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-50815201 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-50815201 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-50815201 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-50815201 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-522685905 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-522685905 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-522685905 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-522685905 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-570714305 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-570714305 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-570714305 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-570714305 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-58733529 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-58733529 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-58733529 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-58733529 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-616518304 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-616518304 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-616518304 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-616518304 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-662169426 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-662169426 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-662169426 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-662169426 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-677278788 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-677278788 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-677278788 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-677278788 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-690486170 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-690486170 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-690486170 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-690486170 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-709693331 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-709693331 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-709693331 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-709693331 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-734531556 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-734531556 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-734531556 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-734531556 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-767530276 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-767530276 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-767530276 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-767530276 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-783154014 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-783154014 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-783154014 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-783154014 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-796905237 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-796905237 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-796905237 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-796905237 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-800099955 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-800099955 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-800099955 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-800099955 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-804101946 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-804101946 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-804101946 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-804101946 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-830664902 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-830664902 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-830664902 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-830664902 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-876060686 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-876060686 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-876060686 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-876060686 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-892584998 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-892584998 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-892584998 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-892584998 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-942458463 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-942458463 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-942458463 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-942458463 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-952036171 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-952036171 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-952036171 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-952036171 diff --git a/code/features-convert/summary-extraction/src/test/resources/html/work-set/url-968207276 b/code/features-convert/summary-extraction/test-resources/html/work-set/url-968207276 similarity index 100% rename from code/features-convert/summary-extraction/src/test/resources/html/work-set/url-968207276 rename to code/features-convert/summary-extraction/test-resources/html/work-set/url-968207276 diff --git a/code/features-convert/summary-extraction/src/test/java/nu/marginalia/summary/SummaryExtractorTest.java b/code/features-convert/summary-extraction/test/nu/marginalia/summary/SummaryExtractorTest.java similarity index 100% rename from code/features-convert/summary-extraction/src/test/java/nu/marginalia/summary/SummaryExtractorTest.java rename to code/features-convert/summary-extraction/test/nu/marginalia/summary/SummaryExtractorTest.java diff --git a/code/features-convert/summary-extraction/src/test/java/nu/marginalia/summary/heuristic/HeuristicTextUtilTest.java b/code/features-convert/summary-extraction/test/nu/marginalia/summary/heuristic/HeuristicTextUtilTest.java similarity index 100% rename from code/features-convert/summary-extraction/src/test/java/nu/marginalia/summary/heuristic/HeuristicTextUtilTest.java rename to code/features-convert/summary-extraction/test/nu/marginalia/summary/heuristic/HeuristicTextUtilTest.java diff --git a/code/features-convert/topic-detection/build.gradle b/code/features-convert/topic-detection/build.gradle index 5836dc2b..49661c25 100644 --- a/code/features-convert/topic-detection/build.gradle +++ b/code/features-convert/topic-detection/build.gradle @@ -13,6 +13,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':code:common:config') implementation project(':code:libraries:language-processing') diff --git a/code/features-convert/topic-detection/src/main/java/nu/marginalia/topic/RecipeDetector.java b/code/features-convert/topic-detection/java/nu/marginalia/topic/RecipeDetector.java similarity index 100% rename from code/features-convert/topic-detection/src/main/java/nu/marginalia/topic/RecipeDetector.java rename to code/features-convert/topic-detection/java/nu/marginalia/topic/RecipeDetector.java diff --git a/code/features-convert/topic-detection/src/main/java/nu/marginalia/topic/TextileCraftDetector.java b/code/features-convert/topic-detection/java/nu/marginalia/topic/TextileCraftDetector.java similarity index 100% rename from code/features-convert/topic-detection/src/main/java/nu/marginalia/topic/TextileCraftDetector.java rename to code/features-convert/topic-detection/java/nu/marginalia/topic/TextileCraftDetector.java diff --git a/code/features-convert/topic-detection/src/main/java/nu/marginalia/topic/WoodworkingDetector.java b/code/features-convert/topic-detection/java/nu/marginalia/topic/WoodworkingDetector.java similarity index 100% rename from code/features-convert/topic-detection/src/main/java/nu/marginalia/topic/WoodworkingDetector.java rename to code/features-convert/topic-detection/java/nu/marginalia/topic/WoodworkingDetector.java diff --git a/code/features-crawl/content-type/build.gradle b/code/features-crawl/content-type/build.gradle index 73a155cb..c807b86e 100644 --- a/code/features-crawl/content-type/build.gradle +++ b/code/features-crawl/content-type/build.gradle @@ -11,6 +11,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':code:common:model') implementation libs.crawlercommons diff --git a/code/features-crawl/content-type/src/main/java/nu/marginalia/contenttype/ContentType.java b/code/features-crawl/content-type/java/nu/marginalia/contenttype/ContentType.java similarity index 100% rename from code/features-crawl/content-type/src/main/java/nu/marginalia/contenttype/ContentType.java rename to code/features-crawl/content-type/java/nu/marginalia/contenttype/ContentType.java diff --git a/code/features-crawl/content-type/src/main/java/nu/marginalia/contenttype/ContentTypeParser.java b/code/features-crawl/content-type/java/nu/marginalia/contenttype/ContentTypeParser.java similarity index 100% rename from code/features-crawl/content-type/src/main/java/nu/marginalia/contenttype/ContentTypeParser.java rename to code/features-crawl/content-type/java/nu/marginalia/contenttype/ContentTypeParser.java diff --git a/code/features-crawl/content-type/src/main/java/nu/marginalia/contenttype/DocumentBodyToString.java b/code/features-crawl/content-type/java/nu/marginalia/contenttype/DocumentBodyToString.java similarity index 100% rename from code/features-crawl/content-type/src/main/java/nu/marginalia/contenttype/DocumentBodyToString.java rename to code/features-crawl/content-type/java/nu/marginalia/contenttype/DocumentBodyToString.java diff --git a/code/features-crawl/content-type/src/test/java/nu/marginalia/contenttype/ContentTypeParserTest.java b/code/features-crawl/content-type/test/nu/marginalia/contenttype/ContentTypeParserTest.java similarity index 100% rename from code/features-crawl/content-type/src/test/java/nu/marginalia/contenttype/ContentTypeParserTest.java rename to code/features-crawl/content-type/test/nu/marginalia/contenttype/ContentTypeParserTest.java diff --git a/code/features-crawl/content-type/src/test/java/nu/marginalia/contenttype/DocumentBodyToStringTest.java b/code/features-crawl/content-type/test/nu/marginalia/contenttype/DocumentBodyToStringTest.java similarity index 100% rename from code/features-crawl/content-type/src/test/java/nu/marginalia/contenttype/DocumentBodyToStringTest.java rename to code/features-crawl/content-type/test/nu/marginalia/contenttype/DocumentBodyToStringTest.java diff --git a/code/features-crawl/crawl-blocklist/build.gradle b/code/features-crawl/crawl-blocklist/build.gradle index fa849eef..a6fc4f91 100644 --- a/code/features-crawl/crawl-blocklist/build.gradle +++ b/code/features-crawl/crawl-blocklist/build.gradle @@ -11,6 +11,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':code:common:model') implementation project(':code:common:config') diff --git a/code/features-crawl/crawl-blocklist/src/main/java/nu/marginalia/ip_blocklist/GeoIpBlocklist.java b/code/features-crawl/crawl-blocklist/java/nu/marginalia/ip_blocklist/GeoIpBlocklist.java similarity index 100% rename from code/features-crawl/crawl-blocklist/src/main/java/nu/marginalia/ip_blocklist/GeoIpBlocklist.java rename to code/features-crawl/crawl-blocklist/java/nu/marginalia/ip_blocklist/GeoIpBlocklist.java diff --git a/code/features-crawl/crawl-blocklist/src/main/java/nu/marginalia/ip_blocklist/InetAddressCache.java b/code/features-crawl/crawl-blocklist/java/nu/marginalia/ip_blocklist/InetAddressCache.java similarity index 100% rename from code/features-crawl/crawl-blocklist/src/main/java/nu/marginalia/ip_blocklist/InetAddressCache.java rename to code/features-crawl/crawl-blocklist/java/nu/marginalia/ip_blocklist/InetAddressCache.java diff --git a/code/features-crawl/crawl-blocklist/src/main/java/nu/marginalia/ip_blocklist/IpBlockList.java b/code/features-crawl/crawl-blocklist/java/nu/marginalia/ip_blocklist/IpBlockList.java similarity index 100% rename from code/features-crawl/crawl-blocklist/src/main/java/nu/marginalia/ip_blocklist/IpBlockList.java rename to code/features-crawl/crawl-blocklist/java/nu/marginalia/ip_blocklist/IpBlockList.java diff --git a/code/features-crawl/crawl-blocklist/src/main/java/nu/marginalia/ip_blocklist/UrlBlocklist.java b/code/features-crawl/crawl-blocklist/java/nu/marginalia/ip_blocklist/UrlBlocklist.java similarity index 100% rename from code/features-crawl/crawl-blocklist/src/main/java/nu/marginalia/ip_blocklist/UrlBlocklist.java rename to code/features-crawl/crawl-blocklist/java/nu/marginalia/ip_blocklist/UrlBlocklist.java diff --git a/code/features-crawl/crawl-blocklist/src/test/java/nu/marginalia/ip_blocklist/UrlBlocklistTest.java b/code/features-crawl/crawl-blocklist/test/nu/marginalia/ip_blocklist/UrlBlocklistTest.java similarity index 100% rename from code/features-crawl/crawl-blocklist/src/test/java/nu/marginalia/ip_blocklist/UrlBlocklistTest.java rename to code/features-crawl/crawl-blocklist/test/nu/marginalia/ip_blocklist/UrlBlocklistTest.java diff --git a/code/features-crawl/link-parser/build.gradle b/code/features-crawl/link-parser/build.gradle index dc551943..2dd04a5c 100644 --- a/code/features-crawl/link-parser/build.gradle +++ b/code/features-crawl/link-parser/build.gradle @@ -11,6 +11,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':code:common:model') diff --git a/code/features-crawl/link-parser/src/main/java/nu/marginalia/link_parser/FeedExtractor.java b/code/features-crawl/link-parser/java/nu/marginalia/link_parser/FeedExtractor.java similarity index 100% rename from code/features-crawl/link-parser/src/main/java/nu/marginalia/link_parser/FeedExtractor.java rename to code/features-crawl/link-parser/java/nu/marginalia/link_parser/FeedExtractor.java diff --git a/code/features-crawl/link-parser/src/main/java/nu/marginalia/link_parser/LinkParser.java b/code/features-crawl/link-parser/java/nu/marginalia/link_parser/LinkParser.java similarity index 100% rename from code/features-crawl/link-parser/src/main/java/nu/marginalia/link_parser/LinkParser.java rename to code/features-crawl/link-parser/java/nu/marginalia/link_parser/LinkParser.java diff --git a/code/features-search/feedlot-client/build.gradle b/code/features-search/feedlot-client/build.gradle index 808c9ca6..c62182fe 100644 --- a/code/features-search/feedlot-client/build.gradle +++ b/code/features-search/feedlot-client/build.gradle @@ -9,6 +9,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation libs.bundles.slf4j diff --git a/code/features-search/feedlot-client/src/main/java/nu/marginalia/feedlot/FeedlotClient.java b/code/features-search/feedlot-client/java/nu/marginalia/feedlot/FeedlotClient.java similarity index 100% rename from code/features-search/feedlot-client/src/main/java/nu/marginalia/feedlot/FeedlotClient.java rename to code/features-search/feedlot-client/java/nu/marginalia/feedlot/FeedlotClient.java diff --git a/code/features-search/feedlot-client/src/main/java/nu/marginalia/feedlot/model/FeedItem.java b/code/features-search/feedlot-client/java/nu/marginalia/feedlot/model/FeedItem.java similarity index 100% rename from code/features-search/feedlot-client/src/main/java/nu/marginalia/feedlot/model/FeedItem.java rename to code/features-search/feedlot-client/java/nu/marginalia/feedlot/model/FeedItem.java diff --git a/code/features-search/feedlot-client/src/main/java/nu/marginalia/feedlot/model/FeedItems.java b/code/features-search/feedlot-client/java/nu/marginalia/feedlot/model/FeedItems.java similarity index 100% rename from code/features-search/feedlot-client/src/main/java/nu/marginalia/feedlot/model/FeedItems.java rename to code/features-search/feedlot-client/java/nu/marginalia/feedlot/model/FeedItems.java diff --git a/code/features-search/random-websites/build.gradle b/code/features-search/random-websites/build.gradle index b95e7aa1..ec4201ec 100644 --- a/code/features-search/random-websites/build.gradle +++ b/code/features-search/random-websites/build.gradle @@ -11,6 +11,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':code:common:model') implementation project(':code:common:db') diff --git a/code/features-search/random-websites/src/main/java/nu/marginalia/browse/DbBrowseDomainsRandom.java b/code/features-search/random-websites/java/nu/marginalia/browse/DbBrowseDomainsRandom.java similarity index 100% rename from code/features-search/random-websites/src/main/java/nu/marginalia/browse/DbBrowseDomainsRandom.java rename to code/features-search/random-websites/java/nu/marginalia/browse/DbBrowseDomainsRandom.java diff --git a/code/features-search/random-websites/src/main/java/nu/marginalia/browse/DbBrowseDomainsSimilarCosine.java b/code/features-search/random-websites/java/nu/marginalia/browse/DbBrowseDomainsSimilarCosine.java similarity index 100% rename from code/features-search/random-websites/src/main/java/nu/marginalia/browse/DbBrowseDomainsSimilarCosine.java rename to code/features-search/random-websites/java/nu/marginalia/browse/DbBrowseDomainsSimilarCosine.java diff --git a/code/features-search/random-websites/src/main/java/nu/marginalia/browse/model/BrowseResult.java b/code/features-search/random-websites/java/nu/marginalia/browse/model/BrowseResult.java similarity index 100% rename from code/features-search/random-websites/src/main/java/nu/marginalia/browse/model/BrowseResult.java rename to code/features-search/random-websites/java/nu/marginalia/browse/model/BrowseResult.java diff --git a/code/features-search/random-websites/src/main/java/nu/marginalia/browse/model/BrowseResultSet.java b/code/features-search/random-websites/java/nu/marginalia/browse/model/BrowseResultSet.java similarity index 100% rename from code/features-search/random-websites/src/main/java/nu/marginalia/browse/model/BrowseResultSet.java rename to code/features-search/random-websites/java/nu/marginalia/browse/model/BrowseResultSet.java diff --git a/code/features-search/screenshots/build.gradle b/code/features-search/screenshots/build.gradle index ac2779f6..52572e91 100644 --- a/code/features-search/screenshots/build.gradle +++ b/code/features-search/screenshots/build.gradle @@ -10,6 +10,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':code:common:model') implementation project(':code:common:db') diff --git a/code/features-search/screenshots/src/main/java/nu/marginalia/screenshot/ScreenshotService.java b/code/features-search/screenshots/java/nu/marginalia/screenshot/ScreenshotService.java similarity index 100% rename from code/features-search/screenshots/src/main/java/nu/marginalia/screenshot/ScreenshotService.java rename to code/features-search/screenshots/java/nu/marginalia/screenshot/ScreenshotService.java diff --git a/code/functions/domain-info/api/build.gradle b/code/functions/domain-info/api/build.gradle index 74c0548e..c99c4fbf 100644 --- a/code/functions/domain-info/api/build.gradle +++ b/code/functions/domain-info/api/build.gradle @@ -13,15 +13,8 @@ java { jar.archiveBaseName = 'domain-info-api' -sourceSets { - main { - proto { - srcDir 'src/main/protobuf' - } - } -} - apply from: "$rootProject.projectDir/protobuf.gradle" +apply from: "$rootProject.projectDir/srcsets.gradle" dependencies { implementation project(':code:common:model') diff --git a/code/functions/domain-info/api/src/main/java/nu/marginalia/api/domains/DomainInfoClient.java b/code/functions/domain-info/api/java/nu/marginalia/api/domains/DomainInfoClient.java similarity index 100% rename from code/functions/domain-info/api/src/main/java/nu/marginalia/api/domains/DomainInfoClient.java rename to code/functions/domain-info/api/java/nu/marginalia/api/domains/DomainInfoClient.java diff --git a/code/functions/domain-info/api/src/main/java/nu/marginalia/api/domains/DomainsProtobufCodec.java b/code/functions/domain-info/api/java/nu/marginalia/api/domains/DomainsProtobufCodec.java similarity index 100% rename from code/functions/domain-info/api/src/main/java/nu/marginalia/api/domains/DomainsProtobufCodec.java rename to code/functions/domain-info/api/java/nu/marginalia/api/domains/DomainsProtobufCodec.java diff --git a/code/functions/domain-info/api/src/main/java/nu/marginalia/api/domains/model/DomainInformation.java b/code/functions/domain-info/api/java/nu/marginalia/api/domains/model/DomainInformation.java similarity index 100% rename from code/functions/domain-info/api/src/main/java/nu/marginalia/api/domains/model/DomainInformation.java rename to code/functions/domain-info/api/java/nu/marginalia/api/domains/model/DomainInformation.java diff --git a/code/functions/domain-info/api/src/main/java/nu/marginalia/api/domains/model/SimilarDomain.java b/code/functions/domain-info/api/java/nu/marginalia/api/domains/model/SimilarDomain.java similarity index 100% rename from code/functions/domain-info/api/src/main/java/nu/marginalia/api/domains/model/SimilarDomain.java rename to code/functions/domain-info/api/java/nu/marginalia/api/domains/model/SimilarDomain.java diff --git a/code/functions/domain-info/build.gradle b/code/functions/domain-info/build.gradle index c9f641d0..11e3f08c 100644 --- a/code/functions/domain-info/build.gradle +++ b/code/functions/domain-info/build.gradle @@ -11,6 +11,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':code:functions:domain-info:api') implementation project(':code:functions:domain-links:api') diff --git a/code/functions/domain-info/src/main/java/nu/marginalia/functions/domains/DomainInfoGrpcService.java b/code/functions/domain-info/java/nu/marginalia/functions/domains/DomainInfoGrpcService.java similarity index 100% rename from code/functions/domain-info/src/main/java/nu/marginalia/functions/domains/DomainInfoGrpcService.java rename to code/functions/domain-info/java/nu/marginalia/functions/domains/DomainInfoGrpcService.java diff --git a/code/functions/domain-info/src/main/java/nu/marginalia/functions/domains/DomainInformationService.java b/code/functions/domain-info/java/nu/marginalia/functions/domains/DomainInformationService.java similarity index 100% rename from code/functions/domain-info/src/main/java/nu/marginalia/functions/domains/DomainInformationService.java rename to code/functions/domain-info/java/nu/marginalia/functions/domains/DomainInformationService.java diff --git a/code/functions/domain-info/src/main/java/nu/marginalia/functions/domains/SimilarDomainsService.java b/code/functions/domain-info/java/nu/marginalia/functions/domains/SimilarDomainsService.java similarity index 100% rename from code/functions/domain-info/src/main/java/nu/marginalia/functions/domains/SimilarDomainsService.java rename to code/functions/domain-info/java/nu/marginalia/functions/domains/SimilarDomainsService.java diff --git a/code/functions/domain-links/aggregate/build.gradle b/code/functions/domain-links/aggregate/build.gradle index b8702030..11260f1f 100644 --- a/code/functions/domain-links/aggregate/build.gradle +++ b/code/functions/domain-links/aggregate/build.gradle @@ -11,6 +11,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':code:functions:domain-links:api') diff --git a/code/functions/domain-links/aggregate/src/main/java/nu/marginalia/functions/domainlinks/AggregateDomainLinksService.java b/code/functions/domain-links/aggregate/java/nu/marginalia/functions/domainlinks/AggregateDomainLinksService.java similarity index 100% rename from code/functions/domain-links/aggregate/src/main/java/nu/marginalia/functions/domainlinks/AggregateDomainLinksService.java rename to code/functions/domain-links/aggregate/java/nu/marginalia/functions/domainlinks/AggregateDomainLinksService.java diff --git a/code/functions/domain-links/api/build.gradle b/code/functions/domain-links/api/build.gradle index 081e3167..3232a623 100644 --- a/code/functions/domain-links/api/build.gradle +++ b/code/functions/domain-links/api/build.gradle @@ -13,15 +13,8 @@ java { jar.archiveBaseName = 'index-domain-links-api' -sourceSets { - main { - proto { - srcDir 'src/main/protobuf' - } - } -} - apply from: "$rootProject.projectDir/protobuf.gradle" +apply from: "$rootProject.projectDir/srcsets.gradle" dependencies { implementation project(':code:common:model') diff --git a/code/functions/domain-links/api/src/main/java/nu/marginalia/api/indexdomainlinks/AggregateDomainLinksClient.java b/code/functions/domain-links/api/java/nu/marginalia/api/indexdomainlinks/AggregateDomainLinksClient.java similarity index 100% rename from code/functions/domain-links/api/src/main/java/nu/marginalia/api/indexdomainlinks/AggregateDomainLinksClient.java rename to code/functions/domain-links/api/java/nu/marginalia/api/indexdomainlinks/AggregateDomainLinksClient.java diff --git a/code/functions/domain-links/api/src/main/java/nu/marginalia/api/indexdomainlinks/PartitionDomainLinksClient.java b/code/functions/domain-links/api/java/nu/marginalia/api/indexdomainlinks/PartitionDomainLinksClient.java similarity index 100% rename from code/functions/domain-links/api/src/main/java/nu/marginalia/api/indexdomainlinks/PartitionDomainLinksClient.java rename to code/functions/domain-links/api/java/nu/marginalia/api/indexdomainlinks/PartitionDomainLinksClient.java diff --git a/code/functions/domain-links/partition/build.gradle b/code/functions/domain-links/partition/build.gradle index 1a5f9dde..940cecfe 100644 --- a/code/functions/domain-links/partition/build.gradle +++ b/code/functions/domain-links/partition/build.gradle @@ -11,6 +11,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':code:functions:domain-links:api') diff --git a/code/functions/domain-links/partition/src/main/java/nu/marginalia/functions/domainlinks/PartitionDomainLinksService.java b/code/functions/domain-links/partition/java/nu/marginalia/functions/domainlinks/PartitionDomainLinksService.java similarity index 100% rename from code/functions/domain-links/partition/src/main/java/nu/marginalia/functions/domainlinks/PartitionDomainLinksService.java rename to code/functions/domain-links/partition/java/nu/marginalia/functions/domainlinks/PartitionDomainLinksService.java diff --git a/code/functions/math/api/build.gradle b/code/functions/math/api/build.gradle index 0ef23547..779c4508 100644 --- a/code/functions/math/api/build.gradle +++ b/code/functions/math/api/build.gradle @@ -13,15 +13,8 @@ java { jar.archiveBaseName = 'math-api' -sourceSets { - main { - proto { - srcDir 'src/main/protobuf' - } - } -} - apply from: "$rootProject.projectDir/protobuf.gradle" +apply from: "$rootProject.projectDir/srcsets.gradle" dependencies { implementation project(':code:common:model') diff --git a/code/functions/math/api/src/main/java/nu/marginalia/api/math/MathClient.java b/code/functions/math/api/java/nu/marginalia/api/math/MathClient.java similarity index 100% rename from code/functions/math/api/src/main/java/nu/marginalia/api/math/MathClient.java rename to code/functions/math/api/java/nu/marginalia/api/math/MathClient.java diff --git a/code/functions/math/api/src/main/java/nu/marginalia/api/math/MathProtobufCodec.java b/code/functions/math/api/java/nu/marginalia/api/math/MathProtobufCodec.java similarity index 100% rename from code/functions/math/api/src/main/java/nu/marginalia/api/math/MathProtobufCodec.java rename to code/functions/math/api/java/nu/marginalia/api/math/MathProtobufCodec.java diff --git a/code/functions/math/api/src/main/java/nu/marginalia/api/math/model/DictionaryEntry.java b/code/functions/math/api/java/nu/marginalia/api/math/model/DictionaryEntry.java similarity index 100% rename from code/functions/math/api/src/main/java/nu/marginalia/api/math/model/DictionaryEntry.java rename to code/functions/math/api/java/nu/marginalia/api/math/model/DictionaryEntry.java diff --git a/code/functions/math/api/src/main/java/nu/marginalia/api/math/model/DictionaryResponse.java b/code/functions/math/api/java/nu/marginalia/api/math/model/DictionaryResponse.java similarity index 100% rename from code/functions/math/api/src/main/java/nu/marginalia/api/math/model/DictionaryResponse.java rename to code/functions/math/api/java/nu/marginalia/api/math/model/DictionaryResponse.java diff --git a/code/functions/math/build.gradle b/code/functions/math/build.gradle index 2a843de8..c1fe528d 100644 --- a/code/functions/math/build.gradle +++ b/code/functions/math/build.gradle @@ -9,6 +9,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':third-party:symspell') implementation project(':code:functions:math:api') diff --git a/code/functions/math/src/main/java/nu/marginalia/functions/math/MathGrpcService.java b/code/functions/math/java/nu/marginalia/functions/math/MathGrpcService.java similarity index 100% rename from code/functions/math/src/main/java/nu/marginalia/functions/math/MathGrpcService.java rename to code/functions/math/java/nu/marginalia/functions/math/MathGrpcService.java diff --git a/code/functions/math/src/main/java/nu/marginalia/functions/math/dict/DictionaryService.java b/code/functions/math/java/nu/marginalia/functions/math/dict/DictionaryService.java similarity index 100% rename from code/functions/math/src/main/java/nu/marginalia/functions/math/dict/DictionaryService.java rename to code/functions/math/java/nu/marginalia/functions/math/dict/DictionaryService.java diff --git a/code/functions/math/src/main/java/nu/marginalia/functions/math/dict/SpellChecker.java b/code/functions/math/java/nu/marginalia/functions/math/dict/SpellChecker.java similarity index 100% rename from code/functions/math/src/main/java/nu/marginalia/functions/math/dict/SpellChecker.java rename to code/functions/math/java/nu/marginalia/functions/math/dict/SpellChecker.java diff --git a/code/functions/math/src/main/java/nu/marginalia/functions/math/eval/MathParser.java b/code/functions/math/java/nu/marginalia/functions/math/eval/MathParser.java similarity index 100% rename from code/functions/math/src/main/java/nu/marginalia/functions/math/eval/MathParser.java rename to code/functions/math/java/nu/marginalia/functions/math/eval/MathParser.java diff --git a/code/functions/math/src/main/java/nu/marginalia/functions/math/eval/Unit.java b/code/functions/math/java/nu/marginalia/functions/math/eval/Unit.java similarity index 100% rename from code/functions/math/src/main/java/nu/marginalia/functions/math/eval/Unit.java rename to code/functions/math/java/nu/marginalia/functions/math/eval/Unit.java diff --git a/code/functions/math/src/main/java/nu/marginalia/functions/math/eval/Units.java b/code/functions/math/java/nu/marginalia/functions/math/eval/Units.java similarity index 100% rename from code/functions/math/src/main/java/nu/marginalia/functions/math/eval/Units.java rename to code/functions/math/java/nu/marginalia/functions/math/eval/Units.java diff --git a/code/functions/math/src/main/resources/units.csv b/code/functions/math/resources/units.csv similarity index 100% rename from code/functions/math/src/main/resources/units.csv rename to code/functions/math/resources/units.csv diff --git a/code/functions/math/src/test/java/nu/marginalia/functions/math/eval/MathParserTest.java b/code/functions/math/test/nu/marginalia/functions/math/eval/MathParserTest.java similarity index 100% rename from code/functions/math/src/test/java/nu/marginalia/functions/math/eval/MathParserTest.java rename to code/functions/math/test/nu/marginalia/functions/math/eval/MathParserTest.java diff --git a/code/functions/math/src/test/java/nu/marginalia/functions/math/eval/UnitsTest.java b/code/functions/math/test/nu/marginalia/functions/math/eval/UnitsTest.java similarity index 100% rename from code/functions/math/src/test/java/nu/marginalia/functions/math/eval/UnitsTest.java rename to code/functions/math/test/nu/marginalia/functions/math/eval/UnitsTest.java diff --git a/code/functions/search-query/api/build.gradle b/code/functions/search-query/api/build.gradle index 5605473c..8da48164 100644 --- a/code/functions/search-query/api/build.gradle +++ b/code/functions/search-query/api/build.gradle @@ -13,16 +13,11 @@ java { jar.archiveBaseName = 'search-query-api' -sourceSets { - main { - proto { - srcDir 'src/main/protobuf' - } - } -} apply from: "$rootProject.projectDir/protobuf.gradle" +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':code:common:model') implementation project(':code:common:config') diff --git a/code/functions/search-query/api/src/main/java/nu/marginalia/api/searchquery/IndexProtobufCodec.java b/code/functions/search-query/api/java/nu/marginalia/api/searchquery/IndexProtobufCodec.java similarity index 100% rename from code/functions/search-query/api/src/main/java/nu/marginalia/api/searchquery/IndexProtobufCodec.java rename to code/functions/search-query/api/java/nu/marginalia/api/searchquery/IndexProtobufCodec.java diff --git a/code/functions/search-query/api/src/main/java/nu/marginalia/api/searchquery/QueryClient.java b/code/functions/search-query/api/java/nu/marginalia/api/searchquery/QueryClient.java similarity index 100% rename from code/functions/search-query/api/src/main/java/nu/marginalia/api/searchquery/QueryClient.java rename to code/functions/search-query/api/java/nu/marginalia/api/searchquery/QueryClient.java diff --git a/code/functions/search-query/api/src/main/java/nu/marginalia/api/searchquery/QueryProtobufCodec.java b/code/functions/search-query/api/java/nu/marginalia/api/searchquery/QueryProtobufCodec.java similarity index 100% rename from code/functions/search-query/api/src/main/java/nu/marginalia/api/searchquery/QueryProtobufCodec.java rename to code/functions/search-query/api/java/nu/marginalia/api/searchquery/QueryProtobufCodec.java diff --git a/code/functions/search-query/api/src/main/java/nu/marginalia/api/searchquery/model/query/ProcessedQuery.java b/code/functions/search-query/api/java/nu/marginalia/api/searchquery/model/query/ProcessedQuery.java similarity index 100% rename from code/functions/search-query/api/src/main/java/nu/marginalia/api/searchquery/model/query/ProcessedQuery.java rename to code/functions/search-query/api/java/nu/marginalia/api/searchquery/model/query/ProcessedQuery.java diff --git a/code/functions/search-query/api/src/main/java/nu/marginalia/api/searchquery/model/query/QueryParams.java b/code/functions/search-query/api/java/nu/marginalia/api/searchquery/model/query/QueryParams.java similarity index 100% rename from code/functions/search-query/api/src/main/java/nu/marginalia/api/searchquery/model/query/QueryParams.java rename to code/functions/search-query/api/java/nu/marginalia/api/searchquery/model/query/QueryParams.java diff --git a/code/functions/search-query/api/src/main/java/nu/marginalia/api/searchquery/model/query/QueryResponse.java b/code/functions/search-query/api/java/nu/marginalia/api/searchquery/model/query/QueryResponse.java similarity index 100% rename from code/functions/search-query/api/src/main/java/nu/marginalia/api/searchquery/model/query/QueryResponse.java rename to code/functions/search-query/api/java/nu/marginalia/api/searchquery/model/query/QueryResponse.java diff --git a/code/functions/search-query/api/src/main/java/nu/marginalia/api/searchquery/model/query/SearchSetIdentifier.java b/code/functions/search-query/api/java/nu/marginalia/api/searchquery/model/query/SearchSetIdentifier.java similarity index 100% rename from code/functions/search-query/api/src/main/java/nu/marginalia/api/searchquery/model/query/SearchSetIdentifier.java rename to code/functions/search-query/api/java/nu/marginalia/api/searchquery/model/query/SearchSetIdentifier.java diff --git a/code/functions/search-query/api/src/main/java/nu/marginalia/api/searchquery/model/query/SearchSpecification.java b/code/functions/search-query/api/java/nu/marginalia/api/searchquery/model/query/SearchSpecification.java similarity index 100% rename from code/functions/search-query/api/src/main/java/nu/marginalia/api/searchquery/model/query/SearchSpecification.java rename to code/functions/search-query/api/java/nu/marginalia/api/searchquery/model/query/SearchSpecification.java diff --git a/code/functions/search-query/api/src/main/java/nu/marginalia/api/searchquery/model/query/SearchSubquery.java b/code/functions/search-query/api/java/nu/marginalia/api/searchquery/model/query/SearchSubquery.java similarity index 100% rename from code/functions/search-query/api/src/main/java/nu/marginalia/api/searchquery/model/query/SearchSubquery.java rename to code/functions/search-query/api/java/nu/marginalia/api/searchquery/model/query/SearchSubquery.java diff --git a/code/functions/search-query/api/src/main/java/nu/marginalia/api/searchquery/model/results/Bm25Parameters.java b/code/functions/search-query/api/java/nu/marginalia/api/searchquery/model/results/Bm25Parameters.java similarity index 100% rename from code/functions/search-query/api/src/main/java/nu/marginalia/api/searchquery/model/results/Bm25Parameters.java rename to code/functions/search-query/api/java/nu/marginalia/api/searchquery/model/results/Bm25Parameters.java diff --git a/code/functions/search-query/api/src/main/java/nu/marginalia/api/searchquery/model/results/DecoratedSearchResultItem.java b/code/functions/search-query/api/java/nu/marginalia/api/searchquery/model/results/DecoratedSearchResultItem.java similarity index 100% rename from code/functions/search-query/api/src/main/java/nu/marginalia/api/searchquery/model/results/DecoratedSearchResultItem.java rename to code/functions/search-query/api/java/nu/marginalia/api/searchquery/model/results/DecoratedSearchResultItem.java diff --git a/code/functions/search-query/api/src/main/java/nu/marginalia/api/searchquery/model/results/ResultRankingContext.java b/code/functions/search-query/api/java/nu/marginalia/api/searchquery/model/results/ResultRankingContext.java similarity index 100% rename from code/functions/search-query/api/src/main/java/nu/marginalia/api/searchquery/model/results/ResultRankingContext.java rename to code/functions/search-query/api/java/nu/marginalia/api/searchquery/model/results/ResultRankingContext.java diff --git a/code/functions/search-query/api/src/main/java/nu/marginalia/api/searchquery/model/results/ResultRankingParameters.java b/code/functions/search-query/api/java/nu/marginalia/api/searchquery/model/results/ResultRankingParameters.java similarity index 100% rename from code/functions/search-query/api/src/main/java/nu/marginalia/api/searchquery/model/results/ResultRankingParameters.java rename to code/functions/search-query/api/java/nu/marginalia/api/searchquery/model/results/ResultRankingParameters.java diff --git a/code/functions/search-query/api/src/main/java/nu/marginalia/api/searchquery/model/results/SearchResultItem.java b/code/functions/search-query/api/java/nu/marginalia/api/searchquery/model/results/SearchResultItem.java similarity index 100% rename from code/functions/search-query/api/src/main/java/nu/marginalia/api/searchquery/model/results/SearchResultItem.java rename to code/functions/search-query/api/java/nu/marginalia/api/searchquery/model/results/SearchResultItem.java diff --git a/code/functions/search-query/api/src/main/java/nu/marginalia/api/searchquery/model/results/SearchResultKeywordScore.java b/code/functions/search-query/api/java/nu/marginalia/api/searchquery/model/results/SearchResultKeywordScore.java similarity index 100% rename from code/functions/search-query/api/src/main/java/nu/marginalia/api/searchquery/model/results/SearchResultKeywordScore.java rename to code/functions/search-query/api/java/nu/marginalia/api/searchquery/model/results/SearchResultKeywordScore.java diff --git a/code/functions/search-query/api/src/main/java/nu/marginalia/api/searchquery/model/results/SearchResultPreliminaryScore.java b/code/functions/search-query/api/java/nu/marginalia/api/searchquery/model/results/SearchResultPreliminaryScore.java similarity index 100% rename from code/functions/search-query/api/src/main/java/nu/marginalia/api/searchquery/model/results/SearchResultPreliminaryScore.java rename to code/functions/search-query/api/java/nu/marginalia/api/searchquery/model/results/SearchResultPreliminaryScore.java diff --git a/code/functions/search-query/api/src/main/java/nu/marginalia/api/searchquery/model/results/SearchResultSet.java b/code/functions/search-query/api/java/nu/marginalia/api/searchquery/model/results/SearchResultSet.java similarity index 100% rename from code/functions/search-query/api/src/main/java/nu/marginalia/api/searchquery/model/results/SearchResultSet.java rename to code/functions/search-query/api/java/nu/marginalia/api/searchquery/model/results/SearchResultSet.java diff --git a/code/functions/search-query/api/src/test/java/nu/marginalia/index/client/IndexProtobufCodecTest.java b/code/functions/search-query/api/test/nu/marginalia/index/client/IndexProtobufCodecTest.java similarity index 100% rename from code/functions/search-query/api/src/test/java/nu/marginalia/index/client/IndexProtobufCodecTest.java rename to code/functions/search-query/api/test/nu/marginalia/index/client/IndexProtobufCodecTest.java diff --git a/code/functions/search-query/build.gradle b/code/functions/search-query/build.gradle index d75504fe..14b662f9 100644 --- a/code/functions/search-query/build.gradle +++ b/code/functions/search-query/build.gradle @@ -9,6 +9,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':code:index:api') diff --git a/code/functions/search-query/src/main/java/nu/marginalia/functions/searchquery/QueryGRPCService.java b/code/functions/search-query/java/nu/marginalia/functions/searchquery/QueryGRPCService.java similarity index 100% rename from code/functions/search-query/src/main/java/nu/marginalia/functions/searchquery/QueryGRPCService.java rename to code/functions/search-query/java/nu/marginalia/functions/searchquery/QueryGRPCService.java diff --git a/code/functions/search-query/src/main/java/nu/marginalia/functions/searchquery/query_parser/QueryParser.java b/code/functions/search-query/java/nu/marginalia/functions/searchquery/query_parser/QueryParser.java similarity index 100% rename from code/functions/search-query/src/main/java/nu/marginalia/functions/searchquery/query_parser/QueryParser.java rename to code/functions/search-query/java/nu/marginalia/functions/searchquery/query_parser/QueryParser.java diff --git a/code/functions/search-query/src/main/java/nu/marginalia/functions/searchquery/query_parser/QueryPermutation.java b/code/functions/search-query/java/nu/marginalia/functions/searchquery/query_parser/QueryPermutation.java similarity index 100% rename from code/functions/search-query/src/main/java/nu/marginalia/functions/searchquery/query_parser/QueryPermutation.java rename to code/functions/search-query/java/nu/marginalia/functions/searchquery/query_parser/QueryPermutation.java diff --git a/code/functions/search-query/src/main/java/nu/marginalia/functions/searchquery/query_parser/QueryTokenizer.java b/code/functions/search-query/java/nu/marginalia/functions/searchquery/query_parser/QueryTokenizer.java similarity index 100% rename from code/functions/search-query/src/main/java/nu/marginalia/functions/searchquery/query_parser/QueryTokenizer.java rename to code/functions/search-query/java/nu/marginalia/functions/searchquery/query_parser/QueryTokenizer.java diff --git a/code/functions/search-query/src/main/java/nu/marginalia/functions/searchquery/query_parser/QueryVariants.java b/code/functions/search-query/java/nu/marginalia/functions/searchquery/query_parser/QueryVariants.java similarity index 100% rename from code/functions/search-query/src/main/java/nu/marginalia/functions/searchquery/query_parser/QueryVariants.java rename to code/functions/search-query/java/nu/marginalia/functions/searchquery/query_parser/QueryVariants.java diff --git a/code/functions/search-query/src/main/java/nu/marginalia/functions/searchquery/query_parser/token/Token.java b/code/functions/search-query/java/nu/marginalia/functions/searchquery/query_parser/token/Token.java similarity index 100% rename from code/functions/search-query/src/main/java/nu/marginalia/functions/searchquery/query_parser/token/Token.java rename to code/functions/search-query/java/nu/marginalia/functions/searchquery/query_parser/token/Token.java diff --git a/code/functions/search-query/src/main/java/nu/marginalia/functions/searchquery/query_parser/token/TokenType.java b/code/functions/search-query/java/nu/marginalia/functions/searchquery/query_parser/token/TokenType.java similarity index 100% rename from code/functions/search-query/src/main/java/nu/marginalia/functions/searchquery/query_parser/token/TokenType.java rename to code/functions/search-query/java/nu/marginalia/functions/searchquery/query_parser/token/TokenType.java diff --git a/code/functions/search-query/src/main/java/nu/marginalia/functions/searchquery/query_parser/token/TokenVisitor.java b/code/functions/search-query/java/nu/marginalia/functions/searchquery/query_parser/token/TokenVisitor.java similarity index 100% rename from code/functions/search-query/src/main/java/nu/marginalia/functions/searchquery/query_parser/token/TokenVisitor.java rename to code/functions/search-query/java/nu/marginalia/functions/searchquery/query_parser/token/TokenVisitor.java diff --git a/code/functions/search-query/src/main/java/nu/marginalia/functions/searchquery/svc/QueryFactory.java b/code/functions/search-query/java/nu/marginalia/functions/searchquery/svc/QueryFactory.java similarity index 100% rename from code/functions/search-query/src/main/java/nu/marginalia/functions/searchquery/svc/QueryFactory.java rename to code/functions/search-query/java/nu/marginalia/functions/searchquery/svc/QueryFactory.java diff --git a/code/functions/search-query/src/main/java/nu/marginalia/functions/searchquery/svc/QueryLimitsAccumulator.java b/code/functions/search-query/java/nu/marginalia/functions/searchquery/svc/QueryLimitsAccumulator.java similarity index 100% rename from code/functions/search-query/src/main/java/nu/marginalia/functions/searchquery/svc/QueryLimitsAccumulator.java rename to code/functions/search-query/java/nu/marginalia/functions/searchquery/svc/QueryLimitsAccumulator.java diff --git a/code/functions/search-query/src/main/java/nu/marginalia/functions/searchquery/svc/QuerySearchTermsAccumulator.java b/code/functions/search-query/java/nu/marginalia/functions/searchquery/svc/QuerySearchTermsAccumulator.java similarity index 100% rename from code/functions/search-query/src/main/java/nu/marginalia/functions/searchquery/svc/QuerySearchTermsAccumulator.java rename to code/functions/search-query/java/nu/marginalia/functions/searchquery/svc/QuerySearchTermsAccumulator.java diff --git a/code/functions/search-query/src/main/java/nu/marginalia/util/language/EnglishDictionary.java b/code/functions/search-query/java/nu/marginalia/util/language/EnglishDictionary.java similarity index 100% rename from code/functions/search-query/src/main/java/nu/marginalia/util/language/EnglishDictionary.java rename to code/functions/search-query/java/nu/marginalia/util/language/EnglishDictionary.java diff --git a/code/functions/search-query/src/main/java/nu/marginalia/util/ngrams/DenseBitMap.java b/code/functions/search-query/java/nu/marginalia/util/ngrams/DenseBitMap.java similarity index 100% rename from code/functions/search-query/src/main/java/nu/marginalia/util/ngrams/DenseBitMap.java rename to code/functions/search-query/java/nu/marginalia/util/ngrams/DenseBitMap.java diff --git a/code/functions/search-query/src/main/java/nu/marginalia/util/ngrams/NGramBloomFilter.java b/code/functions/search-query/java/nu/marginalia/util/ngrams/NGramBloomFilter.java similarity index 100% rename from code/functions/search-query/src/main/java/nu/marginalia/util/ngrams/NGramBloomFilter.java rename to code/functions/search-query/java/nu/marginalia/util/ngrams/NGramBloomFilter.java diff --git a/code/functions/search-query/src/main/java/nu/marginalia/util/transform_list/TransformList.java b/code/functions/search-query/java/nu/marginalia/util/transform_list/TransformList.java similarity index 100% rename from code/functions/search-query/src/main/java/nu/marginalia/util/transform_list/TransformList.java rename to code/functions/search-query/java/nu/marginalia/util/transform_list/TransformList.java diff --git a/code/functions/search-query/src/test/java/nu/marginalia/query/svc/QueryFactoryTest.java b/code/functions/search-query/test/nu/marginalia/query/svc/QueryFactoryTest.java similarity index 100% rename from code/functions/search-query/src/test/java/nu/marginalia/query/svc/QueryFactoryTest.java rename to code/functions/search-query/test/nu/marginalia/query/svc/QueryFactoryTest.java diff --git a/code/index/api/build.gradle b/code/index/api/build.gradle index 69c5afff..895f75b0 100644 --- a/code/index/api/build.gradle +++ b/code/index/api/build.gradle @@ -9,6 +9,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':code:common:model') implementation project(':code:common:config') diff --git a/code/index/api/src/main/java/nu/marginalia/index/api/IndexClient.java b/code/index/api/java/nu/marginalia/index/api/IndexClient.java similarity index 100% rename from code/index/api/src/main/java/nu/marginalia/index/api/IndexClient.java rename to code/index/api/java/nu/marginalia/index/api/IndexClient.java diff --git a/code/index/api/src/main/java/nu/marginalia/index/api/IndexMqClient.java b/code/index/api/java/nu/marginalia/index/api/IndexMqClient.java similarity index 100% rename from code/index/api/src/main/java/nu/marginalia/index/api/IndexMqClient.java rename to code/index/api/java/nu/marginalia/index/api/IndexMqClient.java diff --git a/code/index/api/src/main/java/nu/marginalia/index/api/IndexMqEndpoints.java b/code/index/api/java/nu/marginalia/index/api/IndexMqEndpoints.java similarity index 100% rename from code/index/api/src/main/java/nu/marginalia/index/api/IndexMqEndpoints.java rename to code/index/api/java/nu/marginalia/index/api/IndexMqEndpoints.java diff --git a/code/index/build.gradle b/code/index/build.gradle index cfeb66d8..403da54a 100644 --- a/code/index/build.gradle +++ b/code/index/build.gradle @@ -9,6 +9,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation 'org.jgrapht:jgrapht-core:1.5.2' @@ -29,8 +31,8 @@ dependencies { implementation project(':code:functions:search-query:api') - implementation project(':code:index:forward-index') - implementation project(':code:index:reverse-index') + implementation project(':code:index:index-forward') + implementation project(':code:index:index-reverse') implementation project(':code:index:query') implementation project(':code:index:index-journal') diff --git a/code/index/forward-index/build.gradle b/code/index/index-forward/build.gradle similarity index 93% rename from code/index/forward-index/build.gradle rename to code/index/index-forward/build.gradle index 35e0146e..daf9bc0b 100644 --- a/code/index/forward-index/build.gradle +++ b/code/index/index-forward/build.gradle @@ -10,6 +10,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':code:libraries:array') implementation project(':code:libraries:btree') diff --git a/code/index/forward-index/src/main/java/nu/marginalia/index/forward/ForwardIndexConverter.java b/code/index/index-forward/java/nu/marginalia/index/forward/ForwardIndexConverter.java similarity index 100% rename from code/index/forward-index/src/main/java/nu/marginalia/index/forward/ForwardIndexConverter.java rename to code/index/index-forward/java/nu/marginalia/index/forward/ForwardIndexConverter.java diff --git a/code/index/forward-index/src/main/java/nu/marginalia/index/forward/ForwardIndexFileNames.java b/code/index/index-forward/java/nu/marginalia/index/forward/ForwardIndexFileNames.java similarity index 100% rename from code/index/forward-index/src/main/java/nu/marginalia/index/forward/ForwardIndexFileNames.java rename to code/index/index-forward/java/nu/marginalia/index/forward/ForwardIndexFileNames.java diff --git a/code/index/forward-index/src/main/java/nu/marginalia/index/forward/ForwardIndexParameters.java b/code/index/index-forward/java/nu/marginalia/index/forward/ForwardIndexParameters.java similarity index 100% rename from code/index/forward-index/src/main/java/nu/marginalia/index/forward/ForwardIndexParameters.java rename to code/index/index-forward/java/nu/marginalia/index/forward/ForwardIndexParameters.java diff --git a/code/index/forward-index/src/main/java/nu/marginalia/index/forward/ForwardIndexReader.java b/code/index/index-forward/java/nu/marginalia/index/forward/ForwardIndexReader.java similarity index 100% rename from code/index/forward-index/src/main/java/nu/marginalia/index/forward/ForwardIndexReader.java rename to code/index/index-forward/java/nu/marginalia/index/forward/ForwardIndexReader.java diff --git a/code/index/forward-index/readme.md b/code/index/index-forward/readme.md similarity index 100% rename from code/index/forward-index/readme.md rename to code/index/index-forward/readme.md diff --git a/code/index/forward-index/src/test/java/nu/marginalia/index/forward/ForwardIndexConverterTest.java b/code/index/index-forward/test/nu/marginalia/index/forward/ForwardIndexConverterTest.java similarity index 100% rename from code/index/forward-index/src/test/java/nu/marginalia/index/forward/ForwardIndexConverterTest.java rename to code/index/index-forward/test/nu/marginalia/index/forward/ForwardIndexConverterTest.java diff --git a/code/index/forward-index/src/test/java/nu/marginalia/test/TestUtil.java b/code/index/index-forward/test/nu/marginalia/test/TestUtil.java similarity index 100% rename from code/index/forward-index/src/test/java/nu/marginalia/test/TestUtil.java rename to code/index/index-forward/test/nu/marginalia/test/TestUtil.java diff --git a/code/index/index-journal/build.gradle b/code/index/index-journal/build.gradle index 26e7855a..c6186cf7 100644 --- a/code/index/index-journal/build.gradle +++ b/code/index/index-journal/build.gradle @@ -10,6 +10,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':code:libraries:array') implementation project(':code:common:model') diff --git a/code/index/index-journal/src/main/java/nu/marginalia/index/journal/IndexJournalFileNames.java b/code/index/index-journal/java/nu/marginalia/index/journal/IndexJournalFileNames.java similarity index 100% rename from code/index/index-journal/src/main/java/nu/marginalia/index/journal/IndexJournalFileNames.java rename to code/index/index-journal/java/nu/marginalia/index/journal/IndexJournalFileNames.java diff --git a/code/index/index-journal/src/main/java/nu/marginalia/index/journal/model/IndexJournalEntry.java b/code/index/index-journal/java/nu/marginalia/index/journal/model/IndexJournalEntry.java similarity index 100% rename from code/index/index-journal/src/main/java/nu/marginalia/index/journal/model/IndexJournalEntry.java rename to code/index/index-journal/java/nu/marginalia/index/journal/model/IndexJournalEntry.java diff --git a/code/index/index-journal/src/main/java/nu/marginalia/index/journal/model/IndexJournalEntryBuilder.java b/code/index/index-journal/java/nu/marginalia/index/journal/model/IndexJournalEntryBuilder.java similarity index 100% rename from code/index/index-journal/src/main/java/nu/marginalia/index/journal/model/IndexJournalEntryBuilder.java rename to code/index/index-journal/java/nu/marginalia/index/journal/model/IndexJournalEntryBuilder.java diff --git a/code/index/index-journal/src/main/java/nu/marginalia/index/journal/model/IndexJournalEntryData.java b/code/index/index-journal/java/nu/marginalia/index/journal/model/IndexJournalEntryData.java similarity index 100% rename from code/index/index-journal/src/main/java/nu/marginalia/index/journal/model/IndexJournalEntryData.java rename to code/index/index-journal/java/nu/marginalia/index/journal/model/IndexJournalEntryData.java diff --git a/code/index/index-journal/src/main/java/nu/marginalia/index/journal/model/IndexJournalEntryHeader.java b/code/index/index-journal/java/nu/marginalia/index/journal/model/IndexJournalEntryHeader.java similarity index 100% rename from code/index/index-journal/src/main/java/nu/marginalia/index/journal/model/IndexJournalEntryHeader.java rename to code/index/index-journal/java/nu/marginalia/index/journal/model/IndexJournalEntryHeader.java diff --git a/code/index/index-journal/src/main/java/nu/marginalia/index/journal/model/IndexJournalFileHeader.java b/code/index/index-journal/java/nu/marginalia/index/journal/model/IndexJournalFileHeader.java similarity index 100% rename from code/index/index-journal/src/main/java/nu/marginalia/index/journal/model/IndexJournalFileHeader.java rename to code/index/index-journal/java/nu/marginalia/index/journal/model/IndexJournalFileHeader.java diff --git a/code/index/index-journal/src/main/java/nu/marginalia/index/journal/reader/IndexJournalReadEntry.java b/code/index/index-journal/java/nu/marginalia/index/journal/reader/IndexJournalReadEntry.java similarity index 100% rename from code/index/index-journal/src/main/java/nu/marginalia/index/journal/reader/IndexJournalReadEntry.java rename to code/index/index-journal/java/nu/marginalia/index/journal/reader/IndexJournalReadEntry.java diff --git a/code/index/index-journal/src/main/java/nu/marginalia/index/journal/reader/IndexJournalReader.java b/code/index/index-journal/java/nu/marginalia/index/journal/reader/IndexJournalReader.java similarity index 100% rename from code/index/index-journal/src/main/java/nu/marginalia/index/journal/reader/IndexJournalReader.java rename to code/index/index-journal/java/nu/marginalia/index/journal/reader/IndexJournalReader.java diff --git a/code/index/index-journal/src/main/java/nu/marginalia/index/journal/reader/IndexJournalReaderPagingImpl.java b/code/index/index-journal/java/nu/marginalia/index/journal/reader/IndexJournalReaderPagingImpl.java similarity index 100% rename from code/index/index-journal/src/main/java/nu/marginalia/index/journal/reader/IndexJournalReaderPagingImpl.java rename to code/index/index-journal/java/nu/marginalia/index/journal/reader/IndexJournalReaderPagingImpl.java diff --git a/code/index/index-journal/src/main/java/nu/marginalia/index/journal/reader/IndexJournalReaderSingleFile.java b/code/index/index-journal/java/nu/marginalia/index/journal/reader/IndexJournalReaderSingleFile.java similarity index 100% rename from code/index/index-journal/src/main/java/nu/marginalia/index/journal/reader/IndexJournalReaderSingleFile.java rename to code/index/index-journal/java/nu/marginalia/index/journal/reader/IndexJournalReaderSingleFile.java diff --git a/code/index/index-journal/src/main/java/nu/marginalia/index/journal/reader/pointer/IndexJournalPointer.java b/code/index/index-journal/java/nu/marginalia/index/journal/reader/pointer/IndexJournalPointer.java similarity index 100% rename from code/index/index-journal/src/main/java/nu/marginalia/index/journal/reader/pointer/IndexJournalPointer.java rename to code/index/index-journal/java/nu/marginalia/index/journal/reader/pointer/IndexJournalPointer.java diff --git a/code/index/index-journal/src/main/java/nu/marginalia/index/journal/writer/IndexJournalWriter.java b/code/index/index-journal/java/nu/marginalia/index/journal/writer/IndexJournalWriter.java similarity index 100% rename from code/index/index-journal/src/main/java/nu/marginalia/index/journal/writer/IndexJournalWriter.java rename to code/index/index-journal/java/nu/marginalia/index/journal/writer/IndexJournalWriter.java diff --git a/code/index/index-journal/src/main/java/nu/marginalia/index/journal/writer/IndexJournalWriterPagingImpl.java b/code/index/index-journal/java/nu/marginalia/index/journal/writer/IndexJournalWriterPagingImpl.java similarity index 100% rename from code/index/index-journal/src/main/java/nu/marginalia/index/journal/writer/IndexJournalWriterPagingImpl.java rename to code/index/index-journal/java/nu/marginalia/index/journal/writer/IndexJournalWriterPagingImpl.java diff --git a/code/index/index-journal/src/main/java/nu/marginalia/index/journal/writer/IndexJournalWriterSingleFileImpl.java b/code/index/index-journal/java/nu/marginalia/index/journal/writer/IndexJournalWriterSingleFileImpl.java similarity index 100% rename from code/index/index-journal/src/main/java/nu/marginalia/index/journal/writer/IndexJournalWriterSingleFileImpl.java rename to code/index/index-journal/java/nu/marginalia/index/journal/writer/IndexJournalWriterSingleFileImpl.java diff --git a/code/index/index-journal/src/test/java/nu/marginalia/index/journal/IndexJournalTest.java b/code/index/index-journal/test/nu/marginalia/index/journal/IndexJournalTest.java similarity index 100% rename from code/index/index-journal/src/test/java/nu/marginalia/index/journal/IndexJournalTest.java rename to code/index/index-journal/test/nu/marginalia/index/journal/IndexJournalTest.java diff --git a/code/index/index-journal/src/test/java/nu/marginalia/index/journal/reader/pointer/IndexJournalPointerTest.java b/code/index/index-journal/test/nu/marginalia/index/journal/reader/pointer/IndexJournalPointerTest.java similarity index 100% rename from code/index/index-journal/src/test/java/nu/marginalia/index/journal/reader/pointer/IndexJournalPointerTest.java rename to code/index/index-journal/test/nu/marginalia/index/journal/reader/pointer/IndexJournalPointerTest.java diff --git a/code/index/reverse-index/build.gradle b/code/index/index-reverse/build.gradle similarity index 93% rename from code/index/reverse-index/build.gradle rename to code/index/index-reverse/build.gradle index 216d1142..a9523656 100644 --- a/code/index/reverse-index/build.gradle +++ b/code/index/index-reverse/build.gradle @@ -11,6 +11,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':code:libraries:array') implementation project(':code:libraries:btree') diff --git a/code/index/reverse-index/index.svg b/code/index/index-reverse/index.svg similarity index 100% rename from code/index/reverse-index/index.svg rename to code/index/index-reverse/index.svg diff --git a/code/index/reverse-index/src/main/java/nu/marginalia/index/ReverseIndexEntrySource.java b/code/index/index-reverse/java/nu/marginalia/index/ReverseIndexEntrySource.java similarity index 100% rename from code/index/reverse-index/src/main/java/nu/marginalia/index/ReverseIndexEntrySource.java rename to code/index/index-reverse/java/nu/marginalia/index/ReverseIndexEntrySource.java diff --git a/code/index/reverse-index/src/main/java/nu/marginalia/index/ReverseIndexFullFileNames.java b/code/index/index-reverse/java/nu/marginalia/index/ReverseIndexFullFileNames.java similarity index 100% rename from code/index/reverse-index/src/main/java/nu/marginalia/index/ReverseIndexFullFileNames.java rename to code/index/index-reverse/java/nu/marginalia/index/ReverseIndexFullFileNames.java diff --git a/code/index/reverse-index/src/main/java/nu/marginalia/index/ReverseIndexParameters.java b/code/index/index-reverse/java/nu/marginalia/index/ReverseIndexParameters.java similarity index 100% rename from code/index/reverse-index/src/main/java/nu/marginalia/index/ReverseIndexParameters.java rename to code/index/index-reverse/java/nu/marginalia/index/ReverseIndexParameters.java diff --git a/code/index/reverse-index/src/main/java/nu/marginalia/index/ReverseIndexPrioFileNames.java b/code/index/index-reverse/java/nu/marginalia/index/ReverseIndexPrioFileNames.java similarity index 100% rename from code/index/reverse-index/src/main/java/nu/marginalia/index/ReverseIndexPrioFileNames.java rename to code/index/index-reverse/java/nu/marginalia/index/ReverseIndexPrioFileNames.java diff --git a/code/index/reverse-index/src/main/java/nu/marginalia/index/ReverseIndexReader.java b/code/index/index-reverse/java/nu/marginalia/index/ReverseIndexReader.java similarity index 100% rename from code/index/reverse-index/src/main/java/nu/marginalia/index/ReverseIndexReader.java rename to code/index/index-reverse/java/nu/marginalia/index/ReverseIndexReader.java diff --git a/code/index/reverse-index/src/main/java/nu/marginalia/index/ReverseIndexSelfTest.java b/code/index/index-reverse/java/nu/marginalia/index/ReverseIndexSelfTest.java similarity index 100% rename from code/index/reverse-index/src/main/java/nu/marginalia/index/ReverseIndexSelfTest.java rename to code/index/index-reverse/java/nu/marginalia/index/ReverseIndexSelfTest.java diff --git a/code/index/reverse-index/src/main/java/nu/marginalia/index/construction/CountToOffsetTransformer.java b/code/index/index-reverse/java/nu/marginalia/index/construction/CountToOffsetTransformer.java similarity index 100% rename from code/index/reverse-index/src/main/java/nu/marginalia/index/construction/CountToOffsetTransformer.java rename to code/index/index-reverse/java/nu/marginalia/index/construction/CountToOffsetTransformer.java diff --git a/code/index/reverse-index/src/main/java/nu/marginalia/index/construction/DocIdRewriter.java b/code/index/index-reverse/java/nu/marginalia/index/construction/DocIdRewriter.java similarity index 100% rename from code/index/reverse-index/src/main/java/nu/marginalia/index/construction/DocIdRewriter.java rename to code/index/index-reverse/java/nu/marginalia/index/construction/DocIdRewriter.java diff --git a/code/index/reverse-index/src/main/java/nu/marginalia/index/construction/IndexSizeEstimator.java b/code/index/index-reverse/java/nu/marginalia/index/construction/IndexSizeEstimator.java similarity index 100% rename from code/index/reverse-index/src/main/java/nu/marginalia/index/construction/IndexSizeEstimator.java rename to code/index/index-reverse/java/nu/marginalia/index/construction/IndexSizeEstimator.java diff --git a/code/index/reverse-index/src/main/java/nu/marginalia/index/construction/JournalReaderSource.java b/code/index/index-reverse/java/nu/marginalia/index/construction/JournalReaderSource.java similarity index 100% rename from code/index/reverse-index/src/main/java/nu/marginalia/index/construction/JournalReaderSource.java rename to code/index/index-reverse/java/nu/marginalia/index/construction/JournalReaderSource.java diff --git a/code/index/reverse-index/src/main/java/nu/marginalia/index/construction/ReverseIndexBTreeTransformer.java b/code/index/index-reverse/java/nu/marginalia/index/construction/ReverseIndexBTreeTransformer.java similarity index 100% rename from code/index/reverse-index/src/main/java/nu/marginalia/index/construction/ReverseIndexBTreeTransformer.java rename to code/index/index-reverse/java/nu/marginalia/index/construction/ReverseIndexBTreeTransformer.java diff --git a/code/index/reverse-index/src/main/java/nu/marginalia/index/construction/ReverseIndexConstructor.java b/code/index/index-reverse/java/nu/marginalia/index/construction/ReverseIndexConstructor.java similarity index 100% rename from code/index/reverse-index/src/main/java/nu/marginalia/index/construction/ReverseIndexConstructor.java rename to code/index/index-reverse/java/nu/marginalia/index/construction/ReverseIndexConstructor.java diff --git a/code/index/reverse-index/src/main/java/nu/marginalia/index/construction/ReversePreindex.java b/code/index/index-reverse/java/nu/marginalia/index/construction/ReversePreindex.java similarity index 100% rename from code/index/reverse-index/src/main/java/nu/marginalia/index/construction/ReversePreindex.java rename to code/index/index-reverse/java/nu/marginalia/index/construction/ReversePreindex.java diff --git a/code/index/reverse-index/src/main/java/nu/marginalia/index/construction/ReversePreindexDocuments.java b/code/index/index-reverse/java/nu/marginalia/index/construction/ReversePreindexDocuments.java similarity index 100% rename from code/index/reverse-index/src/main/java/nu/marginalia/index/construction/ReversePreindexDocuments.java rename to code/index/index-reverse/java/nu/marginalia/index/construction/ReversePreindexDocuments.java diff --git a/code/index/reverse-index/src/main/java/nu/marginalia/index/construction/ReversePreindexReference.java b/code/index/index-reverse/java/nu/marginalia/index/construction/ReversePreindexReference.java similarity index 100% rename from code/index/reverse-index/src/main/java/nu/marginalia/index/construction/ReversePreindexReference.java rename to code/index/index-reverse/java/nu/marginalia/index/construction/ReversePreindexReference.java diff --git a/code/index/reverse-index/src/main/java/nu/marginalia/index/construction/ReversePreindexWordSegments.java b/code/index/index-reverse/java/nu/marginalia/index/construction/ReversePreindexWordSegments.java similarity index 100% rename from code/index/reverse-index/src/main/java/nu/marginalia/index/construction/ReversePreindexWordSegments.java rename to code/index/index-reverse/java/nu/marginalia/index/construction/ReversePreindexWordSegments.java diff --git a/code/index/reverse-index/src/main/java/nu/marginalia/index/query/ReverseIndexRejectFilter.java b/code/index/index-reverse/java/nu/marginalia/index/query/ReverseIndexRejectFilter.java similarity index 100% rename from code/index/reverse-index/src/main/java/nu/marginalia/index/query/ReverseIndexRejectFilter.java rename to code/index/index-reverse/java/nu/marginalia/index/query/ReverseIndexRejectFilter.java diff --git a/code/index/reverse-index/src/main/java/nu/marginalia/index/query/ReverseIndexRetainFilter.java b/code/index/index-reverse/java/nu/marginalia/index/query/ReverseIndexRetainFilter.java similarity index 100% rename from code/index/reverse-index/src/main/java/nu/marginalia/index/query/ReverseIndexRetainFilter.java rename to code/index/index-reverse/java/nu/marginalia/index/query/ReverseIndexRetainFilter.java diff --git a/code/index/reverse-index/merging.svg b/code/index/index-reverse/merging.svg similarity index 100% rename from code/index/reverse-index/merging.svg rename to code/index/index-reverse/merging.svg diff --git a/code/index/reverse-index/preindex.svg b/code/index/index-reverse/preindex.svg similarity index 100% rename from code/index/reverse-index/preindex.svg rename to code/index/index-reverse/preindex.svg diff --git a/code/index/reverse-index/readme.md b/code/index/index-reverse/readme.md similarity index 100% rename from code/index/reverse-index/readme.md rename to code/index/index-reverse/readme.md diff --git a/code/index/reverse-index/src/test/java/nu/marginalia/index/ReverseIndexDebugTest.java b/code/index/index-reverse/test/nu/marginalia/index/ReverseIndexDebugTest.java similarity index 100% rename from code/index/reverse-index/src/test/java/nu/marginalia/index/ReverseIndexDebugTest.java rename to code/index/index-reverse/test/nu/marginalia/index/ReverseIndexDebugTest.java diff --git a/code/index/reverse-index/src/test/java/nu/marginalia/index/ReverseIndexReaderTest.java b/code/index/index-reverse/test/nu/marginalia/index/ReverseIndexReaderTest.java similarity index 100% rename from code/index/reverse-index/src/test/java/nu/marginalia/index/ReverseIndexReaderTest.java rename to code/index/index-reverse/test/nu/marginalia/index/ReverseIndexReaderTest.java diff --git a/code/index/reverse-index/src/test/java/nu/marginalia/index/construction/ReversePreindexDocsTest.java b/code/index/index-reverse/test/nu/marginalia/index/construction/ReversePreindexDocsTest.java similarity index 100% rename from code/index/reverse-index/src/test/java/nu/marginalia/index/construction/ReversePreindexDocsTest.java rename to code/index/index-reverse/test/nu/marginalia/index/construction/ReversePreindexDocsTest.java diff --git a/code/index/reverse-index/src/test/java/nu/marginalia/index/construction/ReversePreindexFinalizeTest.java b/code/index/index-reverse/test/nu/marginalia/index/construction/ReversePreindexFinalizeTest.java similarity index 100% rename from code/index/reverse-index/src/test/java/nu/marginalia/index/construction/ReversePreindexFinalizeTest.java rename to code/index/index-reverse/test/nu/marginalia/index/construction/ReversePreindexFinalizeTest.java diff --git a/code/index/reverse-index/src/test/java/nu/marginalia/index/construction/ReversePreindexMergeTest.java b/code/index/index-reverse/test/nu/marginalia/index/construction/ReversePreindexMergeTest.java similarity index 100% rename from code/index/reverse-index/src/test/java/nu/marginalia/index/construction/ReversePreindexMergeTest.java rename to code/index/index-reverse/test/nu/marginalia/index/construction/ReversePreindexMergeTest.java diff --git a/code/index/reverse-index/src/test/java/nu/marginalia/index/construction/ReversePreindexWordSegmentsTest.java b/code/index/index-reverse/test/nu/marginalia/index/construction/ReversePreindexWordSegmentsTest.java similarity index 100% rename from code/index/reverse-index/src/test/java/nu/marginalia/index/construction/ReversePreindexWordSegmentsTest.java rename to code/index/index-reverse/test/nu/marginalia/index/construction/ReversePreindexWordSegmentsTest.java diff --git a/code/index/reverse-index/src/test/java/nu/marginalia/index/construction/TestJournalFactory.java b/code/index/index-reverse/test/nu/marginalia/index/construction/TestJournalFactory.java similarity index 100% rename from code/index/reverse-index/src/test/java/nu/marginalia/index/construction/TestJournalFactory.java rename to code/index/index-reverse/test/nu/marginalia/index/construction/TestJournalFactory.java diff --git a/code/index/reverse-index/src/test/java/nu/marginalia/index/construction/TestSegmentData.java b/code/index/index-reverse/test/nu/marginalia/index/construction/TestSegmentData.java similarity index 100% rename from code/index/reverse-index/src/test/java/nu/marginalia/index/construction/TestSegmentData.java rename to code/index/index-reverse/test/nu/marginalia/index/construction/TestSegmentData.java diff --git a/code/index/reverse-index/src/test/java/nu/marginalia/test/TestUtil.java b/code/index/index-reverse/test/nu/marginalia/test/TestUtil.java similarity index 100% rename from code/index/reverse-index/src/test/java/nu/marginalia/test/TestUtil.java rename to code/index/index-reverse/test/nu/marginalia/test/TestUtil.java diff --git a/code/index/src/main/java/nu/marginalia/index/IndexQueryGrpcService.java b/code/index/java/nu/marginalia/index/IndexQueryGrpcService.java similarity index 100% rename from code/index/src/main/java/nu/marginalia/index/IndexQueryGrpcService.java rename to code/index/java/nu/marginalia/index/IndexQueryGrpcService.java diff --git a/code/index/src/main/java/nu/marginalia/index/IndexServicesFactory.java b/code/index/java/nu/marginalia/index/IndexServicesFactory.java similarity index 100% rename from code/index/src/main/java/nu/marginalia/index/IndexServicesFactory.java rename to code/index/java/nu/marginalia/index/IndexServicesFactory.java diff --git a/code/index/src/main/java/nu/marginalia/index/SearchTermsUtil.java b/code/index/java/nu/marginalia/index/SearchTermsUtil.java similarity index 100% rename from code/index/src/main/java/nu/marginalia/index/SearchTermsUtil.java rename to code/index/java/nu/marginalia/index/SearchTermsUtil.java diff --git a/code/index/src/main/java/nu/marginalia/index/index/CombinedIndexReader.java b/code/index/java/nu/marginalia/index/index/CombinedIndexReader.java similarity index 100% rename from code/index/src/main/java/nu/marginalia/index/index/CombinedIndexReader.java rename to code/index/java/nu/marginalia/index/index/CombinedIndexReader.java diff --git a/code/index/src/main/java/nu/marginalia/index/index/IndexQueryBuilderImpl.java b/code/index/java/nu/marginalia/index/index/IndexQueryBuilderImpl.java similarity index 100% rename from code/index/src/main/java/nu/marginalia/index/index/IndexQueryBuilderImpl.java rename to code/index/java/nu/marginalia/index/index/IndexQueryBuilderImpl.java diff --git a/code/index/src/main/java/nu/marginalia/index/index/IndexQueryService.java b/code/index/java/nu/marginalia/index/index/IndexQueryService.java similarity index 100% rename from code/index/src/main/java/nu/marginalia/index/index/IndexQueryService.java rename to code/index/java/nu/marginalia/index/index/IndexQueryService.java diff --git a/code/index/src/main/java/nu/marginalia/index/index/StatefulIndex.java b/code/index/java/nu/marginalia/index/index/StatefulIndex.java similarity index 100% rename from code/index/src/main/java/nu/marginalia/index/index/StatefulIndex.java rename to code/index/java/nu/marginalia/index/index/StatefulIndex.java diff --git a/code/index/src/main/java/nu/marginalia/index/model/IndexQueryParams.java b/code/index/java/nu/marginalia/index/model/IndexQueryParams.java similarity index 100% rename from code/index/src/main/java/nu/marginalia/index/model/IndexQueryParams.java rename to code/index/java/nu/marginalia/index/model/IndexQueryParams.java diff --git a/code/index/src/main/java/nu/marginalia/index/model/IndexSearchParameters.java b/code/index/java/nu/marginalia/index/model/IndexSearchParameters.java similarity index 100% rename from code/index/src/main/java/nu/marginalia/index/model/IndexSearchParameters.java rename to code/index/java/nu/marginalia/index/model/IndexSearchParameters.java diff --git a/code/index/src/main/java/nu/marginalia/index/model/IndexSearchTerms.java b/code/index/java/nu/marginalia/index/model/IndexSearchTerms.java similarity index 100% rename from code/index/src/main/java/nu/marginalia/index/model/IndexSearchTerms.java rename to code/index/java/nu/marginalia/index/model/IndexSearchTerms.java diff --git a/code/index/src/main/java/nu/marginalia/index/results/IndexMetadataService.java b/code/index/java/nu/marginalia/index/results/IndexMetadataService.java similarity index 100% rename from code/index/src/main/java/nu/marginalia/index/results/IndexMetadataService.java rename to code/index/java/nu/marginalia/index/results/IndexMetadataService.java diff --git a/code/index/src/main/java/nu/marginalia/index/results/IndexResultDomainDeduplicator.java b/code/index/java/nu/marginalia/index/results/IndexResultDomainDeduplicator.java similarity index 100% rename from code/index/src/main/java/nu/marginalia/index/results/IndexResultDomainDeduplicator.java rename to code/index/java/nu/marginalia/index/results/IndexResultDomainDeduplicator.java diff --git a/code/index/src/main/java/nu/marginalia/index/results/IndexResultValuationContext.java b/code/index/java/nu/marginalia/index/results/IndexResultValuationContext.java similarity index 100% rename from code/index/src/main/java/nu/marginalia/index/results/IndexResultValuationContext.java rename to code/index/java/nu/marginalia/index/results/IndexResultValuationContext.java diff --git a/code/index/src/main/java/nu/marginalia/index/results/IndexResultValuatorService.java b/code/index/java/nu/marginalia/index/results/IndexResultValuatorService.java similarity index 100% rename from code/index/src/main/java/nu/marginalia/index/results/IndexResultValuatorService.java rename to code/index/java/nu/marginalia/index/results/IndexResultValuatorService.java diff --git a/code/index/src/main/java/nu/marginalia/index/searchset/DbUpdateRanks.java b/code/index/java/nu/marginalia/index/searchset/DbUpdateRanks.java similarity index 100% rename from code/index/src/main/java/nu/marginalia/index/searchset/DbUpdateRanks.java rename to code/index/java/nu/marginalia/index/searchset/DbUpdateRanks.java diff --git a/code/index/src/main/java/nu/marginalia/index/searchset/RankingSearchSet.java b/code/index/java/nu/marginalia/index/searchset/RankingSearchSet.java similarity index 100% rename from code/index/src/main/java/nu/marginalia/index/searchset/RankingSearchSet.java rename to code/index/java/nu/marginalia/index/searchset/RankingSearchSet.java diff --git a/code/index/src/main/java/nu/marginalia/index/searchset/SearchSet.java b/code/index/java/nu/marginalia/index/searchset/SearchSet.java similarity index 100% rename from code/index/src/main/java/nu/marginalia/index/searchset/SearchSet.java rename to code/index/java/nu/marginalia/index/searchset/SearchSet.java diff --git a/code/index/src/main/java/nu/marginalia/index/searchset/SearchSetAny.java b/code/index/java/nu/marginalia/index/searchset/SearchSetAny.java similarity index 100% rename from code/index/src/main/java/nu/marginalia/index/searchset/SearchSetAny.java rename to code/index/java/nu/marginalia/index/searchset/SearchSetAny.java diff --git a/code/index/src/main/java/nu/marginalia/index/searchset/SearchSetsService.java b/code/index/java/nu/marginalia/index/searchset/SearchSetsService.java similarity index 100% rename from code/index/src/main/java/nu/marginalia/index/searchset/SearchSetsService.java rename to code/index/java/nu/marginalia/index/searchset/SearchSetsService.java diff --git a/code/index/src/main/java/nu/marginalia/index/searchset/SmallSearchSet.java b/code/index/java/nu/marginalia/index/searchset/SmallSearchSet.java similarity index 100% rename from code/index/src/main/java/nu/marginalia/index/searchset/SmallSearchSet.java rename to code/index/java/nu/marginalia/index/searchset/SmallSearchSet.java diff --git a/code/index/src/main/java/nu/marginalia/ranking/domains/PageRankDomainRanker.java b/code/index/java/nu/marginalia/ranking/domains/PageRankDomainRanker.java similarity index 100% rename from code/index/src/main/java/nu/marginalia/ranking/domains/PageRankDomainRanker.java rename to code/index/java/nu/marginalia/ranking/domains/PageRankDomainRanker.java diff --git a/code/index/src/main/java/nu/marginalia/ranking/domains/RankingAlgorithm.java b/code/index/java/nu/marginalia/ranking/domains/RankingAlgorithm.java similarity index 100% rename from code/index/src/main/java/nu/marginalia/ranking/domains/RankingAlgorithm.java rename to code/index/java/nu/marginalia/ranking/domains/RankingAlgorithm.java diff --git a/code/index/src/main/java/nu/marginalia/ranking/domains/accumulator/RankingResultAccumulator.java b/code/index/java/nu/marginalia/ranking/domains/accumulator/RankingResultAccumulator.java similarity index 100% rename from code/index/src/main/java/nu/marginalia/ranking/domains/accumulator/RankingResultAccumulator.java rename to code/index/java/nu/marginalia/ranking/domains/accumulator/RankingResultAccumulator.java diff --git a/code/index/src/main/java/nu/marginalia/ranking/domains/accumulator/RankingResultBitSetAccumulator.java b/code/index/java/nu/marginalia/ranking/domains/accumulator/RankingResultBitSetAccumulator.java similarity index 100% rename from code/index/src/main/java/nu/marginalia/ranking/domains/accumulator/RankingResultBitSetAccumulator.java rename to code/index/java/nu/marginalia/ranking/domains/accumulator/RankingResultBitSetAccumulator.java diff --git a/code/index/src/main/java/nu/marginalia/ranking/domains/accumulator/RankingResultHashMapAccumulator.java b/code/index/java/nu/marginalia/ranking/domains/accumulator/RankingResultHashMapAccumulator.java similarity index 100% rename from code/index/src/main/java/nu/marginalia/ranking/domains/accumulator/RankingResultHashMapAccumulator.java rename to code/index/java/nu/marginalia/ranking/domains/accumulator/RankingResultHashMapAccumulator.java diff --git a/code/index/src/main/java/nu/marginalia/ranking/domains/accumulator/RankingResultHashSetAccumulator.java b/code/index/java/nu/marginalia/ranking/domains/accumulator/RankingResultHashSetAccumulator.java similarity index 100% rename from code/index/src/main/java/nu/marginalia/ranking/domains/accumulator/RankingResultHashSetAccumulator.java rename to code/index/java/nu/marginalia/ranking/domains/accumulator/RankingResultHashSetAccumulator.java diff --git a/code/index/src/main/java/nu/marginalia/ranking/domains/accumulator/RankingResultListAccumulator.java b/code/index/java/nu/marginalia/ranking/domains/accumulator/RankingResultListAccumulator.java similarity index 100% rename from code/index/src/main/java/nu/marginalia/ranking/domains/accumulator/RankingResultListAccumulator.java rename to code/index/java/nu/marginalia/ranking/domains/accumulator/RankingResultListAccumulator.java diff --git a/code/index/src/main/java/nu/marginalia/ranking/domains/data/AbstractGraphSource.java b/code/index/java/nu/marginalia/ranking/domains/data/AbstractGraphSource.java similarity index 100% rename from code/index/src/main/java/nu/marginalia/ranking/domains/data/AbstractGraphSource.java rename to code/index/java/nu/marginalia/ranking/domains/data/AbstractGraphSource.java diff --git a/code/index/src/main/java/nu/marginalia/ranking/domains/data/GraphSource.java b/code/index/java/nu/marginalia/ranking/domains/data/GraphSource.java similarity index 100% rename from code/index/src/main/java/nu/marginalia/ranking/domains/data/GraphSource.java rename to code/index/java/nu/marginalia/ranking/domains/data/GraphSource.java diff --git a/code/index/src/main/java/nu/marginalia/ranking/domains/data/InvertedLinkGraphSource.java b/code/index/java/nu/marginalia/ranking/domains/data/InvertedLinkGraphSource.java similarity index 100% rename from code/index/src/main/java/nu/marginalia/ranking/domains/data/InvertedLinkGraphSource.java rename to code/index/java/nu/marginalia/ranking/domains/data/InvertedLinkGraphSource.java diff --git a/code/index/src/main/java/nu/marginalia/ranking/domains/data/LinkGraphSource.java b/code/index/java/nu/marginalia/ranking/domains/data/LinkGraphSource.java similarity index 100% rename from code/index/src/main/java/nu/marginalia/ranking/domains/data/LinkGraphSource.java rename to code/index/java/nu/marginalia/ranking/domains/data/LinkGraphSource.java diff --git a/code/index/src/main/java/nu/marginalia/ranking/domains/data/SimilarityGraphSource.java b/code/index/java/nu/marginalia/ranking/domains/data/SimilarityGraphSource.java similarity index 100% rename from code/index/src/main/java/nu/marginalia/ranking/domains/data/SimilarityGraphSource.java rename to code/index/java/nu/marginalia/ranking/domains/data/SimilarityGraphSource.java diff --git a/code/index/src/main/java/nu/marginalia/ranking/domains/jgrapht/PersonalizedPageRank.java b/code/index/java/nu/marginalia/ranking/domains/jgrapht/PersonalizedPageRank.java similarity index 100% rename from code/index/src/main/java/nu/marginalia/ranking/domains/jgrapht/PersonalizedPageRank.java rename to code/index/java/nu/marginalia/ranking/domains/jgrapht/PersonalizedPageRank.java diff --git a/code/index/src/main/java/nu/marginalia/ranking/results/ResultKeywordSet.java b/code/index/java/nu/marginalia/ranking/results/ResultKeywordSet.java similarity index 100% rename from code/index/src/main/java/nu/marginalia/ranking/results/ResultKeywordSet.java rename to code/index/java/nu/marginalia/ranking/results/ResultKeywordSet.java diff --git a/code/index/src/main/java/nu/marginalia/ranking/results/ResultValuator.java b/code/index/java/nu/marginalia/ranking/results/ResultValuator.java similarity index 100% rename from code/index/src/main/java/nu/marginalia/ranking/results/ResultValuator.java rename to code/index/java/nu/marginalia/ranking/results/ResultValuator.java diff --git a/code/index/src/main/java/nu/marginalia/ranking/results/factors/Bm25Factor.java b/code/index/java/nu/marginalia/ranking/results/factors/Bm25Factor.java similarity index 100% rename from code/index/src/main/java/nu/marginalia/ranking/results/factors/Bm25Factor.java rename to code/index/java/nu/marginalia/ranking/results/factors/Bm25Factor.java diff --git a/code/index/src/main/java/nu/marginalia/ranking/results/factors/PriorityTermBonus.java b/code/index/java/nu/marginalia/ranking/results/factors/PriorityTermBonus.java similarity index 100% rename from code/index/src/main/java/nu/marginalia/ranking/results/factors/PriorityTermBonus.java rename to code/index/java/nu/marginalia/ranking/results/factors/PriorityTermBonus.java diff --git a/code/index/src/main/java/nu/marginalia/ranking/results/factors/TermCoherenceFactor.java b/code/index/java/nu/marginalia/ranking/results/factors/TermCoherenceFactor.java similarity index 100% rename from code/index/src/main/java/nu/marginalia/ranking/results/factors/TermCoherenceFactor.java rename to code/index/java/nu/marginalia/ranking/results/factors/TermCoherenceFactor.java diff --git a/code/index/query/build.gradle b/code/index/query/build.gradle index c54b7fc4..7977ad73 100644 --- a/code/index/query/build.gradle +++ b/code/index/query/build.gradle @@ -11,6 +11,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':code:libraries:array') implementation project(':code:common:model') diff --git a/code/index/query/src/main/java/nu/marginalia/index/domainrankings/DomainRankings.java b/code/index/query/java/nu/marginalia/index/domainrankings/DomainRankings.java similarity index 100% rename from code/index/query/src/main/java/nu/marginalia/index/domainrankings/DomainRankings.java rename to code/index/query/java/nu/marginalia/index/domainrankings/DomainRankings.java diff --git a/code/index/query/src/main/java/nu/marginalia/index/query/EmptyEntrySource.java b/code/index/query/java/nu/marginalia/index/query/EmptyEntrySource.java similarity index 100% rename from code/index/query/src/main/java/nu/marginalia/index/query/EmptyEntrySource.java rename to code/index/query/java/nu/marginalia/index/query/EmptyEntrySource.java diff --git a/code/index/query/src/main/java/nu/marginalia/index/query/EntrySource.java b/code/index/query/java/nu/marginalia/index/query/EntrySource.java similarity index 100% rename from code/index/query/src/main/java/nu/marginalia/index/query/EntrySource.java rename to code/index/query/java/nu/marginalia/index/query/EntrySource.java diff --git a/code/index/query/src/main/java/nu/marginalia/index/query/IndexQuery.java b/code/index/query/java/nu/marginalia/index/query/IndexQuery.java similarity index 100% rename from code/index/query/src/main/java/nu/marginalia/index/query/IndexQuery.java rename to code/index/query/java/nu/marginalia/index/query/IndexQuery.java diff --git a/code/index/query/src/main/java/nu/marginalia/index/query/IndexQueryBuilder.java b/code/index/query/java/nu/marginalia/index/query/IndexQueryBuilder.java similarity index 100% rename from code/index/query/src/main/java/nu/marginalia/index/query/IndexQueryBuilder.java rename to code/index/query/java/nu/marginalia/index/query/IndexQueryBuilder.java diff --git a/code/index/query/src/main/java/nu/marginalia/index/query/IndexQueryPriority.java b/code/index/query/java/nu/marginalia/index/query/IndexQueryPriority.java similarity index 100% rename from code/index/query/src/main/java/nu/marginalia/index/query/IndexQueryPriority.java rename to code/index/query/java/nu/marginalia/index/query/IndexQueryPriority.java diff --git a/code/index/query/src/main/java/nu/marginalia/index/query/IndexSearchBudget.java b/code/index/query/java/nu/marginalia/index/query/IndexSearchBudget.java similarity index 100% rename from code/index/query/src/main/java/nu/marginalia/index/query/IndexSearchBudget.java rename to code/index/query/java/nu/marginalia/index/query/IndexSearchBudget.java diff --git a/code/index/query/src/main/java/nu/marginalia/index/query/filter/QueryFilterAnyOf.java b/code/index/query/java/nu/marginalia/index/query/filter/QueryFilterAnyOf.java similarity index 100% rename from code/index/query/src/main/java/nu/marginalia/index/query/filter/QueryFilterAnyOf.java rename to code/index/query/java/nu/marginalia/index/query/filter/QueryFilterAnyOf.java diff --git a/code/index/query/src/main/java/nu/marginalia/index/query/filter/QueryFilterLetThrough.java b/code/index/query/java/nu/marginalia/index/query/filter/QueryFilterLetThrough.java similarity index 100% rename from code/index/query/src/main/java/nu/marginalia/index/query/filter/QueryFilterLetThrough.java rename to code/index/query/java/nu/marginalia/index/query/filter/QueryFilterLetThrough.java diff --git a/code/index/query/src/main/java/nu/marginalia/index/query/filter/QueryFilterNoPass.java b/code/index/query/java/nu/marginalia/index/query/filter/QueryFilterNoPass.java similarity index 100% rename from code/index/query/src/main/java/nu/marginalia/index/query/filter/QueryFilterNoPass.java rename to code/index/query/java/nu/marginalia/index/query/filter/QueryFilterNoPass.java diff --git a/code/index/query/src/main/java/nu/marginalia/index/query/filter/QueryFilterStepExcludeFromPredicate.java b/code/index/query/java/nu/marginalia/index/query/filter/QueryFilterStepExcludeFromPredicate.java similarity index 100% rename from code/index/query/src/main/java/nu/marginalia/index/query/filter/QueryFilterStepExcludeFromPredicate.java rename to code/index/query/java/nu/marginalia/index/query/filter/QueryFilterStepExcludeFromPredicate.java diff --git a/code/index/query/src/main/java/nu/marginalia/index/query/filter/QueryFilterStepFromPredicate.java b/code/index/query/java/nu/marginalia/index/query/filter/QueryFilterStepFromPredicate.java similarity index 100% rename from code/index/query/src/main/java/nu/marginalia/index/query/filter/QueryFilterStepFromPredicate.java rename to code/index/query/java/nu/marginalia/index/query/filter/QueryFilterStepFromPredicate.java diff --git a/code/index/query/src/main/java/nu/marginalia/index/query/filter/QueryFilterStepIf.java b/code/index/query/java/nu/marginalia/index/query/filter/QueryFilterStepIf.java similarity index 100% rename from code/index/query/src/main/java/nu/marginalia/index/query/filter/QueryFilterStepIf.java rename to code/index/query/java/nu/marginalia/index/query/filter/QueryFilterStepIf.java diff --git a/code/index/query/src/main/java/nu/marginalia/index/query/limit/QueryLimits.java b/code/index/query/java/nu/marginalia/index/query/limit/QueryLimits.java similarity index 100% rename from code/index/query/src/main/java/nu/marginalia/index/query/limit/QueryLimits.java rename to code/index/query/java/nu/marginalia/index/query/limit/QueryLimits.java diff --git a/code/index/query/src/main/java/nu/marginalia/index/query/limit/QueryStrategy.java b/code/index/query/java/nu/marginalia/index/query/limit/QueryStrategy.java similarity index 100% rename from code/index/query/src/main/java/nu/marginalia/index/query/limit/QueryStrategy.java rename to code/index/query/java/nu/marginalia/index/query/limit/QueryStrategy.java diff --git a/code/index/query/src/main/java/nu/marginalia/index/query/limit/SpecificationLimit.java b/code/index/query/java/nu/marginalia/index/query/limit/SpecificationLimit.java similarity index 100% rename from code/index/query/src/main/java/nu/marginalia/index/query/limit/SpecificationLimit.java rename to code/index/query/java/nu/marginalia/index/query/limit/SpecificationLimit.java diff --git a/code/index/query/src/main/java/nu/marginalia/index/query/limit/SpecificationLimitType.java b/code/index/query/java/nu/marginalia/index/query/limit/SpecificationLimitType.java similarity index 100% rename from code/index/query/src/main/java/nu/marginalia/index/query/limit/SpecificationLimitType.java rename to code/index/query/java/nu/marginalia/index/query/limit/SpecificationLimitType.java diff --git a/code/index/query/src/test/java/nu/marginalia/index/query/filter/QueryFilterStepIfTest.java b/code/index/query/test/nu/marginalia/index/query/filter/QueryFilterStepIfTest.java similarity index 100% rename from code/index/query/src/test/java/nu/marginalia/index/query/filter/QueryFilterStepIfTest.java rename to code/index/query/test/nu/marginalia/index/query/filter/QueryFilterStepIfTest.java diff --git a/code/index/src/test/java/nu/marginalia/index/IndexQueryServiceIntegrationSmokeTest.java b/code/index/test/nu/marginalia/index/IndexQueryServiceIntegrationSmokeTest.java similarity index 100% rename from code/index/src/test/java/nu/marginalia/index/IndexQueryServiceIntegrationSmokeTest.java rename to code/index/test/nu/marginalia/index/IndexQueryServiceIntegrationSmokeTest.java diff --git a/code/index/src/test/java/nu/marginalia/index/IndexQueryServiceIntegrationTest.java b/code/index/test/nu/marginalia/index/IndexQueryServiceIntegrationTest.java similarity index 100% rename from code/index/src/test/java/nu/marginalia/index/IndexQueryServiceIntegrationTest.java rename to code/index/test/nu/marginalia/index/IndexQueryServiceIntegrationTest.java diff --git a/code/index/src/test/java/nu/marginalia/index/IndexQueryServiceIntegrationTestModule.java b/code/index/test/nu/marginalia/index/IndexQueryServiceIntegrationTestModule.java similarity index 100% rename from code/index/src/test/java/nu/marginalia/index/IndexQueryServiceIntegrationTestModule.java rename to code/index/test/nu/marginalia/index/IndexQueryServiceIntegrationTestModule.java diff --git a/code/index/src/test/java/nu/marginalia/index/results/IndexResultDomainDeduplicatorTest.java b/code/index/test/nu/marginalia/index/results/IndexResultDomainDeduplicatorTest.java similarity index 100% rename from code/index/src/test/java/nu/marginalia/index/results/IndexResultDomainDeduplicatorTest.java rename to code/index/test/nu/marginalia/index/results/IndexResultDomainDeduplicatorTest.java diff --git a/code/index/src/test/java/nu/marginalia/index/searchset/RankingSearchSetTest.java b/code/index/test/nu/marginalia/index/searchset/RankingSearchSetTest.java similarity index 100% rename from code/index/src/test/java/nu/marginalia/index/searchset/RankingSearchSetTest.java rename to code/index/test/nu/marginalia/index/searchset/RankingSearchSetTest.java diff --git a/code/index/src/test/java/nu/marginalia/index/util/TestUtil.java b/code/index/test/nu/marginalia/index/util/TestUtil.java similarity index 100% rename from code/index/src/test/java/nu/marginalia/index/util/TestUtil.java rename to code/index/test/nu/marginalia/index/util/TestUtil.java diff --git a/code/index/src/test/java/nu/marginalia/ranking/domains/RankingAlgorithmWithRealDataTest.java b/code/index/test/nu/marginalia/ranking/domains/RankingAlgorithmWithRealDataTest.java similarity index 100% rename from code/index/src/test/java/nu/marginalia/ranking/domains/RankingAlgorithmWithRealDataTest.java rename to code/index/test/nu/marginalia/ranking/domains/RankingAlgorithmWithRealDataTest.java diff --git a/code/index/src/test/java/nu/marginalia/ranking/domains/RankingAlgorithmsContainerTest.java b/code/index/test/nu/marginalia/ranking/domains/RankingAlgorithmsContainerTest.java similarity index 100% rename from code/index/src/test/java/nu/marginalia/ranking/domains/RankingAlgorithmsContainerTest.java rename to code/index/test/nu/marginalia/ranking/domains/RankingAlgorithmsContainerTest.java diff --git a/code/index/src/test/java/nu/marginalia/ranking/domains/TestGraphSourceForInvertedLinkData.java b/code/index/test/nu/marginalia/ranking/domains/TestGraphSourceForInvertedLinkData.java similarity index 100% rename from code/index/src/test/java/nu/marginalia/ranking/domains/TestGraphSourceForInvertedLinkData.java rename to code/index/test/nu/marginalia/ranking/domains/TestGraphSourceForInvertedLinkData.java diff --git a/code/index/src/test/java/nu/marginalia/ranking/domains/TestGraphSourceForLinkData.java b/code/index/test/nu/marginalia/ranking/domains/TestGraphSourceForLinkData.java similarity index 100% rename from code/index/src/test/java/nu/marginalia/ranking/domains/TestGraphSourceForLinkData.java rename to code/index/test/nu/marginalia/ranking/domains/TestGraphSourceForLinkData.java diff --git a/code/index/src/test/java/nu/marginalia/ranking/domains/TestGraphSourceForSimilarityData.java b/code/index/test/nu/marginalia/ranking/domains/TestGraphSourceForSimilarityData.java similarity index 100% rename from code/index/src/test/java/nu/marginalia/ranking/domains/TestGraphSourceForSimilarityData.java rename to code/index/test/nu/marginalia/ranking/domains/TestGraphSourceForSimilarityData.java diff --git a/code/index/src/test/java/nu/marginalia/ranking/results/ResultValuatorTest.java b/code/index/test/nu/marginalia/ranking/results/ResultValuatorTest.java similarity index 100% rename from code/index/src/test/java/nu/marginalia/ranking/results/ResultValuatorTest.java rename to code/index/test/nu/marginalia/ranking/results/ResultValuatorTest.java diff --git a/code/index/src/test/java/nu/marginalia/ranking/results/factors/TermCoherenceFactorTest.java b/code/index/test/nu/marginalia/ranking/results/factors/TermCoherenceFactorTest.java similarity index 100% rename from code/index/src/test/java/nu/marginalia/ranking/results/factors/TermCoherenceFactorTest.java rename to code/index/test/nu/marginalia/ranking/results/factors/TermCoherenceFactorTest.java diff --git a/code/libraries/array/build.gradle b/code/libraries/array/build.gradle index 306ab2f9..88e27107 100644 --- a/code/libraries/array/build.gradle +++ b/code/libraries/array/build.gradle @@ -9,6 +9,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation libs.bundles.slf4j diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/ArrayRangeReference.java b/code/libraries/array/java/nu/marginalia/array/ArrayRangeReference.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/ArrayRangeReference.java rename to code/libraries/array/java/nu/marginalia/array/ArrayRangeReference.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/IntArray.java b/code/libraries/array/java/nu/marginalia/array/IntArray.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/IntArray.java rename to code/libraries/array/java/nu/marginalia/array/IntArray.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/LongArray.java b/code/libraries/array/java/nu/marginalia/array/LongArray.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/LongArray.java rename to code/libraries/array/java/nu/marginalia/array/LongArray.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/LongArrayFactory.java b/code/libraries/array/java/nu/marginalia/array/LongArrayFactory.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/LongArrayFactory.java rename to code/libraries/array/java/nu/marginalia/array/LongArrayFactory.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/algo/BulkTransferArray.java b/code/libraries/array/java/nu/marginalia/array/algo/BulkTransferArray.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/algo/BulkTransferArray.java rename to code/libraries/array/java/nu/marginalia/array/algo/BulkTransferArray.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/algo/IntArrayBase.java b/code/libraries/array/java/nu/marginalia/array/algo/IntArrayBase.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/algo/IntArrayBase.java rename to code/libraries/array/java/nu/marginalia/array/algo/IntArrayBase.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/algo/IntArraySearch.java b/code/libraries/array/java/nu/marginalia/array/algo/IntArraySearch.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/algo/IntArraySearch.java rename to code/libraries/array/java/nu/marginalia/array/algo/IntArraySearch.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/algo/IntArraySort.java b/code/libraries/array/java/nu/marginalia/array/algo/IntArraySort.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/algo/IntArraySort.java rename to code/libraries/array/java/nu/marginalia/array/algo/IntArraySort.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/algo/IntArrayTransformations.java b/code/libraries/array/java/nu/marginalia/array/algo/IntArrayTransformations.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/algo/IntArrayTransformations.java rename to code/libraries/array/java/nu/marginalia/array/algo/IntArrayTransformations.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/algo/LongArrayBase.java b/code/libraries/array/java/nu/marginalia/array/algo/LongArrayBase.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/algo/LongArrayBase.java rename to code/libraries/array/java/nu/marginalia/array/algo/LongArrayBase.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/algo/LongArraySearch.java b/code/libraries/array/java/nu/marginalia/array/algo/LongArraySearch.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/algo/LongArraySearch.java rename to code/libraries/array/java/nu/marginalia/array/algo/LongArraySearch.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/algo/LongArraySort.java b/code/libraries/array/java/nu/marginalia/array/algo/LongArraySort.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/algo/LongArraySort.java rename to code/libraries/array/java/nu/marginalia/array/algo/LongArraySort.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/algo/LongArrayTransformations.java b/code/libraries/array/java/nu/marginalia/array/algo/LongArrayTransformations.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/algo/LongArrayTransformations.java rename to code/libraries/array/java/nu/marginalia/array/algo/LongArrayTransformations.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/algo/SortAlgoInsertionSort.java b/code/libraries/array/java/nu/marginalia/array/algo/SortAlgoInsertionSort.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/algo/SortAlgoInsertionSort.java rename to code/libraries/array/java/nu/marginalia/array/algo/SortAlgoInsertionSort.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/algo/SortAlgoMergeSort.java b/code/libraries/array/java/nu/marginalia/array/algo/SortAlgoMergeSort.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/algo/SortAlgoMergeSort.java rename to code/libraries/array/java/nu/marginalia/array/algo/SortAlgoMergeSort.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/algo/SortAlgoQuickSort.java b/code/libraries/array/java/nu/marginalia/array/algo/SortAlgoQuickSort.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/algo/SortAlgoQuickSort.java rename to code/libraries/array/java/nu/marginalia/array/algo/SortAlgoQuickSort.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/algo/SortingContext.java b/code/libraries/array/java/nu/marginalia/array/algo/SortingContext.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/algo/SortingContext.java rename to code/libraries/array/java/nu/marginalia/array/algo/SortingContext.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/algo/TwoArrayOperations.java b/code/libraries/array/java/nu/marginalia/array/algo/TwoArrayOperations.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/algo/TwoArrayOperations.java rename to code/libraries/array/java/nu/marginalia/array/algo/TwoArrayOperations.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/buffer/IntQueryBuffer.java b/code/libraries/array/java/nu/marginalia/array/buffer/IntQueryBuffer.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/buffer/IntQueryBuffer.java rename to code/libraries/array/java/nu/marginalia/array/buffer/IntQueryBuffer.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/buffer/LongQueryBuffer.java b/code/libraries/array/java/nu/marginalia/array/buffer/LongQueryBuffer.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/buffer/LongQueryBuffer.java rename to code/libraries/array/java/nu/marginalia/array/buffer/LongQueryBuffer.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/delegate/ReferenceImplIntArrayDelegate.java b/code/libraries/array/java/nu/marginalia/array/delegate/ReferenceImplIntArrayDelegate.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/delegate/ReferenceImplIntArrayDelegate.java rename to code/libraries/array/java/nu/marginalia/array/delegate/ReferenceImplIntArrayDelegate.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/delegate/ReferenceImplLongArrayDelegate.java b/code/libraries/array/java/nu/marginalia/array/delegate/ReferenceImplLongArrayDelegate.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/delegate/ReferenceImplLongArrayDelegate.java rename to code/libraries/array/java/nu/marginalia/array/delegate/ReferenceImplLongArrayDelegate.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/delegate/ShiftedIntArray.java b/code/libraries/array/java/nu/marginalia/array/delegate/ShiftedIntArray.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/delegate/ShiftedIntArray.java rename to code/libraries/array/java/nu/marginalia/array/delegate/ShiftedIntArray.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/delegate/ShiftedLongArray.java b/code/libraries/array/java/nu/marginalia/array/delegate/ShiftedLongArray.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/delegate/ShiftedLongArray.java rename to code/libraries/array/java/nu/marginalia/array/delegate/ShiftedLongArray.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/functional/AddressRangeCall.java b/code/libraries/array/java/nu/marginalia/array/functional/AddressRangeCall.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/functional/AddressRangeCall.java rename to code/libraries/array/java/nu/marginalia/array/functional/AddressRangeCall.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/functional/AddressRangeCallIO.java b/code/libraries/array/java/nu/marginalia/array/functional/AddressRangeCallIO.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/functional/AddressRangeCallIO.java rename to code/libraries/array/java/nu/marginalia/array/functional/AddressRangeCallIO.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/functional/AddressRangeIntFunction.java b/code/libraries/array/java/nu/marginalia/array/functional/AddressRangeIntFunction.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/functional/AddressRangeIntFunction.java rename to code/libraries/array/java/nu/marginalia/array/functional/AddressRangeIntFunction.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/functional/AddressRangeLongFunction.java b/code/libraries/array/java/nu/marginalia/array/functional/AddressRangeLongFunction.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/functional/AddressRangeLongFunction.java rename to code/libraries/array/java/nu/marginalia/array/functional/AddressRangeLongFunction.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/functional/IntBinaryIOOperation.java b/code/libraries/array/java/nu/marginalia/array/functional/IntBinaryIOOperation.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/functional/IntBinaryIOOperation.java rename to code/libraries/array/java/nu/marginalia/array/functional/IntBinaryIOOperation.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/functional/IntBinaryOperation.java b/code/libraries/array/java/nu/marginalia/array/functional/IntBinaryOperation.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/functional/IntBinaryOperation.java rename to code/libraries/array/java/nu/marginalia/array/functional/IntBinaryOperation.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/functional/IntIOTransformer.java b/code/libraries/array/java/nu/marginalia/array/functional/IntIOTransformer.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/functional/IntIOTransformer.java rename to code/libraries/array/java/nu/marginalia/array/functional/IntIOTransformer.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/functional/IntTransformer.java b/code/libraries/array/java/nu/marginalia/array/functional/IntTransformer.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/functional/IntTransformer.java rename to code/libraries/array/java/nu/marginalia/array/functional/IntTransformer.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/functional/LongBinaryIOOperation.java b/code/libraries/array/java/nu/marginalia/array/functional/LongBinaryIOOperation.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/functional/LongBinaryIOOperation.java rename to code/libraries/array/java/nu/marginalia/array/functional/LongBinaryIOOperation.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/functional/LongBinaryOperation.java b/code/libraries/array/java/nu/marginalia/array/functional/LongBinaryOperation.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/functional/LongBinaryOperation.java rename to code/libraries/array/java/nu/marginalia/array/functional/LongBinaryOperation.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/functional/LongIOTransformer.java b/code/libraries/array/java/nu/marginalia/array/functional/LongIOTransformer.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/functional/LongIOTransformer.java rename to code/libraries/array/java/nu/marginalia/array/functional/LongIOTransformer.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/functional/LongIntConsumer.java b/code/libraries/array/java/nu/marginalia/array/functional/LongIntConsumer.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/functional/LongIntConsumer.java rename to code/libraries/array/java/nu/marginalia/array/functional/LongIntConsumer.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/functional/LongLongConsumer.java b/code/libraries/array/java/nu/marginalia/array/functional/LongLongConsumer.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/functional/LongLongConsumer.java rename to code/libraries/array/java/nu/marginalia/array/functional/LongLongConsumer.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/functional/LongTransformer.java b/code/libraries/array/java/nu/marginalia/array/functional/LongTransformer.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/functional/LongTransformer.java rename to code/libraries/array/java/nu/marginalia/array/functional/LongTransformer.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/page/AbstractPagingArray.java b/code/libraries/array/java/nu/marginalia/array/page/AbstractPagingArray.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/page/AbstractPagingArray.java rename to code/libraries/array/java/nu/marginalia/array/page/AbstractPagingArray.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/page/PartitionPage.java b/code/libraries/array/java/nu/marginalia/array/page/PartitionPage.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/page/PartitionPage.java rename to code/libraries/array/java/nu/marginalia/array/page/PartitionPage.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/page/SegmentIntArray.java b/code/libraries/array/java/nu/marginalia/array/page/SegmentIntArray.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/page/SegmentIntArray.java rename to code/libraries/array/java/nu/marginalia/array/page/SegmentIntArray.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/page/SegmentLongArray.java b/code/libraries/array/java/nu/marginalia/array/page/SegmentLongArray.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/page/SegmentLongArray.java rename to code/libraries/array/java/nu/marginalia/array/page/SegmentLongArray.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/page/UnsafeLongArray.java b/code/libraries/array/java/nu/marginalia/array/page/UnsafeLongArray.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/page/UnsafeLongArray.java rename to code/libraries/array/java/nu/marginalia/array/page/UnsafeLongArray.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/page/UnsafeProvider.java b/code/libraries/array/java/nu/marginalia/array/page/UnsafeProvider.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/page/UnsafeProvider.java rename to code/libraries/array/java/nu/marginalia/array/page/UnsafeProvider.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/scheme/ArrayPartitioningScheme.java b/code/libraries/array/java/nu/marginalia/array/scheme/ArrayPartitioningScheme.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/scheme/ArrayPartitioningScheme.java rename to code/libraries/array/java/nu/marginalia/array/scheme/ArrayPartitioningScheme.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/scheme/PowerOf2PartitioningScheme.java b/code/libraries/array/java/nu/marginalia/array/scheme/PowerOf2PartitioningScheme.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/scheme/PowerOf2PartitioningScheme.java rename to code/libraries/array/java/nu/marginalia/array/scheme/PowerOf2PartitioningScheme.java diff --git a/code/libraries/array/src/main/java/nu/marginalia/array/scheme/SequentialPartitioningScheme.java b/code/libraries/array/java/nu/marginalia/array/scheme/SequentialPartitioningScheme.java similarity index 100% rename from code/libraries/array/src/main/java/nu/marginalia/array/scheme/SequentialPartitioningScheme.java rename to code/libraries/array/java/nu/marginalia/array/scheme/SequentialPartitioningScheme.java diff --git a/code/libraries/array/src/test/java/nu/marginalia/array/IntLowBitPartitioningSchemeTest.java b/code/libraries/array/test/nu/marginalia/array/IntLowBitPartitioningSchemeTest.java similarity index 100% rename from code/libraries/array/src/test/java/nu/marginalia/array/IntLowBitPartitioningSchemeTest.java rename to code/libraries/array/test/nu/marginalia/array/IntLowBitPartitioningSchemeTest.java diff --git a/code/libraries/array/src/test/java/nu/marginalia/array/algo/IntArraySearchTest.java b/code/libraries/array/test/nu/marginalia/array/algo/IntArraySearchTest.java similarity index 100% rename from code/libraries/array/src/test/java/nu/marginalia/array/algo/IntArraySearchTest.java rename to code/libraries/array/test/nu/marginalia/array/algo/IntArraySearchTest.java diff --git a/code/libraries/array/src/test/java/nu/marginalia/array/algo/IntArraySortTest.java b/code/libraries/array/test/nu/marginalia/array/algo/IntArraySortTest.java similarity index 100% rename from code/libraries/array/src/test/java/nu/marginalia/array/algo/IntArraySortTest.java rename to code/libraries/array/test/nu/marginalia/array/algo/IntArraySortTest.java diff --git a/code/libraries/array/src/test/java/nu/marginalia/array/algo/IntArrayTransformations2Test.java b/code/libraries/array/test/nu/marginalia/array/algo/IntArrayTransformations2Test.java similarity index 100% rename from code/libraries/array/src/test/java/nu/marginalia/array/algo/IntArrayTransformations2Test.java rename to code/libraries/array/test/nu/marginalia/array/algo/IntArrayTransformations2Test.java diff --git a/code/libraries/array/src/test/java/nu/marginalia/array/algo/IntArrayTransformationsTest.java b/code/libraries/array/test/nu/marginalia/array/algo/IntArrayTransformationsTest.java similarity index 100% rename from code/libraries/array/src/test/java/nu/marginalia/array/algo/IntArrayTransformationsTest.java rename to code/libraries/array/test/nu/marginalia/array/algo/IntArrayTransformationsTest.java diff --git a/code/libraries/array/src/test/java/nu/marginalia/array/algo/LongArraySearchTest.java b/code/libraries/array/test/nu/marginalia/array/algo/LongArraySearchTest.java similarity index 100% rename from code/libraries/array/src/test/java/nu/marginalia/array/algo/LongArraySearchTest.java rename to code/libraries/array/test/nu/marginalia/array/algo/LongArraySearchTest.java diff --git a/code/libraries/array/src/test/java/nu/marginalia/array/algo/LongArraySortNTest.java b/code/libraries/array/test/nu/marginalia/array/algo/LongArraySortNTest.java similarity index 100% rename from code/libraries/array/src/test/java/nu/marginalia/array/algo/LongArraySortNTest.java rename to code/libraries/array/test/nu/marginalia/array/algo/LongArraySortNTest.java diff --git a/code/libraries/array/src/test/java/nu/marginalia/array/algo/LongArraySortTest.java b/code/libraries/array/test/nu/marginalia/array/algo/LongArraySortTest.java similarity index 100% rename from code/libraries/array/src/test/java/nu/marginalia/array/algo/LongArraySortTest.java rename to code/libraries/array/test/nu/marginalia/array/algo/LongArraySortTest.java diff --git a/code/libraries/array/src/test/java/nu/marginalia/array/algo/LongArrayTransformations2Test.java b/code/libraries/array/test/nu/marginalia/array/algo/LongArrayTransformations2Test.java similarity index 100% rename from code/libraries/array/src/test/java/nu/marginalia/array/algo/LongArrayTransformations2Test.java rename to code/libraries/array/test/nu/marginalia/array/algo/LongArrayTransformations2Test.java diff --git a/code/libraries/array/src/test/java/nu/marginalia/array/algo/LongArrayTransformationsTest.java b/code/libraries/array/test/nu/marginalia/array/algo/LongArrayTransformationsTest.java similarity index 100% rename from code/libraries/array/src/test/java/nu/marginalia/array/algo/LongArrayTransformationsTest.java rename to code/libraries/array/test/nu/marginalia/array/algo/LongArrayTransformationsTest.java diff --git a/code/libraries/array/src/test/java/nu/marginalia/array/algo/TwoArrayOperationsTest.java b/code/libraries/array/test/nu/marginalia/array/algo/TwoArrayOperationsTest.java similarity index 100% rename from code/libraries/array/src/test/java/nu/marginalia/array/algo/TwoArrayOperationsTest.java rename to code/libraries/array/test/nu/marginalia/array/algo/TwoArrayOperationsTest.java diff --git a/code/libraries/array/src/test/java/nu/marginalia/array/scheme/ArrayPartitioningSchemeTest.java b/code/libraries/array/test/nu/marginalia/array/scheme/ArrayPartitioningSchemeTest.java similarity index 100% rename from code/libraries/array/src/test/java/nu/marginalia/array/scheme/ArrayPartitioningSchemeTest.java rename to code/libraries/array/test/nu/marginalia/array/scheme/ArrayPartitioningSchemeTest.java diff --git a/code/libraries/array/src/test/java/nu/marginalia/util/test/TestUtil.java b/code/libraries/array/test/nu/marginalia/util/test/TestUtil.java similarity index 100% rename from code/libraries/array/src/test/java/nu/marginalia/util/test/TestUtil.java rename to code/libraries/array/test/nu/marginalia/util/test/TestUtil.java diff --git a/code/libraries/big-string/build.gradle b/code/libraries/big-string/build.gradle index c769bc12..2f67aa7f 100644 --- a/code/libraries/big-string/build.gradle +++ b/code/libraries/big-string/build.gradle @@ -8,6 +8,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation libs.bundles.slf4j diff --git a/code/libraries/big-string/src/main/java/nu/marginalia/bigstring/BigString.java b/code/libraries/big-string/java/nu/marginalia/bigstring/BigString.java similarity index 100% rename from code/libraries/big-string/src/main/java/nu/marginalia/bigstring/BigString.java rename to code/libraries/big-string/java/nu/marginalia/bigstring/BigString.java diff --git a/code/libraries/big-string/src/main/java/nu/marginalia/bigstring/CompressedBigString.java b/code/libraries/big-string/java/nu/marginalia/bigstring/CompressedBigString.java similarity index 100% rename from code/libraries/big-string/src/main/java/nu/marginalia/bigstring/CompressedBigString.java rename to code/libraries/big-string/java/nu/marginalia/bigstring/CompressedBigString.java diff --git a/code/libraries/big-string/src/main/java/nu/marginalia/bigstring/CompressionBuffer.java b/code/libraries/big-string/java/nu/marginalia/bigstring/CompressionBuffer.java similarity index 100% rename from code/libraries/big-string/src/main/java/nu/marginalia/bigstring/CompressionBuffer.java rename to code/libraries/big-string/java/nu/marginalia/bigstring/CompressionBuffer.java diff --git a/code/libraries/big-string/src/main/java/nu/marginalia/bigstring/CompressionBufferPool.java b/code/libraries/big-string/java/nu/marginalia/bigstring/CompressionBufferPool.java similarity index 100% rename from code/libraries/big-string/src/main/java/nu/marginalia/bigstring/CompressionBufferPool.java rename to code/libraries/big-string/java/nu/marginalia/bigstring/CompressionBufferPool.java diff --git a/code/libraries/big-string/src/main/java/nu/marginalia/bigstring/PlainBigString.java b/code/libraries/big-string/java/nu/marginalia/bigstring/PlainBigString.java similarity index 100% rename from code/libraries/big-string/src/main/java/nu/marginalia/bigstring/PlainBigString.java rename to code/libraries/big-string/java/nu/marginalia/bigstring/PlainBigString.java diff --git a/code/libraries/big-string/src/test/java/nu/marginalia/bigstring/CompressedBigStringTest.java b/code/libraries/big-string/test/nu/marginalia/bigstring/CompressedBigStringTest.java similarity index 100% rename from code/libraries/big-string/src/test/java/nu/marginalia/bigstring/CompressedBigStringTest.java rename to code/libraries/big-string/test/nu/marginalia/bigstring/CompressedBigStringTest.java diff --git a/code/libraries/blocking-thread-pool/build.gradle b/code/libraries/blocking-thread-pool/build.gradle index e716f1c8..8c5609a5 100644 --- a/code/libraries/blocking-thread-pool/build.gradle +++ b/code/libraries/blocking-thread-pool/build.gradle @@ -8,6 +8,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation libs.bundles.slf4j diff --git a/code/libraries/blocking-thread-pool/src/main/java/nu/marginalia/util/ProcessingIterator.java b/code/libraries/blocking-thread-pool/java/nu/marginalia/util/ProcessingIterator.java similarity index 100% rename from code/libraries/blocking-thread-pool/src/main/java/nu/marginalia/util/ProcessingIterator.java rename to code/libraries/blocking-thread-pool/java/nu/marginalia/util/ProcessingIterator.java diff --git a/code/libraries/blocking-thread-pool/src/main/java/nu/marginalia/util/SimpleBlockingThreadPool.java b/code/libraries/blocking-thread-pool/java/nu/marginalia/util/SimpleBlockingThreadPool.java similarity index 100% rename from code/libraries/blocking-thread-pool/src/main/java/nu/marginalia/util/SimpleBlockingThreadPool.java rename to code/libraries/blocking-thread-pool/java/nu/marginalia/util/SimpleBlockingThreadPool.java diff --git a/code/libraries/blocking-thread-pool/src/test/java/nu/marginalia/util/ProcessingIteratorTest.java b/code/libraries/blocking-thread-pool/test/nu/marginalia/util/ProcessingIteratorTest.java similarity index 100% rename from code/libraries/blocking-thread-pool/src/test/java/nu/marginalia/util/ProcessingIteratorTest.java rename to code/libraries/blocking-thread-pool/test/nu/marginalia/util/ProcessingIteratorTest.java diff --git a/code/libraries/braille-block-punch-cards/build.gradle b/code/libraries/braille-block-punch-cards/build.gradle index 4d9c5997..673d944f 100644 --- a/code/libraries/braille-block-punch-cards/build.gradle +++ b/code/libraries/braille-block-punch-cards/build.gradle @@ -8,6 +8,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation libs.bundles.slf4j implementation libs.notnull diff --git a/code/libraries/braille-block-punch-cards/src/main/java/nu/marginalia/bbpc/BrailleBlockPunchCards.java b/code/libraries/braille-block-punch-cards/java/nu/marginalia/bbpc/BrailleBlockPunchCards.java similarity index 100% rename from code/libraries/braille-block-punch-cards/src/main/java/nu/marginalia/bbpc/BrailleBlockPunchCards.java rename to code/libraries/braille-block-punch-cards/java/nu/marginalia/bbpc/BrailleBlockPunchCards.java diff --git a/code/libraries/braille-block-punch-cards/src/test/java/nu/marginalia/bbpc/BrailleBlockPunchCardsTest.java b/code/libraries/braille-block-punch-cards/test/nu/marginalia/bbpc/BrailleBlockPunchCardsTest.java similarity index 100% rename from code/libraries/braille-block-punch-cards/src/test/java/nu/marginalia/bbpc/BrailleBlockPunchCardsTest.java rename to code/libraries/braille-block-punch-cards/test/nu/marginalia/bbpc/BrailleBlockPunchCardsTest.java diff --git a/code/libraries/btree/build.gradle b/code/libraries/btree/build.gradle index d39af03c..99917255 100644 --- a/code/libraries/btree/build.gradle +++ b/code/libraries/btree/build.gradle @@ -8,6 +8,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':code:libraries:array') implementation project(':code:libraries:next-prime') diff --git a/code/libraries/btree/src/main/java/nu/marginalia/btree/BTreeDogEar.java b/code/libraries/btree/java/nu/marginalia/btree/BTreeDogEar.java similarity index 100% rename from code/libraries/btree/src/main/java/nu/marginalia/btree/BTreeDogEar.java rename to code/libraries/btree/java/nu/marginalia/btree/BTreeDogEar.java diff --git a/code/libraries/btree/src/main/java/nu/marginalia/btree/BTreeReader.java b/code/libraries/btree/java/nu/marginalia/btree/BTreeReader.java similarity index 100% rename from code/libraries/btree/src/main/java/nu/marginalia/btree/BTreeReader.java rename to code/libraries/btree/java/nu/marginalia/btree/BTreeReader.java diff --git a/code/libraries/btree/src/main/java/nu/marginalia/btree/BTreeWriteCallback.java b/code/libraries/btree/java/nu/marginalia/btree/BTreeWriteCallback.java similarity index 100% rename from code/libraries/btree/src/main/java/nu/marginalia/btree/BTreeWriteCallback.java rename to code/libraries/btree/java/nu/marginalia/btree/BTreeWriteCallback.java diff --git a/code/libraries/btree/src/main/java/nu/marginalia/btree/BTreeWriter.java b/code/libraries/btree/java/nu/marginalia/btree/BTreeWriter.java similarity index 100% rename from code/libraries/btree/src/main/java/nu/marginalia/btree/BTreeWriter.java rename to code/libraries/btree/java/nu/marginalia/btree/BTreeWriter.java diff --git a/code/libraries/btree/src/main/java/nu/marginalia/btree/model/BTreeBlockSize.java b/code/libraries/btree/java/nu/marginalia/btree/model/BTreeBlockSize.java similarity index 100% rename from code/libraries/btree/src/main/java/nu/marginalia/btree/model/BTreeBlockSize.java rename to code/libraries/btree/java/nu/marginalia/btree/model/BTreeBlockSize.java diff --git a/code/libraries/btree/src/main/java/nu/marginalia/btree/model/BTreeContext.java b/code/libraries/btree/java/nu/marginalia/btree/model/BTreeContext.java similarity index 100% rename from code/libraries/btree/src/main/java/nu/marginalia/btree/model/BTreeContext.java rename to code/libraries/btree/java/nu/marginalia/btree/model/BTreeContext.java diff --git a/code/libraries/btree/src/main/java/nu/marginalia/btree/model/BTreeHeader.java b/code/libraries/btree/java/nu/marginalia/btree/model/BTreeHeader.java similarity index 100% rename from code/libraries/btree/src/main/java/nu/marginalia/btree/model/BTreeHeader.java rename to code/libraries/btree/java/nu/marginalia/btree/model/BTreeHeader.java diff --git a/code/libraries/btree/src/test/java/nu/marginalia/btree/BTreeReaderQueryDataWithIndexTest.java b/code/libraries/btree/test/nu/marginalia/btree/BTreeReaderQueryDataWithIndexTest.java similarity index 100% rename from code/libraries/btree/src/test/java/nu/marginalia/btree/BTreeReaderQueryDataWithIndexTest.java rename to code/libraries/btree/test/nu/marginalia/btree/BTreeReaderQueryDataWithIndexTest.java diff --git a/code/libraries/btree/src/test/java/nu/marginalia/btree/BTreeReaderQueryDataWithoutIndexTest.java b/code/libraries/btree/test/nu/marginalia/btree/BTreeReaderQueryDataWithoutIndexTest.java similarity index 100% rename from code/libraries/btree/src/test/java/nu/marginalia/btree/BTreeReaderQueryDataWithoutIndexTest.java rename to code/libraries/btree/test/nu/marginalia/btree/BTreeReaderQueryDataWithoutIndexTest.java diff --git a/code/libraries/btree/src/test/java/nu/marginalia/btree/BTreeReaderRejectRetainWithIndexTest.java b/code/libraries/btree/test/nu/marginalia/btree/BTreeReaderRejectRetainWithIndexTest.java similarity index 100% rename from code/libraries/btree/src/test/java/nu/marginalia/btree/BTreeReaderRejectRetainWithIndexTest.java rename to code/libraries/btree/test/nu/marginalia/btree/BTreeReaderRejectRetainWithIndexTest.java diff --git a/code/libraries/btree/src/test/java/nu/marginalia/btree/BTreeReaderRejectRetainWithoutIndexTest.java b/code/libraries/btree/test/nu/marginalia/btree/BTreeReaderRejectRetainWithoutIndexTest.java similarity index 100% rename from code/libraries/btree/src/test/java/nu/marginalia/btree/BTreeReaderRejectRetainWithoutIndexTest.java rename to code/libraries/btree/test/nu/marginalia/btree/BTreeReaderRejectRetainWithoutIndexTest.java diff --git a/code/libraries/btree/src/test/java/nu/marginalia/btree/BTreeWriterTest.java b/code/libraries/btree/test/nu/marginalia/btree/BTreeWriterTest.java similarity index 100% rename from code/libraries/btree/src/test/java/nu/marginalia/btree/BTreeWriterTest.java rename to code/libraries/btree/test/nu/marginalia/btree/BTreeWriterTest.java diff --git a/code/libraries/easy-lsh/build.gradle b/code/libraries/easy-lsh/build.gradle index e8b11046..74fd976e 100644 --- a/code/libraries/easy-lsh/build.gradle +++ b/code/libraries/easy-lsh/build.gradle @@ -8,6 +8,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation libs.bundles.slf4j diff --git a/code/libraries/easy-lsh/src/main/java/nu/marginalia/lsh/EasyLSH.java b/code/libraries/easy-lsh/java/nu/marginalia/lsh/EasyLSH.java similarity index 100% rename from code/libraries/easy-lsh/src/main/java/nu/marginalia/lsh/EasyLSH.java rename to code/libraries/easy-lsh/java/nu/marginalia/lsh/EasyLSH.java diff --git a/code/libraries/easy-lsh/src/test/java/nu/marginalia/lsh/EasyLSHTest.java b/code/libraries/easy-lsh/test/nu/marginalia/lsh/EasyLSHTest.java similarity index 100% rename from code/libraries/easy-lsh/src/test/java/nu/marginalia/lsh/EasyLSHTest.java rename to code/libraries/easy-lsh/test/nu/marginalia/lsh/EasyLSHTest.java diff --git a/code/libraries/geo-ip/build.gradle b/code/libraries/geo-ip/build.gradle index b0180ef8..a47f64a5 100644 --- a/code/libraries/geo-ip/build.gradle +++ b/code/libraries/geo-ip/build.gradle @@ -8,6 +8,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':code:common:config') diff --git a/code/libraries/geo-ip/src/main/java/nu/marginalia/geoip/GeoIpDictionary.java b/code/libraries/geo-ip/java/nu/marginalia/geoip/GeoIpDictionary.java similarity index 100% rename from code/libraries/geo-ip/src/main/java/nu/marginalia/geoip/GeoIpDictionary.java rename to code/libraries/geo-ip/java/nu/marginalia/geoip/GeoIpDictionary.java diff --git a/code/libraries/geo-ip/src/main/java/nu/marginalia/geoip/sources/AsnMapping.java b/code/libraries/geo-ip/java/nu/marginalia/geoip/sources/AsnMapping.java similarity index 100% rename from code/libraries/geo-ip/src/main/java/nu/marginalia/geoip/sources/AsnMapping.java rename to code/libraries/geo-ip/java/nu/marginalia/geoip/sources/AsnMapping.java diff --git a/code/libraries/geo-ip/src/main/java/nu/marginalia/geoip/sources/AsnTable.java b/code/libraries/geo-ip/java/nu/marginalia/geoip/sources/AsnTable.java similarity index 100% rename from code/libraries/geo-ip/src/main/java/nu/marginalia/geoip/sources/AsnTable.java rename to code/libraries/geo-ip/java/nu/marginalia/geoip/sources/AsnTable.java diff --git a/code/libraries/geo-ip/src/main/java/nu/marginalia/geoip/sources/IP2LocationMapping.java b/code/libraries/geo-ip/java/nu/marginalia/geoip/sources/IP2LocationMapping.java similarity index 100% rename from code/libraries/geo-ip/src/main/java/nu/marginalia/geoip/sources/IP2LocationMapping.java rename to code/libraries/geo-ip/java/nu/marginalia/geoip/sources/IP2LocationMapping.java diff --git a/code/libraries/geo-ip/src/main/java/nu/marginalia/geoip/sources/IpRangeMapping.java b/code/libraries/geo-ip/java/nu/marginalia/geoip/sources/IpRangeMapping.java similarity index 100% rename from code/libraries/geo-ip/src/main/java/nu/marginalia/geoip/sources/IpRangeMapping.java rename to code/libraries/geo-ip/java/nu/marginalia/geoip/sources/IpRangeMapping.java diff --git a/code/libraries/geo-ip/src/test/java/nu/marginalia/geoip/GeoIpDictionaryTest.java b/code/libraries/geo-ip/test/nu/marginalia/geoip/GeoIpDictionaryTest.java similarity index 100% rename from code/libraries/geo-ip/src/test/java/nu/marginalia/geoip/GeoIpDictionaryTest.java rename to code/libraries/geo-ip/test/nu/marginalia/geoip/GeoIpDictionaryTest.java diff --git a/code/libraries/guarded-regex/build.gradle b/code/libraries/guarded-regex/build.gradle index 8640776d..6faa6f3c 100644 --- a/code/libraries/guarded-regex/build.gradle +++ b/code/libraries/guarded-regex/build.gradle @@ -8,6 +8,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation libs.bundles.slf4j diff --git a/code/libraries/guarded-regex/src/main/java/nu/marginalia/gregex/GuardedRegex.java b/code/libraries/guarded-regex/java/nu/marginalia/gregex/GuardedRegex.java similarity index 100% rename from code/libraries/guarded-regex/src/main/java/nu/marginalia/gregex/GuardedRegex.java rename to code/libraries/guarded-regex/java/nu/marginalia/gregex/GuardedRegex.java diff --git a/code/libraries/guarded-regex/src/main/java/nu/marginalia/gregex/GuardedRegexFactory.java b/code/libraries/guarded-regex/java/nu/marginalia/gregex/GuardedRegexFactory.java similarity index 100% rename from code/libraries/guarded-regex/src/main/java/nu/marginalia/gregex/GuardedRegexFactory.java rename to code/libraries/guarded-regex/java/nu/marginalia/gregex/GuardedRegexFactory.java diff --git a/code/libraries/language-processing/build.gradle b/code/libraries/language-processing/build.gradle index 266bcfb4..56abe731 100644 --- a/code/libraries/language-processing/build.gradle +++ b/code/libraries/language-processing/build.gradle @@ -9,6 +9,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':third-party:rdrpostagger') implementation project(':third-party:porterstemmer') diff --git a/code/libraries/language-processing/src/main/java/nu/marginalia/language/WordDictionary.java b/code/libraries/language-processing/java/nu/marginalia/language/WordDictionary.java similarity index 100% rename from code/libraries/language-processing/src/main/java/nu/marginalia/language/WordDictionary.java rename to code/libraries/language-processing/java/nu/marginalia/language/WordDictionary.java diff --git a/code/libraries/language-processing/src/main/java/nu/marginalia/language/WordPatterns.java b/code/libraries/language-processing/java/nu/marginalia/language/WordPatterns.java similarity index 100% rename from code/libraries/language-processing/src/main/java/nu/marginalia/language/WordPatterns.java rename to code/libraries/language-processing/java/nu/marginalia/language/WordPatterns.java diff --git a/code/libraries/language-processing/src/main/java/nu/marginalia/language/encoding/AsciiFlattener.java b/code/libraries/language-processing/java/nu/marginalia/language/encoding/AsciiFlattener.java similarity index 100% rename from code/libraries/language-processing/src/main/java/nu/marginalia/language/encoding/AsciiFlattener.java rename to code/libraries/language-processing/java/nu/marginalia/language/encoding/AsciiFlattener.java diff --git a/code/libraries/language-processing/src/main/java/nu/marginalia/language/encoding/UnicodeRanges.java b/code/libraries/language-processing/java/nu/marginalia/language/encoding/UnicodeRanges.java similarity index 100% rename from code/libraries/language-processing/src/main/java/nu/marginalia/language/encoding/UnicodeRanges.java rename to code/libraries/language-processing/java/nu/marginalia/language/encoding/UnicodeRanges.java diff --git a/code/libraries/language-processing/src/main/java/nu/marginalia/language/filter/FasttextLanguagePredictionModel.java b/code/libraries/language-processing/java/nu/marginalia/language/filter/FasttextLanguagePredictionModel.java similarity index 100% rename from code/libraries/language-processing/src/main/java/nu/marginalia/language/filter/FasttextLanguagePredictionModel.java rename to code/libraries/language-processing/java/nu/marginalia/language/filter/FasttextLanguagePredictionModel.java diff --git a/code/libraries/language-processing/src/main/java/nu/marginalia/language/filter/LanguageFilter.java b/code/libraries/language-processing/java/nu/marginalia/language/filter/LanguageFilter.java similarity index 100% rename from code/libraries/language-processing/src/main/java/nu/marginalia/language/filter/LanguageFilter.java rename to code/libraries/language-processing/java/nu/marginalia/language/filter/LanguageFilter.java diff --git a/code/libraries/language-processing/src/main/java/nu/marginalia/language/filter/LanguagePredictionModel.java b/code/libraries/language-processing/java/nu/marginalia/language/filter/LanguagePredictionModel.java similarity index 100% rename from code/libraries/language-processing/src/main/java/nu/marginalia/language/filter/LanguagePredictionModel.java rename to code/libraries/language-processing/java/nu/marginalia/language/filter/LanguagePredictionModel.java diff --git a/code/libraries/language-processing/src/main/java/nu/marginalia/language/filter/UngaBungaLanguagePredictionModel.java b/code/libraries/language-processing/java/nu/marginalia/language/filter/UngaBungaLanguagePredictionModel.java similarity index 100% rename from code/libraries/language-processing/src/main/java/nu/marginalia/language/filter/UngaBungaLanguagePredictionModel.java rename to code/libraries/language-processing/java/nu/marginalia/language/filter/UngaBungaLanguagePredictionModel.java diff --git a/code/libraries/language-processing/src/main/java/nu/marginalia/language/model/DocumentLanguageData.java b/code/libraries/language-processing/java/nu/marginalia/language/model/DocumentLanguageData.java similarity index 100% rename from code/libraries/language-processing/src/main/java/nu/marginalia/language/model/DocumentLanguageData.java rename to code/libraries/language-processing/java/nu/marginalia/language/model/DocumentLanguageData.java diff --git a/code/libraries/language-processing/src/main/java/nu/marginalia/language/model/DocumentSentence.java b/code/libraries/language-processing/java/nu/marginalia/language/model/DocumentSentence.java similarity index 100% rename from code/libraries/language-processing/src/main/java/nu/marginalia/language/model/DocumentSentence.java rename to code/libraries/language-processing/java/nu/marginalia/language/model/DocumentSentence.java diff --git a/code/libraries/language-processing/src/main/java/nu/marginalia/language/model/WordFrequencyData.java b/code/libraries/language-processing/java/nu/marginalia/language/model/WordFrequencyData.java similarity index 100% rename from code/libraries/language-processing/src/main/java/nu/marginalia/language/model/WordFrequencyData.java rename to code/libraries/language-processing/java/nu/marginalia/language/model/WordFrequencyData.java diff --git a/code/libraries/language-processing/src/main/java/nu/marginalia/language/model/WordRep.java b/code/libraries/language-processing/java/nu/marginalia/language/model/WordRep.java similarity index 100% rename from code/libraries/language-processing/src/main/java/nu/marginalia/language/model/WordRep.java rename to code/libraries/language-processing/java/nu/marginalia/language/model/WordRep.java diff --git a/code/libraries/language-processing/src/main/java/nu/marginalia/language/model/WordSeparator.java b/code/libraries/language-processing/java/nu/marginalia/language/model/WordSeparator.java similarity index 100% rename from code/libraries/language-processing/src/main/java/nu/marginalia/language/model/WordSeparator.java rename to code/libraries/language-processing/java/nu/marginalia/language/model/WordSeparator.java diff --git a/code/libraries/language-processing/src/main/java/nu/marginalia/language/model/WordSpan.java b/code/libraries/language-processing/java/nu/marginalia/language/model/WordSpan.java similarity index 100% rename from code/libraries/language-processing/src/main/java/nu/marginalia/language/model/WordSpan.java rename to code/libraries/language-processing/java/nu/marginalia/language/model/WordSpan.java diff --git a/code/libraries/language-processing/src/main/java/nu/marginalia/language/sentence/SentenceExtractor.java b/code/libraries/language-processing/java/nu/marginalia/language/sentence/SentenceExtractor.java similarity index 100% rename from code/libraries/language-processing/src/main/java/nu/marginalia/language/sentence/SentenceExtractor.java rename to code/libraries/language-processing/java/nu/marginalia/language/sentence/SentenceExtractor.java diff --git a/code/libraries/language-processing/src/main/java/nu/marginalia/language/sentence/SentenceExtractorHtmlTagCleaner.java b/code/libraries/language-processing/java/nu/marginalia/language/sentence/SentenceExtractorHtmlTagCleaner.java similarity index 100% rename from code/libraries/language-processing/src/main/java/nu/marginalia/language/sentence/SentenceExtractorHtmlTagCleaner.java rename to code/libraries/language-processing/java/nu/marginalia/language/sentence/SentenceExtractorHtmlTagCleaner.java diff --git a/code/libraries/language-processing/src/main/java/nu/marginalia/language/sentence/SentenceExtractorStringUtils.java b/code/libraries/language-processing/java/nu/marginalia/language/sentence/SentenceExtractorStringUtils.java similarity index 100% rename from code/libraries/language-processing/src/main/java/nu/marginalia/language/sentence/SentenceExtractorStringUtils.java rename to code/libraries/language-processing/java/nu/marginalia/language/sentence/SentenceExtractorStringUtils.java diff --git a/code/libraries/language-processing/src/main/java/nu/marginalia/language/sentence/SentencePreCleaner.java b/code/libraries/language-processing/java/nu/marginalia/language/sentence/SentencePreCleaner.java similarity index 100% rename from code/libraries/language-processing/src/main/java/nu/marginalia/language/sentence/SentencePreCleaner.java rename to code/libraries/language-processing/java/nu/marginalia/language/sentence/SentencePreCleaner.java diff --git a/code/libraries/language-processing/src/main/java/nu/marginalia/language/sentence/SentenceSegmentSplitter.java b/code/libraries/language-processing/java/nu/marginalia/language/sentence/SentenceSegmentSplitter.java similarity index 100% rename from code/libraries/language-processing/src/main/java/nu/marginalia/language/sentence/SentenceSegmentSplitter.java rename to code/libraries/language-processing/java/nu/marginalia/language/sentence/SentenceSegmentSplitter.java diff --git a/code/libraries/language-processing/src/main/java/nu/marginalia/language/sentence/ThreadLocalSentenceExtractorProvider.java b/code/libraries/language-processing/java/nu/marginalia/language/sentence/ThreadLocalSentenceExtractorProvider.java similarity index 100% rename from code/libraries/language-processing/src/main/java/nu/marginalia/language/sentence/ThreadLocalSentenceExtractorProvider.java rename to code/libraries/language-processing/java/nu/marginalia/language/sentence/ThreadLocalSentenceExtractorProvider.java diff --git a/code/libraries/language-processing/src/main/resources/dictionary/en-1000 b/code/libraries/language-processing/resources/dictionary/en-1000 similarity index 100% rename from code/libraries/language-processing/src/main/resources/dictionary/en-1000 rename to code/libraries/language-processing/resources/dictionary/en-1000 diff --git a/code/libraries/language-processing/src/main/resources/dictionary/en-stopwords b/code/libraries/language-processing/resources/dictionary/en-stopwords similarity index 100% rename from code/libraries/language-processing/src/main/resources/dictionary/en-stopwords rename to code/libraries/language-processing/resources/dictionary/en-stopwords diff --git a/code/libraries/language-processing/src/main/resources/dictionary/en-words b/code/libraries/language-processing/resources/dictionary/en-words similarity index 100% rename from code/libraries/language-processing/src/main/resources/dictionary/en-words rename to code/libraries/language-processing/resources/dictionary/en-words diff --git a/code/libraries/language-processing/src/main/resources/dictionary/latin-1000 b/code/libraries/language-processing/resources/dictionary/latin-1000 similarity index 100% rename from code/libraries/language-processing/src/main/resources/dictionary/latin-1000 rename to code/libraries/language-processing/resources/dictionary/latin-1000 diff --git a/code/libraries/language-processing/src/main/resources/dictionary/swe-1000 b/code/libraries/language-processing/resources/dictionary/swe-1000 similarity index 100% rename from code/libraries/language-processing/src/main/resources/dictionary/swe-1000 rename to code/libraries/language-processing/resources/dictionary/swe-1000 diff --git a/code/libraries/language-processing/src/main/resources/dictionary/word-frequency b/code/libraries/language-processing/resources/dictionary/word-frequency similarity index 100% rename from code/libraries/language-processing/src/main/resources/dictionary/word-frequency rename to code/libraries/language-processing/resources/dictionary/word-frequency diff --git a/code/libraries/language-processing/src/test/resources/html/jep.html b/code/libraries/language-processing/test-resources/html/jep.html similarity index 100% rename from code/libraries/language-processing/src/test/resources/html/jep.html rename to code/libraries/language-processing/test-resources/html/jep.html diff --git a/code/libraries/language-processing/src/test/resources/html/spam.html b/code/libraries/language-processing/test-resources/html/spam.html similarity index 100% rename from code/libraries/language-processing/src/test/resources/html/spam.html rename to code/libraries/language-processing/test-resources/html/spam.html diff --git a/code/libraries/language-processing/src/test/java/nu/marginalia/language/encoding/AsciiFlattenerTest.java b/code/libraries/language-processing/test/nu/marginalia/language/encoding/AsciiFlattenerTest.java similarity index 100% rename from code/libraries/language-processing/src/test/java/nu/marginalia/language/encoding/AsciiFlattenerTest.java rename to code/libraries/language-processing/test/nu/marginalia/language/encoding/AsciiFlattenerTest.java diff --git a/code/libraries/language-processing/src/test/java/nu/marginalia/language/encoding/SentenceExtractorHtmlTagCleanerTest.java b/code/libraries/language-processing/test/nu/marginalia/language/encoding/SentenceExtractorHtmlTagCleanerTest.java similarity index 100% rename from code/libraries/language-processing/src/test/java/nu/marginalia/language/encoding/SentenceExtractorHtmlTagCleanerTest.java rename to code/libraries/language-processing/test/nu/marginalia/language/encoding/SentenceExtractorHtmlTagCleanerTest.java diff --git a/code/libraries/language-processing/src/test/java/nu/marginalia/language/filter/LanguageFilterTest.java b/code/libraries/language-processing/test/nu/marginalia/language/filter/LanguageFilterTest.java similarity index 100% rename from code/libraries/language-processing/src/test/java/nu/marginalia/language/filter/LanguageFilterTest.java rename to code/libraries/language-processing/test/nu/marginalia/language/filter/LanguageFilterTest.java diff --git a/code/libraries/language-processing/src/test/java/nu/marginalia/language/filter/TestLanguageModels.java b/code/libraries/language-processing/test/nu/marginalia/language/filter/TestLanguageModels.java similarity index 100% rename from code/libraries/language-processing/src/test/java/nu/marginalia/language/filter/TestLanguageModels.java rename to code/libraries/language-processing/test/nu/marginalia/language/filter/TestLanguageModels.java diff --git a/code/libraries/language-processing/src/test/java/nu/marginalia/language/sentence/SentenceExtractorTest.java b/code/libraries/language-processing/test/nu/marginalia/language/sentence/SentenceExtractorTest.java similarity index 100% rename from code/libraries/language-processing/src/test/java/nu/marginalia/language/sentence/SentenceExtractorTest.java rename to code/libraries/language-processing/test/nu/marginalia/language/sentence/SentenceExtractorTest.java diff --git a/code/libraries/message-queue/build.gradle b/code/libraries/message-queue/build.gradle index e3572cf6..5931a76e 100644 --- a/code/libraries/message-queue/build.gradle +++ b/code/libraries/message-queue/build.gradle @@ -9,6 +9,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation libs.spark implementation libs.guice diff --git a/code/libraries/message-queue/src/main/java/nu/marginalia/actor/ActorStateMachine.java b/code/libraries/message-queue/java/nu/marginalia/actor/ActorStateMachine.java similarity index 100% rename from code/libraries/message-queue/src/main/java/nu/marginalia/actor/ActorStateMachine.java rename to code/libraries/message-queue/java/nu/marginalia/actor/ActorStateMachine.java diff --git a/code/libraries/message-queue/src/main/java/nu/marginalia/actor/ExpectedMessage.java b/code/libraries/message-queue/java/nu/marginalia/actor/ExpectedMessage.java similarity index 100% rename from code/libraries/message-queue/src/main/java/nu/marginalia/actor/ExpectedMessage.java rename to code/libraries/message-queue/java/nu/marginalia/actor/ExpectedMessage.java diff --git a/code/libraries/message-queue/src/main/java/nu/marginalia/actor/prototype/ActorPrototype.java b/code/libraries/message-queue/java/nu/marginalia/actor/prototype/ActorPrototype.java similarity index 100% rename from code/libraries/message-queue/src/main/java/nu/marginalia/actor/prototype/ActorPrototype.java rename to code/libraries/message-queue/java/nu/marginalia/actor/prototype/ActorPrototype.java diff --git a/code/libraries/message-queue/src/main/java/nu/marginalia/actor/prototype/RecordActorPrototype.java b/code/libraries/message-queue/java/nu/marginalia/actor/prototype/RecordActorPrototype.java similarity index 100% rename from code/libraries/message-queue/src/main/java/nu/marginalia/actor/prototype/RecordActorPrototype.java rename to code/libraries/message-queue/java/nu/marginalia/actor/prototype/RecordActorPrototype.java diff --git a/code/libraries/message-queue/src/main/java/nu/marginalia/actor/state/ActorControlFlowException.java b/code/libraries/message-queue/java/nu/marginalia/actor/state/ActorControlFlowException.java similarity index 100% rename from code/libraries/message-queue/src/main/java/nu/marginalia/actor/state/ActorControlFlowException.java rename to code/libraries/message-queue/java/nu/marginalia/actor/state/ActorControlFlowException.java diff --git a/code/libraries/message-queue/src/main/java/nu/marginalia/actor/state/ActorResumeBehavior.java b/code/libraries/message-queue/java/nu/marginalia/actor/state/ActorResumeBehavior.java similarity index 100% rename from code/libraries/message-queue/src/main/java/nu/marginalia/actor/state/ActorResumeBehavior.java rename to code/libraries/message-queue/java/nu/marginalia/actor/state/ActorResumeBehavior.java diff --git a/code/libraries/message-queue/src/main/java/nu/marginalia/actor/state/ActorStateInstance.java b/code/libraries/message-queue/java/nu/marginalia/actor/state/ActorStateInstance.java similarity index 100% rename from code/libraries/message-queue/src/main/java/nu/marginalia/actor/state/ActorStateInstance.java rename to code/libraries/message-queue/java/nu/marginalia/actor/state/ActorStateInstance.java diff --git a/code/libraries/message-queue/src/main/java/nu/marginalia/actor/state/ActorStateTransition.java b/code/libraries/message-queue/java/nu/marginalia/actor/state/ActorStateTransition.java similarity index 100% rename from code/libraries/message-queue/src/main/java/nu/marginalia/actor/state/ActorStateTransition.java rename to code/libraries/message-queue/java/nu/marginalia/actor/state/ActorStateTransition.java diff --git a/code/libraries/message-queue/src/main/java/nu/marginalia/actor/state/ActorStep.java b/code/libraries/message-queue/java/nu/marginalia/actor/state/ActorStep.java similarity index 100% rename from code/libraries/message-queue/src/main/java/nu/marginalia/actor/state/ActorStep.java rename to code/libraries/message-queue/java/nu/marginalia/actor/state/ActorStep.java diff --git a/code/libraries/message-queue/src/main/java/nu/marginalia/actor/state/Resume.java b/code/libraries/message-queue/java/nu/marginalia/actor/state/Resume.java similarity index 100% rename from code/libraries/message-queue/src/main/java/nu/marginalia/actor/state/Resume.java rename to code/libraries/message-queue/java/nu/marginalia/actor/state/Resume.java diff --git a/code/libraries/message-queue/src/main/java/nu/marginalia/actor/state/Terminal.java b/code/libraries/message-queue/java/nu/marginalia/actor/state/Terminal.java similarity index 100% rename from code/libraries/message-queue/src/main/java/nu/marginalia/actor/state/Terminal.java rename to code/libraries/message-queue/java/nu/marginalia/actor/state/Terminal.java diff --git a/code/libraries/message-queue/src/main/java/nu/marginalia/mq/MessageQueueFactory.java b/code/libraries/message-queue/java/nu/marginalia/mq/MessageQueueFactory.java similarity index 100% rename from code/libraries/message-queue/src/main/java/nu/marginalia/mq/MessageQueueFactory.java rename to code/libraries/message-queue/java/nu/marginalia/mq/MessageQueueFactory.java diff --git a/code/libraries/message-queue/src/main/java/nu/marginalia/mq/MqException.java b/code/libraries/message-queue/java/nu/marginalia/mq/MqException.java similarity index 100% rename from code/libraries/message-queue/src/main/java/nu/marginalia/mq/MqException.java rename to code/libraries/message-queue/java/nu/marginalia/mq/MqException.java diff --git a/code/libraries/message-queue/src/main/java/nu/marginalia/mq/MqMessage.java b/code/libraries/message-queue/java/nu/marginalia/mq/MqMessage.java similarity index 100% rename from code/libraries/message-queue/src/main/java/nu/marginalia/mq/MqMessage.java rename to code/libraries/message-queue/java/nu/marginalia/mq/MqMessage.java diff --git a/code/libraries/message-queue/src/main/java/nu/marginalia/mq/MqMessageState.java b/code/libraries/message-queue/java/nu/marginalia/mq/MqMessageState.java similarity index 100% rename from code/libraries/message-queue/src/main/java/nu/marginalia/mq/MqMessageState.java rename to code/libraries/message-queue/java/nu/marginalia/mq/MqMessageState.java diff --git a/code/libraries/message-queue/src/main/java/nu/marginalia/mq/inbox/MqAsynchronousInbox.java b/code/libraries/message-queue/java/nu/marginalia/mq/inbox/MqAsynchronousInbox.java similarity index 100% rename from code/libraries/message-queue/src/main/java/nu/marginalia/mq/inbox/MqAsynchronousInbox.java rename to code/libraries/message-queue/java/nu/marginalia/mq/inbox/MqAsynchronousInbox.java diff --git a/code/libraries/message-queue/src/main/java/nu/marginalia/mq/inbox/MqInboxIf.java b/code/libraries/message-queue/java/nu/marginalia/mq/inbox/MqInboxIf.java similarity index 100% rename from code/libraries/message-queue/src/main/java/nu/marginalia/mq/inbox/MqInboxIf.java rename to code/libraries/message-queue/java/nu/marginalia/mq/inbox/MqInboxIf.java diff --git a/code/libraries/message-queue/src/main/java/nu/marginalia/mq/inbox/MqInboxResponse.java b/code/libraries/message-queue/java/nu/marginalia/mq/inbox/MqInboxResponse.java similarity index 100% rename from code/libraries/message-queue/src/main/java/nu/marginalia/mq/inbox/MqInboxResponse.java rename to code/libraries/message-queue/java/nu/marginalia/mq/inbox/MqInboxResponse.java diff --git a/code/libraries/message-queue/src/main/java/nu/marginalia/mq/inbox/MqInboxShredder.java b/code/libraries/message-queue/java/nu/marginalia/mq/inbox/MqInboxShredder.java similarity index 100% rename from code/libraries/message-queue/src/main/java/nu/marginalia/mq/inbox/MqInboxShredder.java rename to code/libraries/message-queue/java/nu/marginalia/mq/inbox/MqInboxShredder.java diff --git a/code/libraries/message-queue/src/main/java/nu/marginalia/mq/inbox/MqSingleShotInbox.java b/code/libraries/message-queue/java/nu/marginalia/mq/inbox/MqSingleShotInbox.java similarity index 100% rename from code/libraries/message-queue/src/main/java/nu/marginalia/mq/inbox/MqSingleShotInbox.java rename to code/libraries/message-queue/java/nu/marginalia/mq/inbox/MqSingleShotInbox.java diff --git a/code/libraries/message-queue/src/main/java/nu/marginalia/mq/inbox/MqSubscription.java b/code/libraries/message-queue/java/nu/marginalia/mq/inbox/MqSubscription.java similarity index 100% rename from code/libraries/message-queue/src/main/java/nu/marginalia/mq/inbox/MqSubscription.java rename to code/libraries/message-queue/java/nu/marginalia/mq/inbox/MqSubscription.java diff --git a/code/libraries/message-queue/src/main/java/nu/marginalia/mq/inbox/MqSynchronousInbox.java b/code/libraries/message-queue/java/nu/marginalia/mq/inbox/MqSynchronousInbox.java similarity index 100% rename from code/libraries/message-queue/src/main/java/nu/marginalia/mq/inbox/MqSynchronousInbox.java rename to code/libraries/message-queue/java/nu/marginalia/mq/inbox/MqSynchronousInbox.java diff --git a/code/libraries/message-queue/src/main/java/nu/marginalia/mq/outbox/MqOutbox.java b/code/libraries/message-queue/java/nu/marginalia/mq/outbox/MqOutbox.java similarity index 100% rename from code/libraries/message-queue/src/main/java/nu/marginalia/mq/outbox/MqOutbox.java rename to code/libraries/message-queue/java/nu/marginalia/mq/outbox/MqOutbox.java diff --git a/code/libraries/message-queue/src/main/java/nu/marginalia/mq/persistence/MqMessageHandlerRegistry.java b/code/libraries/message-queue/java/nu/marginalia/mq/persistence/MqMessageHandlerRegistry.java similarity index 100% rename from code/libraries/message-queue/src/main/java/nu/marginalia/mq/persistence/MqMessageHandlerRegistry.java rename to code/libraries/message-queue/java/nu/marginalia/mq/persistence/MqMessageHandlerRegistry.java diff --git a/code/libraries/message-queue/src/main/java/nu/marginalia/mq/persistence/MqPersistence.java b/code/libraries/message-queue/java/nu/marginalia/mq/persistence/MqPersistence.java similarity index 100% rename from code/libraries/message-queue/src/main/java/nu/marginalia/mq/persistence/MqPersistence.java rename to code/libraries/message-queue/java/nu/marginalia/mq/persistence/MqPersistence.java diff --git a/code/libraries/message-queue/src/test/java/nu/marginalia/actor/ActorRecordMachineTest.java b/code/libraries/message-queue/test/nu/marginalia/actor/ActorRecordMachineTest.java similarity index 100% rename from code/libraries/message-queue/src/test/java/nu/marginalia/actor/ActorRecordMachineTest.java rename to code/libraries/message-queue/test/nu/marginalia/actor/ActorRecordMachineTest.java diff --git a/code/libraries/message-queue/src/test/java/nu/marginalia/mq/MqMessageRow.java b/code/libraries/message-queue/test/nu/marginalia/mq/MqMessageRow.java similarity index 100% rename from code/libraries/message-queue/src/test/java/nu/marginalia/mq/MqMessageRow.java rename to code/libraries/message-queue/test/nu/marginalia/mq/MqMessageRow.java diff --git a/code/libraries/message-queue/src/test/java/nu/marginalia/mq/MqTestUtil.java b/code/libraries/message-queue/test/nu/marginalia/mq/MqTestUtil.java similarity index 100% rename from code/libraries/message-queue/src/test/java/nu/marginalia/mq/MqTestUtil.java rename to code/libraries/message-queue/test/nu/marginalia/mq/MqTestUtil.java diff --git a/code/libraries/message-queue/src/test/java/nu/marginalia/mq/outbox/MqOutboxTest.java b/code/libraries/message-queue/test/nu/marginalia/mq/outbox/MqOutboxTest.java similarity index 100% rename from code/libraries/message-queue/src/test/java/nu/marginalia/mq/outbox/MqOutboxTest.java rename to code/libraries/message-queue/test/nu/marginalia/mq/outbox/MqOutboxTest.java diff --git a/code/libraries/message-queue/src/test/java/nu/marginalia/mq/persistence/MqPersistenceTest.java b/code/libraries/message-queue/test/nu/marginalia/mq/persistence/MqPersistenceTest.java similarity index 100% rename from code/libraries/message-queue/src/test/java/nu/marginalia/mq/persistence/MqPersistenceTest.java rename to code/libraries/message-queue/test/nu/marginalia/mq/persistence/MqPersistenceTest.java diff --git a/code/libraries/next-prime/build.gradle b/code/libraries/next-prime/build.gradle index e716f1c8..8c5609a5 100644 --- a/code/libraries/next-prime/build.gradle +++ b/code/libraries/next-prime/build.gradle @@ -8,6 +8,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation libs.bundles.slf4j diff --git a/code/libraries/next-prime/src/main/java/nu/marginalia/util/NextPrimeUtil.java b/code/libraries/next-prime/java/nu/marginalia/util/NextPrimeUtil.java similarity index 100% rename from code/libraries/next-prime/src/main/java/nu/marginalia/util/NextPrimeUtil.java rename to code/libraries/next-prime/java/nu/marginalia/util/NextPrimeUtil.java diff --git a/code/libraries/next-prime/src/test/java/nu/marginalia/util/NextPrimeUtilTest.java b/code/libraries/next-prime/test/nu/marginalia/util/NextPrimeUtilTest.java similarity index 100% rename from code/libraries/next-prime/src/test/java/nu/marginalia/util/NextPrimeUtilTest.java rename to code/libraries/next-prime/test/nu/marginalia/util/NextPrimeUtilTest.java diff --git a/code/libraries/random-write-funnel/build.gradle b/code/libraries/random-write-funnel/build.gradle index 997ff739..9d23af16 100644 --- a/code/libraries/random-write-funnel/build.gradle +++ b/code/libraries/random-write-funnel/build.gradle @@ -8,6 +8,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':code:libraries:array') diff --git a/code/libraries/random-write-funnel/src/main/java/nu/marginalia/rwf/RandomFileAssembler.java b/code/libraries/random-write-funnel/java/nu/marginalia/rwf/RandomFileAssembler.java similarity index 100% rename from code/libraries/random-write-funnel/src/main/java/nu/marginalia/rwf/RandomFileAssembler.java rename to code/libraries/random-write-funnel/java/nu/marginalia/rwf/RandomFileAssembler.java diff --git a/code/libraries/random-write-funnel/src/main/java/nu/marginalia/rwf/RandomWriteFunnel.java b/code/libraries/random-write-funnel/java/nu/marginalia/rwf/RandomWriteFunnel.java similarity index 100% rename from code/libraries/random-write-funnel/src/main/java/nu/marginalia/rwf/RandomWriteFunnel.java rename to code/libraries/random-write-funnel/java/nu/marginalia/rwf/RandomWriteFunnel.java diff --git a/code/libraries/random-write-funnel/src/test/java/nu/marginalia/rwf/RandomFileAssemblerTest.java b/code/libraries/random-write-funnel/test/nu/marginalia/rwf/RandomFileAssemblerTest.java similarity index 100% rename from code/libraries/random-write-funnel/src/test/java/nu/marginalia/rwf/RandomFileAssemblerTest.java rename to code/libraries/random-write-funnel/test/nu/marginalia/rwf/RandomFileAssemblerTest.java diff --git a/code/libraries/random-write-funnel/src/test/java/nu/marginalia/rwf/RandomWriteFunnelTest.java b/code/libraries/random-write-funnel/test/nu/marginalia/rwf/RandomWriteFunnelTest.java similarity index 100% rename from code/libraries/random-write-funnel/src/test/java/nu/marginalia/rwf/RandomWriteFunnelTest.java rename to code/libraries/random-write-funnel/test/nu/marginalia/rwf/RandomWriteFunnelTest.java diff --git a/code/libraries/term-frequency-dict/build.gradle b/code/libraries/term-frequency-dict/build.gradle index d7cd4029..0fe311b6 100644 --- a/code/libraries/term-frequency-dict/build.gradle +++ b/code/libraries/term-frequency-dict/build.gradle @@ -11,6 +11,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':third-party:rdrpostagger') implementation project(':third-party:porterstemmer') diff --git a/code/libraries/term-frequency-dict/src/main/java/nu/marginalia/term_frequency_dict/TermFrequencyDict.java b/code/libraries/term-frequency-dict/java/nu/marginalia/term_frequency_dict/TermFrequencyDict.java similarity index 100% rename from code/libraries/term-frequency-dict/src/main/java/nu/marginalia/term_frequency_dict/TermFrequencyDict.java rename to code/libraries/term-frequency-dict/java/nu/marginalia/term_frequency_dict/TermFrequencyDict.java diff --git a/code/libraries/test-helpers/build.gradle b/code/libraries/test-helpers/build.gradle index b50556a1..16244d0a 100644 --- a/code/libraries/test-helpers/build.gradle +++ b/code/libraries/test-helpers/build.gradle @@ -8,6 +8,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation libs.bundles.slf4j implementation libs.bundles.mariadb diff --git a/code/libraries/test-helpers/src/main/java/nu/marginalia/test/TestMigrationLoader.java b/code/libraries/test-helpers/java/nu/marginalia/test/TestMigrationLoader.java similarity index 100% rename from code/libraries/test-helpers/src/main/java/nu/marginalia/test/TestMigrationLoader.java rename to code/libraries/test-helpers/java/nu/marginalia/test/TestMigrationLoader.java diff --git a/code/process-models/crawl-spec/build.gradle b/code/process-models/crawl-spec/build.gradle index a0045a22..551f2c6e 100644 --- a/code/process-models/crawl-spec/build.gradle +++ b/code/process-models/crawl-spec/build.gradle @@ -10,6 +10,8 @@ java { languageVersion.set(JavaLanguageVersion.of(21)) } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation libs.bundles.slf4j diff --git a/code/process-models/crawl-spec/src/main/java/nu/marginalia/crawlspec/CrawlSpecFileNames.java b/code/process-models/crawl-spec/java/nu/marginalia/crawlspec/CrawlSpecFileNames.java similarity index 100% rename from code/process-models/crawl-spec/src/main/java/nu/marginalia/crawlspec/CrawlSpecFileNames.java rename to code/process-models/crawl-spec/java/nu/marginalia/crawlspec/CrawlSpecFileNames.java diff --git a/code/process-models/crawl-spec/src/main/java/nu/marginalia/crawlspec/CrawlSpecGenerator.java b/code/process-models/crawl-spec/java/nu/marginalia/crawlspec/CrawlSpecGenerator.java similarity index 100% rename from code/process-models/crawl-spec/src/main/java/nu/marginalia/crawlspec/CrawlSpecGenerator.java rename to code/process-models/crawl-spec/java/nu/marginalia/crawlspec/CrawlSpecGenerator.java diff --git a/code/process-models/crawl-spec/src/main/java/nu/marginalia/io/crawlspec/CrawlSpecRecordParquetFileReader.java b/code/process-models/crawl-spec/java/nu/marginalia/io/crawlspec/CrawlSpecRecordParquetFileReader.java similarity index 100% rename from code/process-models/crawl-spec/src/main/java/nu/marginalia/io/crawlspec/CrawlSpecRecordParquetFileReader.java rename to code/process-models/crawl-spec/java/nu/marginalia/io/crawlspec/CrawlSpecRecordParquetFileReader.java diff --git a/code/process-models/crawl-spec/src/main/java/nu/marginalia/io/crawlspec/CrawlSpecRecordParquetFileWriter.java b/code/process-models/crawl-spec/java/nu/marginalia/io/crawlspec/CrawlSpecRecordParquetFileWriter.java similarity index 100% rename from code/process-models/crawl-spec/src/main/java/nu/marginalia/io/crawlspec/CrawlSpecRecordParquetFileWriter.java rename to code/process-models/crawl-spec/java/nu/marginalia/io/crawlspec/CrawlSpecRecordParquetFileWriter.java diff --git a/code/process-models/crawl-spec/src/main/java/nu/marginalia/model/crawlspec/CrawlSpecRecord.java b/code/process-models/crawl-spec/java/nu/marginalia/model/crawlspec/CrawlSpecRecord.java similarity index 100% rename from code/process-models/crawl-spec/src/main/java/nu/marginalia/model/crawlspec/CrawlSpecRecord.java rename to code/process-models/crawl-spec/java/nu/marginalia/model/crawlspec/CrawlSpecRecord.java diff --git a/code/process-models/crawling-model/build.gradle b/code/process-models/crawling-model/build.gradle index f7b5cf49..505db80f 100644 --- a/code/process-models/crawling-model/build.gradle +++ b/code/process-models/crawling-model/build.gradle @@ -12,6 +12,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':code:common:model') implementation project(':code:common:db') diff --git a/code/process-models/crawling-model/src/main/java/nu/marginalia/crawling/body/ContentTypeLogic.java b/code/process-models/crawling-model/java/nu/marginalia/crawling/body/ContentTypeLogic.java similarity index 100% rename from code/process-models/crawling-model/src/main/java/nu/marginalia/crawling/body/ContentTypeLogic.java rename to code/process-models/crawling-model/java/nu/marginalia/crawling/body/ContentTypeLogic.java diff --git a/code/process-models/crawling-model/src/main/java/nu/marginalia/crawling/body/DocumentBodyExtractor.java b/code/process-models/crawling-model/java/nu/marginalia/crawling/body/DocumentBodyExtractor.java similarity index 100% rename from code/process-models/crawling-model/src/main/java/nu/marginalia/crawling/body/DocumentBodyExtractor.java rename to code/process-models/crawling-model/java/nu/marginalia/crawling/body/DocumentBodyExtractor.java diff --git a/code/process-models/crawling-model/src/main/java/nu/marginalia/crawling/body/DocumentBodyResult.java b/code/process-models/crawling-model/java/nu/marginalia/crawling/body/DocumentBodyResult.java similarity index 100% rename from code/process-models/crawling-model/src/main/java/nu/marginalia/crawling/body/DocumentBodyResult.java rename to code/process-models/crawling-model/java/nu/marginalia/crawling/body/DocumentBodyResult.java diff --git a/code/process-models/crawling-model/src/main/java/nu/marginalia/crawling/body/HttpFetchResult.java b/code/process-models/crawling-model/java/nu/marginalia/crawling/body/HttpFetchResult.java similarity index 100% rename from code/process-models/crawling-model/src/main/java/nu/marginalia/crawling/body/HttpFetchResult.java rename to code/process-models/crawling-model/java/nu/marginalia/crawling/body/HttpFetchResult.java diff --git a/code/process-models/crawling-model/src/main/java/nu/marginalia/crawling/io/CrawledDomainReader.java b/code/process-models/crawling-model/java/nu/marginalia/crawling/io/CrawledDomainReader.java similarity index 100% rename from code/process-models/crawling-model/src/main/java/nu/marginalia/crawling/io/CrawledDomainReader.java rename to code/process-models/crawling-model/java/nu/marginalia/crawling/io/CrawledDomainReader.java diff --git a/code/process-models/crawling-model/src/main/java/nu/marginalia/crawling/io/CrawledDomainWriter.java b/code/process-models/crawling-model/java/nu/marginalia/crawling/io/CrawledDomainWriter.java similarity index 100% rename from code/process-models/crawling-model/src/main/java/nu/marginalia/crawling/io/CrawledDomainWriter.java rename to code/process-models/crawling-model/java/nu/marginalia/crawling/io/CrawledDomainWriter.java diff --git a/code/process-models/crawling-model/src/main/java/nu/marginalia/crawling/io/CrawlerOutputFile.java b/code/process-models/crawling-model/java/nu/marginalia/crawling/io/CrawlerOutputFile.java similarity index 100% rename from code/process-models/crawling-model/src/main/java/nu/marginalia/crawling/io/CrawlerOutputFile.java rename to code/process-models/crawling-model/java/nu/marginalia/crawling/io/CrawlerOutputFile.java diff --git a/code/process-models/crawling-model/src/main/java/nu/marginalia/crawling/io/SerializableCrawlDataStream.java b/code/process-models/crawling-model/java/nu/marginalia/crawling/io/SerializableCrawlDataStream.java similarity index 100% rename from code/process-models/crawling-model/src/main/java/nu/marginalia/crawling/io/SerializableCrawlDataStream.java rename to code/process-models/crawling-model/java/nu/marginalia/crawling/io/SerializableCrawlDataStream.java diff --git a/code/process-models/crawling-model/src/main/java/nu/marginalia/crawling/io/format/CompatibleLegacySerializableCrawlDataStream.java b/code/process-models/crawling-model/java/nu/marginalia/crawling/io/format/CompatibleLegacySerializableCrawlDataStream.java similarity index 100% rename from code/process-models/crawling-model/src/main/java/nu/marginalia/crawling/io/format/CompatibleLegacySerializableCrawlDataStream.java rename to code/process-models/crawling-model/java/nu/marginalia/crawling/io/format/CompatibleLegacySerializableCrawlDataStream.java diff --git a/code/process-models/crawling-model/src/main/java/nu/marginalia/crawling/io/format/FastLegacySerializableCrawlDataStream.java b/code/process-models/crawling-model/java/nu/marginalia/crawling/io/format/FastLegacySerializableCrawlDataStream.java similarity index 100% rename from code/process-models/crawling-model/src/main/java/nu/marginalia/crawling/io/format/FastLegacySerializableCrawlDataStream.java rename to code/process-models/crawling-model/java/nu/marginalia/crawling/io/format/FastLegacySerializableCrawlDataStream.java diff --git a/code/process-models/crawling-model/src/main/java/nu/marginalia/crawling/io/format/ParquetSerializableCrawlDataStream.java b/code/process-models/crawling-model/java/nu/marginalia/crawling/io/format/ParquetSerializableCrawlDataStream.java similarity index 100% rename from code/process-models/crawling-model/src/main/java/nu/marginalia/crawling/io/format/ParquetSerializableCrawlDataStream.java rename to code/process-models/crawling-model/java/nu/marginalia/crawling/io/format/ParquetSerializableCrawlDataStream.java diff --git a/code/process-models/crawling-model/src/main/java/nu/marginalia/crawling/model/CrawledDocument.java b/code/process-models/crawling-model/java/nu/marginalia/crawling/model/CrawledDocument.java similarity index 100% rename from code/process-models/crawling-model/src/main/java/nu/marginalia/crawling/model/CrawledDocument.java rename to code/process-models/crawling-model/java/nu/marginalia/crawling/model/CrawledDocument.java diff --git a/code/process-models/crawling-model/src/main/java/nu/marginalia/crawling/model/CrawledDomain.java b/code/process-models/crawling-model/java/nu/marginalia/crawling/model/CrawledDomain.java similarity index 100% rename from code/process-models/crawling-model/src/main/java/nu/marginalia/crawling/model/CrawledDomain.java rename to code/process-models/crawling-model/java/nu/marginalia/crawling/model/CrawledDomain.java diff --git a/code/process-models/crawling-model/src/main/java/nu/marginalia/crawling/model/CrawlerDocumentStatus.java b/code/process-models/crawling-model/java/nu/marginalia/crawling/model/CrawlerDocumentStatus.java similarity index 100% rename from code/process-models/crawling-model/src/main/java/nu/marginalia/crawling/model/CrawlerDocumentStatus.java rename to code/process-models/crawling-model/java/nu/marginalia/crawling/model/CrawlerDocumentStatus.java diff --git a/code/process-models/crawling-model/src/main/java/nu/marginalia/crawling/model/CrawlerDomainStatus.java b/code/process-models/crawling-model/java/nu/marginalia/crawling/model/CrawlerDomainStatus.java similarity index 100% rename from code/process-models/crawling-model/src/main/java/nu/marginalia/crawling/model/CrawlerDomainStatus.java rename to code/process-models/crawling-model/java/nu/marginalia/crawling/model/CrawlerDomainStatus.java diff --git a/code/process-models/crawling-model/src/main/java/nu/marginalia/crawling/model/SerializableCrawlData.java b/code/process-models/crawling-model/java/nu/marginalia/crawling/model/SerializableCrawlData.java similarity index 100% rename from code/process-models/crawling-model/src/main/java/nu/marginalia/crawling/model/SerializableCrawlData.java rename to code/process-models/crawling-model/java/nu/marginalia/crawling/model/SerializableCrawlData.java diff --git a/code/process-models/crawling-model/src/main/java/nu/marginalia/crawling/parquet/CrawledDocumentParquetRecord.java b/code/process-models/crawling-model/java/nu/marginalia/crawling/parquet/CrawledDocumentParquetRecord.java similarity index 100% rename from code/process-models/crawling-model/src/main/java/nu/marginalia/crawling/parquet/CrawledDocumentParquetRecord.java rename to code/process-models/crawling-model/java/nu/marginalia/crawling/parquet/CrawledDocumentParquetRecord.java diff --git a/code/process-models/crawling-model/src/main/java/nu/marginalia/crawling/parquet/CrawledDocumentParquetRecordFileReader.java b/code/process-models/crawling-model/java/nu/marginalia/crawling/parquet/CrawledDocumentParquetRecordFileReader.java similarity index 100% rename from code/process-models/crawling-model/src/main/java/nu/marginalia/crawling/parquet/CrawledDocumentParquetRecordFileReader.java rename to code/process-models/crawling-model/java/nu/marginalia/crawling/parquet/CrawledDocumentParquetRecordFileReader.java diff --git a/code/process-models/crawling-model/src/main/java/nu/marginalia/crawling/parquet/CrawledDocumentParquetRecordFileWriter.java b/code/process-models/crawling-model/java/nu/marginalia/crawling/parquet/CrawledDocumentParquetRecordFileWriter.java similarity index 100% rename from code/process-models/crawling-model/src/main/java/nu/marginalia/crawling/parquet/CrawledDocumentParquetRecordFileWriter.java rename to code/process-models/crawling-model/java/nu/marginalia/crawling/parquet/CrawledDocumentParquetRecordFileWriter.java diff --git a/code/process-models/crawling-model/src/main/java/org/netpreserve/jwarc/WarcXCookieInformationHeader.java b/code/process-models/crawling-model/java/org/netpreserve/jwarc/WarcXCookieInformationHeader.java similarity index 100% rename from code/process-models/crawling-model/src/main/java/org/netpreserve/jwarc/WarcXCookieInformationHeader.java rename to code/process-models/crawling-model/java/org/netpreserve/jwarc/WarcXCookieInformationHeader.java diff --git a/code/process-models/crawling-model/src/main/java/org/netpreserve/jwarc/WarcXEntityRefused.java b/code/process-models/crawling-model/java/org/netpreserve/jwarc/WarcXEntityRefused.java similarity index 100% rename from code/process-models/crawling-model/src/main/java/org/netpreserve/jwarc/WarcXEntityRefused.java rename to code/process-models/crawling-model/java/org/netpreserve/jwarc/WarcXEntityRefused.java diff --git a/code/process-models/crawling-model/src/main/java/org/netpreserve/jwarc/WarcXResponseReference.java b/code/process-models/crawling-model/java/org/netpreserve/jwarc/WarcXResponseReference.java similarity index 100% rename from code/process-models/crawling-model/src/main/java/org/netpreserve/jwarc/WarcXResponseReference.java rename to code/process-models/crawling-model/java/org/netpreserve/jwarc/WarcXResponseReference.java diff --git a/code/process-models/crawling-model/src/main/java/plan/CrawlPlan.java b/code/process-models/crawling-model/java/plan/CrawlPlan.java similarity index 100% rename from code/process-models/crawling-model/src/main/java/plan/CrawlPlan.java rename to code/process-models/crawling-model/java/plan/CrawlPlan.java diff --git a/code/process-models/crawling-model/src/main/java/plan/CrawlPlanLoader.java b/code/process-models/crawling-model/java/plan/CrawlPlanLoader.java similarity index 100% rename from code/process-models/crawling-model/src/main/java/plan/CrawlPlanLoader.java rename to code/process-models/crawling-model/java/plan/CrawlPlanLoader.java diff --git a/code/process-models/crawling-model/src/test/java/nu/marginalia/crawling/model/CrawledDocumentTest.java b/code/process-models/crawling-model/test/nu/marginalia/crawling/model/CrawledDocumentTest.java similarity index 100% rename from code/process-models/crawling-model/src/test/java/nu/marginalia/crawling/model/CrawledDocumentTest.java rename to code/process-models/crawling-model/test/nu/marginalia/crawling/model/CrawledDocumentTest.java diff --git a/code/process-models/crawling-model/src/test/java/nu/marginalia/crawling/parquet/CrawledDocumentParquetRecordFileWriterTest.java b/code/process-models/crawling-model/test/nu/marginalia/crawling/parquet/CrawledDocumentParquetRecordFileWriterTest.java similarity index 100% rename from code/process-models/crawling-model/src/test/java/nu/marginalia/crawling/parquet/CrawledDocumentParquetRecordFileWriterTest.java rename to code/process-models/crawling-model/test/nu/marginalia/crawling/parquet/CrawledDocumentParquetRecordFileWriterTest.java diff --git a/code/process-models/processed-data/build.gradle b/code/process-models/processed-data/build.gradle index d77ebab5..910cecc6 100644 --- a/code/process-models/processed-data/build.gradle +++ b/code/process-models/processed-data/build.gradle @@ -10,6 +10,8 @@ java { languageVersion.set(JavaLanguageVersion.of(21)) } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation libs.bundles.slf4j diff --git a/code/process-models/processed-data/src/main/java/nu/marginalia/io/processed/DocumentRecordParquetFileReader.java b/code/process-models/processed-data/java/nu/marginalia/io/processed/DocumentRecordParquetFileReader.java similarity index 100% rename from code/process-models/processed-data/src/main/java/nu/marginalia/io/processed/DocumentRecordParquetFileReader.java rename to code/process-models/processed-data/java/nu/marginalia/io/processed/DocumentRecordParquetFileReader.java diff --git a/code/process-models/processed-data/src/main/java/nu/marginalia/io/processed/DocumentRecordParquetFileWriter.java b/code/process-models/processed-data/java/nu/marginalia/io/processed/DocumentRecordParquetFileWriter.java similarity index 100% rename from code/process-models/processed-data/src/main/java/nu/marginalia/io/processed/DocumentRecordParquetFileWriter.java rename to code/process-models/processed-data/java/nu/marginalia/io/processed/DocumentRecordParquetFileWriter.java diff --git a/code/process-models/processed-data/src/main/java/nu/marginalia/io/processed/DomainLinkRecordParquetFileReader.java b/code/process-models/processed-data/java/nu/marginalia/io/processed/DomainLinkRecordParquetFileReader.java similarity index 100% rename from code/process-models/processed-data/src/main/java/nu/marginalia/io/processed/DomainLinkRecordParquetFileReader.java rename to code/process-models/processed-data/java/nu/marginalia/io/processed/DomainLinkRecordParquetFileReader.java diff --git a/code/process-models/processed-data/src/main/java/nu/marginalia/io/processed/DomainLinkRecordParquetFileWriter.java b/code/process-models/processed-data/java/nu/marginalia/io/processed/DomainLinkRecordParquetFileWriter.java similarity index 100% rename from code/process-models/processed-data/src/main/java/nu/marginalia/io/processed/DomainLinkRecordParquetFileWriter.java rename to code/process-models/processed-data/java/nu/marginalia/io/processed/DomainLinkRecordParquetFileWriter.java diff --git a/code/process-models/processed-data/src/main/java/nu/marginalia/io/processed/DomainRecordParquetFileReader.java b/code/process-models/processed-data/java/nu/marginalia/io/processed/DomainRecordParquetFileReader.java similarity index 100% rename from code/process-models/processed-data/src/main/java/nu/marginalia/io/processed/DomainRecordParquetFileReader.java rename to code/process-models/processed-data/java/nu/marginalia/io/processed/DomainRecordParquetFileReader.java diff --git a/code/process-models/processed-data/src/main/java/nu/marginalia/io/processed/DomainRecordParquetFileWriter.java b/code/process-models/processed-data/java/nu/marginalia/io/processed/DomainRecordParquetFileWriter.java similarity index 100% rename from code/process-models/processed-data/src/main/java/nu/marginalia/io/processed/DomainRecordParquetFileWriter.java rename to code/process-models/processed-data/java/nu/marginalia/io/processed/DomainRecordParquetFileWriter.java diff --git a/code/process-models/processed-data/src/main/java/nu/marginalia/io/processed/ProcessedDataFileNames.java b/code/process-models/processed-data/java/nu/marginalia/io/processed/ProcessedDataFileNames.java similarity index 100% rename from code/process-models/processed-data/src/main/java/nu/marginalia/io/processed/ProcessedDataFileNames.java rename to code/process-models/processed-data/java/nu/marginalia/io/processed/ProcessedDataFileNames.java diff --git a/code/process-models/processed-data/src/main/java/nu/marginalia/model/processed/DocumentRecord.java b/code/process-models/processed-data/java/nu/marginalia/model/processed/DocumentRecord.java similarity index 100% rename from code/process-models/processed-data/src/main/java/nu/marginalia/model/processed/DocumentRecord.java rename to code/process-models/processed-data/java/nu/marginalia/model/processed/DocumentRecord.java diff --git a/code/process-models/processed-data/src/main/java/nu/marginalia/model/processed/DocumentRecordKeywordsProjection.java b/code/process-models/processed-data/java/nu/marginalia/model/processed/DocumentRecordKeywordsProjection.java similarity index 100% rename from code/process-models/processed-data/src/main/java/nu/marginalia/model/processed/DocumentRecordKeywordsProjection.java rename to code/process-models/processed-data/java/nu/marginalia/model/processed/DocumentRecordKeywordsProjection.java diff --git a/code/process-models/processed-data/src/main/java/nu/marginalia/model/processed/DocumentRecordMetadataProjection.java b/code/process-models/processed-data/java/nu/marginalia/model/processed/DocumentRecordMetadataProjection.java similarity index 100% rename from code/process-models/processed-data/src/main/java/nu/marginalia/model/processed/DocumentRecordMetadataProjection.java rename to code/process-models/processed-data/java/nu/marginalia/model/processed/DocumentRecordMetadataProjection.java diff --git a/code/process-models/processed-data/src/main/java/nu/marginalia/model/processed/DomainLinkRecord.java b/code/process-models/processed-data/java/nu/marginalia/model/processed/DomainLinkRecord.java similarity index 100% rename from code/process-models/processed-data/src/main/java/nu/marginalia/model/processed/DomainLinkRecord.java rename to code/process-models/processed-data/java/nu/marginalia/model/processed/DomainLinkRecord.java diff --git a/code/process-models/processed-data/src/main/java/nu/marginalia/model/processed/DomainRecord.java b/code/process-models/processed-data/java/nu/marginalia/model/processed/DomainRecord.java similarity index 100% rename from code/process-models/processed-data/src/main/java/nu/marginalia/model/processed/DomainRecord.java rename to code/process-models/processed-data/java/nu/marginalia/model/processed/DomainRecord.java diff --git a/code/process-models/processed-data/src/main/java/nu/marginalia/model/processed/DomainWithIp.java b/code/process-models/processed-data/java/nu/marginalia/model/processed/DomainWithIp.java similarity index 100% rename from code/process-models/processed-data/src/main/java/nu/marginalia/model/processed/DomainWithIp.java rename to code/process-models/processed-data/java/nu/marginalia/model/processed/DomainWithIp.java diff --git a/code/process-models/processed-data/src/test/java/nu/marginalia/io/processed/DocumentRecordParquetFileReaderTest.java b/code/process-models/processed-data/test/nu/marginalia/io/processed/DocumentRecordParquetFileReaderTest.java similarity index 100% rename from code/process-models/processed-data/src/test/java/nu/marginalia/io/processed/DocumentRecordParquetFileReaderTest.java rename to code/process-models/processed-data/test/nu/marginalia/io/processed/DocumentRecordParquetFileReaderTest.java diff --git a/code/process-models/processed-data/src/test/java/nu/marginalia/io/processed/DomainLinkRecordParquetFileReaderTest.java b/code/process-models/processed-data/test/nu/marginalia/io/processed/DomainLinkRecordParquetFileReaderTest.java similarity index 100% rename from code/process-models/processed-data/src/test/java/nu/marginalia/io/processed/DomainLinkRecordParquetFileReaderTest.java rename to code/process-models/processed-data/test/nu/marginalia/io/processed/DomainLinkRecordParquetFileReaderTest.java diff --git a/code/process-models/processed-data/src/test/java/nu/marginalia/io/processed/DomainRecordParquetFileReaderTest.java b/code/process-models/processed-data/test/nu/marginalia/io/processed/DomainRecordParquetFileReaderTest.java similarity index 100% rename from code/process-models/processed-data/src/test/java/nu/marginalia/io/processed/DomainRecordParquetFileReaderTest.java rename to code/process-models/processed-data/test/nu/marginalia/io/processed/DomainRecordParquetFileReaderTest.java diff --git a/code/process-models/work-log/build.gradle b/code/process-models/work-log/build.gradle index 25fbf22e..fbade272 100644 --- a/code/process-models/work-log/build.gradle +++ b/code/process-models/work-log/build.gradle @@ -10,6 +10,8 @@ java { languageVersion.set(JavaLanguageVersion.of(21)) } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation libs.bundles.slf4j diff --git a/code/process-models/work-log/src/main/java/nu/marginalia/worklog/BatchingWorkLog.java b/code/process-models/work-log/java/nu/marginalia/worklog/BatchingWorkLog.java similarity index 100% rename from code/process-models/work-log/src/main/java/nu/marginalia/worklog/BatchingWorkLog.java rename to code/process-models/work-log/java/nu/marginalia/worklog/BatchingWorkLog.java diff --git a/code/process-models/work-log/src/main/java/nu/marginalia/worklog/BatchingWorkLogImpl.java b/code/process-models/work-log/java/nu/marginalia/worklog/BatchingWorkLogImpl.java similarity index 100% rename from code/process-models/work-log/src/main/java/nu/marginalia/worklog/BatchingWorkLogImpl.java rename to code/process-models/work-log/java/nu/marginalia/worklog/BatchingWorkLogImpl.java diff --git a/code/process-models/work-log/src/main/java/nu/marginalia/worklog/BatchingWorkLogInspector.java b/code/process-models/work-log/java/nu/marginalia/worklog/BatchingWorkLogInspector.java similarity index 100% rename from code/process-models/work-log/src/main/java/nu/marginalia/worklog/BatchingWorkLogInspector.java rename to code/process-models/work-log/java/nu/marginalia/worklog/BatchingWorkLogInspector.java diff --git a/code/process-models/work-log/src/test/java/nu/marginalia/worklog/BatchingWorkLogImplTest.java b/code/process-models/work-log/test/nu/marginalia/worklog/BatchingWorkLogImplTest.java similarity index 100% rename from code/process-models/work-log/src/test/java/nu/marginalia/worklog/BatchingWorkLogImplTest.java rename to code/process-models/work-log/test/nu/marginalia/worklog/BatchingWorkLogImplTest.java diff --git a/code/process-mqapi/build.gradle b/code/process-mqapi/build.gradle index b99fdf75..b1313c62 100644 --- a/code/process-mqapi/build.gradle +++ b/code/process-mqapi/build.gradle @@ -11,6 +11,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':code:common:config') diff --git a/code/process-mqapi/src/main/java/nu/marginalia/mqapi/ProcessInboxNames.java b/code/process-mqapi/java/nu/marginalia/mqapi/ProcessInboxNames.java similarity index 100% rename from code/process-mqapi/src/main/java/nu/marginalia/mqapi/ProcessInboxNames.java rename to code/process-mqapi/java/nu/marginalia/mqapi/ProcessInboxNames.java diff --git a/code/process-mqapi/src/main/java/nu/marginalia/mqapi/converting/ConvertAction.java b/code/process-mqapi/java/nu/marginalia/mqapi/converting/ConvertAction.java similarity index 100% rename from code/process-mqapi/src/main/java/nu/marginalia/mqapi/converting/ConvertAction.java rename to code/process-mqapi/java/nu/marginalia/mqapi/converting/ConvertAction.java diff --git a/code/process-mqapi/src/main/java/nu/marginalia/mqapi/converting/ConvertRequest.java b/code/process-mqapi/java/nu/marginalia/mqapi/converting/ConvertRequest.java similarity index 100% rename from code/process-mqapi/src/main/java/nu/marginalia/mqapi/converting/ConvertRequest.java rename to code/process-mqapi/java/nu/marginalia/mqapi/converting/ConvertRequest.java diff --git a/code/process-mqapi/src/main/java/nu/marginalia/mqapi/crawling/CrawlRequest.java b/code/process-mqapi/java/nu/marginalia/mqapi/crawling/CrawlRequest.java similarity index 100% rename from code/process-mqapi/src/main/java/nu/marginalia/mqapi/crawling/CrawlRequest.java rename to code/process-mqapi/java/nu/marginalia/mqapi/crawling/CrawlRequest.java diff --git a/code/process-mqapi/src/main/java/nu/marginalia/mqapi/index/CreateIndexRequest.java b/code/process-mqapi/java/nu/marginalia/mqapi/index/CreateIndexRequest.java similarity index 100% rename from code/process-mqapi/src/main/java/nu/marginalia/mqapi/index/CreateIndexRequest.java rename to code/process-mqapi/java/nu/marginalia/mqapi/index/CreateIndexRequest.java diff --git a/code/process-mqapi/src/main/java/nu/marginalia/mqapi/index/IndexName.java b/code/process-mqapi/java/nu/marginalia/mqapi/index/IndexName.java similarity index 100% rename from code/process-mqapi/src/main/java/nu/marginalia/mqapi/index/IndexName.java rename to code/process-mqapi/java/nu/marginalia/mqapi/index/IndexName.java diff --git a/code/process-mqapi/src/main/java/nu/marginalia/mqapi/loading/LoadRequest.java b/code/process-mqapi/java/nu/marginalia/mqapi/loading/LoadRequest.java similarity index 100% rename from code/process-mqapi/src/main/java/nu/marginalia/mqapi/loading/LoadRequest.java rename to code/process-mqapi/java/nu/marginalia/mqapi/loading/LoadRequest.java diff --git a/code/processes/converting-process/build.gradle b/code/processes/converting-process/build.gradle index f36b30d0..8c6b616e 100644 --- a/code/processes/converting-process/build.gradle +++ b/code/processes/converting-process/build.gradle @@ -18,6 +18,8 @@ application { tasks.distZip.enabled = false +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':code:common:process') diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/ConverterMain.java b/code/processes/converting-process/java/nu/marginalia/converting/ConverterMain.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/ConverterMain.java rename to code/processes/converting-process/java/nu/marginalia/converting/ConverterMain.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/ConverterModule.java b/code/processes/converting-process/java/nu/marginalia/converting/ConverterModule.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/ConverterModule.java rename to code/processes/converting-process/java/nu/marginalia/converting/ConverterModule.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/model/DisqualifiedException.java b/code/processes/converting-process/java/nu/marginalia/converting/model/DisqualifiedException.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/model/DisqualifiedException.java rename to code/processes/converting-process/java/nu/marginalia/converting/model/DisqualifiedException.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/model/GeneratorType.java b/code/processes/converting-process/java/nu/marginalia/converting/model/GeneratorType.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/model/GeneratorType.java rename to code/processes/converting-process/java/nu/marginalia/converting/model/GeneratorType.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/model/ProcessedDocument.java b/code/processes/converting-process/java/nu/marginalia/converting/model/ProcessedDocument.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/model/ProcessedDocument.java rename to code/processes/converting-process/java/nu/marginalia/converting/model/ProcessedDocument.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/model/ProcessedDocumentDetails.java b/code/processes/converting-process/java/nu/marginalia/converting/model/ProcessedDocumentDetails.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/model/ProcessedDocumentDetails.java rename to code/processes/converting-process/java/nu/marginalia/converting/model/ProcessedDocumentDetails.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/model/ProcessedDomain.java b/code/processes/converting-process/java/nu/marginalia/converting/model/ProcessedDomain.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/model/ProcessedDomain.java rename to code/processes/converting-process/java/nu/marginalia/converting/model/ProcessedDomain.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/AcceptableAds.java b/code/processes/converting-process/java/nu/marginalia/converting/processor/AcceptableAds.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/AcceptableAds.java rename to code/processes/converting-process/java/nu/marginalia/converting/processor/AcceptableAds.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/ConverterDomainTypes.java b/code/processes/converting-process/java/nu/marginalia/converting/processor/ConverterDomainTypes.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/ConverterDomainTypes.java rename to code/processes/converting-process/java/nu/marginalia/converting/processor/ConverterDomainTypes.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/DocumentClass.java b/code/processes/converting-process/java/nu/marginalia/converting/processor/DocumentClass.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/DocumentClass.java rename to code/processes/converting-process/java/nu/marginalia/converting/processor/DocumentClass.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/DocumentDecorator.java b/code/processes/converting-process/java/nu/marginalia/converting/processor/DocumentDecorator.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/DocumentDecorator.java rename to code/processes/converting-process/java/nu/marginalia/converting/processor/DocumentDecorator.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/DocumentProcessor.java b/code/processes/converting-process/java/nu/marginalia/converting/processor/DocumentProcessor.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/DocumentProcessor.java rename to code/processes/converting-process/java/nu/marginalia/converting/processor/DocumentProcessor.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/DomainProcessor.java b/code/processes/converting-process/java/nu/marginalia/converting/processor/DomainProcessor.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/DomainProcessor.java rename to code/processes/converting-process/java/nu/marginalia/converting/processor/DomainProcessor.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/MetaRobotsTag.java b/code/processes/converting-process/java/nu/marginalia/converting/processor/MetaRobotsTag.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/MetaRobotsTag.java rename to code/processes/converting-process/java/nu/marginalia/converting/processor/MetaRobotsTag.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/SiteWords.java b/code/processes/converting-process/java/nu/marginalia/converting/processor/SiteWords.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/SiteWords.java rename to code/processes/converting-process/java/nu/marginalia/converting/processor/SiteWords.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/logic/DocumentGeneratorExtractor.java b/code/processes/converting-process/java/nu/marginalia/converting/processor/logic/DocumentGeneratorExtractor.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/logic/DocumentGeneratorExtractor.java rename to code/processes/converting-process/java/nu/marginalia/converting/processor/logic/DocumentGeneratorExtractor.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/logic/DocumentLengthLogic.java b/code/processes/converting-process/java/nu/marginalia/converting/processor/logic/DocumentLengthLogic.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/logic/DocumentLengthLogic.java rename to code/processes/converting-process/java/nu/marginalia/converting/processor/logic/DocumentLengthLogic.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/logic/DocumentValuator.java b/code/processes/converting-process/java/nu/marginalia/converting/processor/logic/DocumentValuator.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/logic/DocumentValuator.java rename to code/processes/converting-process/java/nu/marginalia/converting/processor/logic/DocumentValuator.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/logic/FeatureExtractor.java b/code/processes/converting-process/java/nu/marginalia/converting/processor/logic/FeatureExtractor.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/logic/FeatureExtractor.java rename to code/processes/converting-process/java/nu/marginalia/converting/processor/logic/FeatureExtractor.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/logic/HtmlStandardExtractor.java b/code/processes/converting-process/java/nu/marginalia/converting/processor/logic/HtmlStandardExtractor.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/logic/HtmlStandardExtractor.java rename to code/processes/converting-process/java/nu/marginalia/converting/processor/logic/HtmlStandardExtractor.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/logic/LshDocumentDeduplicator.java b/code/processes/converting-process/java/nu/marginalia/converting/processor/logic/LshDocumentDeduplicator.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/logic/LshDocumentDeduplicator.java rename to code/processes/converting-process/java/nu/marginalia/converting/processor/logic/LshDocumentDeduplicator.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/logic/PlainTextLogic.java b/code/processes/converting-process/java/nu/marginalia/converting/processor/logic/PlainTextLogic.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/logic/PlainTextLogic.java rename to code/processes/converting-process/java/nu/marginalia/converting/processor/logic/PlainTextLogic.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/logic/TitleExtractor.java b/code/processes/converting-process/java/nu/marginalia/converting/processor/logic/TitleExtractor.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/logic/TitleExtractor.java rename to code/processes/converting-process/java/nu/marginalia/converting/processor/logic/TitleExtractor.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/logic/dom/DomPruningFilter.java b/code/processes/converting-process/java/nu/marginalia/converting/processor/logic/dom/DomPruningFilter.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/logic/dom/DomPruningFilter.java rename to code/processes/converting-process/java/nu/marginalia/converting/processor/logic/dom/DomPruningFilter.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/logic/dom/MeasureLengthVisitor.java b/code/processes/converting-process/java/nu/marginalia/converting/processor/logic/dom/MeasureLengthVisitor.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/logic/dom/MeasureLengthVisitor.java rename to code/processes/converting-process/java/nu/marginalia/converting/processor/logic/dom/MeasureLengthVisitor.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/logic/links/CommonKeywordExtractor.java b/code/processes/converting-process/java/nu/marginalia/converting/processor/logic/links/CommonKeywordExtractor.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/logic/links/CommonKeywordExtractor.java rename to code/processes/converting-process/java/nu/marginalia/converting/processor/logic/links/CommonKeywordExtractor.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/logic/links/FileLinks.java b/code/processes/converting-process/java/nu/marginalia/converting/processor/logic/links/FileLinks.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/logic/links/FileLinks.java rename to code/processes/converting-process/java/nu/marginalia/converting/processor/logic/links/FileLinks.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/logic/links/LinkGraph.java b/code/processes/converting-process/java/nu/marginalia/converting/processor/logic/links/LinkGraph.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/logic/links/LinkGraph.java rename to code/processes/converting-process/java/nu/marginalia/converting/processor/logic/links/LinkGraph.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/logic/links/LinkProcessor.java b/code/processes/converting-process/java/nu/marginalia/converting/processor/logic/links/LinkProcessor.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/logic/links/LinkProcessor.java rename to code/processes/converting-process/java/nu/marginalia/converting/processor/logic/links/LinkProcessor.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/logic/links/TopKeywords.java b/code/processes/converting-process/java/nu/marginalia/converting/processor/logic/links/TopKeywords.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/logic/links/TopKeywords.java rename to code/processes/converting-process/java/nu/marginalia/converting/processor/logic/links/TopKeywords.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/plugin/AbstractDocumentProcessorPlugin.java b/code/processes/converting-process/java/nu/marginalia/converting/processor/plugin/AbstractDocumentProcessorPlugin.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/plugin/AbstractDocumentProcessorPlugin.java rename to code/processes/converting-process/java/nu/marginalia/converting/processor/plugin/AbstractDocumentProcessorPlugin.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/plugin/HtmlDocumentProcessorPlugin.java b/code/processes/converting-process/java/nu/marginalia/converting/processor/plugin/HtmlDocumentProcessorPlugin.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/plugin/HtmlDocumentProcessorPlugin.java rename to code/processes/converting-process/java/nu/marginalia/converting/processor/plugin/HtmlDocumentProcessorPlugin.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/plugin/PlainTextDocumentProcessorPlugin.java b/code/processes/converting-process/java/nu/marginalia/converting/processor/plugin/PlainTextDocumentProcessorPlugin.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/plugin/PlainTextDocumentProcessorPlugin.java rename to code/processes/converting-process/java/nu/marginalia/converting/processor/plugin/PlainTextDocumentProcessorPlugin.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/plugin/specialization/BlogSpecialization.java b/code/processes/converting-process/java/nu/marginalia/converting/processor/plugin/specialization/BlogSpecialization.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/plugin/specialization/BlogSpecialization.java rename to code/processes/converting-process/java/nu/marginalia/converting/processor/plugin/specialization/BlogSpecialization.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/plugin/specialization/DefaultSpecialization.java b/code/processes/converting-process/java/nu/marginalia/converting/processor/plugin/specialization/DefaultSpecialization.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/plugin/specialization/DefaultSpecialization.java rename to code/processes/converting-process/java/nu/marginalia/converting/processor/plugin/specialization/DefaultSpecialization.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/plugin/specialization/HtmlProcessorSpecializations.java b/code/processes/converting-process/java/nu/marginalia/converting/processor/plugin/specialization/HtmlProcessorSpecializations.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/plugin/specialization/HtmlProcessorSpecializations.java rename to code/processes/converting-process/java/nu/marginalia/converting/processor/plugin/specialization/HtmlProcessorSpecializations.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/plugin/specialization/JavadocSpecialization.java b/code/processes/converting-process/java/nu/marginalia/converting/processor/plugin/specialization/JavadocSpecialization.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/plugin/specialization/JavadocSpecialization.java rename to code/processes/converting-process/java/nu/marginalia/converting/processor/plugin/specialization/JavadocSpecialization.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/plugin/specialization/LemmySpecialization.java b/code/processes/converting-process/java/nu/marginalia/converting/processor/plugin/specialization/LemmySpecialization.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/plugin/specialization/LemmySpecialization.java rename to code/processes/converting-process/java/nu/marginalia/converting/processor/plugin/specialization/LemmySpecialization.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/plugin/specialization/MariadbKbSpecialization.java b/code/processes/converting-process/java/nu/marginalia/converting/processor/plugin/specialization/MariadbKbSpecialization.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/plugin/specialization/MariadbKbSpecialization.java rename to code/processes/converting-process/java/nu/marginalia/converting/processor/plugin/specialization/MariadbKbSpecialization.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/plugin/specialization/PhpBBSpecialization.java b/code/processes/converting-process/java/nu/marginalia/converting/processor/plugin/specialization/PhpBBSpecialization.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/plugin/specialization/PhpBBSpecialization.java rename to code/processes/converting-process/java/nu/marginalia/converting/processor/plugin/specialization/PhpBBSpecialization.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/plugin/specialization/WikiSpecialization.java b/code/processes/converting-process/java/nu/marginalia/converting/processor/plugin/specialization/WikiSpecialization.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/plugin/specialization/WikiSpecialization.java rename to code/processes/converting-process/java/nu/marginalia/converting/processor/plugin/specialization/WikiSpecialization.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/plugin/specialization/XenForoSpecialization.java b/code/processes/converting-process/java/nu/marginalia/converting/processor/plugin/specialization/XenForoSpecialization.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/processor/plugin/specialization/XenForoSpecialization.java rename to code/processes/converting-process/java/nu/marginalia/converting/processor/plugin/specialization/XenForoSpecialization.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/sideload/SideloadSource.java b/code/processes/converting-process/java/nu/marginalia/converting/sideload/SideloadSource.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/sideload/SideloadSource.java rename to code/processes/converting-process/java/nu/marginalia/converting/sideload/SideloadSource.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/sideload/SideloadSourceFactory.java b/code/processes/converting-process/java/nu/marginalia/converting/sideload/SideloadSourceFactory.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/sideload/SideloadSourceFactory.java rename to code/processes/converting-process/java/nu/marginalia/converting/sideload/SideloadSourceFactory.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/sideload/SideloaderProcessing.java b/code/processes/converting-process/java/nu/marginalia/converting/sideload/SideloaderProcessing.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/sideload/SideloaderProcessing.java rename to code/processes/converting-process/java/nu/marginalia/converting/sideload/SideloaderProcessing.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/sideload/dirtree/DirtreeSideloadSpec.java b/code/processes/converting-process/java/nu/marginalia/converting/sideload/dirtree/DirtreeSideloadSpec.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/sideload/dirtree/DirtreeSideloadSpec.java rename to code/processes/converting-process/java/nu/marginalia/converting/sideload/dirtree/DirtreeSideloadSpec.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/sideload/dirtree/DirtreeSideloadSpecList.java b/code/processes/converting-process/java/nu/marginalia/converting/sideload/dirtree/DirtreeSideloadSpecList.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/sideload/dirtree/DirtreeSideloadSpecList.java rename to code/processes/converting-process/java/nu/marginalia/converting/sideload/dirtree/DirtreeSideloadSpecList.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/sideload/dirtree/DirtreeSideloader.java b/code/processes/converting-process/java/nu/marginalia/converting/sideload/dirtree/DirtreeSideloader.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/sideload/dirtree/DirtreeSideloader.java rename to code/processes/converting-process/java/nu/marginalia/converting/sideload/dirtree/DirtreeSideloader.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/sideload/dirtree/DirtreeSideloaderFactory.java b/code/processes/converting-process/java/nu/marginalia/converting/sideload/dirtree/DirtreeSideloaderFactory.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/sideload/dirtree/DirtreeSideloaderFactory.java rename to code/processes/converting-process/java/nu/marginalia/converting/sideload/dirtree/DirtreeSideloaderFactory.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/sideload/encyclopedia/EncyclopediaMarginaliaNuSideloader.java b/code/processes/converting-process/java/nu/marginalia/converting/sideload/encyclopedia/EncyclopediaMarginaliaNuSideloader.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/sideload/encyclopedia/EncyclopediaMarginaliaNuSideloader.java rename to code/processes/converting-process/java/nu/marginalia/converting/sideload/encyclopedia/EncyclopediaMarginaliaNuSideloader.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/sideload/reddit/RedditSideloader.java b/code/processes/converting-process/java/nu/marginalia/converting/sideload/reddit/RedditSideloader.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/sideload/reddit/RedditSideloader.java rename to code/processes/converting-process/java/nu/marginalia/converting/sideload/reddit/RedditSideloader.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/sideload/stackexchange/StackexchangeSideloader.java b/code/processes/converting-process/java/nu/marginalia/converting/sideload/stackexchange/StackexchangeSideloader.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/sideload/stackexchange/StackexchangeSideloader.java rename to code/processes/converting-process/java/nu/marginalia/converting/sideload/stackexchange/StackexchangeSideloader.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/sideload/warc/WarcSideloader.java b/code/processes/converting-process/java/nu/marginalia/converting/sideload/warc/WarcSideloader.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/sideload/warc/WarcSideloader.java rename to code/processes/converting-process/java/nu/marginalia/converting/sideload/warc/WarcSideloader.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/util/LineUtils.java b/code/processes/converting-process/java/nu/marginalia/converting/util/LineUtils.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/util/LineUtils.java rename to code/processes/converting-process/java/nu/marginalia/converting/util/LineUtils.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/writer/ConverterBatchWritableIf.java b/code/processes/converting-process/java/nu/marginalia/converting/writer/ConverterBatchWritableIf.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/writer/ConverterBatchWritableIf.java rename to code/processes/converting-process/java/nu/marginalia/converting/writer/ConverterBatchWritableIf.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/writer/ConverterBatchWriter.java b/code/processes/converting-process/java/nu/marginalia/converting/writer/ConverterBatchWriter.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/writer/ConverterBatchWriter.java rename to code/processes/converting-process/java/nu/marginalia/converting/writer/ConverterBatchWriter.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/writer/ConverterBatchWriterIf.java b/code/processes/converting-process/java/nu/marginalia/converting/writer/ConverterBatchWriterIf.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/writer/ConverterBatchWriterIf.java rename to code/processes/converting-process/java/nu/marginalia/converting/writer/ConverterBatchWriterIf.java diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/writer/ConverterWriter.java b/code/processes/converting-process/java/nu/marginalia/converting/writer/ConverterWriter.java similarity index 100% rename from code/processes/converting-process/src/main/java/nu/marginalia/converting/writer/ConverterWriter.java rename to code/processes/converting-process/java/nu/marginalia/converting/writer/ConverterWriter.java diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/05-test.gmi b/code/processes/converting-process/test-resources/memex-marginalia/05-test.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/05-test.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/05-test.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/code/index.gmi b/code/processes/converting-process/test-resources/memex-marginalia/code/index.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/code/index.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/code/index.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/commons/dialogue.gmi b/code/processes/converting-process/test-resources/memex-marginalia/commons/dialogue.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/commons/dialogue.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/commons/dialogue.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/commons/search-failure-modes.gmi b/code/processes/converting-process/test-resources/memex-marginalia/commons/search-failure-modes.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/commons/search-failure-modes.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/commons/search-failure-modes.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/commons/self-interest.gmi b/code/processes/converting-process/test-resources/memex-marginalia/commons/self-interest.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/commons/self-interest.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/commons/self-interest.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/dead.gmi b/code/processes/converting-process/test-resources/memex-marginalia/dead.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/dead.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/dead.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/debian-laptop-install-log.gmi b/code/processes/converting-process/test-resources/memex-marginalia/debian-laptop-install-log.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/debian-laptop-install-log.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/debian-laptop-install-log.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/debian-laptop.gmi b/code/processes/converting-process/test-resources/memex-marginalia/debian-laptop.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/debian-laptop.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/debian-laptop.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/feed.gmi b/code/processes/converting-process/test-resources/memex-marginalia/feed.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/feed.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/feed.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/fragments-old-web.gmi b/code/processes/converting-process/test-resources/memex-marginalia/fragments-old-web.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/fragments-old-web.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/fragments-old-web.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/good-video-games.gmi b/code/processes/converting-process/test-resources/memex-marginalia/good-video-games.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/good-video-games.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/good-video-games.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/guestbook/footer.gmi b/code/processes/converting-process/test-resources/memex-marginalia/guestbook/footer.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/guestbook/footer.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/guestbook/footer.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/guestbook/header.gmi b/code/processes/converting-process/test-resources/memex-marginalia/guestbook/header.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/guestbook/header.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/guestbook/header.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/guestbook/index.gmi b/code/processes/converting-process/test-resources/memex-marginalia/guestbook/index.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/guestbook/index.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/guestbook/index.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/index b/code/processes/converting-process/test-resources/memex-marginalia/index similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/index rename to code/processes/converting-process/test-resources/memex-marginalia/index diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/index.gmi b/code/processes/converting-process/test-resources/memex-marginalia/index.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/index.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/index.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/junk/DedupTest.gmi b/code/processes/converting-process/test-resources/memex-marginalia/junk/DedupTest.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/junk/DedupTest.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/junk/DedupTest.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/junk/bssl.gmi b/code/processes/converting-process/test-resources/memex-marginalia/junk/bssl.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/junk/bssl.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/junk/bssl.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/junk/eldritch-oneliner.gmi b/code/processes/converting-process/test-resources/memex-marginalia/junk/eldritch-oneliner.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/junk/eldritch-oneliner.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/junk/eldritch-oneliner.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/junk/server.gmi b/code/processes/converting-process/test-resources/memex-marginalia/junk/server.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/junk/server.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/junk/server.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/junk/very-old-code.cc.gmi b/code/processes/converting-process/test-resources/memex-marginalia/junk/very-old-code.cc.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/junk/very-old-code.cc.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/junk/very-old-code.cc.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/links/aggregators.gmi b/code/processes/converting-process/test-resources/memex-marginalia/links/aggregators.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/links/aggregators.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/links/aggregators.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/links/articles.gmi b/code/processes/converting-process/test-resources/memex-marginalia/links/articles.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/links/articles.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/links/articles.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/links/bookmarks.gmi b/code/processes/converting-process/test-resources/memex-marginalia/links/bookmarks.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/links/bookmarks.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/links/bookmarks.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/links/fragments-old-web.gmi b/code/processes/converting-process/test-resources/memex-marginalia/links/fragments-old-web.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/links/fragments-old-web.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/links/fragments-old-web.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/links/index.gmi b/code/processes/converting-process/test-resources/memex-marginalia/links/index.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/links/index.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/links/index.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/links/linkpocalypse.gmi b/code/processes/converting-process/test-resources/memex-marginalia/links/linkpocalypse.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/links/linkpocalypse.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/links/linkpocalypse.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/00-linkpocalypse.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/00-linkpocalypse.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/00-linkpocalypse.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/00-linkpocalypse.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/01-astrolabe.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/01-astrolabe.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/01-astrolabe.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/01-astrolabe.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/02-re-tests.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/02-re-tests.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/02-re-tests.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/02-re-tests.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/03-writing-for-reading.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/03-writing-for-reading.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/03-writing-for-reading.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/03-writing-for-reading.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/04-link-farms.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/04-link-farms.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/04-link-farms.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/04-link-farms.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/05-minds-field.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/05-minds-field.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/05-minds-field.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/05-minds-field.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/06-optimization.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/06-optimization.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/06-optimization.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/06-optimization.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/07-local-backlinks.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/07-local-backlinks.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/07-local-backlinks.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/07-local-backlinks.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/08-whatever-happened-to-the-memex.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/08-whatever-happened-to-the-memex.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/08-whatever-happened-to-the-memex.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/08-whatever-happened-to-the-memex.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/09-system-upgrade.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/09-system-upgrade.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/09-system-upgrade.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/09-system-upgrade.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/10-astrolabe-2-sampling-bias.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/10-astrolabe-2-sampling-bias.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/10-astrolabe-2-sampling-bias.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/10-astrolabe-2-sampling-bias.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/11-dying-every-day.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/11-dying-every-day.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/11-dying-every-day.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/11-dying-every-day.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/12-bye-bye-gmail.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/12-bye-bye-gmail.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/12-bye-bye-gmail.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/12-bye-bye-gmail.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/13-static-html.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/13-static-html.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/13-static-html.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/13-static-html.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/13-test.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/13-test.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/13-test.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/13-test.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/14-enter-the-circle-of-blame.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/14-enter-the-circle-of-blame.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/14-enter-the-circle-of-blame.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/14-enter-the-circle-of-blame.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/15-stages-of-being.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/15-stages-of-being.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/15-stages-of-being.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/15-stages-of-being.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/16-cursed-motivation.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/16-cursed-motivation.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/16-cursed-motivation.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/16-cursed-motivation.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/17-git-isnt-a-web-service.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/17-git-isnt-a-web-service.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/17-git-isnt-a-web-service.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/17-git-isnt-a-web-service.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/18-soaring-high.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/18-soaring-high.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/18-soaring-high.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/18-soaring-high.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/19-website-discoverability-crisis.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/19-website-discoverability-crisis.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/19-website-discoverability-crisis.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/19-website-discoverability-crisis.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/20-dot-com-link-farms.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/20-dot-com-link-farms.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/20-dot-com-link-farms.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/20-dot-com-link-farms.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/21-new-solutions-old-problems.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/21-new-solutions-old-problems.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/21-new-solutions-old-problems.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/21-new-solutions-old-problems.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/22-against-the-flood.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/22-against-the-flood.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/22-against-the-flood.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/22-against-the-flood.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/23-re-software-and-branding.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/23-re-software-and-branding.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/23-re-software-and-branding.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/23-re-software-and-branding.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/24-silly-hats.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/24-silly-hats.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/24-silly-hats.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/24-silly-hats.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/25-october-update.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/25-october-update.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/25-october-update.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/25-october-update.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/26-personalized-pagerank.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/26-personalized-pagerank.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/26-personalized-pagerank.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/26-personalized-pagerank.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/27-getting-with-the-times.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/27-getting-with-the-times.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/27-getting-with-the-times.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/27-getting-with-the-times.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/28-web-browsing.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/28-web-browsing.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/28-web-browsing.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/28-web-browsing.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/29-botnet-ddos.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/29-botnet-ddos.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/29-botnet-ddos.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/29-botnet-ddos.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/30-unintuitive-optimization.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/30-unintuitive-optimization.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/30-unintuitive-optimization.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/30-unintuitive-optimization.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/31-ngram-needles.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/31-ngram-needles.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/31-ngram-needles.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/31-ngram-needles.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/32-bot-apologetics.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/32-bot-apologetics.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/32-bot-apologetics.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/32-bot-apologetics.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/33-rude-guests.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/33-rude-guests.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/33-rude-guests.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/33-rude-guests.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/34-internet-arguments.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/34-internet-arguments.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/34-internet-arguments.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/34-internet-arguments.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/35-keeping-gemini-difficult.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/35-keeping-gemini-difficult.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/35-keeping-gemini-difficult.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/35-keeping-gemini-difficult.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/36-localized-programming-languages.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/36-localized-programming-languages.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/36-localized-programming-languages.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/36-localized-programming-languages.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/37-keyword-extraction.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/37-keyword-extraction.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/37-keyword-extraction.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/37-keyword-extraction.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/38-old-and-new.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/38-old-and-new.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/38-old-and-new.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/38-old-and-new.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/39-normie-hypothesis.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/39-normie-hypothesis.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/39-normie-hypothesis.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/39-normie-hypothesis.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/40-wasted-resources.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/40-wasted-resources.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/40-wasted-resources.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/40-wasted-resources.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/41-search-result-relevance.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/41-search-result-relevance.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/41-search-result-relevance.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/41-search-result-relevance.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/42-dark.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/42-dark.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/42-dark.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/42-dark.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/43-pseodonymous.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/43-pseodonymous.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/43-pseodonymous.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/43-pseodonymous.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/44-discovery-and-design.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/44-discovery-and-design.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/44-discovery-and-design.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/44-discovery-and-design.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/45-unfuck-internet-discoverability.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/45-unfuck-internet-discoverability.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/45-unfuck-internet-discoverability.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/45-unfuck-internet-discoverability.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/46-anatomy-of-search-engine-spam.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/46-anatomy-of-search-engine-spam.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/46-anatomy-of-search-engine-spam.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/46-anatomy-of-search-engine-spam.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/47-drive-failure.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/47-drive-failure.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/47-drive-failure.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/47-drive-failure.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/48-i-have-no-capslock.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/48-i-have-no-capslock.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/48-i-have-no-capslock.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/48-i-have-no-capslock.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/49-marginalia-1-year.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/49-marginalia-1-year.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/49-marginalia-1-year.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/49-marginalia-1-year.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/50-meditation-on-software-correctness.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/50-meditation-on-software-correctness.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/50-meditation-on-software-correctness.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/50-meditation-on-software-correctness.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/51-the-file-startup.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/51-the-file-startup.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/51-the-file-startup.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/51-the-file-startup.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/52-growing-pains.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/52-growing-pains.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/52-growing-pains.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/52-growing-pains.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/53-better-hard-drive-metaphor.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/53-better-hard-drive-metaphor.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/53-better-hard-drive-metaphor.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/53-better-hard-drive-metaphor.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/54-bargain-bin-btree.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/54-bargain-bin-btree.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/54-bargain-bin-btree.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/54-bargain-bin-btree.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/55-lexicon-rubberduck.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/55-lexicon-rubberduck.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/55-lexicon-rubberduck.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/55-lexicon-rubberduck.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/56-uncertain-future.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/56-uncertain-future.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/56-uncertain-future.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/56-uncertain-future.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/57-dont-know-how-to-build-software.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/57-dont-know-how-to-build-software.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/57-dont-know-how-to-build-software.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/57-dont-know-how-to-build-software.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/58-marginalia-open-source.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/58-marginalia-open-source.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/58-marginalia-open-source.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/58-marginalia-open-source.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/59-anchor-text.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/59-anchor-text.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/59-anchor-text.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/59-anchor-text.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/60-prescriptive-descriptions.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/60-prescriptive-descriptions.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/60-prescriptive-descriptions.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/60-prescriptive-descriptions.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/61-botspam-apocalypse.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/61-botspam-apocalypse.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/61-botspam-apocalypse.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/61-botspam-apocalypse.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/62-marginaliacoin.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/62-marginaliacoin.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/62-marginaliacoin.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/62-marginaliacoin.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/63-marginalia-crawler.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/63-marginalia-crawler.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/63-marginalia-crawler.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/63-marginalia-crawler.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/64-hundred-million.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/64-hundred-million.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/64-hundred-million.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/64-hundred-million.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/65-scaling-doesnt-scale.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/65-scaling-doesnt-scale.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/65-scaling-doesnt-scale.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/65-scaling-doesnt-scale.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/66-carbon-dating.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/66-carbon-dating.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/66-carbon-dating.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/66-carbon-dating.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/67-best-ideas-afk.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/67-best-ideas-afk.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/67-best-ideas-afk.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/67-best-ideas-afk.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/68-wizards-vs-sorcerers.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/68-wizards-vs-sorcerers.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/68-wizards-vs-sorcerers.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/68-wizards-vs-sorcerers.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/69-creepy-website-similarity.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/69-creepy-website-similarity.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/69-creepy-website-similarity.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/69-creepy-website-similarity.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/70-faster-index-joins.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/70-faster-index-joins.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/70-faster-index-joins.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/70-faster-index-joins.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/71-memex-design.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/71-memex-design.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/71-memex-design.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/71-memex-design.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/72-are-you-ok.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/72-are-you-ok.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/72-are-you-ok.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/72-are-you-ok.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/72-new-approach-to-ranking.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/72-new-approach-to-ranking.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/72-new-approach-to-ranking.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/72-new-approach-to-ranking.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/73-new-approach-to-ranking.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/73-new-approach-to-ranking.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/73-new-approach-to-ranking.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/73-new-approach-to-ranking.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/74-marginalia-2-years.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/74-marginalia-2-years.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/74-marginalia-2-years.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/74-marginalia-2-years.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/bargain-bin-btree.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/bargain-bin-btree.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/bargain-bin-btree.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/bargain-bin-btree.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/index.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/index.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/index.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/index.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/soaring-high.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/soaring-high.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/soaring-high.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/soaring-high.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/log/todo.gmi b/code/processes/converting-process/test-resources/memex-marginalia/log/todo.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/log/todo.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/log/todo.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/one-weird-trick.gmi b/code/processes/converting-process/test-resources/memex-marginalia/one-weird-trick.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/one-weird-trick.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/one-weird-trick.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/pics/index.gmi b/code/processes/converting-process/test-resources/memex-marginalia/pics/index.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/pics/index.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/pics/index.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/pics/links/index.gmi b/code/processes/converting-process/test-resources/memex-marginalia/pics/links/index.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/pics/links/index.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/pics/links/index.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/pics/raster-test/index.gmi b/code/processes/converting-process/test-resources/memex-marginalia/pics/raster-test/index.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/pics/raster-test/index.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/pics/raster-test/index.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/projects/edge.gmi b/code/processes/converting-process/test-resources/memex-marginalia/projects/edge.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/projects/edge.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/projects/edge.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/projects/edge/about.gmi b/code/processes/converting-process/test-resources/memex-marginalia/projects/edge/about.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/projects/edge/about.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/projects/edge/about.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/projects/edge/api.gmi b/code/processes/converting-process/test-resources/memex-marginalia/projects/edge/api.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/projects/edge/api.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/projects/edge/api.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/projects/edge/changelog.gmi b/code/processes/converting-process/test-resources/memex-marginalia/projects/edge/changelog.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/projects/edge/changelog.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/projects/edge/changelog.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/projects/edge/design-notes.gmi b/code/processes/converting-process/test-resources/memex-marginalia/projects/edge/design-notes.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/projects/edge/design-notes.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/projects/edge/design-notes.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/projects/edge/faq.gmi b/code/processes/converting-process/test-resources/memex-marginalia/projects/edge/faq.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/projects/edge/faq.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/projects/edge/faq.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/projects/edge/for-webmasters.gmi b/code/processes/converting-process/test-resources/memex-marginalia/projects/edge/for-webmasters.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/projects/edge/for-webmasters.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/projects/edge/for-webmasters.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/projects/edge/index.gmi b/code/processes/converting-process/test-resources/memex-marginalia/projects/edge/index.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/projects/edge/index.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/projects/edge/index.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/projects/edge/privacy.gmi b/code/processes/converting-process/test-resources/memex-marginalia/projects/edge/privacy.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/projects/edge/privacy.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/projects/edge/privacy.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/projects/edge/search-tips.gmi b/code/processes/converting-process/test-resources/memex-marginalia/projects/edge/search-tips.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/projects/edge/search-tips.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/projects/edge/search-tips.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/projects/edge/supporting.gmi b/code/processes/converting-process/test-resources/memex-marginalia/projects/edge/supporting.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/projects/edge/supporting.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/projects/edge/supporting.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/projects/edge/top-20.gmi b/code/processes/converting-process/test-resources/memex-marginalia/projects/edge/top-20.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/projects/edge/top-20.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/projects/edge/top-20.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/projects/encyclopedia/index.gmi b/code/processes/converting-process/test-resources/memex-marginalia/projects/encyclopedia/index.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/projects/encyclopedia/index.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/projects/encyclopedia/index.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/projects/gemini-server.gmi b/code/processes/converting-process/test-resources/memex-marginalia/projects/gemini-server.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/projects/gemini-server.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/projects/gemini-server.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/projects/index.gmi b/code/processes/converting-process/test-resources/memex-marginalia/projects/index.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/projects/index.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/projects/index.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/projects/memex.gmi b/code/processes/converting-process/test-resources/memex-marginalia/projects/memex.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/projects/memex.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/projects/memex.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/projects/wmsa.gmi b/code/processes/converting-process/test-resources/memex-marginalia/projects/wmsa.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/projects/wmsa.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/projects/wmsa.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/readme.md b/code/processes/converting-process/test-resources/memex-marginalia/readme.md similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/readme.md rename to code/processes/converting-process/test-resources/memex-marginalia/readme.md diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/recipes/chicken-soup.gmi b/code/processes/converting-process/test-resources/memex-marginalia/recipes/chicken-soup.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/recipes/chicken-soup.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/recipes/chicken-soup.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/recipes/french-borscht.gmi b/code/processes/converting-process/test-resources/memex-marginalia/recipes/french-borscht.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/recipes/french-borscht.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/recipes/french-borscht.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/recipes/index.gmi b/code/processes/converting-process/test-resources/memex-marginalia/recipes/index.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/recipes/index.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/recipes/index.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/recipes/omelette-bacon.gmi b/code/processes/converting-process/test-resources/memex-marginalia/recipes/omelette-bacon.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/recipes/omelette-bacon.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/recipes/omelette-bacon.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/search-about.gmi b/code/processes/converting-process/test-resources/memex-marginalia/search-about.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/search-about.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/search-about.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/server.gmi b/code/processes/converting-process/test-resources/memex-marginalia/server.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/server.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/server.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/special/index.gmi b/code/processes/converting-process/test-resources/memex-marginalia/special/index.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/special/index.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/special/index.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/special/redirect.gmi b/code/processes/converting-process/test-resources/memex-marginalia/special/redirect.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/special/redirect.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/special/redirect.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/special/tombstone.gmi b/code/processes/converting-process/test-resources/memex-marginalia/special/tombstone.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/special/tombstone.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/special/tombstone.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/test.gmi b/code/processes/converting-process/test-resources/memex-marginalia/test.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/test.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/test.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/todo.gmi b/code/processes/converting-process/test-resources/memex-marginalia/todo.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/todo.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/todo.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/todo/done.gmi b/code/processes/converting-process/test-resources/memex-marginalia/todo/done.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/todo/done.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/todo/done.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/todo/index.gmi b/code/processes/converting-process/test-resources/memex-marginalia/todo/index.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/todo/index.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/todo/index.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/todo/todo.gmi b/code/processes/converting-process/test-resources/memex-marginalia/todo/todo.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/todo/todo.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/todo/todo.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/topic/astrolabe.gmi b/code/processes/converting-process/test-resources/memex-marginalia/topic/astrolabe.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/topic/astrolabe.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/topic/astrolabe.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/topic/cooking.gmi b/code/processes/converting-process/test-resources/memex-marginalia/topic/cooking.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/topic/cooking.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/topic/cooking.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/topic/index.gmi b/code/processes/converting-process/test-resources/memex-marginalia/topic/index.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/topic/index.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/topic/index.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/topic/moral-philosophy.gmi b/code/processes/converting-process/test-resources/memex-marginalia/topic/moral-philosophy.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/topic/moral-philosophy.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/topic/moral-philosophy.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/topic/nlnet.gmi b/code/processes/converting-process/test-resources/memex-marginalia/topic/nlnet.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/topic/nlnet.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/topic/nlnet.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/topic/platforms.gmi b/code/processes/converting-process/test-resources/memex-marginalia/topic/platforms.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/topic/platforms.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/topic/platforms.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/topic/programming.gmi b/code/processes/converting-process/test-resources/memex-marginalia/topic/programming.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/topic/programming.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/topic/programming.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/topic/satire.gmi b/code/processes/converting-process/test-resources/memex-marginalia/topic/satire.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/topic/satire.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/topic/satire.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/topic/server.gmi b/code/processes/converting-process/test-resources/memex-marginalia/topic/server.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/topic/server.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/topic/server.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/topic/web-design.gmi b/code/processes/converting-process/test-resources/memex-marginalia/topic/web-design.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/topic/web-design.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/topic/web-design.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/topics.gmi b/code/processes/converting-process/test-resources/memex-marginalia/topics.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/topics.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/topics.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/worklog.gmi b/code/processes/converting-process/test-resources/memex-marginalia/worklog.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/worklog.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/worklog.gmi diff --git a/code/processes/converting-process/src/test/resources/memex-marginalia/writing-topics.gmi b/code/processes/converting-process/test-resources/memex-marginalia/writing-topics.gmi similarity index 100% rename from code/processes/converting-process/src/test/resources/memex-marginalia/writing-topics.gmi rename to code/processes/converting-process/test-resources/memex-marginalia/writing-topics.gmi diff --git a/code/processes/converting-process/src/test/java/nu/marginalia/converting/ConvertingIntegrationTest.java b/code/processes/converting-process/test/nu/marginalia/converting/ConvertingIntegrationTest.java similarity index 100% rename from code/processes/converting-process/src/test/java/nu/marginalia/converting/ConvertingIntegrationTest.java rename to code/processes/converting-process/test/nu/marginalia/converting/ConvertingIntegrationTest.java diff --git a/code/processes/converting-process/src/test/java/nu/marginalia/converting/ConvertingIntegrationTestModule.java b/code/processes/converting-process/test/nu/marginalia/converting/ConvertingIntegrationTestModule.java similarity index 100% rename from code/processes/converting-process/src/test/java/nu/marginalia/converting/ConvertingIntegrationTestModule.java rename to code/processes/converting-process/test/nu/marginalia/converting/ConvertingIntegrationTestModule.java diff --git a/code/processes/converting-process/src/test/java/nu/marginalia/converting/CrawlingThenConvertingIntegrationTest.java b/code/processes/converting-process/test/nu/marginalia/converting/CrawlingThenConvertingIntegrationTest.java similarity index 100% rename from code/processes/converting-process/src/test/java/nu/marginalia/converting/CrawlingThenConvertingIntegrationTest.java rename to code/processes/converting-process/test/nu/marginalia/converting/CrawlingThenConvertingIntegrationTest.java diff --git a/code/processes/converting-process/src/test/java/nu/marginalia/converting/logic/PlainTextLogicTest.java b/code/processes/converting-process/test/nu/marginalia/converting/logic/PlainTextLogicTest.java similarity index 100% rename from code/processes/converting-process/src/test/java/nu/marginalia/converting/logic/PlainTextLogicTest.java rename to code/processes/converting-process/test/nu/marginalia/converting/logic/PlainTextLogicTest.java diff --git a/code/processes/converting-process/src/test/java/nu/marginalia/converting/processor/logic/MetaRobotsTagTest.java b/code/processes/converting-process/test/nu/marginalia/converting/processor/logic/MetaRobotsTagTest.java similarity index 100% rename from code/processes/converting-process/src/test/java/nu/marginalia/converting/processor/logic/MetaRobotsTagTest.java rename to code/processes/converting-process/test/nu/marginalia/converting/processor/logic/MetaRobotsTagTest.java diff --git a/code/processes/converting-process/src/test/java/nu/marginalia/converting/processor/logic/dom/MeasureLengthVisitorTest.java b/code/processes/converting-process/test/nu/marginalia/converting/processor/logic/dom/MeasureLengthVisitorTest.java similarity index 100% rename from code/processes/converting-process/src/test/java/nu/marginalia/converting/processor/logic/dom/MeasureLengthVisitorTest.java rename to code/processes/converting-process/test/nu/marginalia/converting/processor/logic/dom/MeasureLengthVisitorTest.java diff --git a/code/processes/converting-process/src/test/java/nu/marginalia/converting/processor/plugin/specialization/BlogSpecializationTest.java b/code/processes/converting-process/test/nu/marginalia/converting/processor/plugin/specialization/BlogSpecializationTest.java similarity index 100% rename from code/processes/converting-process/src/test/java/nu/marginalia/converting/processor/plugin/specialization/BlogSpecializationTest.java rename to code/processes/converting-process/test/nu/marginalia/converting/processor/plugin/specialization/BlogSpecializationTest.java diff --git a/code/processes/converting-process/src/test/java/nu/marginalia/converting/processor/plugin/specialization/JavadocSpecializationTest.java b/code/processes/converting-process/test/nu/marginalia/converting/processor/plugin/specialization/JavadocSpecializationTest.java similarity index 100% rename from code/processes/converting-process/src/test/java/nu/marginalia/converting/processor/plugin/specialization/JavadocSpecializationTest.java rename to code/processes/converting-process/test/nu/marginalia/converting/processor/plugin/specialization/JavadocSpecializationTest.java diff --git a/code/processes/converting-process/src/test/java/nu/marginalia/converting/processor/plugin/specialization/LemmySpecializationTest.java b/code/processes/converting-process/test/nu/marginalia/converting/processor/plugin/specialization/LemmySpecializationTest.java similarity index 100% rename from code/processes/converting-process/src/test/java/nu/marginalia/converting/processor/plugin/specialization/LemmySpecializationTest.java rename to code/processes/converting-process/test/nu/marginalia/converting/processor/plugin/specialization/LemmySpecializationTest.java diff --git a/code/processes/converting-process/src/test/java/nu/marginalia/converting/processor/plugin/specialization/WikiSpecializationTest.java b/code/processes/converting-process/test/nu/marginalia/converting/processor/plugin/specialization/WikiSpecializationTest.java similarity index 100% rename from code/processes/converting-process/src/test/java/nu/marginalia/converting/processor/plugin/specialization/WikiSpecializationTest.java rename to code/processes/converting-process/test/nu/marginalia/converting/processor/plugin/specialization/WikiSpecializationTest.java diff --git a/code/processes/converting-process/src/test/java/nu/marginalia/converting/processor/plugin/specialization/XenForoSpecializationTest.java b/code/processes/converting-process/test/nu/marginalia/converting/processor/plugin/specialization/XenForoSpecializationTest.java similarity index 100% rename from code/processes/converting-process/src/test/java/nu/marginalia/converting/processor/plugin/specialization/XenForoSpecializationTest.java rename to code/processes/converting-process/test/nu/marginalia/converting/processor/plugin/specialization/XenForoSpecializationTest.java diff --git a/code/processes/converting-process/src/test/java/nu/marginalia/converting/sideload/encyclopedia/EncyclopediaMarginaliaNuSideloaderTest.java b/code/processes/converting-process/test/nu/marginalia/converting/sideload/encyclopedia/EncyclopediaMarginaliaNuSideloaderTest.java similarity index 100% rename from code/processes/converting-process/src/test/java/nu/marginalia/converting/sideload/encyclopedia/EncyclopediaMarginaliaNuSideloaderTest.java rename to code/processes/converting-process/test/nu/marginalia/converting/sideload/encyclopedia/EncyclopediaMarginaliaNuSideloaderTest.java diff --git a/code/processes/converting-process/src/test/java/nu/marginalia/converting/sideload/reddit/RedditSideloaderTest.java b/code/processes/converting-process/test/nu/marginalia/converting/sideload/reddit/RedditSideloaderTest.java similarity index 100% rename from code/processes/converting-process/src/test/java/nu/marginalia/converting/sideload/reddit/RedditSideloaderTest.java rename to code/processes/converting-process/test/nu/marginalia/converting/sideload/reddit/RedditSideloaderTest.java diff --git a/code/processes/converting-process/src/test/java/nu/marginalia/converting/sideload/warc/WarcSideloaderTest.java b/code/processes/converting-process/test/nu/marginalia/converting/sideload/warc/WarcSideloaderTest.java similarity index 100% rename from code/processes/converting-process/src/test/java/nu/marginalia/converting/sideload/warc/WarcSideloaderTest.java rename to code/processes/converting-process/test/nu/marginalia/converting/sideload/warc/WarcSideloaderTest.java diff --git a/code/processes/converting-process/src/test/java/nu/marginalia/converting/util/LineUtilsTest.java b/code/processes/converting-process/test/nu/marginalia/converting/util/LineUtilsTest.java similarity index 100% rename from code/processes/converting-process/src/test/java/nu/marginalia/converting/util/LineUtilsTest.java rename to code/processes/converting-process/test/nu/marginalia/converting/util/LineUtilsTest.java diff --git a/code/processes/converting-process/src/test/java/nu/marginalia/converting/util/TestLanguageModels.java b/code/processes/converting-process/test/nu/marginalia/converting/util/TestLanguageModels.java similarity index 100% rename from code/processes/converting-process/src/test/java/nu/marginalia/converting/util/TestLanguageModels.java rename to code/processes/converting-process/test/nu/marginalia/converting/util/TestLanguageModels.java diff --git a/code/processes/crawling-process/build.gradle b/code/processes/crawling-process/build.gradle index ed53c6a0..94a60b11 100644 --- a/code/processes/crawling-process/build.gradle +++ b/code/processes/crawling-process/build.gradle @@ -18,6 +18,8 @@ application { tasks.distZip.enabled = false +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':code:common:process') diff --git a/code/processes/crawling-process/src/main/java/nu/marginalia/crawl/AbortMonitor.java b/code/processes/crawling-process/java/nu/marginalia/crawl/AbortMonitor.java similarity index 100% rename from code/processes/crawling-process/src/main/java/nu/marginalia/crawl/AbortMonitor.java rename to code/processes/crawling-process/java/nu/marginalia/crawl/AbortMonitor.java diff --git a/code/processes/crawling-process/src/main/java/nu/marginalia/crawl/CrawlerMain.java b/code/processes/crawling-process/java/nu/marginalia/crawl/CrawlerMain.java similarity index 100% rename from code/processes/crawling-process/src/main/java/nu/marginalia/crawl/CrawlerMain.java rename to code/processes/crawling-process/java/nu/marginalia/crawl/CrawlerMain.java diff --git a/code/processes/crawling-process/src/main/java/nu/marginalia/crawl/CrawlerModule.java b/code/processes/crawling-process/java/nu/marginalia/crawl/CrawlerModule.java similarity index 100% rename from code/processes/crawling-process/src/main/java/nu/marginalia/crawl/CrawlerModule.java rename to code/processes/crawling-process/java/nu/marginalia/crawl/CrawlerModule.java diff --git a/code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/Cookies.java b/code/processes/crawling-process/java/nu/marginalia/crawl/retreival/Cookies.java similarity index 100% rename from code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/Cookies.java rename to code/processes/crawling-process/java/nu/marginalia/crawl/retreival/Cookies.java diff --git a/code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/CrawlDataReference.java b/code/processes/crawling-process/java/nu/marginalia/crawl/retreival/CrawlDataReference.java similarity index 100% rename from code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/CrawlDataReference.java rename to code/processes/crawling-process/java/nu/marginalia/crawl/retreival/CrawlDataReference.java diff --git a/code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/CrawlDelayTimer.java b/code/processes/crawling-process/java/nu/marginalia/crawl/retreival/CrawlDelayTimer.java similarity index 100% rename from code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/CrawlDelayTimer.java rename to code/processes/crawling-process/java/nu/marginalia/crawl/retreival/CrawlDelayTimer.java diff --git a/code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/CrawledDocumentFactory.java b/code/processes/crawling-process/java/nu/marginalia/crawl/retreival/CrawledDocumentFactory.java similarity index 100% rename from code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/CrawledDocumentFactory.java rename to code/processes/crawling-process/java/nu/marginalia/crawl/retreival/CrawledDocumentFactory.java diff --git a/code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/CrawlerRetreiver.java b/code/processes/crawling-process/java/nu/marginalia/crawl/retreival/CrawlerRetreiver.java similarity index 100% rename from code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/CrawlerRetreiver.java rename to code/processes/crawling-process/java/nu/marginalia/crawl/retreival/CrawlerRetreiver.java diff --git a/code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/CrawlerWarcResynchronizer.java b/code/processes/crawling-process/java/nu/marginalia/crawl/retreival/CrawlerWarcResynchronizer.java similarity index 100% rename from code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/CrawlerWarcResynchronizer.java rename to code/processes/crawling-process/java/nu/marginalia/crawl/retreival/CrawlerWarcResynchronizer.java diff --git a/code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/DomainCrawlFrontier.java b/code/processes/crawling-process/java/nu/marginalia/crawl/retreival/DomainCrawlFrontier.java similarity index 100% rename from code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/DomainCrawlFrontier.java rename to code/processes/crawling-process/java/nu/marginalia/crawl/retreival/DomainCrawlFrontier.java diff --git a/code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/DomainProber.java b/code/processes/crawling-process/java/nu/marginalia/crawl/retreival/DomainProber.java similarity index 100% rename from code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/DomainProber.java rename to code/processes/crawling-process/java/nu/marginalia/crawl/retreival/DomainProber.java diff --git a/code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/LinkFilterSelector.java b/code/processes/crawling-process/java/nu/marginalia/crawl/retreival/LinkFilterSelector.java similarity index 100% rename from code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/LinkFilterSelector.java rename to code/processes/crawling-process/java/nu/marginalia/crawl/retreival/LinkFilterSelector.java diff --git a/code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/RateLimitException.java b/code/processes/crawling-process/java/nu/marginalia/crawl/retreival/RateLimitException.java similarity index 100% rename from code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/RateLimitException.java rename to code/processes/crawling-process/java/nu/marginalia/crawl/retreival/RateLimitException.java diff --git a/code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/fetcher/ContentTags.java b/code/processes/crawling-process/java/nu/marginalia/crawl/retreival/fetcher/ContentTags.java similarity index 100% rename from code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/fetcher/ContentTags.java rename to code/processes/crawling-process/java/nu/marginalia/crawl/retreival/fetcher/ContentTags.java diff --git a/code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/fetcher/ContentTypeProber.java b/code/processes/crawling-process/java/nu/marginalia/crawl/retreival/fetcher/ContentTypeProber.java similarity index 100% rename from code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/fetcher/ContentTypeProber.java rename to code/processes/crawling-process/java/nu/marginalia/crawl/retreival/fetcher/ContentTypeProber.java diff --git a/code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/fetcher/FetchResult.java b/code/processes/crawling-process/java/nu/marginalia/crawl/retreival/fetcher/FetchResult.java similarity index 100% rename from code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/fetcher/FetchResult.java rename to code/processes/crawling-process/java/nu/marginalia/crawl/retreival/fetcher/FetchResult.java diff --git a/code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/fetcher/FetchResultState.java b/code/processes/crawling-process/java/nu/marginalia/crawl/retreival/fetcher/FetchResultState.java similarity index 100% rename from code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/fetcher/FetchResultState.java rename to code/processes/crawling-process/java/nu/marginalia/crawl/retreival/fetcher/FetchResultState.java diff --git a/code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/fetcher/HttpFetcher.java b/code/processes/crawling-process/java/nu/marginalia/crawl/retreival/fetcher/HttpFetcher.java similarity index 100% rename from code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/fetcher/HttpFetcher.java rename to code/processes/crawling-process/java/nu/marginalia/crawl/retreival/fetcher/HttpFetcher.java diff --git a/code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/fetcher/HttpFetcherImpl.java b/code/processes/crawling-process/java/nu/marginalia/crawl/retreival/fetcher/HttpFetcherImpl.java similarity index 100% rename from code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/fetcher/HttpFetcherImpl.java rename to code/processes/crawling-process/java/nu/marginalia/crawl/retreival/fetcher/HttpFetcherImpl.java diff --git a/code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/fetcher/SitemapRetriever.java b/code/processes/crawling-process/java/nu/marginalia/crawl/retreival/fetcher/SitemapRetriever.java similarity index 100% rename from code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/fetcher/SitemapRetriever.java rename to code/processes/crawling-process/java/nu/marginalia/crawl/retreival/fetcher/SitemapRetriever.java diff --git a/code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/fetcher/socket/FastTerminatingSocketFactory.java b/code/processes/crawling-process/java/nu/marginalia/crawl/retreival/fetcher/socket/FastTerminatingSocketFactory.java similarity index 100% rename from code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/fetcher/socket/FastTerminatingSocketFactory.java rename to code/processes/crawling-process/java/nu/marginalia/crawl/retreival/fetcher/socket/FastTerminatingSocketFactory.java diff --git a/code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/fetcher/socket/IpInterceptingNetworkInterceptor.java b/code/processes/crawling-process/java/nu/marginalia/crawl/retreival/fetcher/socket/IpInterceptingNetworkInterceptor.java similarity index 100% rename from code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/fetcher/socket/IpInterceptingNetworkInterceptor.java rename to code/processes/crawling-process/java/nu/marginalia/crawl/retreival/fetcher/socket/IpInterceptingNetworkInterceptor.java diff --git a/code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/fetcher/socket/NoSecuritySSL.java b/code/processes/crawling-process/java/nu/marginalia/crawl/retreival/fetcher/socket/NoSecuritySSL.java similarity index 100% rename from code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/fetcher/socket/NoSecuritySSL.java rename to code/processes/crawling-process/java/nu/marginalia/crawl/retreival/fetcher/socket/NoSecuritySSL.java diff --git a/code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/fetcher/warc/WarcDigestBuilder.java b/code/processes/crawling-process/java/nu/marginalia/crawl/retreival/fetcher/warc/WarcDigestBuilder.java similarity index 100% rename from code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/fetcher/warc/WarcDigestBuilder.java rename to code/processes/crawling-process/java/nu/marginalia/crawl/retreival/fetcher/warc/WarcDigestBuilder.java diff --git a/code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/fetcher/warc/WarcInputBuffer.java b/code/processes/crawling-process/java/nu/marginalia/crawl/retreival/fetcher/warc/WarcInputBuffer.java similarity index 100% rename from code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/fetcher/warc/WarcInputBuffer.java rename to code/processes/crawling-process/java/nu/marginalia/crawl/retreival/fetcher/warc/WarcInputBuffer.java diff --git a/code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/fetcher/warc/WarcProtocolReconstructor.java b/code/processes/crawling-process/java/nu/marginalia/crawl/retreival/fetcher/warc/WarcProtocolReconstructor.java similarity index 100% rename from code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/fetcher/warc/WarcProtocolReconstructor.java rename to code/processes/crawling-process/java/nu/marginalia/crawl/retreival/fetcher/warc/WarcProtocolReconstructor.java diff --git a/code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/fetcher/warc/WarcRecorder.java b/code/processes/crawling-process/java/nu/marginalia/crawl/retreival/fetcher/warc/WarcRecorder.java similarity index 100% rename from code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/fetcher/warc/WarcRecorder.java rename to code/processes/crawling-process/java/nu/marginalia/crawl/retreival/fetcher/warc/WarcRecorder.java diff --git a/code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/revisit/CrawlerRevisitor.java b/code/processes/crawling-process/java/nu/marginalia/crawl/retreival/revisit/CrawlerRevisitor.java similarity index 100% rename from code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/revisit/CrawlerRevisitor.java rename to code/processes/crawling-process/java/nu/marginalia/crawl/retreival/revisit/CrawlerRevisitor.java diff --git a/code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/revisit/DocumentWithReference.java b/code/processes/crawling-process/java/nu/marginalia/crawl/retreival/revisit/DocumentWithReference.java similarity index 100% rename from code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/revisit/DocumentWithReference.java rename to code/processes/crawling-process/java/nu/marginalia/crawl/retreival/revisit/DocumentWithReference.java diff --git a/code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/sitemap/SitemapFetcher.java b/code/processes/crawling-process/java/nu/marginalia/crawl/retreival/sitemap/SitemapFetcher.java similarity index 100% rename from code/processes/crawling-process/src/main/java/nu/marginalia/crawl/retreival/sitemap/SitemapFetcher.java rename to code/processes/crawling-process/java/nu/marginalia/crawl/retreival/sitemap/SitemapFetcher.java diff --git a/code/processes/crawling-process/src/main/java/nu/marginalia/crawl/spec/CrawlSpecProvider.java b/code/processes/crawling-process/java/nu/marginalia/crawl/spec/CrawlSpecProvider.java similarity index 100% rename from code/processes/crawling-process/src/main/java/nu/marginalia/crawl/spec/CrawlSpecProvider.java rename to code/processes/crawling-process/java/nu/marginalia/crawl/spec/CrawlSpecProvider.java diff --git a/code/processes/crawling-process/src/main/java/nu/marginalia/crawl/spec/DbCrawlSpecProvider.java b/code/processes/crawling-process/java/nu/marginalia/crawl/spec/DbCrawlSpecProvider.java similarity index 100% rename from code/processes/crawling-process/src/main/java/nu/marginalia/crawl/spec/DbCrawlSpecProvider.java rename to code/processes/crawling-process/java/nu/marginalia/crawl/spec/DbCrawlSpecProvider.java diff --git a/code/processes/crawling-process/src/main/java/nu/marginalia/crawl/spec/ParquetCrawlSpecProvider.java b/code/processes/crawling-process/java/nu/marginalia/crawl/spec/ParquetCrawlSpecProvider.java similarity index 100% rename from code/processes/crawling-process/src/main/java/nu/marginalia/crawl/spec/ParquetCrawlSpecProvider.java rename to code/processes/crawling-process/java/nu/marginalia/crawl/spec/ParquetCrawlSpecProvider.java diff --git a/code/processes/crawling-process/src/main/java/nu/marginalia/crawl/warc/WarcArchiverFactory.java b/code/processes/crawling-process/java/nu/marginalia/crawl/warc/WarcArchiverFactory.java similarity index 100% rename from code/processes/crawling-process/src/main/java/nu/marginalia/crawl/warc/WarcArchiverFactory.java rename to code/processes/crawling-process/java/nu/marginalia/crawl/warc/WarcArchiverFactory.java diff --git a/code/processes/crawling-process/src/main/java/nu/marginalia/crawl/warc/WarcArchiverIf.java b/code/processes/crawling-process/java/nu/marginalia/crawl/warc/WarcArchiverIf.java similarity index 100% rename from code/processes/crawling-process/src/main/java/nu/marginalia/crawl/warc/WarcArchiverIf.java rename to code/processes/crawling-process/java/nu/marginalia/crawl/warc/WarcArchiverIf.java diff --git a/code/processes/crawling-process/src/main/resources/ip-banned-cidr.txt b/code/processes/crawling-process/resources/ip-banned-cidr.txt similarity index 100% rename from code/processes/crawling-process/src/main/resources/ip-banned-cidr.txt rename to code/processes/crawling-process/resources/ip-banned-cidr.txt diff --git a/code/processes/crawling-process/src/test/java/nu/marginalia/crawl/retreival/CrawlerWarcResynchronizerTest.java b/code/processes/crawling-process/test/nu/marginalia/crawl/retreival/CrawlerWarcResynchronizerTest.java similarity index 100% rename from code/processes/crawling-process/src/test/java/nu/marginalia/crawl/retreival/CrawlerWarcResynchronizerTest.java rename to code/processes/crawling-process/test/nu/marginalia/crawl/retreival/CrawlerWarcResynchronizerTest.java diff --git a/code/processes/crawling-process/src/test/java/nu/marginalia/crawl/retreival/DomainCrawlFrontierTest.java b/code/processes/crawling-process/test/nu/marginalia/crawl/retreival/DomainCrawlFrontierTest.java similarity index 100% rename from code/processes/crawling-process/src/test/java/nu/marginalia/crawl/retreival/DomainCrawlFrontierTest.java rename to code/processes/crawling-process/test/nu/marginalia/crawl/retreival/DomainCrawlFrontierTest.java diff --git a/code/processes/crawling-process/src/test/java/nu/marginalia/crawl/retreival/fetcher/ContentTypeProberTest.java b/code/processes/crawling-process/test/nu/marginalia/crawl/retreival/fetcher/ContentTypeProberTest.java similarity index 100% rename from code/processes/crawling-process/src/test/java/nu/marginalia/crawl/retreival/fetcher/ContentTypeProberTest.java rename to code/processes/crawling-process/test/nu/marginalia/crawl/retreival/fetcher/ContentTypeProberTest.java diff --git a/code/processes/crawling-process/src/test/java/nu/marginalia/crawl/retreival/fetcher/CrawledDocumentParquetRecordFileWriterTest.java b/code/processes/crawling-process/test/nu/marginalia/crawl/retreival/fetcher/CrawledDocumentParquetRecordFileWriterTest.java similarity index 100% rename from code/processes/crawling-process/src/test/java/nu/marginalia/crawl/retreival/fetcher/CrawledDocumentParquetRecordFileWriterTest.java rename to code/processes/crawling-process/test/nu/marginalia/crawl/retreival/fetcher/CrawledDocumentParquetRecordFileWriterTest.java diff --git a/code/processes/crawling-process/src/test/java/nu/marginalia/crawl/retreival/fetcher/WarcRecorderTest.java b/code/processes/crawling-process/test/nu/marginalia/crawl/retreival/fetcher/WarcRecorderTest.java similarity index 100% rename from code/processes/crawling-process/src/test/java/nu/marginalia/crawl/retreival/fetcher/WarcRecorderTest.java rename to code/processes/crawling-process/test/nu/marginalia/crawl/retreival/fetcher/WarcRecorderTest.java diff --git a/code/processes/crawling-process/src/test/java/nu/marginalia/crawl/retreival/revisit/DocumentWithReferenceTest.java b/code/processes/crawling-process/test/nu/marginalia/crawl/retreival/revisit/DocumentWithReferenceTest.java similarity index 100% rename from code/processes/crawling-process/src/test/java/nu/marginalia/crawl/retreival/revisit/DocumentWithReferenceTest.java rename to code/processes/crawling-process/test/nu/marginalia/crawl/retreival/revisit/DocumentWithReferenceTest.java diff --git a/code/processes/crawling-process/src/test/java/nu/marginalia/crawling/CrawlPlanLoaderTest.java b/code/processes/crawling-process/test/nu/marginalia/crawling/CrawlPlanLoaderTest.java similarity index 100% rename from code/processes/crawling-process/src/test/java/nu/marginalia/crawling/CrawlPlanLoaderTest.java rename to code/processes/crawling-process/test/nu/marginalia/crawling/CrawlPlanLoaderTest.java diff --git a/code/processes/crawling-process/src/test/java/nu/marginalia/crawling/DomainCrawlerRobotsTxtTest.java b/code/processes/crawling-process/test/nu/marginalia/crawling/DomainCrawlerRobotsTxtTest.java similarity index 100% rename from code/processes/crawling-process/src/test/java/nu/marginalia/crawling/DomainCrawlerRobotsTxtTest.java rename to code/processes/crawling-process/test/nu/marginalia/crawling/DomainCrawlerRobotsTxtTest.java diff --git a/code/processes/crawling-process/src/test/java/nu/marginalia/crawling/HttpFetcherTest.java b/code/processes/crawling-process/test/nu/marginalia/crawling/HttpFetcherTest.java similarity index 100% rename from code/processes/crawling-process/src/test/java/nu/marginalia/crawling/HttpFetcherTest.java rename to code/processes/crawling-process/test/nu/marginalia/crawling/HttpFetcherTest.java diff --git a/code/processes/crawling-process/src/test/java/nu/marginalia/crawling/LinkParserTest.java b/code/processes/crawling-process/test/nu/marginalia/crawling/LinkParserTest.java similarity index 100% rename from code/processes/crawling-process/src/test/java/nu/marginalia/crawling/LinkParserTest.java rename to code/processes/crawling-process/test/nu/marginalia/crawling/LinkParserTest.java diff --git a/code/processes/crawling-process/src/test/java/nu/marginalia/crawling/RssCrawlerTest.java b/code/processes/crawling-process/test/nu/marginalia/crawling/RssCrawlerTest.java similarity index 100% rename from code/processes/crawling-process/src/test/java/nu/marginalia/crawling/RssCrawlerTest.java rename to code/processes/crawling-process/test/nu/marginalia/crawling/RssCrawlerTest.java diff --git a/code/processes/crawling-process/src/test/java/nu/marginalia/crawling/retreival/CrawlerMockFetcherTest.java b/code/processes/crawling-process/test/nu/marginalia/crawling/retreival/CrawlerMockFetcherTest.java similarity index 100% rename from code/processes/crawling-process/src/test/java/nu/marginalia/crawling/retreival/CrawlerMockFetcherTest.java rename to code/processes/crawling-process/test/nu/marginalia/crawling/retreival/CrawlerMockFetcherTest.java diff --git a/code/processes/crawling-process/src/test/java/nu/marginalia/crawling/retreival/CrawlerRetreiverTest.java b/code/processes/crawling-process/test/nu/marginalia/crawling/retreival/CrawlerRetreiverTest.java similarity index 100% rename from code/processes/crawling-process/src/test/java/nu/marginalia/crawling/retreival/CrawlerRetreiverTest.java rename to code/processes/crawling-process/test/nu/marginalia/crawling/retreival/CrawlerRetreiverTest.java diff --git a/code/processes/index-constructor-process/build.gradle b/code/processes/index-constructor-process/build.gradle index f7361358..5e48deea 100644 --- a/code/processes/index-constructor-process/build.gradle +++ b/code/processes/index-constructor-process/build.gradle @@ -18,6 +18,8 @@ application { tasks.distZip.enabled = false +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':code:process-mqapi') implementation project(':code:common:process') @@ -28,8 +30,8 @@ dependencies { implementation project(':code:libraries:message-queue') implementation project(':code:index:query') - implementation project(':code:index:forward-index') - implementation project(':code:index:reverse-index') + implementation project(':code:index:index-forward') + implementation project(':code:index:index-reverse') implementation project(':code:index:index-journal') implementation libs.bundles.slf4j diff --git a/code/processes/index-constructor-process/src/main/java/nu/marginalia/index/IndexConstructorMain.java b/code/processes/index-constructor-process/java/nu/marginalia/index/IndexConstructorMain.java similarity index 100% rename from code/processes/index-constructor-process/src/main/java/nu/marginalia/index/IndexConstructorMain.java rename to code/processes/index-constructor-process/java/nu/marginalia/index/IndexConstructorMain.java diff --git a/code/processes/index-constructor-process/src/main/java/nu/marginalia/index/IndexConstructorModule.java b/code/processes/index-constructor-process/java/nu/marginalia/index/IndexConstructorModule.java similarity index 100% rename from code/processes/index-constructor-process/src/main/java/nu/marginalia/index/IndexConstructorModule.java rename to code/processes/index-constructor-process/java/nu/marginalia/index/IndexConstructorModule.java diff --git a/code/processes/loading-process/build.gradle b/code/processes/loading-process/build.gradle index 66db9cb9..cf3ef16b 100644 --- a/code/processes/loading-process/build.gradle +++ b/code/processes/loading-process/build.gradle @@ -17,6 +17,8 @@ application { tasks.distZip.enabled = false +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':code:common:process') implementation project(':code:process-mqapi') diff --git a/code/processes/loading-process/src/main/java/nu/marginalia/loading/LoaderIndexJournalWriter.java b/code/processes/loading-process/java/nu/marginalia/loading/LoaderIndexJournalWriter.java similarity index 100% rename from code/processes/loading-process/src/main/java/nu/marginalia/loading/LoaderIndexJournalWriter.java rename to code/processes/loading-process/java/nu/marginalia/loading/LoaderIndexJournalWriter.java diff --git a/code/processes/loading-process/src/main/java/nu/marginalia/loading/LoaderInputData.java b/code/processes/loading-process/java/nu/marginalia/loading/LoaderInputData.java similarity index 100% rename from code/processes/loading-process/src/main/java/nu/marginalia/loading/LoaderInputData.java rename to code/processes/loading-process/java/nu/marginalia/loading/LoaderInputData.java diff --git a/code/processes/loading-process/src/main/java/nu/marginalia/loading/LoaderMain.java b/code/processes/loading-process/java/nu/marginalia/loading/LoaderMain.java similarity index 100% rename from code/processes/loading-process/src/main/java/nu/marginalia/loading/LoaderMain.java rename to code/processes/loading-process/java/nu/marginalia/loading/LoaderMain.java diff --git a/code/processes/loading-process/src/main/java/nu/marginalia/loading/LoaderModule.java b/code/processes/loading-process/java/nu/marginalia/loading/LoaderModule.java similarity index 100% rename from code/processes/loading-process/src/main/java/nu/marginalia/loading/LoaderModule.java rename to code/processes/loading-process/java/nu/marginalia/loading/LoaderModule.java diff --git a/code/processes/loading-process/src/main/java/nu/marginalia/loading/documents/DocumentLoaderService.java b/code/processes/loading-process/java/nu/marginalia/loading/documents/DocumentLoaderService.java similarity index 100% rename from code/processes/loading-process/src/main/java/nu/marginalia/loading/documents/DocumentLoaderService.java rename to code/processes/loading-process/java/nu/marginalia/loading/documents/DocumentLoaderService.java diff --git a/code/processes/loading-process/src/main/java/nu/marginalia/loading/documents/KeywordLoaderService.java b/code/processes/loading-process/java/nu/marginalia/loading/documents/KeywordLoaderService.java similarity index 100% rename from code/processes/loading-process/src/main/java/nu/marginalia/loading/documents/KeywordLoaderService.java rename to code/processes/loading-process/java/nu/marginalia/loading/documents/KeywordLoaderService.java diff --git a/code/processes/loading-process/src/main/java/nu/marginalia/loading/domains/DomainIdRegistry.java b/code/processes/loading-process/java/nu/marginalia/loading/domains/DomainIdRegistry.java similarity index 100% rename from code/processes/loading-process/src/main/java/nu/marginalia/loading/domains/DomainIdRegistry.java rename to code/processes/loading-process/java/nu/marginalia/loading/domains/DomainIdRegistry.java diff --git a/code/processes/loading-process/src/main/java/nu/marginalia/loading/domains/DomainLoaderService.java b/code/processes/loading-process/java/nu/marginalia/loading/domains/DomainLoaderService.java similarity index 100% rename from code/processes/loading-process/src/main/java/nu/marginalia/loading/domains/DomainLoaderService.java rename to code/processes/loading-process/java/nu/marginalia/loading/domains/DomainLoaderService.java diff --git a/code/processes/loading-process/src/main/java/nu/marginalia/loading/links/DomainLinksLoaderService.java b/code/processes/loading-process/java/nu/marginalia/loading/links/DomainLinksLoaderService.java similarity index 100% rename from code/processes/loading-process/src/main/java/nu/marginalia/loading/links/DomainLinksLoaderService.java rename to code/processes/loading-process/java/nu/marginalia/loading/links/DomainLinksLoaderService.java diff --git a/code/processes/loading-process/src/test/java/nu/marginalia/loader/DbTestUtil.java b/code/processes/loading-process/test/nu/marginalia/loader/DbTestUtil.java similarity index 100% rename from code/processes/loading-process/src/test/java/nu/marginalia/loader/DbTestUtil.java rename to code/processes/loading-process/test/nu/marginalia/loader/DbTestUtil.java diff --git a/code/processes/loading-process/src/test/java/nu/marginalia/loading/domains/DomainLoaderServiceTest.java b/code/processes/loading-process/test/nu/marginalia/loading/domains/DomainLoaderServiceTest.java similarity index 100% rename from code/processes/loading-process/src/test/java/nu/marginalia/loading/domains/DomainLoaderServiceTest.java rename to code/processes/loading-process/test/nu/marginalia/loading/domains/DomainLoaderServiceTest.java diff --git a/code/processes/loading-process/src/test/java/nu/marginalia/loading/loader/LoaderIndexJournalWriterTest.java b/code/processes/loading-process/test/nu/marginalia/loading/loader/LoaderIndexJournalWriterTest.java similarity index 100% rename from code/processes/loading-process/src/test/java/nu/marginalia/loading/loader/LoaderIndexJournalWriterTest.java rename to code/processes/loading-process/test/nu/marginalia/loading/loader/LoaderIndexJournalWriterTest.java diff --git a/code/processes/test-data/build.gradle b/code/processes/test-data/build.gradle index 462be8c3..4f184c80 100644 --- a/code/processes/test-data/build.gradle +++ b/code/processes/test-data/build.gradle @@ -10,5 +10,7 @@ java { } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { } diff --git a/code/processes/test-data/src/main/java/nu/marginalia/test/CommonTestData.java b/code/processes/test-data/java/nu/marginalia/test/CommonTestData.java similarity index 100% rename from code/processes/test-data/src/main/java/nu/marginalia/test/CommonTestData.java rename to code/processes/test-data/java/nu/marginalia/test/CommonTestData.java diff --git a/code/processes/test-data/src/main/resources/mock-crawl-data/discourse/grid.html b/code/processes/test-data/resources/mock-crawl-data/discourse/grid.html similarity index 100% rename from code/processes/test-data/src/main/resources/mock-crawl-data/discourse/grid.html rename to code/processes/test-data/resources/mock-crawl-data/discourse/grid.html diff --git a/code/processes/test-data/src/main/resources/mock-crawl-data/discourse/index.html b/code/processes/test-data/resources/mock-crawl-data/discourse/index.html similarity index 100% rename from code/processes/test-data/src/main/resources/mock-crawl-data/discourse/index.html rename to code/processes/test-data/resources/mock-crawl-data/discourse/index.html diff --git a/code/processes/test-data/src/main/resources/mock-crawl-data/discourse/telegram.html b/code/processes/test-data/resources/mock-crawl-data/discourse/telegram.html similarity index 100% rename from code/processes/test-data/src/main/resources/mock-crawl-data/discourse/telegram.html rename to code/processes/test-data/resources/mock-crawl-data/discourse/telegram.html diff --git a/code/processes/test-data/src/main/resources/mock-crawl-data/javadoc/stream.html b/code/processes/test-data/resources/mock-crawl-data/javadoc/stream.html similarity index 100% rename from code/processes/test-data/src/main/resources/mock-crawl-data/javadoc/stream.html rename to code/processes/test-data/resources/mock-crawl-data/javadoc/stream.html diff --git a/code/processes/test-data/src/main/resources/mock-crawl-data/lemmy/108995.html b/code/processes/test-data/resources/mock-crawl-data/lemmy/108995.html similarity index 100% rename from code/processes/test-data/src/main/resources/mock-crawl-data/lemmy/108995.html rename to code/processes/test-data/resources/mock-crawl-data/lemmy/108995.html diff --git a/code/processes/test-data/src/main/resources/mock-crawl-data/lemmy/c_startrek.html b/code/processes/test-data/resources/mock-crawl-data/lemmy/c_startrek.html similarity index 100% rename from code/processes/test-data/src/main/resources/mock-crawl-data/lemmy/c_startrek.html rename to code/processes/test-data/resources/mock-crawl-data/lemmy/c_startrek.html diff --git a/code/processes/test-data/src/main/resources/mock-crawl-data/lemmy/index.html b/code/processes/test-data/resources/mock-crawl-data/lemmy/index.html similarity index 100% rename from code/processes/test-data/src/main/resources/mock-crawl-data/lemmy/index.html rename to code/processes/test-data/resources/mock-crawl-data/lemmy/index.html diff --git a/code/processes/test-data/src/main/resources/mock-crawl-data/mediawiki/doom1.html b/code/processes/test-data/resources/mock-crawl-data/mediawiki/doom1.html similarity index 100% rename from code/processes/test-data/src/main/resources/mock-crawl-data/mediawiki/doom1.html rename to code/processes/test-data/resources/mock-crawl-data/mediawiki/doom1.html diff --git a/code/processes/test-data/src/main/resources/mock-crawl-data/mediawiki/doom2.html b/code/processes/test-data/resources/mock-crawl-data/mediawiki/doom2.html similarity index 100% rename from code/processes/test-data/src/main/resources/mock-crawl-data/mediawiki/doom2.html rename to code/processes/test-data/resources/mock-crawl-data/mediawiki/doom2.html diff --git a/code/processes/test-data/src/main/resources/mock-crawl-data/mediawiki/index.html b/code/processes/test-data/resources/mock-crawl-data/mediawiki/index.html similarity index 100% rename from code/processes/test-data/src/main/resources/mock-crawl-data/mediawiki/index.html rename to code/processes/test-data/resources/mock-crawl-data/mediawiki/index.html diff --git a/code/processes/test-data/src/main/resources/mock-crawl-data/xenforo/thread.html b/code/processes/test-data/resources/mock-crawl-data/xenforo/thread.html similarity index 100% rename from code/processes/test-data/src/main/resources/mock-crawl-data/xenforo/thread.html rename to code/processes/test-data/resources/mock-crawl-data/xenforo/thread.html diff --git a/code/processes/website-adjacencies-calculator/build.gradle b/code/processes/website-adjacencies-calculator/build.gradle index d262934e..7c4b9623 100644 --- a/code/processes/website-adjacencies-calculator/build.gradle +++ b/code/processes/website-adjacencies-calculator/build.gradle @@ -17,6 +17,8 @@ application { tasks.distZip.enabled = false +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':code:common:model') implementation project(':code:common:db') diff --git a/code/processes/website-adjacencies-calculator/src/main/java/nu/marginalia/adjacencies/AdjacenciesData.java b/code/processes/website-adjacencies-calculator/java/nu/marginalia/adjacencies/AdjacenciesData.java similarity index 100% rename from code/processes/website-adjacencies-calculator/src/main/java/nu/marginalia/adjacencies/AdjacenciesData.java rename to code/processes/website-adjacencies-calculator/java/nu/marginalia/adjacencies/AdjacenciesData.java diff --git a/code/processes/website-adjacencies-calculator/src/main/java/nu/marginalia/adjacencies/AdjacenciesLoader.java b/code/processes/website-adjacencies-calculator/java/nu/marginalia/adjacencies/AdjacenciesLoader.java similarity index 100% rename from code/processes/website-adjacencies-calculator/src/main/java/nu/marginalia/adjacencies/AdjacenciesLoader.java rename to code/processes/website-adjacencies-calculator/java/nu/marginalia/adjacencies/AdjacenciesLoader.java diff --git a/code/processes/website-adjacencies-calculator/src/main/java/nu/marginalia/adjacencies/DomainAliases.java b/code/processes/website-adjacencies-calculator/java/nu/marginalia/adjacencies/DomainAliases.java similarity index 100% rename from code/processes/website-adjacencies-calculator/src/main/java/nu/marginalia/adjacencies/DomainAliases.java rename to code/processes/website-adjacencies-calculator/java/nu/marginalia/adjacencies/DomainAliases.java diff --git a/code/processes/website-adjacencies-calculator/src/main/java/nu/marginalia/adjacencies/SparseBitVector.java b/code/processes/website-adjacencies-calculator/java/nu/marginalia/adjacencies/SparseBitVector.java similarity index 100% rename from code/processes/website-adjacencies-calculator/src/main/java/nu/marginalia/adjacencies/SparseBitVector.java rename to code/processes/website-adjacencies-calculator/java/nu/marginalia/adjacencies/SparseBitVector.java diff --git a/code/processes/website-adjacencies-calculator/src/main/java/nu/marginalia/adjacencies/WebsiteAdjacenciesCalculator.java b/code/processes/website-adjacencies-calculator/java/nu/marginalia/adjacencies/WebsiteAdjacenciesCalculator.java similarity index 100% rename from code/processes/website-adjacencies-calculator/src/main/java/nu/marginalia/adjacencies/WebsiteAdjacenciesCalculator.java rename to code/processes/website-adjacencies-calculator/java/nu/marginalia/adjacencies/WebsiteAdjacenciesCalculator.java diff --git a/code/processes/website-adjacencies-calculator/src/test/java/nu/marginalia/adjacencies/AdjacenciesLoaderTest.java b/code/processes/website-adjacencies-calculator/test/nu/marginalia/adjacencies/AdjacenciesLoaderTest.java similarity index 100% rename from code/processes/website-adjacencies-calculator/src/test/java/nu/marginalia/adjacencies/AdjacenciesLoaderTest.java rename to code/processes/website-adjacencies-calculator/test/nu/marginalia/adjacencies/AdjacenciesLoaderTest.java diff --git a/code/processes/website-adjacencies-calculator/src/test/java/nu/marginalia/adjacencies/SparseBitVectorTest.java b/code/processes/website-adjacencies-calculator/test/nu/marginalia/adjacencies/SparseBitVectorTest.java similarity index 100% rename from code/processes/website-adjacencies-calculator/src/test/java/nu/marginalia/adjacencies/SparseBitVectorTest.java rename to code/processes/website-adjacencies-calculator/test/nu/marginalia/adjacencies/SparseBitVectorTest.java diff --git a/code/services-application/api-service/build.gradle b/code/services-application/api-service/build.gradle index 24293012..b7b29038 100644 --- a/code/services-application/api-service/build.gradle +++ b/code/services-application/api-service/build.gradle @@ -35,6 +35,8 @@ jib { } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':code:common:db') implementation project(':code:common:model') diff --git a/code/services-application/api-service/src/main/java/nu/marginalia/api/ApiMain.java b/code/services-application/api-service/java/nu/marginalia/api/ApiMain.java similarity index 100% rename from code/services-application/api-service/src/main/java/nu/marginalia/api/ApiMain.java rename to code/services-application/api-service/java/nu/marginalia/api/ApiMain.java diff --git a/code/services-application/api-service/src/main/java/nu/marginalia/api/ApiSearchOperator.java b/code/services-application/api-service/java/nu/marginalia/api/ApiSearchOperator.java similarity index 100% rename from code/services-application/api-service/src/main/java/nu/marginalia/api/ApiSearchOperator.java rename to code/services-application/api-service/java/nu/marginalia/api/ApiSearchOperator.java diff --git a/code/services-application/api-service/src/main/java/nu/marginalia/api/ApiService.java b/code/services-application/api-service/java/nu/marginalia/api/ApiService.java similarity index 100% rename from code/services-application/api-service/src/main/java/nu/marginalia/api/ApiService.java rename to code/services-application/api-service/java/nu/marginalia/api/ApiService.java diff --git a/code/services-application/api-service/src/main/java/nu/marginalia/api/model/ApiLicense.java b/code/services-application/api-service/java/nu/marginalia/api/model/ApiLicense.java similarity index 100% rename from code/services-application/api-service/src/main/java/nu/marginalia/api/model/ApiLicense.java rename to code/services-application/api-service/java/nu/marginalia/api/model/ApiLicense.java diff --git a/code/services-application/api-service/src/main/java/nu/marginalia/api/model/ApiSearchResult.java b/code/services-application/api-service/java/nu/marginalia/api/model/ApiSearchResult.java similarity index 100% rename from code/services-application/api-service/src/main/java/nu/marginalia/api/model/ApiSearchResult.java rename to code/services-application/api-service/java/nu/marginalia/api/model/ApiSearchResult.java diff --git a/code/services-application/api-service/src/main/java/nu/marginalia/api/model/ApiSearchResultQueryDetails.java b/code/services-application/api-service/java/nu/marginalia/api/model/ApiSearchResultQueryDetails.java similarity index 100% rename from code/services-application/api-service/src/main/java/nu/marginalia/api/model/ApiSearchResultQueryDetails.java rename to code/services-application/api-service/java/nu/marginalia/api/model/ApiSearchResultQueryDetails.java diff --git a/code/services-application/api-service/src/main/java/nu/marginalia/api/model/ApiSearchResults.java b/code/services-application/api-service/java/nu/marginalia/api/model/ApiSearchResults.java similarity index 100% rename from code/services-application/api-service/src/main/java/nu/marginalia/api/model/ApiSearchResults.java rename to code/services-application/api-service/java/nu/marginalia/api/model/ApiSearchResults.java diff --git a/code/services-application/api-service/src/main/java/nu/marginalia/api/svc/LicenseService.java b/code/services-application/api-service/java/nu/marginalia/api/svc/LicenseService.java similarity index 100% rename from code/services-application/api-service/src/main/java/nu/marginalia/api/svc/LicenseService.java rename to code/services-application/api-service/java/nu/marginalia/api/svc/LicenseService.java diff --git a/code/services-application/api-service/src/main/java/nu/marginalia/api/svc/RateLimiterService.java b/code/services-application/api-service/java/nu/marginalia/api/svc/RateLimiterService.java similarity index 100% rename from code/services-application/api-service/src/main/java/nu/marginalia/api/svc/RateLimiterService.java rename to code/services-application/api-service/java/nu/marginalia/api/svc/RateLimiterService.java diff --git a/code/services-application/api-service/src/main/java/nu/marginalia/api/svc/ResponseCache.java b/code/services-application/api-service/java/nu/marginalia/api/svc/ResponseCache.java similarity index 100% rename from code/services-application/api-service/src/main/java/nu/marginalia/api/svc/ResponseCache.java rename to code/services-application/api-service/java/nu/marginalia/api/svc/ResponseCache.java diff --git a/code/services-application/api-service/src/test/java/nu/marginalia/api/svc/LicenseServiceTest.java b/code/services-application/api-service/test/nu/marginalia/api/svc/LicenseServiceTest.java similarity index 100% rename from code/services-application/api-service/src/test/java/nu/marginalia/api/svc/LicenseServiceTest.java rename to code/services-application/api-service/test/nu/marginalia/api/svc/LicenseServiceTest.java diff --git a/code/services-application/api-service/src/test/java/nu/marginalia/api/svc/RateLimiterServiceTest.java b/code/services-application/api-service/test/nu/marginalia/api/svc/RateLimiterServiceTest.java similarity index 100% rename from code/services-application/api-service/src/test/java/nu/marginalia/api/svc/RateLimiterServiceTest.java rename to code/services-application/api-service/test/nu/marginalia/api/svc/RateLimiterServiceTest.java diff --git a/code/services-application/api-service/src/test/java/nu/marginalia/api/svc/ResponseCacheTest.java b/code/services-application/api-service/test/nu/marginalia/api/svc/ResponseCacheTest.java similarity index 100% rename from code/services-application/api-service/src/test/java/nu/marginalia/api/svc/ResponseCacheTest.java rename to code/services-application/api-service/test/nu/marginalia/api/svc/ResponseCacheTest.java diff --git a/code/services-application/dating-service/build.gradle b/code/services-application/dating-service/build.gradle index b83eff9a..cae0cb59 100644 --- a/code/services-application/dating-service/build.gradle +++ b/code/services-application/dating-service/build.gradle @@ -35,6 +35,8 @@ java { languageVersion.set(JavaLanguageVersion.of(21)) } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':code:common:db') implementation project(':code:common:model') diff --git a/code/services-application/dating-service/src/main/java/nu/marginalia/dating/DatingMain.java b/code/services-application/dating-service/java/nu/marginalia/dating/DatingMain.java similarity index 100% rename from code/services-application/dating-service/src/main/java/nu/marginalia/dating/DatingMain.java rename to code/services-application/dating-service/java/nu/marginalia/dating/DatingMain.java diff --git a/code/services-application/dating-service/src/main/java/nu/marginalia/dating/DatingModule.java b/code/services-application/dating-service/java/nu/marginalia/dating/DatingModule.java similarity index 100% rename from code/services-application/dating-service/src/main/java/nu/marginalia/dating/DatingModule.java rename to code/services-application/dating-service/java/nu/marginalia/dating/DatingModule.java diff --git a/code/services-application/dating-service/src/main/java/nu/marginalia/dating/DatingService.java b/code/services-application/dating-service/java/nu/marginalia/dating/DatingService.java similarity index 100% rename from code/services-application/dating-service/src/main/java/nu/marginalia/dating/DatingService.java rename to code/services-application/dating-service/java/nu/marginalia/dating/DatingService.java diff --git a/code/services-application/dating-service/src/main/java/nu/marginalia/dating/DatingSessionObject.java b/code/services-application/dating-service/java/nu/marginalia/dating/DatingSessionObject.java similarity index 100% rename from code/services-application/dating-service/src/main/java/nu/marginalia/dating/DatingSessionObject.java rename to code/services-application/dating-service/java/nu/marginalia/dating/DatingSessionObject.java diff --git a/code/services-application/dating-service/src/main/resources/static/dating/robots.txt b/code/services-application/dating-service/resources/static/dating/robots.txt similarity index 100% rename from code/services-application/dating-service/src/main/resources/static/dating/robots.txt rename to code/services-application/dating-service/resources/static/dating/robots.txt diff --git a/code/services-application/dating-service/src/main/resources/templates/dating/dating-view.hdb b/code/services-application/dating-service/resources/templates/dating/dating-view.hdb similarity index 100% rename from code/services-application/dating-service/src/main/resources/templates/dating/dating-view.hdb rename to code/services-application/dating-service/resources/templates/dating/dating-view.hdb diff --git a/code/services-application/explorer-service/build.gradle b/code/services-application/explorer-service/build.gradle index 75607fae..cf35c610 100644 --- a/code/services-application/explorer-service/build.gradle +++ b/code/services-application/explorer-service/build.gradle @@ -35,6 +35,8 @@ java { languageVersion.set(JavaLanguageVersion.of(21)) } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':code:common:model') implementation project(':code:common:service') diff --git a/code/services-application/explorer-service/src/main/java/nu/marginalia/explorer/ExplorerMain.java b/code/services-application/explorer-service/java/nu/marginalia/explorer/ExplorerMain.java similarity index 100% rename from code/services-application/explorer-service/src/main/java/nu/marginalia/explorer/ExplorerMain.java rename to code/services-application/explorer-service/java/nu/marginalia/explorer/ExplorerMain.java diff --git a/code/services-application/explorer-service/src/main/java/nu/marginalia/explorer/ExplorerModule.java b/code/services-application/explorer-service/java/nu/marginalia/explorer/ExplorerModule.java similarity index 100% rename from code/services-application/explorer-service/src/main/java/nu/marginalia/explorer/ExplorerModule.java rename to code/services-application/explorer-service/java/nu/marginalia/explorer/ExplorerModule.java diff --git a/code/services-application/explorer-service/src/main/java/nu/marginalia/explorer/ExplorerService.java b/code/services-application/explorer-service/java/nu/marginalia/explorer/ExplorerService.java similarity index 100% rename from code/services-application/explorer-service/src/main/java/nu/marginalia/explorer/ExplorerService.java rename to code/services-application/explorer-service/java/nu/marginalia/explorer/ExplorerService.java diff --git a/code/services-application/explorer-service/src/main/resources/static/explore/robots.txt b/code/services-application/explorer-service/resources/static/explore/robots.txt similarity index 100% rename from code/services-application/explorer-service/src/main/resources/static/explore/robots.txt rename to code/services-application/explorer-service/resources/static/explore/robots.txt diff --git a/code/services-application/explorer-service/src/main/resources/static/explore/style.css b/code/services-application/explorer-service/resources/static/explore/style.css similarity index 100% rename from code/services-application/explorer-service/src/main/resources/static/explore/style.css rename to code/services-application/explorer-service/resources/static/explore/style.css diff --git a/code/services-application/explorer-service/src/main/resources/templates/explorer/explorer-about.hdb b/code/services-application/explorer-service/resources/templates/explorer/explorer-about.hdb similarity index 100% rename from code/services-application/explorer-service/src/main/resources/templates/explorer/explorer-about.hdb rename to code/services-application/explorer-service/resources/templates/explorer/explorer-about.hdb diff --git a/code/services-application/explorer-service/src/main/resources/templates/explorer/explorer-messages.hdb b/code/services-application/explorer-service/resources/templates/explorer/explorer-messages.hdb similarity index 100% rename from code/services-application/explorer-service/src/main/resources/templates/explorer/explorer-messages.hdb rename to code/services-application/explorer-service/resources/templates/explorer/explorer-messages.hdb diff --git a/code/services-application/explorer-service/src/main/resources/templates/explorer/explorer-results.hdb b/code/services-application/explorer-service/resources/templates/explorer/explorer-results.hdb similarity index 100% rename from code/services-application/explorer-service/src/main/resources/templates/explorer/explorer-results.hdb rename to code/services-application/explorer-service/resources/templates/explorer/explorer-results.hdb diff --git a/code/services-application/explorer-service/src/main/resources/templates/explorer/explorer-search.hdb b/code/services-application/explorer-service/resources/templates/explorer/explorer-search.hdb similarity index 100% rename from code/services-application/explorer-service/src/main/resources/templates/explorer/explorer-search.hdb rename to code/services-application/explorer-service/resources/templates/explorer/explorer-search.hdb diff --git a/code/services-application/explorer-service/src/main/resources/templates/explorer/explorer.hdb b/code/services-application/explorer-service/resources/templates/explorer/explorer.hdb similarity index 100% rename from code/services-application/explorer-service/src/main/resources/templates/explorer/explorer.hdb rename to code/services-application/explorer-service/resources/templates/explorer/explorer.hdb diff --git a/code/services-application/search-service/build.gradle b/code/services-application/search-service/build.gradle index a32dc71a..cb799ab9 100644 --- a/code/services-application/search-service/build.gradle +++ b/code/services-application/search-service/build.gradle @@ -42,6 +42,8 @@ sass { outputStyle = EXPANDED } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':code:common:db') implementation project(':code:common:model') diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/SearchHandlebarsConfigurator.java b/code/services-application/search-service/java/nu/marginalia/search/SearchHandlebarsConfigurator.java similarity index 100% rename from code/services-application/search-service/src/main/java/nu/marginalia/search/SearchHandlebarsConfigurator.java rename to code/services-application/search-service/java/nu/marginalia/search/SearchHandlebarsConfigurator.java diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/SearchMain.java b/code/services-application/search-service/java/nu/marginalia/search/SearchMain.java similarity index 100% rename from code/services-application/search-service/src/main/java/nu/marginalia/search/SearchMain.java rename to code/services-application/search-service/java/nu/marginalia/search/SearchMain.java diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/SearchModule.java b/code/services-application/search-service/java/nu/marginalia/search/SearchModule.java similarity index 100% rename from code/services-application/search-service/src/main/java/nu/marginalia/search/SearchModule.java rename to code/services-application/search-service/java/nu/marginalia/search/SearchModule.java diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/SearchOperator.java b/code/services-application/search-service/java/nu/marginalia/search/SearchOperator.java similarity index 100% rename from code/services-application/search-service/src/main/java/nu/marginalia/search/SearchOperator.java rename to code/services-application/search-service/java/nu/marginalia/search/SearchOperator.java diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/SearchQueryParamFactory.java b/code/services-application/search-service/java/nu/marginalia/search/SearchQueryParamFactory.java similarity index 100% rename from code/services-application/search-service/src/main/java/nu/marginalia/search/SearchQueryParamFactory.java rename to code/services-application/search-service/java/nu/marginalia/search/SearchQueryParamFactory.java diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/SearchResultClusterer.java b/code/services-application/search-service/java/nu/marginalia/search/SearchResultClusterer.java similarity index 100% rename from code/services-application/search-service/src/main/java/nu/marginalia/search/SearchResultClusterer.java rename to code/services-application/search-service/java/nu/marginalia/search/SearchResultClusterer.java diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/SearchService.java b/code/services-application/search-service/java/nu/marginalia/search/SearchService.java similarity index 100% rename from code/services-application/search-service/src/main/java/nu/marginalia/search/SearchService.java rename to code/services-application/search-service/java/nu/marginalia/search/SearchService.java diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/command/CommandEvaluator.java b/code/services-application/search-service/java/nu/marginalia/search/command/CommandEvaluator.java similarity index 100% rename from code/services-application/search-service/src/main/java/nu/marginalia/search/command/CommandEvaluator.java rename to code/services-application/search-service/java/nu/marginalia/search/command/CommandEvaluator.java diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/command/SearchAdtechParameter.java b/code/services-application/search-service/java/nu/marginalia/search/command/SearchAdtechParameter.java similarity index 100% rename from code/services-application/search-service/src/main/java/nu/marginalia/search/command/SearchAdtechParameter.java rename to code/services-application/search-service/java/nu/marginalia/search/command/SearchAdtechParameter.java diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/command/SearchCommandInterface.java b/code/services-application/search-service/java/nu/marginalia/search/command/SearchCommandInterface.java similarity index 100% rename from code/services-application/search-service/src/main/java/nu/marginalia/search/command/SearchCommandInterface.java rename to code/services-application/search-service/java/nu/marginalia/search/command/SearchCommandInterface.java diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/command/SearchJsParameter.java b/code/services-application/search-service/java/nu/marginalia/search/command/SearchJsParameter.java similarity index 100% rename from code/services-application/search-service/src/main/java/nu/marginalia/search/command/SearchJsParameter.java rename to code/services-application/search-service/java/nu/marginalia/search/command/SearchJsParameter.java diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/command/SearchParameters.java b/code/services-application/search-service/java/nu/marginalia/search/command/SearchParameters.java similarity index 100% rename from code/services-application/search-service/src/main/java/nu/marginalia/search/command/SearchParameters.java rename to code/services-application/search-service/java/nu/marginalia/search/command/SearchParameters.java diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/command/SearchRecentParameter.java b/code/services-application/search-service/java/nu/marginalia/search/command/SearchRecentParameter.java similarity index 100% rename from code/services-application/search-service/src/main/java/nu/marginalia/search/command/SearchRecentParameter.java rename to code/services-application/search-service/java/nu/marginalia/search/command/SearchRecentParameter.java diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/command/SearchTitleParameter.java b/code/services-application/search-service/java/nu/marginalia/search/command/SearchTitleParameter.java similarity index 100% rename from code/services-application/search-service/src/main/java/nu/marginalia/search/command/SearchTitleParameter.java rename to code/services-application/search-service/java/nu/marginalia/search/command/SearchTitleParameter.java diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/command/commands/BangCommand.java b/code/services-application/search-service/java/nu/marginalia/search/command/commands/BangCommand.java similarity index 100% rename from code/services-application/search-service/src/main/java/nu/marginalia/search/command/commands/BangCommand.java rename to code/services-application/search-service/java/nu/marginalia/search/command/commands/BangCommand.java diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/command/commands/BrowseCommand.java b/code/services-application/search-service/java/nu/marginalia/search/command/commands/BrowseCommand.java similarity index 100% rename from code/services-application/search-service/src/main/java/nu/marginalia/search/command/commands/BrowseCommand.java rename to code/services-application/search-service/java/nu/marginalia/search/command/commands/BrowseCommand.java diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/command/commands/ConvertCommand.java b/code/services-application/search-service/java/nu/marginalia/search/command/commands/ConvertCommand.java similarity index 100% rename from code/services-application/search-service/src/main/java/nu/marginalia/search/command/commands/ConvertCommand.java rename to code/services-application/search-service/java/nu/marginalia/search/command/commands/ConvertCommand.java diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/command/commands/DefinitionCommand.java b/code/services-application/search-service/java/nu/marginalia/search/command/commands/DefinitionCommand.java similarity index 100% rename from code/services-application/search-service/src/main/java/nu/marginalia/search/command/commands/DefinitionCommand.java rename to code/services-application/search-service/java/nu/marginalia/search/command/commands/DefinitionCommand.java diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/command/commands/SearchCommand.java b/code/services-application/search-service/java/nu/marginalia/search/command/commands/SearchCommand.java similarity index 100% rename from code/services-application/search-service/src/main/java/nu/marginalia/search/command/commands/SearchCommand.java rename to code/services-application/search-service/java/nu/marginalia/search/command/commands/SearchCommand.java diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/command/commands/SiteRedirectCommand.java b/code/services-application/search-service/java/nu/marginalia/search/command/commands/SiteRedirectCommand.java similarity index 100% rename from code/services-application/search-service/src/main/java/nu/marginalia/search/command/commands/SiteRedirectCommand.java rename to code/services-application/search-service/java/nu/marginalia/search/command/commands/SiteRedirectCommand.java diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/db/DbNearDomainsQuery.java b/code/services-application/search-service/java/nu/marginalia/search/db/DbNearDomainsQuery.java similarity index 100% rename from code/services-application/search-service/src/main/java/nu/marginalia/search/db/DbNearDomainsQuery.java rename to code/services-application/search-service/java/nu/marginalia/search/db/DbNearDomainsQuery.java diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/exceptions/RedirectException.java b/code/services-application/search-service/java/nu/marginalia/search/exceptions/RedirectException.java similarity index 100% rename from code/services-application/search-service/src/main/java/nu/marginalia/search/exceptions/RedirectException.java rename to code/services-application/search-service/java/nu/marginalia/search/exceptions/RedirectException.java diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/model/ClusteredUrlDetails.java b/code/services-application/search-service/java/nu/marginalia/search/model/ClusteredUrlDetails.java similarity index 100% rename from code/services-application/search-service/src/main/java/nu/marginalia/search/model/ClusteredUrlDetails.java rename to code/services-application/search-service/java/nu/marginalia/search/model/ClusteredUrlDetails.java diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/model/DecoratedSearchResults.java b/code/services-application/search-service/java/nu/marginalia/search/model/DecoratedSearchResults.java similarity index 100% rename from code/services-application/search-service/src/main/java/nu/marginalia/search/model/DecoratedSearchResults.java rename to code/services-application/search-service/java/nu/marginalia/search/model/DecoratedSearchResults.java diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/model/SearchFilters.java b/code/services-application/search-service/java/nu/marginalia/search/model/SearchFilters.java similarity index 100% rename from code/services-application/search-service/src/main/java/nu/marginalia/search/model/SearchFilters.java rename to code/services-application/search-service/java/nu/marginalia/search/model/SearchFilters.java diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/model/SearchProfile.java b/code/services-application/search-service/java/nu/marginalia/search/model/SearchProfile.java similarity index 100% rename from code/services-application/search-service/src/main/java/nu/marginalia/search/model/SearchProfile.java rename to code/services-application/search-service/java/nu/marginalia/search/model/SearchProfile.java diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/model/UrlDetails.java b/code/services-application/search-service/java/nu/marginalia/search/model/UrlDetails.java similarity index 100% rename from code/services-application/search-service/src/main/java/nu/marginalia/search/model/UrlDetails.java rename to code/services-application/search-service/java/nu/marginalia/search/model/UrlDetails.java diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/results/BrowseResultCleaner.java b/code/services-application/search-service/java/nu/marginalia/search/results/BrowseResultCleaner.java similarity index 100% rename from code/services-application/search-service/src/main/java/nu/marginalia/search/results/BrowseResultCleaner.java rename to code/services-application/search-service/java/nu/marginalia/search/results/BrowseResultCleaner.java diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/results/UrlDeduplicator.java b/code/services-application/search-service/java/nu/marginalia/search/results/UrlDeduplicator.java similarity index 100% rename from code/services-application/search-service/src/main/java/nu/marginalia/search/results/UrlDeduplicator.java rename to code/services-application/search-service/java/nu/marginalia/search/results/UrlDeduplicator.java diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchAddToCrawlQueueService.java b/code/services-application/search-service/java/nu/marginalia/search/svc/SearchAddToCrawlQueueService.java similarity index 100% rename from code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchAddToCrawlQueueService.java rename to code/services-application/search-service/java/nu/marginalia/search/svc/SearchAddToCrawlQueueService.java diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchBrowseService.java b/code/services-application/search-service/java/nu/marginalia/search/svc/SearchBrowseService.java similarity index 100% rename from code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchBrowseService.java rename to code/services-application/search-service/java/nu/marginalia/search/svc/SearchBrowseService.java diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchCrosstalkService.java b/code/services-application/search-service/java/nu/marginalia/search/svc/SearchCrosstalkService.java similarity index 100% rename from code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchCrosstalkService.java rename to code/services-application/search-service/java/nu/marginalia/search/svc/SearchCrosstalkService.java diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchErrorPageService.java b/code/services-application/search-service/java/nu/marginalia/search/svc/SearchErrorPageService.java similarity index 100% rename from code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchErrorPageService.java rename to code/services-application/search-service/java/nu/marginalia/search/svc/SearchErrorPageService.java diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchFlagSiteService.java b/code/services-application/search-service/java/nu/marginalia/search/svc/SearchFlagSiteService.java similarity index 100% rename from code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchFlagSiteService.java rename to code/services-application/search-service/java/nu/marginalia/search/svc/SearchFlagSiteService.java diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchFrontPageService.java b/code/services-application/search-service/java/nu/marginalia/search/svc/SearchFrontPageService.java similarity index 100% rename from code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchFrontPageService.java rename to code/services-application/search-service/java/nu/marginalia/search/svc/SearchFrontPageService.java diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchQueryCountService.java b/code/services-application/search-service/java/nu/marginalia/search/svc/SearchQueryCountService.java similarity index 100% rename from code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchQueryCountService.java rename to code/services-application/search-service/java/nu/marginalia/search/svc/SearchQueryCountService.java diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchQueryIndexService.java b/code/services-application/search-service/java/nu/marginalia/search/svc/SearchQueryIndexService.java similarity index 100% rename from code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchQueryIndexService.java rename to code/services-application/search-service/java/nu/marginalia/search/svc/SearchQueryIndexService.java diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchQueryService.java b/code/services-application/search-service/java/nu/marginalia/search/svc/SearchQueryService.java similarity index 100% rename from code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchQueryService.java rename to code/services-application/search-service/java/nu/marginalia/search/svc/SearchQueryService.java diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchSiteInfoService.java b/code/services-application/search-service/java/nu/marginalia/search/svc/SearchSiteInfoService.java similarity index 100% rename from code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchSiteInfoService.java rename to code/services-application/search-service/java/nu/marginalia/search/svc/SearchSiteInfoService.java diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchUnitConversionService.java b/code/services-application/search-service/java/nu/marginalia/search/svc/SearchUnitConversionService.java similarity index 100% rename from code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchUnitConversionService.java rename to code/services-application/search-service/java/nu/marginalia/search/svc/SearchUnitConversionService.java diff --git a/code/services-application/search-service/src/main/resources/static/search/crawler-ips.txt b/code/services-application/search-service/resources/static/search/crawler-ips.txt similarity index 100% rename from code/services-application/search-service/src/main/resources/static/search/crawler-ips.txt rename to code/services-application/search-service/resources/static/search/crawler-ips.txt diff --git a/code/services-application/search-service/src/main/resources/static/search/favicon.ico b/code/services-application/search-service/resources/static/search/favicon.ico similarity index 100% rename from code/services-application/search-service/src/main/resources/static/search/favicon.ico rename to code/services-application/search-service/resources/static/search/favicon.ico diff --git a/code/services-application/search-service/src/main/resources/static/search/main.js b/code/services-application/search-service/resources/static/search/main.js similarity index 100% rename from code/services-application/search-service/src/main/resources/static/search/main.js rename to code/services-application/search-service/resources/static/search/main.js diff --git a/code/services-application/search-service/src/main/resources/static/search/menu.js b/code/services-application/search-service/resources/static/search/menu.js similarity index 100% rename from code/services-application/search-service/src/main/resources/static/search/menu.js rename to code/services-application/search-service/resources/static/search/menu.js diff --git a/code/services-application/search-service/src/main/resources/static/search/opensearch.xml b/code/services-application/search-service/resources/static/search/opensearch.xml similarity index 100% rename from code/services-application/search-service/src/main/resources/static/search/opensearch.xml rename to code/services-application/search-service/resources/static/search/opensearch.xml diff --git a/code/services-application/search-service/src/main/resources/static/search/robots.txt b/code/services-application/search-service/resources/static/search/robots.txt similarity index 100% rename from code/services-application/search-service/src/main/resources/static/search/robots.txt rename to code/services-application/search-service/resources/static/search/robots.txt diff --git a/code/services-application/search-service/src/main/resources/static/search/rss.svg b/code/services-application/search-service/resources/static/search/rss.svg similarity index 100% rename from code/services-application/search-service/src/main/resources/static/search/rss.svg rename to code/services-application/search-service/resources/static/search/rss.svg diff --git a/code/services-application/search-service/src/main/resources/static/search/serp.scss b/code/services-application/search-service/resources/static/search/serp.scss similarity index 100% rename from code/services-application/search-service/src/main/resources/static/search/serp.scss rename to code/services-application/search-service/resources/static/search/serp.scss diff --git a/code/services-application/search-service/src/main/resources/static/search/style-new.css b/code/services-application/search-service/resources/static/search/style-new.css similarity index 100% rename from code/services-application/search-service/src/main/resources/static/search/style-new.css rename to code/services-application/search-service/resources/static/search/style-new.css diff --git a/code/services-application/search-service/src/main/resources/static/search/tts.js b/code/services-application/search-service/resources/static/search/tts.js similarity index 100% rename from code/services-application/search-service/src/main/resources/static/search/tts.js rename to code/services-application/search-service/resources/static/search/tts.js diff --git a/code/services-application/search-service/src/main/resources/templates/search/browse-result.hdb b/code/services-application/search-service/resources/templates/search/browse-result.hdb similarity index 100% rename from code/services-application/search-service/src/main/resources/templates/search/browse-result.hdb rename to code/services-application/search-service/resources/templates/search/browse-result.hdb diff --git a/code/services-application/search-service/src/main/resources/templates/search/browse-results.hdb b/code/services-application/search-service/resources/templates/search/browse-results.hdb similarity index 100% rename from code/services-application/search-service/src/main/resources/templates/search/browse-results.hdb rename to code/services-application/search-service/resources/templates/search/browse-results.hdb diff --git a/code/services-application/search-service/src/main/resources/templates/search/conversion-results.hdb b/code/services-application/search-service/resources/templates/search/conversion-results.hdb similarity index 100% rename from code/services-application/search-service/src/main/resources/templates/search/conversion-results.hdb rename to code/services-application/search-service/resources/templates/search/conversion-results.hdb diff --git a/code/services-application/search-service/src/main/resources/templates/search/dictionary-results.hdb b/code/services-application/search-service/resources/templates/search/dictionary-results.hdb similarity index 100% rename from code/services-application/search-service/src/main/resources/templates/search/dictionary-results.hdb rename to code/services-application/search-service/resources/templates/search/dictionary-results.hdb diff --git a/code/services-application/search-service/src/main/resources/templates/search/error-page-search.hdb b/code/services-application/search-service/resources/templates/search/error-page-search.hdb similarity index 100% rename from code/services-application/search-service/src/main/resources/templates/search/error-page-search.hdb rename to code/services-application/search-service/resources/templates/search/error-page-search.hdb diff --git a/code/services-application/search-service/src/main/resources/templates/search/error-page.hdb b/code/services-application/search-service/resources/templates/search/error-page.hdb similarity index 100% rename from code/services-application/search-service/src/main/resources/templates/search/error-page.hdb rename to code/services-application/search-service/resources/templates/search/error-page.hdb diff --git a/code/services-application/search-service/src/main/resources/templates/search/index/index-about.hdb b/code/services-application/search-service/resources/templates/search/index/index-about.hdb similarity index 100% rename from code/services-application/search-service/src/main/resources/templates/search/index/index-about.hdb rename to code/services-application/search-service/resources/templates/search/index/index-about.hdb diff --git a/code/services-application/search-service/src/main/resources/templates/search/index/index-news.hdb b/code/services-application/search-service/resources/templates/search/index/index-news.hdb similarity index 100% rename from code/services-application/search-service/src/main/resources/templates/search/index/index-news.hdb rename to code/services-application/search-service/resources/templates/search/index/index-news.hdb diff --git a/code/services-application/search-service/src/main/resources/templates/search/index/index-tips.hdb b/code/services-application/search-service/resources/templates/search/index/index-tips.hdb similarity index 100% rename from code/services-application/search-service/src/main/resources/templates/search/index/index-tips.hdb rename to code/services-application/search-service/resources/templates/search/index/index-tips.hdb diff --git a/code/services-application/search-service/src/main/resources/templates/search/index/index.hdb b/code/services-application/search-service/resources/templates/search/index/index.hdb similarity index 100% rename from code/services-application/search-service/src/main/resources/templates/search/index/index.hdb rename to code/services-application/search-service/resources/templates/search/index/index.hdb diff --git a/code/services-application/search-service/src/main/resources/templates/search/parts/search-filters.hdb b/code/services-application/search-service/resources/templates/search/parts/search-filters.hdb similarity index 100% rename from code/services-application/search-service/src/main/resources/templates/search/parts/search-filters.hdb rename to code/services-application/search-service/resources/templates/search/parts/search-filters.hdb diff --git a/code/services-application/search-service/src/main/resources/templates/search/parts/search-footer.hdb b/code/services-application/search-service/resources/templates/search/parts/search-footer.hdb similarity index 100% rename from code/services-application/search-service/src/main/resources/templates/search/parts/search-footer.hdb rename to code/services-application/search-service/resources/templates/search/parts/search-footer.hdb diff --git a/code/services-application/search-service/src/main/resources/templates/search/parts/search-form.hdb b/code/services-application/search-service/resources/templates/search/parts/search-form.hdb similarity index 100% rename from code/services-application/search-service/src/main/resources/templates/search/parts/search-form.hdb rename to code/services-application/search-service/resources/templates/search/parts/search-form.hdb diff --git a/code/services-application/search-service/src/main/resources/templates/search/parts/search-header.hdb b/code/services-application/search-service/resources/templates/search/parts/search-header.hdb similarity index 100% rename from code/services-application/search-service/src/main/resources/templates/search/parts/search-header.hdb rename to code/services-application/search-service/resources/templates/search/parts/search-header.hdb diff --git a/code/services-application/search-service/src/main/resources/templates/search/parts/search-result-rest.hdb b/code/services-application/search-service/resources/templates/search/parts/search-result-rest.hdb similarity index 100% rename from code/services-application/search-service/src/main/resources/templates/search/parts/search-result-rest.hdb rename to code/services-application/search-service/resources/templates/search/parts/search-result-rest.hdb diff --git a/code/services-application/search-service/src/main/resources/templates/search/parts/search-result.hdb b/code/services-application/search-service/resources/templates/search/parts/search-result.hdb similarity index 100% rename from code/services-application/search-service/src/main/resources/templates/search/parts/search-result.hdb rename to code/services-application/search-service/resources/templates/search/parts/search-result.hdb diff --git a/code/services-application/search-service/src/main/resources/templates/search/search-results.hdb b/code/services-application/search-service/resources/templates/search/search-results.hdb similarity index 100% rename from code/services-application/search-service/src/main/resources/templates/search/search-results.hdb rename to code/services-application/search-service/resources/templates/search/search-results.hdb diff --git a/code/services-application/search-service/src/main/resources/templates/search/site-info/site-crosstalk.hdb b/code/services-application/search-service/resources/templates/search/site-info/site-crosstalk.hdb similarity index 100% rename from code/services-application/search-service/src/main/resources/templates/search/site-info/site-crosstalk.hdb rename to code/services-application/search-service/resources/templates/search/site-info/site-crosstalk.hdb diff --git a/code/services-application/search-service/src/main/resources/templates/search/site-info/site-info-feed.hdb b/code/services-application/search-service/resources/templates/search/site-info/site-info-feed.hdb similarity index 100% rename from code/services-application/search-service/src/main/resources/templates/search/site-info/site-info-feed.hdb rename to code/services-application/search-service/resources/templates/search/site-info/site-info-feed.hdb diff --git a/code/services-application/search-service/src/main/resources/templates/search/site-info/site-info-index-blacklisted.hdb b/code/services-application/search-service/resources/templates/search/site-info/site-info-index-blacklisted.hdb similarity index 100% rename from code/services-application/search-service/src/main/resources/templates/search/site-info/site-info-index-blacklisted.hdb rename to code/services-application/search-service/resources/templates/search/site-info/site-info-index-blacklisted.hdb diff --git a/code/services-application/search-service/src/main/resources/templates/search/site-info/site-info-index-indexed.hdb b/code/services-application/search-service/resources/templates/search/site-info/site-info-index-indexed.hdb similarity index 100% rename from code/services-application/search-service/src/main/resources/templates/search/site-info/site-info-index-indexed.hdb rename to code/services-application/search-service/resources/templates/search/site-info/site-info-index-indexed.hdb diff --git a/code/services-application/search-service/src/main/resources/templates/search/site-info/site-info-index-suggest.hdb b/code/services-application/search-service/resources/templates/search/site-info/site-info-index-suggest.hdb similarity index 100% rename from code/services-application/search-service/src/main/resources/templates/search/site-info/site-info-index-suggest.hdb rename to code/services-application/search-service/resources/templates/search/site-info/site-info-index-suggest.hdb diff --git a/code/services-application/search-service/src/main/resources/templates/search/site-info/site-info-index-unknown.hdb b/code/services-application/search-service/resources/templates/search/site-info/site-info-index-unknown.hdb similarity index 100% rename from code/services-application/search-service/src/main/resources/templates/search/site-info/site-info-index-unknown.hdb rename to code/services-application/search-service/resources/templates/search/site-info/site-info-index-unknown.hdb diff --git a/code/services-application/search-service/src/main/resources/templates/search/site-info/site-info-index.hdb b/code/services-application/search-service/resources/templates/search/site-info/site-info-index.hdb similarity index 100% rename from code/services-application/search-service/src/main/resources/templates/search/site-info/site-info-index.hdb rename to code/services-application/search-service/resources/templates/search/site-info/site-info-index.hdb diff --git a/code/services-application/search-service/src/main/resources/templates/search/site-info/site-info-links.hdb b/code/services-application/search-service/resources/templates/search/site-info/site-info-links.hdb similarity index 100% rename from code/services-application/search-service/src/main/resources/templates/search/site-info/site-info-links.hdb rename to code/services-application/search-service/resources/templates/search/site-info/site-info-links.hdb diff --git a/code/services-application/search-service/src/main/resources/templates/search/site-info/site-info-report.hdb b/code/services-application/search-service/resources/templates/search/site-info/site-info-report.hdb similarity index 100% rename from code/services-application/search-service/src/main/resources/templates/search/site-info/site-info-report.hdb rename to code/services-application/search-service/resources/templates/search/site-info/site-info-report.hdb diff --git a/code/services-application/search-service/src/main/resources/templates/search/site-info/site-info-summary.hdb b/code/services-application/search-service/resources/templates/search/site-info/site-info-summary.hdb similarity index 100% rename from code/services-application/search-service/src/main/resources/templates/search/site-info/site-info-summary.hdb rename to code/services-application/search-service/resources/templates/search/site-info/site-info-summary.hdb diff --git a/code/services-application/search-service/src/main/resources/templates/search/site-info/site-info.hdb b/code/services-application/search-service/resources/templates/search/site-info/site-info.hdb similarity index 100% rename from code/services-application/search-service/src/main/resources/templates/search/site-info/site-info.hdb rename to code/services-application/search-service/resources/templates/search/site-info/site-info.hdb diff --git a/code/services-application/search-service/src/test/java/nu/marginalia/search/command/commands/BangCommandTest.java b/code/services-application/search-service/test/nu/marginalia/search/command/commands/BangCommandTest.java similarity index 100% rename from code/services-application/search-service/src/test/java/nu/marginalia/search/command/commands/BangCommandTest.java rename to code/services-application/search-service/test/nu/marginalia/search/command/commands/BangCommandTest.java diff --git a/code/services-application/search-service/src/test/java/nu/marginalia/util/TestLanguageModels.java b/code/services-application/search-service/test/nu/marginalia/util/TestLanguageModels.java similarity index 100% rename from code/services-application/search-service/src/test/java/nu/marginalia/util/TestLanguageModels.java rename to code/services-application/search-service/test/nu/marginalia/util/TestLanguageModels.java diff --git a/code/services-core/assistant-service/build.gradle b/code/services-core/assistant-service/build.gradle index ce7e8843..27f89012 100644 --- a/code/services-core/assistant-service/build.gradle +++ b/code/services-core/assistant-service/build.gradle @@ -36,6 +36,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':third-party:symspell') diff --git a/code/services-core/assistant-service/src/main/java/nu/marginalia/assistant/AssistantMain.java b/code/services-core/assistant-service/java/nu/marginalia/assistant/AssistantMain.java similarity index 100% rename from code/services-core/assistant-service/src/main/java/nu/marginalia/assistant/AssistantMain.java rename to code/services-core/assistant-service/java/nu/marginalia/assistant/AssistantMain.java diff --git a/code/services-core/assistant-service/src/main/java/nu/marginalia/assistant/AssistantModule.java b/code/services-core/assistant-service/java/nu/marginalia/assistant/AssistantModule.java similarity index 100% rename from code/services-core/assistant-service/src/main/java/nu/marginalia/assistant/AssistantModule.java rename to code/services-core/assistant-service/java/nu/marginalia/assistant/AssistantModule.java diff --git a/code/services-core/assistant-service/src/main/java/nu/marginalia/assistant/AssistantService.java b/code/services-core/assistant-service/java/nu/marginalia/assistant/AssistantService.java similarity index 100% rename from code/services-core/assistant-service/src/main/java/nu/marginalia/assistant/AssistantService.java rename to code/services-core/assistant-service/java/nu/marginalia/assistant/AssistantService.java diff --git a/code/services-core/assistant-service/src/main/java/nu/marginalia/assistant/suggest/Suggestions.java b/code/services-core/assistant-service/java/nu/marginalia/assistant/suggest/Suggestions.java similarity index 100% rename from code/services-core/assistant-service/src/main/java/nu/marginalia/assistant/suggest/Suggestions.java rename to code/services-core/assistant-service/java/nu/marginalia/assistant/suggest/Suggestions.java diff --git a/code/services-core/control-service/build.gradle b/code/services-core/control-service/build.gradle index 634eb1c5..2ecd1f92 100644 --- a/code/services-core/control-service/build.gradle +++ b/code/services-core/control-service/build.gradle @@ -35,6 +35,8 @@ jib { } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation libs.bundles.gson diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/ControlHandlebarsConfigurator.java b/code/services-core/control-service/java/nu/marginalia/control/ControlHandlebarsConfigurator.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/ControlHandlebarsConfigurator.java rename to code/services-core/control-service/java/nu/marginalia/control/ControlHandlebarsConfigurator.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/ControlMain.java b/code/services-core/control-service/java/nu/marginalia/control/ControlMain.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/ControlMain.java rename to code/services-core/control-service/java/nu/marginalia/control/ControlMain.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/ControlProcessModule.java b/code/services-core/control-service/java/nu/marginalia/control/ControlProcessModule.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/ControlProcessModule.java rename to code/services-core/control-service/java/nu/marginalia/control/ControlProcessModule.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/ControlRendererFactory.java b/code/services-core/control-service/java/nu/marginalia/control/ControlRendererFactory.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/ControlRendererFactory.java rename to code/services-core/control-service/java/nu/marginalia/control/ControlRendererFactory.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/ControlService.java b/code/services-core/control-service/java/nu/marginalia/control/ControlService.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/ControlService.java rename to code/services-core/control-service/java/nu/marginalia/control/ControlService.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/ControlValidationError.java b/code/services-core/control-service/java/nu/marginalia/control/ControlValidationError.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/ControlValidationError.java rename to code/services-core/control-service/java/nu/marginalia/control/ControlValidationError.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/RedirectControl.java b/code/services-core/control-service/java/nu/marginalia/control/RedirectControl.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/RedirectControl.java rename to code/services-core/control-service/java/nu/marginalia/control/RedirectControl.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/Redirects.java b/code/services-core/control-service/java/nu/marginalia/control/Redirects.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/Redirects.java rename to code/services-core/control-service/java/nu/marginalia/control/Redirects.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/actor/ControlActor.java b/code/services-core/control-service/java/nu/marginalia/control/actor/ControlActor.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/actor/ControlActor.java rename to code/services-core/control-service/java/nu/marginalia/control/actor/ControlActor.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/actor/ControlActorService.java b/code/services-core/control-service/java/nu/marginalia/control/actor/ControlActorService.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/actor/ControlActorService.java rename to code/services-core/control-service/java/nu/marginalia/control/actor/ControlActorService.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/actor/PrecessionNodes.java b/code/services-core/control-service/java/nu/marginalia/control/actor/PrecessionNodes.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/actor/PrecessionNodes.java rename to code/services-core/control-service/java/nu/marginalia/control/actor/PrecessionNodes.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/actor/monitor/MessageQueueMonitorActor.java b/code/services-core/control-service/java/nu/marginalia/control/actor/monitor/MessageQueueMonitorActor.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/actor/monitor/MessageQueueMonitorActor.java rename to code/services-core/control-service/java/nu/marginalia/control/actor/monitor/MessageQueueMonitorActor.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/actor/monitor/ServiceHeartbeatMonitorActor.java b/code/services-core/control-service/java/nu/marginalia/control/actor/monitor/ServiceHeartbeatMonitorActor.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/actor/monitor/ServiceHeartbeatMonitorActor.java rename to code/services-core/control-service/java/nu/marginalia/control/actor/monitor/ServiceHeartbeatMonitorActor.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/actor/precession/RecrawlAllActor.java b/code/services-core/control-service/java/nu/marginalia/control/actor/precession/RecrawlAllActor.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/actor/precession/RecrawlAllActor.java rename to code/services-core/control-service/java/nu/marginalia/control/actor/precession/RecrawlAllActor.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/actor/precession/ReindexAllActor.java b/code/services-core/control-service/java/nu/marginalia/control/actor/precession/ReindexAllActor.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/actor/precession/ReindexAllActor.java rename to code/services-core/control-service/java/nu/marginalia/control/actor/precession/ReindexAllActor.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/actor/precession/ReprocessAllActor.java b/code/services-core/control-service/java/nu/marginalia/control/actor/precession/ReprocessAllActor.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/actor/precession/ReprocessAllActor.java rename to code/services-core/control-service/java/nu/marginalia/control/actor/precession/ReprocessAllActor.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/actor/rebalance/RebalanceActor.java b/code/services-core/control-service/java/nu/marginalia/control/actor/rebalance/RebalanceActor.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/actor/rebalance/RebalanceActor.java rename to code/services-core/control-service/java/nu/marginalia/control/actor/rebalance/RebalanceActor.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/app/model/ApiKeyModel.java b/code/services-core/control-service/java/nu/marginalia/control/app/model/ApiKeyModel.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/app/model/ApiKeyModel.java rename to code/services-core/control-service/java/nu/marginalia/control/app/model/ApiKeyModel.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/app/model/BlacklistedDomainModel.java b/code/services-core/control-service/java/nu/marginalia/control/app/model/BlacklistedDomainModel.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/app/model/BlacklistedDomainModel.java rename to code/services-core/control-service/java/nu/marginalia/control/app/model/BlacklistedDomainModel.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/app/model/DomainComplaintCategory.java b/code/services-core/control-service/java/nu/marginalia/control/app/model/DomainComplaintCategory.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/app/model/DomainComplaintCategory.java rename to code/services-core/control-service/java/nu/marginalia/control/app/model/DomainComplaintCategory.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/app/model/DomainComplaintModel.java b/code/services-core/control-service/java/nu/marginalia/control/app/model/DomainComplaintModel.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/app/model/DomainComplaintModel.java rename to code/services-core/control-service/java/nu/marginalia/control/app/model/DomainComplaintModel.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/app/svc/ApiKeyService.java b/code/services-core/control-service/java/nu/marginalia/control/app/svc/ApiKeyService.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/app/svc/ApiKeyService.java rename to code/services-core/control-service/java/nu/marginalia/control/app/svc/ApiKeyService.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/app/svc/ControlBlacklistService.java b/code/services-core/control-service/java/nu/marginalia/control/app/svc/ControlBlacklistService.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/app/svc/ControlBlacklistService.java rename to code/services-core/control-service/java/nu/marginalia/control/app/svc/ControlBlacklistService.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/app/svc/DomainComplaintService.java b/code/services-core/control-service/java/nu/marginalia/control/app/svc/DomainComplaintService.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/app/svc/DomainComplaintService.java rename to code/services-core/control-service/java/nu/marginalia/control/app/svc/DomainComplaintService.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/app/svc/RandomExplorationService.java b/code/services-core/control-service/java/nu/marginalia/control/app/svc/RandomExplorationService.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/app/svc/RandomExplorationService.java rename to code/services-core/control-service/java/nu/marginalia/control/app/svc/RandomExplorationService.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/app/svc/SearchToBanService.java b/code/services-core/control-service/java/nu/marginalia/control/app/svc/SearchToBanService.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/app/svc/SearchToBanService.java rename to code/services-core/control-service/java/nu/marginalia/control/app/svc/SearchToBanService.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/node/model/FileStorageBaseWithStorage.java b/code/services-core/control-service/java/nu/marginalia/control/node/model/FileStorageBaseWithStorage.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/node/model/FileStorageBaseWithStorage.java rename to code/services-core/control-service/java/nu/marginalia/control/node/model/FileStorageBaseWithStorage.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/node/model/FileStorageFileModel.java b/code/services-core/control-service/java/nu/marginalia/control/node/model/FileStorageFileModel.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/node/model/FileStorageFileModel.java rename to code/services-core/control-service/java/nu/marginalia/control/node/model/FileStorageFileModel.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/node/model/FileStorageWithActions.java b/code/services-core/control-service/java/nu/marginalia/control/node/model/FileStorageWithActions.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/node/model/FileStorageWithActions.java rename to code/services-core/control-service/java/nu/marginalia/control/node/model/FileStorageWithActions.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/node/model/FileStorageWithRelatedEntries.java b/code/services-core/control-service/java/nu/marginalia/control/node/model/FileStorageWithRelatedEntries.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/node/model/FileStorageWithRelatedEntries.java rename to code/services-core/control-service/java/nu/marginalia/control/node/model/FileStorageWithRelatedEntries.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/node/model/IndexNodeStatus.java b/code/services-core/control-service/java/nu/marginalia/control/node/model/IndexNodeStatus.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/node/model/IndexNodeStatus.java rename to code/services-core/control-service/java/nu/marginalia/control/node/model/IndexNodeStatus.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/node/svc/ControlFileStorageService.java b/code/services-core/control-service/java/nu/marginalia/control/node/svc/ControlFileStorageService.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/node/svc/ControlFileStorageService.java rename to code/services-core/control-service/java/nu/marginalia/control/node/svc/ControlFileStorageService.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/node/svc/ControlNodeActionsService.java b/code/services-core/control-service/java/nu/marginalia/control/node/svc/ControlNodeActionsService.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/node/svc/ControlNodeActionsService.java rename to code/services-core/control-service/java/nu/marginalia/control/node/svc/ControlNodeActionsService.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/node/svc/ControlNodeService.java b/code/services-core/control-service/java/nu/marginalia/control/node/svc/ControlNodeService.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/node/svc/ControlNodeService.java rename to code/services-core/control-service/java/nu/marginalia/control/node/svc/ControlNodeService.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/sys/model/AbortedProcess.java b/code/services-core/control-service/java/nu/marginalia/control/sys/model/AbortedProcess.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/sys/model/AbortedProcess.java rename to code/services-core/control-service/java/nu/marginalia/control/sys/model/AbortedProcess.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/sys/model/EventLogEntry.java b/code/services-core/control-service/java/nu/marginalia/control/sys/model/EventLogEntry.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/sys/model/EventLogEntry.java rename to code/services-core/control-service/java/nu/marginalia/control/sys/model/EventLogEntry.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/sys/model/EventLogServiceFilter.java b/code/services-core/control-service/java/nu/marginalia/control/sys/model/EventLogServiceFilter.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/sys/model/EventLogServiceFilter.java rename to code/services-core/control-service/java/nu/marginalia/control/sys/model/EventLogServiceFilter.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/sys/model/EventLogTypeFilter.java b/code/services-core/control-service/java/nu/marginalia/control/sys/model/EventLogTypeFilter.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/sys/model/EventLogTypeFilter.java rename to code/services-core/control-service/java/nu/marginalia/control/sys/model/EventLogTypeFilter.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/sys/model/MessageQueueEntry.java b/code/services-core/control-service/java/nu/marginalia/control/sys/model/MessageQueueEntry.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/sys/model/MessageQueueEntry.java rename to code/services-core/control-service/java/nu/marginalia/control/sys/model/MessageQueueEntry.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/sys/model/ProcessHeartbeat.java b/code/services-core/control-service/java/nu/marginalia/control/sys/model/ProcessHeartbeat.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/sys/model/ProcessHeartbeat.java rename to code/services-core/control-service/java/nu/marginalia/control/sys/model/ProcessHeartbeat.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/sys/model/ServiceHeartbeat.java b/code/services-core/control-service/java/nu/marginalia/control/sys/model/ServiceHeartbeat.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/sys/model/ServiceHeartbeat.java rename to code/services-core/control-service/java/nu/marginalia/control/sys/model/ServiceHeartbeat.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/sys/model/TaskHeartbeat.java b/code/services-core/control-service/java/nu/marginalia/control/sys/model/TaskHeartbeat.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/sys/model/TaskHeartbeat.java rename to code/services-core/control-service/java/nu/marginalia/control/sys/model/TaskHeartbeat.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/sys/svc/AbortedProcessService.java b/code/services-core/control-service/java/nu/marginalia/control/sys/svc/AbortedProcessService.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/sys/svc/AbortedProcessService.java rename to code/services-core/control-service/java/nu/marginalia/control/sys/svc/AbortedProcessService.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/sys/svc/ControlDomainRankingSetsService.java b/code/services-core/control-service/java/nu/marginalia/control/sys/svc/ControlDomainRankingSetsService.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/sys/svc/ControlDomainRankingSetsService.java rename to code/services-core/control-service/java/nu/marginalia/control/sys/svc/ControlDomainRankingSetsService.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/sys/svc/ControlErrorHandler.java b/code/services-core/control-service/java/nu/marginalia/control/sys/svc/ControlErrorHandler.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/sys/svc/ControlErrorHandler.java rename to code/services-core/control-service/java/nu/marginalia/control/sys/svc/ControlErrorHandler.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/sys/svc/ControlSysActionsService.java b/code/services-core/control-service/java/nu/marginalia/control/sys/svc/ControlSysActionsService.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/sys/svc/ControlSysActionsService.java rename to code/services-core/control-service/java/nu/marginalia/control/sys/svc/ControlSysActionsService.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/sys/svc/DataSetsService.java b/code/services-core/control-service/java/nu/marginalia/control/sys/svc/DataSetsService.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/sys/svc/DataSetsService.java rename to code/services-core/control-service/java/nu/marginalia/control/sys/svc/DataSetsService.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/sys/svc/EventLogService.java b/code/services-core/control-service/java/nu/marginalia/control/sys/svc/EventLogService.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/sys/svc/EventLogService.java rename to code/services-core/control-service/java/nu/marginalia/control/sys/svc/EventLogService.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/sys/svc/HeartbeatService.java b/code/services-core/control-service/java/nu/marginalia/control/sys/svc/HeartbeatService.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/sys/svc/HeartbeatService.java rename to code/services-core/control-service/java/nu/marginalia/control/sys/svc/HeartbeatService.java diff --git a/code/services-core/control-service/src/main/java/nu/marginalia/control/sys/svc/MessageQueueService.java b/code/services-core/control-service/java/nu/marginalia/control/sys/svc/MessageQueueService.java similarity index 100% rename from code/services-core/control-service/src/main/java/nu/marginalia/control/sys/svc/MessageQueueService.java rename to code/services-core/control-service/java/nu/marginalia/control/sys/svc/MessageQueueService.java diff --git a/code/services-core/control-service/src/main/resources/static/control/noanimation.css b/code/services-core/control-service/resources/static/control/noanimation.css similarity index 100% rename from code/services-core/control-service/src/main/resources/static/control/noanimation.css rename to code/services-core/control-service/resources/static/control/noanimation.css diff --git a/code/services-core/control-service/src/main/resources/static/control/refresh.js b/code/services-core/control-service/resources/static/control/refresh.js similarity index 100% rename from code/services-core/control-service/src/main/resources/static/control/refresh.js rename to code/services-core/control-service/resources/static/control/refresh.js diff --git a/code/services-core/control-service/src/main/resources/static/control/tables.css b/code/services-core/control-service/resources/static/control/tables.css similarity index 100% rename from code/services-core/control-service/src/main/resources/static/control/tables.css rename to code/services-core/control-service/resources/static/control/tables.css diff --git a/code/services-core/control-service/src/main/resources/templates/control/actions.hdb b/code/services-core/control-service/resources/templates/control/actions.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/actions.hdb rename to code/services-core/control-service/resources/templates/control/actions.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/actor-details.hdb b/code/services-core/control-service/resources/templates/control/actor-details.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/actor-details.hdb rename to code/services-core/control-service/resources/templates/control/actor-details.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/app/api-keys.hdb b/code/services-core/control-service/resources/templates/control/app/api-keys.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/app/api-keys.hdb rename to code/services-core/control-service/resources/templates/control/app/api-keys.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/app/blacklist.hdb b/code/services-core/control-service/resources/templates/control/app/blacklist.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/app/blacklist.hdb rename to code/services-core/control-service/resources/templates/control/app/blacklist.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/app/domain-complaints.hdb b/code/services-core/control-service/resources/templates/control/app/domain-complaints.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/app/domain-complaints.hdb rename to code/services-core/control-service/resources/templates/control/app/domain-complaints.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/app/review-random-domains.hdb b/code/services-core/control-service/resources/templates/control/app/review-random-domains.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/app/review-random-domains.hdb rename to code/services-core/control-service/resources/templates/control/app/review-random-domains.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/app/search-to-ban.hdb b/code/services-core/control-service/resources/templates/control/app/search-to-ban.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/app/search-to-ban.hdb rename to code/services-core/control-service/resources/templates/control/app/search-to-ban.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/error.hdb b/code/services-core/control-service/resources/templates/control/error.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/error.hdb rename to code/services-core/control-service/resources/templates/control/error.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/index.hdb b/code/services-core/control-service/resources/templates/control/index.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/index.hdb rename to code/services-core/control-service/resources/templates/control/index.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/node/actions/partial-download-sample-data.hdb b/code/services-core/control-service/resources/templates/control/node/actions/partial-download-sample-data.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/node/actions/partial-download-sample-data.hdb rename to code/services-core/control-service/resources/templates/control/node/actions/partial-download-sample-data.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/node/actions/partial-export-db-data.hdb b/code/services-core/control-service/resources/templates/control/node/actions/partial-export-db-data.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/node/actions/partial-export-db-data.hdb rename to code/services-core/control-service/resources/templates/control/node/actions/partial-export-db-data.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/node/actions/partial-export-from-crawl-data.hdb b/code/services-core/control-service/resources/templates/control/node/actions/partial-export-from-crawl-data.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/node/actions/partial-export-from-crawl-data.hdb rename to code/services-core/control-service/resources/templates/control/node/actions/partial-export-from-crawl-data.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/node/actions/partial-export-sample-data.hdb b/code/services-core/control-service/resources/templates/control/node/actions/partial-export-sample-data.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/node/actions/partial-export-sample-data.hdb rename to code/services-core/control-service/resources/templates/control/node/actions/partial-export-sample-data.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/node/actions/partial-load.hdb b/code/services-core/control-service/resources/templates/control/node/actions/partial-load.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/node/actions/partial-load.hdb rename to code/services-core/control-service/resources/templates/control/node/actions/partial-load.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/node/actions/partial-new-crawl-specs.hdb b/code/services-core/control-service/resources/templates/control/node/actions/partial-new-crawl-specs.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/node/actions/partial-new-crawl-specs.hdb rename to code/services-core/control-service/resources/templates/control/node/actions/partial-new-crawl-specs.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/node/actions/partial-new-crawl.hdb b/code/services-core/control-service/resources/templates/control/node/actions/partial-new-crawl.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/node/actions/partial-new-crawl.hdb rename to code/services-core/control-service/resources/templates/control/node/actions/partial-new-crawl.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/node/actions/partial-process.hdb b/code/services-core/control-service/resources/templates/control/node/actions/partial-process.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/node/actions/partial-process.hdb rename to code/services-core/control-service/resources/templates/control/node/actions/partial-process.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/node/actions/partial-recrawl.hdb b/code/services-core/control-service/resources/templates/control/node/actions/partial-recrawl.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/node/actions/partial-recrawl.hdb rename to code/services-core/control-service/resources/templates/control/node/actions/partial-recrawl.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/node/actions/partial-repartition.hdb b/code/services-core/control-service/resources/templates/control/node/actions/partial-repartition.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/node/actions/partial-repartition.hdb rename to code/services-core/control-service/resources/templates/control/node/actions/partial-repartition.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/node/actions/partial-restore-backup.hdb b/code/services-core/control-service/resources/templates/control/node/actions/partial-restore-backup.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/node/actions/partial-restore-backup.hdb rename to code/services-core/control-service/resources/templates/control/node/actions/partial-restore-backup.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/node/actions/partial-sideload-dirtree.hdb b/code/services-core/control-service/resources/templates/control/node/actions/partial-sideload-dirtree.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/node/actions/partial-sideload-dirtree.hdb rename to code/services-core/control-service/resources/templates/control/node/actions/partial-sideload-dirtree.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/node/actions/partial-sideload-encyclopedia.hdb b/code/services-core/control-service/resources/templates/control/node/actions/partial-sideload-encyclopedia.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/node/actions/partial-sideload-encyclopedia.hdb rename to code/services-core/control-service/resources/templates/control/node/actions/partial-sideload-encyclopedia.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/node/actions/partial-sideload-reddit.hdb b/code/services-core/control-service/resources/templates/control/node/actions/partial-sideload-reddit.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/node/actions/partial-sideload-reddit.hdb rename to code/services-core/control-service/resources/templates/control/node/actions/partial-sideload-reddit.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/node/actions/partial-sideload-stackexchange.hdb b/code/services-core/control-service/resources/templates/control/node/actions/partial-sideload-stackexchange.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/node/actions/partial-sideload-stackexchange.hdb rename to code/services-core/control-service/resources/templates/control/node/actions/partial-sideload-stackexchange.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/node/actions/partial-sideload-warc.hdb b/code/services-core/control-service/resources/templates/control/node/actions/partial-sideload-warc.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/node/actions/partial-sideload-warc.hdb rename to code/services-core/control-service/resources/templates/control/node/actions/partial-sideload-warc.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/node/node-actions.hdb b/code/services-core/control-service/resources/templates/control/node/node-actions.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/node/node-actions.hdb rename to code/services-core/control-service/resources/templates/control/node/node-actions.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/node/node-actors.hdb b/code/services-core/control-service/resources/templates/control/node/node-actors.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/node/node-actors.hdb rename to code/services-core/control-service/resources/templates/control/node/node-actors.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/node/node-config.hdb b/code/services-core/control-service/resources/templates/control/node/node-config.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/node/node-config.hdb rename to code/services-core/control-service/resources/templates/control/node/node-config.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/node/node-overview.hdb b/code/services-core/control-service/resources/templates/control/node/node-overview.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/node/node-overview.hdb rename to code/services-core/control-service/resources/templates/control/node/node-overview.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/node/node-storage-conf.hdb b/code/services-core/control-service/resources/templates/control/node/node-storage-conf.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/node/node-storage-conf.hdb rename to code/services-core/control-service/resources/templates/control/node/node-storage-conf.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/node/node-storage-details.hdb b/code/services-core/control-service/resources/templates/control/node/node-storage-details.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/node/node-storage-details.hdb rename to code/services-core/control-service/resources/templates/control/node/node-storage-details.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/node/node-storage-list.hdb b/code/services-core/control-service/resources/templates/control/node/node-storage-list.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/node/node-storage-list.hdb rename to code/services-core/control-service/resources/templates/control/node/node-storage-list.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/node/nodes-list.hdb b/code/services-core/control-service/resources/templates/control/node/nodes-list.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/node/nodes-list.hdb rename to code/services-core/control-service/resources/templates/control/node/nodes-list.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/node/partial-node-nav.hdb b/code/services-core/control-service/resources/templates/control/node/partial-node-nav.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/node/partial-node-nav.hdb rename to code/services-core/control-service/resources/templates/control/node/partial-node-nav.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/partials/actor-summary-table.hdb b/code/services-core/control-service/resources/templates/control/partials/actor-summary-table.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/partials/actor-summary-table.hdb rename to code/services-core/control-service/resources/templates/control/partials/actor-summary-table.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/partials/actors-table.hdb b/code/services-core/control-service/resources/templates/control/partials/actors-table.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/partials/actors-table.hdb rename to code/services-core/control-service/resources/templates/control/partials/actors-table.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/partials/events-table-summary.hdb b/code/services-core/control-service/resources/templates/control/partials/events-table-summary.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/partials/events-table-summary.hdb rename to code/services-core/control-service/resources/templates/control/partials/events-table-summary.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/partials/events-table.hdb b/code/services-core/control-service/resources/templates/control/partials/events-table.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/partials/events-table.hdb rename to code/services-core/control-service/resources/templates/control/partials/events-table.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/partials/foot-includes.hdb b/code/services-core/control-service/resources/templates/control/partials/foot-includes.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/partials/foot-includes.hdb rename to code/services-core/control-service/resources/templates/control/partials/foot-includes.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/partials/head-includes.hdb b/code/services-core/control-service/resources/templates/control/partials/head-includes.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/partials/head-includes.hdb rename to code/services-core/control-service/resources/templates/control/partials/head-includes.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/partials/message-queue-table.hdb b/code/services-core/control-service/resources/templates/control/partials/message-queue-table.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/partials/message-queue-table.hdb rename to code/services-core/control-service/resources/templates/control/partials/message-queue-table.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/partials/nav.hdb b/code/services-core/control-service/resources/templates/control/partials/nav.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/partials/nav.hdb rename to code/services-core/control-service/resources/templates/control/partials/nav.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/partials/nodes-table.hdb b/code/services-core/control-service/resources/templates/control/partials/nodes-table.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/partials/nodes-table.hdb rename to code/services-core/control-service/resources/templates/control/partials/nodes-table.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/partials/processes-table.hdb b/code/services-core/control-service/resources/templates/control/partials/processes-table.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/partials/processes-table.hdb rename to code/services-core/control-service/resources/templates/control/partials/processes-table.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/partials/services-table.hdb b/code/services-core/control-service/resources/templates/control/partials/services-table.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/partials/services-table.hdb rename to code/services-core/control-service/resources/templates/control/partials/services-table.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/partials/storage-details/files.hdb b/code/services-core/control-service/resources/templates/control/partials/storage-details/files.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/partials/storage-details/files.hdb rename to code/services-core/control-service/resources/templates/control/partials/storage-details/files.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/partials/storage-details/related.hdb b/code/services-core/control-service/resources/templates/control/partials/storage-details/related.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/partials/storage-details/related.hdb rename to code/services-core/control-service/resources/templates/control/partials/storage-details/related.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/partials/storage-types.hdb b/code/services-core/control-service/resources/templates/control/partials/storage-types.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/partials/storage-types.hdb rename to code/services-core/control-service/resources/templates/control/partials/storage-types.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/redirect-ok.hdb b/code/services-core/control-service/resources/templates/control/redirect-ok.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/redirect-ok.hdb rename to code/services-core/control-service/resources/templates/control/redirect-ok.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/sys/aborted-processes.hdb b/code/services-core/control-service/resources/templates/control/sys/aborted-processes.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/sys/aborted-processes.hdb rename to code/services-core/control-service/resources/templates/control/sys/aborted-processes.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/sys/data-sets.hdb b/code/services-core/control-service/resources/templates/control/sys/data-sets.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/sys/data-sets.hdb rename to code/services-core/control-service/resources/templates/control/sys/data-sets.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/sys/domain-ranking-sets.hdb b/code/services-core/control-service/resources/templates/control/sys/domain-ranking-sets.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/sys/domain-ranking-sets.hdb rename to code/services-core/control-service/resources/templates/control/sys/domain-ranking-sets.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/sys/events.hdb b/code/services-core/control-service/resources/templates/control/sys/events.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/sys/events.hdb rename to code/services-core/control-service/resources/templates/control/sys/events.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/sys/message-queue.hdb b/code/services-core/control-service/resources/templates/control/sys/message-queue.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/sys/message-queue.hdb rename to code/services-core/control-service/resources/templates/control/sys/message-queue.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/sys/new-domain-ranking-set.hdb b/code/services-core/control-service/resources/templates/control/sys/new-domain-ranking-set.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/sys/new-domain-ranking-set.hdb rename to code/services-core/control-service/resources/templates/control/sys/new-domain-ranking-set.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/sys/new-message.hdb b/code/services-core/control-service/resources/templates/control/sys/new-message.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/sys/new-message.hdb rename to code/services-core/control-service/resources/templates/control/sys/new-message.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/sys/service-by-id.hdb b/code/services-core/control-service/resources/templates/control/sys/service-by-id.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/sys/service-by-id.hdb rename to code/services-core/control-service/resources/templates/control/sys/service-by-id.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/sys/sys-actions.hdb b/code/services-core/control-service/resources/templates/control/sys/sys-actions.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/sys/sys-actions.hdb rename to code/services-core/control-service/resources/templates/control/sys/sys-actions.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/sys/update-domain-ranking-set.hdb b/code/services-core/control-service/resources/templates/control/sys/update-domain-ranking-set.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/sys/update-domain-ranking-set.hdb rename to code/services-core/control-service/resources/templates/control/sys/update-domain-ranking-set.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/sys/update-message-state.hdb b/code/services-core/control-service/resources/templates/control/sys/update-message-state.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/sys/update-message-state.hdb rename to code/services-core/control-service/resources/templates/control/sys/update-message-state.hdb diff --git a/code/services-core/control-service/src/main/resources/templates/control/sys/view-message.hdb b/code/services-core/control-service/resources/templates/control/sys/view-message.hdb similarity index 100% rename from code/services-core/control-service/src/main/resources/templates/control/sys/view-message.hdb rename to code/services-core/control-service/resources/templates/control/sys/view-message.hdb diff --git a/code/services-core/control-service/src/test/java/nu/marginalia/control/svc/ApiKeyServiceTest.java b/code/services-core/control-service/test/nu/marginalia/control/svc/ApiKeyServiceTest.java similarity index 100% rename from code/services-core/control-service/src/test/java/nu/marginalia/control/svc/ApiKeyServiceTest.java rename to code/services-core/control-service/test/nu/marginalia/control/svc/ApiKeyServiceTest.java diff --git a/code/services-core/control-service/src/test/java/nu/marginalia/control/svc/HeartbeatServiceTest.java b/code/services-core/control-service/test/nu/marginalia/control/svc/HeartbeatServiceTest.java similarity index 100% rename from code/services-core/control-service/src/test/java/nu/marginalia/control/svc/HeartbeatServiceTest.java rename to code/services-core/control-service/test/nu/marginalia/control/svc/HeartbeatServiceTest.java diff --git a/code/services-core/executor-service/build.gradle b/code/services-core/executor-service/build.gradle index 68a28eff..62324c7f 100644 --- a/code/services-core/executor-service/build.gradle +++ b/code/services-core/executor-service/build.gradle @@ -34,6 +34,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { // These look weird but they're needed to be able to spawn the processes // from the executor service diff --git a/code/services-core/executor-service/src/main/java/nu/marginalia/executor/ExecutorMain.java b/code/services-core/executor-service/java/nu/marginalia/executor/ExecutorMain.java similarity index 100% rename from code/services-core/executor-service/src/main/java/nu/marginalia/executor/ExecutorMain.java rename to code/services-core/executor-service/java/nu/marginalia/executor/ExecutorMain.java diff --git a/code/services-core/executor-service/src/main/java/nu/marginalia/executor/ExecutorModule.java b/code/services-core/executor-service/java/nu/marginalia/executor/ExecutorModule.java similarity index 100% rename from code/services-core/executor-service/src/main/java/nu/marginalia/executor/ExecutorModule.java rename to code/services-core/executor-service/java/nu/marginalia/executor/ExecutorModule.java diff --git a/code/services-core/executor-service/src/main/java/nu/marginalia/executor/ExecutorSvc.java b/code/services-core/executor-service/java/nu/marginalia/executor/ExecutorSvc.java similarity index 100% rename from code/services-core/executor-service/src/main/java/nu/marginalia/executor/ExecutorSvc.java rename to code/services-core/executor-service/java/nu/marginalia/executor/ExecutorSvc.java diff --git a/code/services-core/index-service/build.gradle b/code/services-core/index-service/build.gradle index 1c7f81fe..69f1f38d 100644 --- a/code/services-core/index-service/build.gradle +++ b/code/services-core/index-service/build.gradle @@ -35,6 +35,8 @@ java { languageVersion.set(JavaLanguageVersion.of(21)) } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':code:common:config') implementation project(':code:common:service') diff --git a/code/services-core/index-service/src/main/java/nu/marginalia/index/IndexMain.java b/code/services-core/index-service/java/nu/marginalia/index/IndexMain.java similarity index 100% rename from code/services-core/index-service/src/main/java/nu/marginalia/index/IndexMain.java rename to code/services-core/index-service/java/nu/marginalia/index/IndexMain.java diff --git a/code/services-core/index-service/src/main/java/nu/marginalia/index/IndexModule.java b/code/services-core/index-service/java/nu/marginalia/index/IndexModule.java similarity index 100% rename from code/services-core/index-service/src/main/java/nu/marginalia/index/IndexModule.java rename to code/services-core/index-service/java/nu/marginalia/index/IndexModule.java diff --git a/code/services-core/index-service/src/main/java/nu/marginalia/index/IndexOpsService.java b/code/services-core/index-service/java/nu/marginalia/index/IndexOpsService.java similarity index 100% rename from code/services-core/index-service/src/main/java/nu/marginalia/index/IndexOpsService.java rename to code/services-core/index-service/java/nu/marginalia/index/IndexOpsService.java diff --git a/code/services-core/index-service/src/main/java/nu/marginalia/index/IndexService.java b/code/services-core/index-service/java/nu/marginalia/index/IndexService.java similarity index 100% rename from code/services-core/index-service/src/main/java/nu/marginalia/index/IndexService.java rename to code/services-core/index-service/java/nu/marginalia/index/IndexService.java diff --git a/code/services-core/query-service/build.gradle b/code/services-core/query-service/build.gradle index a013e86d..0e283788 100644 --- a/code/services-core/query-service/build.gradle +++ b/code/services-core/query-service/build.gradle @@ -36,6 +36,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':code:common:config') implementation project(':code:common:model') diff --git a/code/services-core/query-service/src/main/java/nu/marginalia/query/QueryBasicInterface.java b/code/services-core/query-service/java/nu/marginalia/query/QueryBasicInterface.java similarity index 100% rename from code/services-core/query-service/src/main/java/nu/marginalia/query/QueryBasicInterface.java rename to code/services-core/query-service/java/nu/marginalia/query/QueryBasicInterface.java diff --git a/code/services-core/query-service/src/main/java/nu/marginalia/query/QueryMain.java b/code/services-core/query-service/java/nu/marginalia/query/QueryMain.java similarity index 100% rename from code/services-core/query-service/src/main/java/nu/marginalia/query/QueryMain.java rename to code/services-core/query-service/java/nu/marginalia/query/QueryMain.java diff --git a/code/services-core/query-service/src/main/java/nu/marginalia/query/QueryModule.java b/code/services-core/query-service/java/nu/marginalia/query/QueryModule.java similarity index 100% rename from code/services-core/query-service/src/main/java/nu/marginalia/query/QueryModule.java rename to code/services-core/query-service/java/nu/marginalia/query/QueryModule.java diff --git a/code/services-core/query-service/src/main/java/nu/marginalia/query/QueryService.java b/code/services-core/query-service/java/nu/marginalia/query/QueryService.java similarity index 100% rename from code/services-core/query-service/src/main/java/nu/marginalia/query/QueryService.java rename to code/services-core/query-service/java/nu/marginalia/query/QueryService.java diff --git a/code/services-core/query-service/src/main/resources/static/public/index.html b/code/services-core/query-service/resources/static/public/index.html similarity index 100% rename from code/services-core/query-service/src/main/resources/static/public/index.html rename to code/services-core/query-service/resources/static/public/index.html diff --git a/code/services-core/query-service/src/main/resources/templates/search.hdb b/code/services-core/query-service/resources/templates/search.hdb similarity index 100% rename from code/services-core/query-service/src/main/resources/templates/search.hdb rename to code/services-core/query-service/resources/templates/search.hdb diff --git a/code/tools/crawl-data-unfcker/build.gradle b/code/tools/crawl-data-unfcker/build.gradle index 6673eab6..40ec3bcb 100644 --- a/code/tools/crawl-data-unfcker/build.gradle +++ b/code/tools/crawl-data-unfcker/build.gradle @@ -19,6 +19,8 @@ application { tasks.distZip.enabled = false +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':third-party:rdrpostagger') implementation project(':third-party:porterstemmer') diff --git a/code/tools/crawl-data-unfcker/src/main/java/nu/marginalia/tools/CrawlDataUnfcker.java b/code/tools/crawl-data-unfcker/java/nu/marginalia/tools/CrawlDataUnfcker.java similarity index 100% rename from code/tools/crawl-data-unfcker/src/main/java/nu/marginalia/tools/CrawlDataUnfcker.java rename to code/tools/crawl-data-unfcker/java/nu/marginalia/tools/CrawlDataUnfcker.java diff --git a/code/tools/experiment-runner/build.gradle b/code/tools/experiment-runner/build.gradle index 44494949..36001e0b 100644 --- a/code/tools/experiment-runner/build.gradle +++ b/code/tools/experiment-runner/build.gradle @@ -19,6 +19,8 @@ application { tasks.distZip.enabled = false +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':third-party:rdrpostagger') implementation project(':third-party:porterstemmer') diff --git a/code/tools/experiment-runner/src/main/java/nu/marginalia/tools/Experiment.java b/code/tools/experiment-runner/java/nu/marginalia/tools/Experiment.java similarity index 100% rename from code/tools/experiment-runner/src/main/java/nu/marginalia/tools/Experiment.java rename to code/tools/experiment-runner/java/nu/marginalia/tools/Experiment.java diff --git a/code/tools/experiment-runner/src/main/java/nu/marginalia/tools/ExperimentRunnerMain.java b/code/tools/experiment-runner/java/nu/marginalia/tools/ExperimentRunnerMain.java similarity index 100% rename from code/tools/experiment-runner/src/main/java/nu/marginalia/tools/ExperimentRunnerMain.java rename to code/tools/experiment-runner/java/nu/marginalia/tools/ExperimentRunnerMain.java diff --git a/code/tools/experiment-runner/src/main/java/nu/marginalia/tools/LegacyExperiment.java b/code/tools/experiment-runner/java/nu/marginalia/tools/LegacyExperiment.java similarity index 100% rename from code/tools/experiment-runner/src/main/java/nu/marginalia/tools/LegacyExperiment.java rename to code/tools/experiment-runner/java/nu/marginalia/tools/LegacyExperiment.java diff --git a/code/tools/experiment-runner/src/main/java/nu/marginalia/tools/experiments/AdblockExperiment.java b/code/tools/experiment-runner/java/nu/marginalia/tools/experiments/AdblockExperiment.java similarity index 100% rename from code/tools/experiment-runner/src/main/java/nu/marginalia/tools/experiments/AdblockExperiment.java rename to code/tools/experiment-runner/java/nu/marginalia/tools/experiments/AdblockExperiment.java diff --git a/code/tools/experiment-runner/src/main/java/nu/marginalia/tools/experiments/AtagsExperiment.java b/code/tools/experiment-runner/java/nu/marginalia/tools/experiments/AtagsExperiment.java similarity index 100% rename from code/tools/experiment-runner/src/main/java/nu/marginalia/tools/experiments/AtagsExperiment.java rename to code/tools/experiment-runner/java/nu/marginalia/tools/experiments/AtagsExperiment.java diff --git a/code/tools/experiment-runner/src/main/java/nu/marginalia/tools/experiments/DebugConverterExperiment.java b/code/tools/experiment-runner/java/nu/marginalia/tools/experiments/DebugConverterExperiment.java similarity index 100% rename from code/tools/experiment-runner/src/main/java/nu/marginalia/tools/experiments/DebugConverterExperiment.java rename to code/tools/experiment-runner/java/nu/marginalia/tools/experiments/DebugConverterExperiment.java diff --git a/code/tools/experiment-runner/src/main/java/nu/marginalia/tools/experiments/ExportExternalLinksExperiment.java b/code/tools/experiment-runner/java/nu/marginalia/tools/experiments/ExportExternalLinksExperiment.java similarity index 100% rename from code/tools/experiment-runner/src/main/java/nu/marginalia/tools/experiments/ExportExternalLinksExperiment.java rename to code/tools/experiment-runner/java/nu/marginalia/tools/experiments/ExportExternalLinksExperiment.java diff --git a/code/tools/experiment-runner/src/main/java/nu/marginalia/tools/experiments/SentenceStatisticsExperiment.java b/code/tools/experiment-runner/java/nu/marginalia/tools/experiments/SentenceStatisticsExperiment.java similarity index 100% rename from code/tools/experiment-runner/src/main/java/nu/marginalia/tools/experiments/SentenceStatisticsExperiment.java rename to code/tools/experiment-runner/java/nu/marginalia/tools/experiments/SentenceStatisticsExperiment.java diff --git a/code/tools/experiment-runner/src/main/java/nu/marginalia/tools/experiments/SiteStatisticsExperiment.java b/code/tools/experiment-runner/java/nu/marginalia/tools/experiments/SiteStatisticsExperiment.java similarity index 100% rename from code/tools/experiment-runner/src/main/java/nu/marginalia/tools/experiments/SiteStatisticsExperiment.java rename to code/tools/experiment-runner/java/nu/marginalia/tools/experiments/SiteStatisticsExperiment.java diff --git a/code/tools/experiment-runner/src/main/java/nu/marginalia/tools/experiments/TestExperiment.java b/code/tools/experiment-runner/java/nu/marginalia/tools/experiments/TestExperiment.java similarity index 100% rename from code/tools/experiment-runner/src/main/java/nu/marginalia/tools/experiments/TestExperiment.java rename to code/tools/experiment-runner/java/nu/marginalia/tools/experiments/TestExperiment.java diff --git a/code/tools/experiment-runner/src/main/java/nu/marginalia/tools/experiments/TopicExperiment.java b/code/tools/experiment-runner/java/nu/marginalia/tools/experiments/TopicExperiment.java similarity index 100% rename from code/tools/experiment-runner/src/main/java/nu/marginalia/tools/experiments/TopicExperiment.java rename to code/tools/experiment-runner/java/nu/marginalia/tools/experiments/TopicExperiment.java diff --git a/code/tools/load-test/build.gradle b/code/tools/load-test/build.gradle index e8b363c8..744333c8 100644 --- a/code/tools/load-test/build.gradle +++ b/code/tools/load-test/build.gradle @@ -11,6 +11,8 @@ java { } } +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':code:common:config') implementation project(':code:common:model') diff --git a/code/tools/load-test/src/main/java/nu/marginalia/load_test/LoadTestMain.java b/code/tools/load-test/java/nu/marginalia/load_test/LoadTestMain.java similarity index 100% rename from code/tools/load-test/src/main/java/nu/marginalia/load_test/LoadTestMain.java rename to code/tools/load-test/java/nu/marginalia/load_test/LoadTestMain.java diff --git a/code/tools/screenshot-capture-tool/build.gradle b/code/tools/screenshot-capture-tool/build.gradle index b821f7b7..82903746 100644 --- a/code/tools/screenshot-capture-tool/build.gradle +++ b/code/tools/screenshot-capture-tool/build.gradle @@ -35,6 +35,8 @@ jib { tasks.distZip.enabled = false +apply from: "$rootProject.projectDir/srcsets.gradle" + dependencies { implementation project(':code:common:model') implementation project(':code:features-search:screenshots') diff --git a/code/tools/screenshot-capture-tool/src/main/java/nu/marginalia/screenshot/ScreenshotCaptureToolMain.java b/code/tools/screenshot-capture-tool/java/nu/marginalia/screenshot/ScreenshotCaptureToolMain.java similarity index 100% rename from code/tools/screenshot-capture-tool/src/main/java/nu/marginalia/screenshot/ScreenshotCaptureToolMain.java rename to code/tools/screenshot-capture-tool/java/nu/marginalia/screenshot/ScreenshotCaptureToolMain.java diff --git a/code/tools/screenshot-capture-tool/src/main/java/nu/marginalia/screenshot/ScreenshotLoaderMain.java b/code/tools/screenshot-capture-tool/java/nu/marginalia/screenshot/ScreenshotLoaderMain.java similarity index 100% rename from code/tools/screenshot-capture-tool/src/main/java/nu/marginalia/screenshot/ScreenshotLoaderMain.java rename to code/tools/screenshot-capture-tool/java/nu/marginalia/screenshot/ScreenshotLoaderMain.java diff --git a/protobuf.gradle b/protobuf.gradle index af2f5317..d8eec78e 100644 --- a/protobuf.gradle +++ b/protobuf.gradle @@ -26,4 +26,14 @@ protobuf { } } } -} \ No newline at end of file +} + +tasks.compileJava.dependsOn('generateProto') + +sourceSets { + main { + proto { + srcDirs += 'src/main/protobuf' + } + } +} diff --git a/settings.gradle b/settings.gradle index 8fe58024..0dbc4376 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,4 @@ -rootProject.name = 'marginalia.nu' +rootProject.name = 'marginalia' include 'code:services-core:index-service' include 'code:services-core:assistant-service' @@ -31,8 +31,8 @@ include 'code:index' include 'code:index:api' include 'code:index:index-journal' include 'code:index:query' -include 'code:index:forward-index' -include 'code:index:reverse-index' +include 'code:index:index-forward' +include 'code:index:index-reverse' include 'code:libraries:array' include 'code:libraries:geo-ip' diff --git a/srcsets.gradle b/srcsets.gradle new file mode 100644 index 00000000..ae1e0729 --- /dev/null +++ b/srcsets.gradle @@ -0,0 +1,51 @@ +/** Configures the source sets for the code/ subprojects. + * + * Ideally this would have been done in the root build.gradle file, but due to disagreements + * between Gradle and IntelliJ's gradle plugin about how to interpret the sourceSets block + * when applied to subprojects from the root project, this has to be done in each subproject. + * */ +apply plugin: 'java' +apply plugin: 'io.freefair.lombok' + +dependencies { + implementation libs.lombok + testImplementation libs.lombok + annotationProcessor libs.lombok + + lombok libs.lombok // prevent plugin from downgrading the version to something incompatible with '19 +} + +test { + maxHeapSize = "8G" + useJUnitPlatform() +} + +tasks.register('fastTests', Test) { + maxHeapSize = "8G" + useJUnitPlatform { + excludeTags "slow" + } +} + +sourceSets { + main { + java { + srcDirs = [ + 'java', + 'build/generated/source/proto/main/grpc', + 'build/generated/source/proto/main/java' + ] + } + resources { + srcDirs = [ 'resources' ] + } + } + test { + java { + srcDirs = [ 'test' ] + } + resources { + srcDirs = [ 'test-resources' ] + } + } +} diff --git a/third-party/encyclopedia-marginalia-nu/build.gradle b/third-party/encyclopedia-marginalia-nu/build.gradle index 992f70e2..faf794ec 100644 --- a/third-party/encyclopedia-marginalia-nu/build.gradle +++ b/third-party/encyclopedia-marginalia-nu/build.gradle @@ -1,5 +1,6 @@ plugins { id 'java' + id 'io.freefair.lombok' } java { @@ -15,6 +16,12 @@ dependencies { implementation libs.zstd implementation libs.bundles.slf4j + implementation libs.lombok + testImplementation libs.lombok + annotationProcessor libs.lombok + + lombok libs.lombok // prevent plugin from downgrading the version to something incompatible with '19 + implementation project(':code:libraries:blocking-thread-pool') implementation project(':third-party:openzim') diff --git a/third-party/encyclopedia-marginalia-nu/src/main/java/nu/marginalia/encyclopedia/EncyclopediaConverter.java b/third-party/encyclopedia-marginalia-nu/src/main/java/nu/marginalia/encyclopedia/EncyclopediaConverter.java index 1920f536..e5274652 100644 --- a/third-party/encyclopedia-marginalia-nu/src/main/java/nu/marginalia/encyclopedia/EncyclopediaConverter.java +++ b/third-party/encyclopedia-marginalia-nu/src/main/java/nu/marginalia/encyclopedia/EncyclopediaConverter.java @@ -3,7 +3,6 @@ package nu.marginalia.encyclopedia; import nu.marginalia.encyclopedia.cleaner.WikiCleaner; import nu.marginalia.encyclopedia.store.ArticleDbProvider; import nu.marginalia.encyclopedia.store.ArticleStoreWriter; -import nu.marginalia.util.SimpleBlockingThreadPool; import org.openzim.ZIMTypes.ZIMFile; import org.openzim.ZIMTypes.ZIMReader; import org.slf4j.LoggerFactory; @@ -13,7 +12,7 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.sql.SQLException; -import java.util.concurrent.TimeUnit; +import java.util.concurrent.Executors; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.BiConsumer; import java.util.function.Predicate; @@ -26,41 +25,35 @@ public class EncyclopediaConverter { public static void convert(Path inputFile, Path outputFile) throws IOException, SQLException, InterruptedException { var wc = new WikiCleaner(); - var pool = new SimpleBlockingThreadPool("Convert ZIM", - Math.clamp(Runtime.getRuntime().availableProcessors() - 2, 1, 32), - 2); - var size = new AtomicInteger(); - if (!Files.exists(inputFile)) { - throw new IllegalStateException("ZIM file not found: " + inputFile); - } - Files.deleteIfExists(outputFile); + try (var executor = Executors.newWorkStealingPool(Math.clamp(Runtime.getRuntime().availableProcessors() - 2, 1, 32))) { - try (var asw = new ArticleStoreWriter(new ArticleDbProvider(outputFile))) { - Predicate keepGoing = (s) -> true; + var size = new AtomicInteger(); - BiConsumer handleArticle = (url, html) -> { - if (pool.isTerminated()) - return; + if (!Files.exists(inputFile)) { + throw new IllegalStateException("ZIM file not found: " + inputFile); + } + Files.deleteIfExists(outputFile); - pool.submitQuietly(() -> { - int sz = size.incrementAndGet(); - if (sz % 1000 == 0) { - System.out.printf("\u001b[2K\r%d", sz); - } - asw.add(wc.cleanWikiJunk(url, html)); - }); + try (var asw = new ArticleStoreWriter(new ArticleDbProvider(outputFile))) { + Predicate keepGoing = (s) -> true; - size.incrementAndGet(); - }; + BiConsumer handleArticle = (url, html) -> { + if (executor.isTerminated()) + return; - new ZIMReader(new ZIMFile(inputFile.toString())).forEachArticles(handleArticle, keepGoing); + executor.submit(() -> { + int sz = size.incrementAndGet(); + if (sz % 1000 == 0) { + System.out.printf("\u001b[2K\r%d", sz); + } + asw.add(wc.cleanWikiJunk(url, html)); + }); - pool.shutDown(); - logger.info("Waiting for pool to finish"); + size.incrementAndGet(); + }; - while (!pool.awaitTermination(1, TimeUnit.SECONDS)) { - // ... + new ZIMReader(new ZIMFile(inputFile.toString())).forEachArticles(handleArticle, keepGoing); } } }