From 5dd55c7cad65339f04f838c7694d1bb378803cc7 Mon Sep 17 00:00:00 2001 From: Viktor Lofgren Date: Mon, 9 Oct 2023 13:45:45 +0200 Subject: [PATCH] (refactor) Rename satellite services to application services This is a better descriptor, since they now all implement different applications on top of the core services' APIs. --- code/api/readme.md | 4 ++-- code/processes/loading-process/build.gradle | 2 +- code/readme.md | 8 ++++---- .../api-service/build.gradle | 0 .../api-service/readme.md | 0 .../src/main/java/nu/marginalia/api/ApiMain.java | 0 .../src/main/java/nu/marginalia/api/ApiService.java | 0 .../java/nu/marginalia/api/model/ApiLicense.java | 0 .../java/nu/marginalia/api/svc/LicenseService.java | 0 .../nu/marginalia/api/svc/RateLimiterService.java | 0 .../java/nu/marginalia/api/svc/ResponseCache.java | 0 .../nu/marginalia/api/svc/LicenseServiceTest.java | 0 .../marginalia/api/svc/RateLimiterServiceTest.java | 0 .../nu/marginalia/api/svc/ResponseCacheTest.java | 0 .../dating-service/build.gradle | 0 .../dating-service/readme.md | 0 .../main/java/nu/marginalia/dating/DatingMain.java | 0 .../java/nu/marginalia/dating/DatingModule.java | 0 .../java/nu/marginalia/dating/DatingService.java | 0 .../nu/marginalia/dating/DatingSessionObject.java | 0 .../src/main/resources/static/dating/robots.txt | 0 .../main/resources/templates/dating/dating-view.hdb | 0 .../explorer-service/build.gradle | 0 .../explorer-service/readme.md | 0 .../java/nu/marginalia/explorer/ExplorerMain.java | 0 .../nu/marginalia/explorer/ExplorerService.java | 0 .../src/main/resources/static/explore/style.css | 0 .../resources/templates/explorer/explorer-about.hdb | 0 .../templates/explorer/explorer-messages.hdb | 0 .../templates/explorer/explorer-results.hdb | 0 .../templates/explorer/explorer-search.hdb | 0 .../main/resources/templates/explorer/explorer.hdb | 0 .../readme.md | 0 .../search-service/build.gradle | 0 .../search-service/readme.md | 0 .../main/java/nu/marginalia/search/SearchMain.java | 0 .../java/nu/marginalia/search/SearchModule.java | 0 .../java/nu/marginalia/search/SearchOperator.java | 0 .../marginalia/search/SearchQueryParamFactory.java | 0 .../java/nu/marginalia/search/SearchService.java | 0 .../marginalia/search/command/CommandEvaluator.java | 0 .../search/command/SearchCommandInterface.java | 0 .../search/command/SearchJsParameter.java | 0 .../marginalia/search/command/SearchParameters.java | 0 .../search/command/commands/BangCommand.java | 0 .../search/command/commands/BrowseCommand.java | 0 .../search/command/commands/ConvertCommand.java | 0 .../search/command/commands/DefinitionCommand.java | 0 .../search/command/commands/SearchCommand.java | 0 .../search/command/commands/SiteListCommand.java | 0 .../nu/marginalia/search/db/DbNearDomainsQuery.java | 0 .../search/exceptions/RedirectException.java | 0 .../search/model/DecoratedSearchResults.java | 0 .../marginalia/search/model/DomainInformation.java | 0 .../search/model/PageScoreAdjustment.java | 0 .../nu/marginalia/search/model/SearchProfile.java | 0 .../java/nu/marginalia/search/model/UrlDetails.java | 0 .../search/model/UserSearchParameters.java | 0 .../search/results/BrowseResultCleaner.java | 0 .../search/results/SearchResultDecorator.java | 0 .../marginalia/search/results/UrlDeduplicator.java | 0 .../search/siteinfo/DomainInformationService.java | 0 .../search/svc/SearchAddToCrawlQueueService.java | 0 .../search/svc/SearchApiQueryService.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 .../marginalia/search/svc/SearchQueryService.java | 0 .../search/svc/SearchUnitConversionService.java | 0 .../main/resources/static/search/crawler-ips.txt | 0 .../src/main/resources/static/search/favicon.ico | Bin .../src/main/resources/static/search/opensearch.xml | 0 .../src/main/resources/static/search/robots.txt | 0 .../src/main/resources/static/search/style-new.css | 0 .../src/main/resources/static/search/tts.js | 0 .../resources/templates/search/browse-result.hdb | 0 .../resources/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 .../main/resources/templates/search/error-page.hdb | 0 .../templates/search/index/index-about.hdb | 0 .../resources/templates/search/index/index-news.hdb | 0 .../resources/templates/search/index/index-tips.hdb | 0 .../templates/search/index/index-updates.hdb | 0 .../main/resources/templates/search/index/index.hdb | 0 .../templates/search/indict/indict-form.hdb | 0 .../templates/search/parts/search-footer.hdb | 0 .../templates/search/parts/search-form.hdb | 0 .../templates/search/parts/search-header.hdb | 0 .../templates/search/parts/site-info-index.hdb | 0 .../templates/search/parts/site-info-links.hdb | 0 .../templates/search/search-result-metadata.hdb | 0 .../resources/templates/search/search-result.hdb | 0 .../resources/templates/search/search-results.hdb | 0 .../main/resources/templates/search/site-info.hdb | 0 .../search/command/commands/BangCommandTest.java | 0 .../java/nu/marginalia/util/TestLanguageModels.java | 0 code/tools/website-adjacencies-calculator/readme.md | 2 +- settings.gradle | 8 ++++---- 102 files changed, 12 insertions(+), 12 deletions(-) rename code/{services-satellite => services-application}/api-service/build.gradle (100%) rename code/{services-satellite => services-application}/api-service/readme.md (100%) rename code/{services-satellite => services-application}/api-service/src/main/java/nu/marginalia/api/ApiMain.java (100%) rename code/{services-satellite => services-application}/api-service/src/main/java/nu/marginalia/api/ApiService.java (100%) rename code/{services-satellite => services-application}/api-service/src/main/java/nu/marginalia/api/model/ApiLicense.java (100%) rename code/{services-satellite => services-application}/api-service/src/main/java/nu/marginalia/api/svc/LicenseService.java (100%) rename code/{services-satellite => services-application}/api-service/src/main/java/nu/marginalia/api/svc/RateLimiterService.java (100%) rename code/{services-satellite => services-application}/api-service/src/main/java/nu/marginalia/api/svc/ResponseCache.java (100%) rename code/{services-satellite => services-application}/api-service/src/test/java/nu/marginalia/api/svc/LicenseServiceTest.java (100%) rename code/{services-satellite => services-application}/api-service/src/test/java/nu/marginalia/api/svc/RateLimiterServiceTest.java (100%) rename code/{services-satellite => services-application}/api-service/src/test/java/nu/marginalia/api/svc/ResponseCacheTest.java (100%) rename code/{services-satellite => services-application}/dating-service/build.gradle (100%) rename code/{services-satellite => services-application}/dating-service/readme.md (100%) rename code/{services-satellite => services-application}/dating-service/src/main/java/nu/marginalia/dating/DatingMain.java (100%) rename code/{services-satellite => services-application}/dating-service/src/main/java/nu/marginalia/dating/DatingModule.java (100%) rename code/{services-satellite => services-application}/dating-service/src/main/java/nu/marginalia/dating/DatingService.java (100%) rename code/{services-satellite => services-application}/dating-service/src/main/java/nu/marginalia/dating/DatingSessionObject.java (100%) rename code/{services-satellite => services-application}/dating-service/src/main/resources/static/dating/robots.txt (100%) rename code/{services-satellite => services-application}/dating-service/src/main/resources/templates/dating/dating-view.hdb (100%) rename code/{services-satellite => services-application}/explorer-service/build.gradle (100%) rename code/{services-satellite => services-application}/explorer-service/readme.md (100%) rename code/{services-satellite => services-application}/explorer-service/src/main/java/nu/marginalia/explorer/ExplorerMain.java (100%) rename code/{services-satellite => services-application}/explorer-service/src/main/java/nu/marginalia/explorer/ExplorerService.java (100%) rename code/{services-satellite => services-application}/explorer-service/src/main/resources/static/explore/style.css (100%) rename code/{services-satellite => services-application}/explorer-service/src/main/resources/templates/explorer/explorer-about.hdb (100%) rename code/{services-satellite => services-application}/explorer-service/src/main/resources/templates/explorer/explorer-messages.hdb (100%) rename code/{services-satellite => services-application}/explorer-service/src/main/resources/templates/explorer/explorer-results.hdb (100%) rename code/{services-satellite => services-application}/explorer-service/src/main/resources/templates/explorer/explorer-search.hdb (100%) rename code/{services-satellite => services-application}/explorer-service/src/main/resources/templates/explorer/explorer.hdb (100%) rename code/{services-satellite => services-application}/readme.md (100%) rename code/{services-satellite => services-application}/search-service/build.gradle (100%) rename code/{services-satellite => services-application}/search-service/readme.md (100%) rename code/{services-satellite => services-application}/search-service/src/main/java/nu/marginalia/search/SearchMain.java (100%) rename code/{services-satellite => services-application}/search-service/src/main/java/nu/marginalia/search/SearchModule.java (100%) rename code/{services-satellite => services-application}/search-service/src/main/java/nu/marginalia/search/SearchOperator.java (100%) rename code/{services-satellite => services-application}/search-service/src/main/java/nu/marginalia/search/SearchQueryParamFactory.java (100%) rename code/{services-satellite => services-application}/search-service/src/main/java/nu/marginalia/search/SearchService.java (100%) rename code/{services-satellite => services-application}/search-service/src/main/java/nu/marginalia/search/command/CommandEvaluator.java (100%) rename code/{services-satellite => services-application}/search-service/src/main/java/nu/marginalia/search/command/SearchCommandInterface.java (100%) rename code/{services-satellite => services-application}/search-service/src/main/java/nu/marginalia/search/command/SearchJsParameter.java (100%) rename code/{services-satellite => services-application}/search-service/src/main/java/nu/marginalia/search/command/SearchParameters.java (100%) rename code/{services-satellite => services-application}/search-service/src/main/java/nu/marginalia/search/command/commands/BangCommand.java (100%) rename code/{services-satellite => services-application}/search-service/src/main/java/nu/marginalia/search/command/commands/BrowseCommand.java (100%) rename code/{services-satellite => services-application}/search-service/src/main/java/nu/marginalia/search/command/commands/ConvertCommand.java (100%) rename code/{services-satellite => services-application}/search-service/src/main/java/nu/marginalia/search/command/commands/DefinitionCommand.java (100%) rename code/{services-satellite => services-application}/search-service/src/main/java/nu/marginalia/search/command/commands/SearchCommand.java (100%) rename code/{services-satellite => services-application}/search-service/src/main/java/nu/marginalia/search/command/commands/SiteListCommand.java (100%) rename code/{services-satellite => services-application}/search-service/src/main/java/nu/marginalia/search/db/DbNearDomainsQuery.java (100%) rename code/{services-satellite => services-application}/search-service/src/main/java/nu/marginalia/search/exceptions/RedirectException.java (100%) rename code/{services-satellite => services-application}/search-service/src/main/java/nu/marginalia/search/model/DecoratedSearchResults.java (100%) rename code/{services-satellite => services-application}/search-service/src/main/java/nu/marginalia/search/model/DomainInformation.java (100%) rename code/{services-satellite => services-application}/search-service/src/main/java/nu/marginalia/search/model/PageScoreAdjustment.java (100%) rename code/{services-satellite => services-application}/search-service/src/main/java/nu/marginalia/search/model/SearchProfile.java (100%) rename code/{services-satellite => services-application}/search-service/src/main/java/nu/marginalia/search/model/UrlDetails.java (100%) rename code/{services-satellite => services-application}/search-service/src/main/java/nu/marginalia/search/model/UserSearchParameters.java (100%) rename code/{services-satellite => services-application}/search-service/src/main/java/nu/marginalia/search/results/BrowseResultCleaner.java (100%) rename code/{services-satellite => services-application}/search-service/src/main/java/nu/marginalia/search/results/SearchResultDecorator.java (100%) rename code/{services-satellite => services-application}/search-service/src/main/java/nu/marginalia/search/results/UrlDeduplicator.java (100%) rename code/{services-satellite => services-application}/search-service/src/main/java/nu/marginalia/search/siteinfo/DomainInformationService.java (100%) rename code/{services-satellite => services-application}/search-service/src/main/java/nu/marginalia/search/svc/SearchAddToCrawlQueueService.java (100%) rename code/{services-satellite => services-application}/search-service/src/main/java/nu/marginalia/search/svc/SearchApiQueryService.java (100%) rename code/{services-satellite => services-application}/search-service/src/main/java/nu/marginalia/search/svc/SearchErrorPageService.java (100%) rename code/{services-satellite => services-application}/search-service/src/main/java/nu/marginalia/search/svc/SearchFlagSiteService.java (100%) rename code/{services-satellite => services-application}/search-service/src/main/java/nu/marginalia/search/svc/SearchFrontPageService.java (100%) rename code/{services-satellite => services-application}/search-service/src/main/java/nu/marginalia/search/svc/SearchQueryCountService.java (100%) rename code/{services-satellite => services-application}/search-service/src/main/java/nu/marginalia/search/svc/SearchQueryIndexService.java (100%) rename code/{services-satellite => services-application}/search-service/src/main/java/nu/marginalia/search/svc/SearchQueryService.java (100%) rename code/{services-satellite => services-application}/search-service/src/main/java/nu/marginalia/search/svc/SearchUnitConversionService.java (100%) rename code/{services-satellite => services-application}/search-service/src/main/resources/static/search/crawler-ips.txt (100%) rename code/{services-satellite => services-application}/search-service/src/main/resources/static/search/favicon.ico (100%) rename code/{services-satellite => services-application}/search-service/src/main/resources/static/search/opensearch.xml (100%) rename code/{services-satellite => services-application}/search-service/src/main/resources/static/search/robots.txt (100%) rename code/{services-satellite => services-application}/search-service/src/main/resources/static/search/style-new.css (100%) rename code/{services-satellite => services-application}/search-service/src/main/resources/static/search/tts.js (100%) rename code/{services-satellite => services-application}/search-service/src/main/resources/templates/search/browse-result.hdb (100%) rename code/{services-satellite => services-application}/search-service/src/main/resources/templates/search/browse-results.hdb (100%) rename code/{services-satellite => services-application}/search-service/src/main/resources/templates/search/conversion-results.hdb (100%) rename code/{services-satellite => services-application}/search-service/src/main/resources/templates/search/dictionary-results.hdb (100%) rename code/{services-satellite => services-application}/search-service/src/main/resources/templates/search/error-page-search.hdb (100%) rename code/{services-satellite => services-application}/search-service/src/main/resources/templates/search/error-page.hdb (100%) rename code/{services-satellite => services-application}/search-service/src/main/resources/templates/search/index/index-about.hdb (100%) rename code/{services-satellite => services-application}/search-service/src/main/resources/templates/search/index/index-news.hdb (100%) rename code/{services-satellite => services-application}/search-service/src/main/resources/templates/search/index/index-tips.hdb (100%) rename code/{services-satellite => services-application}/search-service/src/main/resources/templates/search/index/index-updates.hdb (100%) rename code/{services-satellite => services-application}/search-service/src/main/resources/templates/search/index/index.hdb (100%) rename code/{services-satellite => services-application}/search-service/src/main/resources/templates/search/indict/indict-form.hdb (100%) rename code/{services-satellite => services-application}/search-service/src/main/resources/templates/search/parts/search-footer.hdb (100%) rename code/{services-satellite => services-application}/search-service/src/main/resources/templates/search/parts/search-form.hdb (100%) rename code/{services-satellite => services-application}/search-service/src/main/resources/templates/search/parts/search-header.hdb (100%) rename code/{services-satellite => services-application}/search-service/src/main/resources/templates/search/parts/site-info-index.hdb (100%) rename code/{services-satellite => services-application}/search-service/src/main/resources/templates/search/parts/site-info-links.hdb (100%) rename code/{services-satellite => services-application}/search-service/src/main/resources/templates/search/search-result-metadata.hdb (100%) rename code/{services-satellite => services-application}/search-service/src/main/resources/templates/search/search-result.hdb (100%) rename code/{services-satellite => services-application}/search-service/src/main/resources/templates/search/search-results.hdb (100%) rename code/{services-satellite => services-application}/search-service/src/main/resources/templates/search/site-info.hdb (100%) rename code/{services-satellite => services-application}/search-service/src/test/java/nu/marginalia/search/command/commands/BangCommandTest.java (100%) rename code/{services-satellite => services-application}/search-service/src/test/java/nu/marginalia/util/TestLanguageModels.java (100%) diff --git a/code/api/readme.md b/code/api/readme.md index b5becc12..9bee706e 100644 --- a/code/api/readme.md +++ b/code/api/readme.md @@ -13,11 +13,11 @@ are necessary for speaking to them. They each implement the abstract client clas All that is necessary is to `@Inject` them into the constructor and then requests can be sent. -**Note:** If you are looking for the public API, it's handled by the api service in [services-satellite/api-service](../services-satellite/api-service). +**Note:** If you are looking for the public API, it's handled by the api service in [services-application/api-service](../services-application/api-service). ## MQ-API Process API [process-mqapi](process-mqapi/) defines requests and inboxes for the message queue based API used for interacting with processes. -See [libraries/message-queue](../libraries/message-queue) and [services-satellite/control-service](../services-satellite/control-service). \ No newline at end of file +See [libraries/message-queue](../libraries/message-queue) and [services-application/control-service](../services-application/control-service). \ No newline at end of file diff --git a/code/processes/loading-process/build.gradle b/code/processes/loading-process/build.gradle index 6bc10f54..cbf56743 100644 --- a/code/processes/loading-process/build.gradle +++ b/code/processes/loading-process/build.gradle @@ -32,7 +32,7 @@ dependencies { implementation project(':code:libraries:message-queue') implementation project(':code:libraries:language-processing') implementation project(':third-party:commons-codec') - testImplementation project(':code:services-satellite:search-service') + testImplementation project(':code:services-application:search-service') implementation project(':code:process-models:crawling-model') implementation project(':code:process-models:processed-data') diff --git a/code/readme.md b/code/readme.md index cf0224c9..8d20f90b 100644 --- a/code/readme.md +++ b/code/readme.md @@ -18,11 +18,11 @@ A map of the most important components and how they relate can be found below. * * [query](services-core/query-service) * * [index](services-core/index-service) * * [assistant](services-core/assistant-service) -* [satellite services](services-satellite/) "microservices", stateless providing additional functionality. -* * [api](services-satellite/api-service) - public API +* [application services](services-application/) "microservices", stateless providing additional functionality and making an application out of the search engine. +* * [api](services-application/api-service) - public API * * [search](services-core/search-service) - marginalia search application -* * [dating](services-satellite/dating-service) - [https://explore.marginalia.nu/](https://explore.marginalia.nu/) -* * [explorer](services-satellite/explorer-service) - [https://explore2.marginalia.nu/](https://explore2.marginalia.nu/) +* * [dating](services-application/dating-service) - [https://explore.marginalia.nu/](https://explore.marginalia.nu/) +* * [explorer](services-application/explorer-service) - [https://explore2.marginalia.nu/](https://explore2.marginalia.nu/) * an [internal API](api/) ### Processes diff --git a/code/services-satellite/api-service/build.gradle b/code/services-application/api-service/build.gradle similarity index 100% rename from code/services-satellite/api-service/build.gradle rename to code/services-application/api-service/build.gradle diff --git a/code/services-satellite/api-service/readme.md b/code/services-application/api-service/readme.md similarity index 100% rename from code/services-satellite/api-service/readme.md rename to code/services-application/api-service/readme.md diff --git a/code/services-satellite/api-service/src/main/java/nu/marginalia/api/ApiMain.java b/code/services-application/api-service/src/main/java/nu/marginalia/api/ApiMain.java similarity index 100% rename from code/services-satellite/api-service/src/main/java/nu/marginalia/api/ApiMain.java rename to code/services-application/api-service/src/main/java/nu/marginalia/api/ApiMain.java diff --git a/code/services-satellite/api-service/src/main/java/nu/marginalia/api/ApiService.java b/code/services-application/api-service/src/main/java/nu/marginalia/api/ApiService.java similarity index 100% rename from code/services-satellite/api-service/src/main/java/nu/marginalia/api/ApiService.java rename to code/services-application/api-service/src/main/java/nu/marginalia/api/ApiService.java diff --git a/code/services-satellite/api-service/src/main/java/nu/marginalia/api/model/ApiLicense.java b/code/services-application/api-service/src/main/java/nu/marginalia/api/model/ApiLicense.java similarity index 100% rename from code/services-satellite/api-service/src/main/java/nu/marginalia/api/model/ApiLicense.java rename to code/services-application/api-service/src/main/java/nu/marginalia/api/model/ApiLicense.java diff --git a/code/services-satellite/api-service/src/main/java/nu/marginalia/api/svc/LicenseService.java b/code/services-application/api-service/src/main/java/nu/marginalia/api/svc/LicenseService.java similarity index 100% rename from code/services-satellite/api-service/src/main/java/nu/marginalia/api/svc/LicenseService.java rename to code/services-application/api-service/src/main/java/nu/marginalia/api/svc/LicenseService.java diff --git a/code/services-satellite/api-service/src/main/java/nu/marginalia/api/svc/RateLimiterService.java b/code/services-application/api-service/src/main/java/nu/marginalia/api/svc/RateLimiterService.java similarity index 100% rename from code/services-satellite/api-service/src/main/java/nu/marginalia/api/svc/RateLimiterService.java rename to code/services-application/api-service/src/main/java/nu/marginalia/api/svc/RateLimiterService.java diff --git a/code/services-satellite/api-service/src/main/java/nu/marginalia/api/svc/ResponseCache.java b/code/services-application/api-service/src/main/java/nu/marginalia/api/svc/ResponseCache.java similarity index 100% rename from code/services-satellite/api-service/src/main/java/nu/marginalia/api/svc/ResponseCache.java rename to code/services-application/api-service/src/main/java/nu/marginalia/api/svc/ResponseCache.java diff --git a/code/services-satellite/api-service/src/test/java/nu/marginalia/api/svc/LicenseServiceTest.java b/code/services-application/api-service/src/test/java/nu/marginalia/api/svc/LicenseServiceTest.java similarity index 100% rename from code/services-satellite/api-service/src/test/java/nu/marginalia/api/svc/LicenseServiceTest.java rename to code/services-application/api-service/src/test/java/nu/marginalia/api/svc/LicenseServiceTest.java diff --git a/code/services-satellite/api-service/src/test/java/nu/marginalia/api/svc/RateLimiterServiceTest.java b/code/services-application/api-service/src/test/java/nu/marginalia/api/svc/RateLimiterServiceTest.java similarity index 100% rename from code/services-satellite/api-service/src/test/java/nu/marginalia/api/svc/RateLimiterServiceTest.java rename to code/services-application/api-service/src/test/java/nu/marginalia/api/svc/RateLimiterServiceTest.java diff --git a/code/services-satellite/api-service/src/test/java/nu/marginalia/api/svc/ResponseCacheTest.java b/code/services-application/api-service/src/test/java/nu/marginalia/api/svc/ResponseCacheTest.java similarity index 100% rename from code/services-satellite/api-service/src/test/java/nu/marginalia/api/svc/ResponseCacheTest.java rename to code/services-application/api-service/src/test/java/nu/marginalia/api/svc/ResponseCacheTest.java diff --git a/code/services-satellite/dating-service/build.gradle b/code/services-application/dating-service/build.gradle similarity index 100% rename from code/services-satellite/dating-service/build.gradle rename to code/services-application/dating-service/build.gradle diff --git a/code/services-satellite/dating-service/readme.md b/code/services-application/dating-service/readme.md similarity index 100% rename from code/services-satellite/dating-service/readme.md rename to code/services-application/dating-service/readme.md diff --git a/code/services-satellite/dating-service/src/main/java/nu/marginalia/dating/DatingMain.java b/code/services-application/dating-service/src/main/java/nu/marginalia/dating/DatingMain.java similarity index 100% rename from code/services-satellite/dating-service/src/main/java/nu/marginalia/dating/DatingMain.java rename to code/services-application/dating-service/src/main/java/nu/marginalia/dating/DatingMain.java diff --git a/code/services-satellite/dating-service/src/main/java/nu/marginalia/dating/DatingModule.java b/code/services-application/dating-service/src/main/java/nu/marginalia/dating/DatingModule.java similarity index 100% rename from code/services-satellite/dating-service/src/main/java/nu/marginalia/dating/DatingModule.java rename to code/services-application/dating-service/src/main/java/nu/marginalia/dating/DatingModule.java diff --git a/code/services-satellite/dating-service/src/main/java/nu/marginalia/dating/DatingService.java b/code/services-application/dating-service/src/main/java/nu/marginalia/dating/DatingService.java similarity index 100% rename from code/services-satellite/dating-service/src/main/java/nu/marginalia/dating/DatingService.java rename to code/services-application/dating-service/src/main/java/nu/marginalia/dating/DatingService.java diff --git a/code/services-satellite/dating-service/src/main/java/nu/marginalia/dating/DatingSessionObject.java b/code/services-application/dating-service/src/main/java/nu/marginalia/dating/DatingSessionObject.java similarity index 100% rename from code/services-satellite/dating-service/src/main/java/nu/marginalia/dating/DatingSessionObject.java rename to code/services-application/dating-service/src/main/java/nu/marginalia/dating/DatingSessionObject.java diff --git a/code/services-satellite/dating-service/src/main/resources/static/dating/robots.txt b/code/services-application/dating-service/src/main/resources/static/dating/robots.txt similarity index 100% rename from code/services-satellite/dating-service/src/main/resources/static/dating/robots.txt rename to code/services-application/dating-service/src/main/resources/static/dating/robots.txt diff --git a/code/services-satellite/dating-service/src/main/resources/templates/dating/dating-view.hdb b/code/services-application/dating-service/src/main/resources/templates/dating/dating-view.hdb similarity index 100% rename from code/services-satellite/dating-service/src/main/resources/templates/dating/dating-view.hdb rename to code/services-application/dating-service/src/main/resources/templates/dating/dating-view.hdb diff --git a/code/services-satellite/explorer-service/build.gradle b/code/services-application/explorer-service/build.gradle similarity index 100% rename from code/services-satellite/explorer-service/build.gradle rename to code/services-application/explorer-service/build.gradle diff --git a/code/services-satellite/explorer-service/readme.md b/code/services-application/explorer-service/readme.md similarity index 100% rename from code/services-satellite/explorer-service/readme.md rename to code/services-application/explorer-service/readme.md diff --git a/code/services-satellite/explorer-service/src/main/java/nu/marginalia/explorer/ExplorerMain.java b/code/services-application/explorer-service/src/main/java/nu/marginalia/explorer/ExplorerMain.java similarity index 100% rename from code/services-satellite/explorer-service/src/main/java/nu/marginalia/explorer/ExplorerMain.java rename to code/services-application/explorer-service/src/main/java/nu/marginalia/explorer/ExplorerMain.java diff --git a/code/services-satellite/explorer-service/src/main/java/nu/marginalia/explorer/ExplorerService.java b/code/services-application/explorer-service/src/main/java/nu/marginalia/explorer/ExplorerService.java similarity index 100% rename from code/services-satellite/explorer-service/src/main/java/nu/marginalia/explorer/ExplorerService.java rename to code/services-application/explorer-service/src/main/java/nu/marginalia/explorer/ExplorerService.java diff --git a/code/services-satellite/explorer-service/src/main/resources/static/explore/style.css b/code/services-application/explorer-service/src/main/resources/static/explore/style.css similarity index 100% rename from code/services-satellite/explorer-service/src/main/resources/static/explore/style.css rename to code/services-application/explorer-service/src/main/resources/static/explore/style.css diff --git a/code/services-satellite/explorer-service/src/main/resources/templates/explorer/explorer-about.hdb b/code/services-application/explorer-service/src/main/resources/templates/explorer/explorer-about.hdb similarity index 100% rename from code/services-satellite/explorer-service/src/main/resources/templates/explorer/explorer-about.hdb rename to code/services-application/explorer-service/src/main/resources/templates/explorer/explorer-about.hdb diff --git a/code/services-satellite/explorer-service/src/main/resources/templates/explorer/explorer-messages.hdb b/code/services-application/explorer-service/src/main/resources/templates/explorer/explorer-messages.hdb similarity index 100% rename from code/services-satellite/explorer-service/src/main/resources/templates/explorer/explorer-messages.hdb rename to code/services-application/explorer-service/src/main/resources/templates/explorer/explorer-messages.hdb diff --git a/code/services-satellite/explorer-service/src/main/resources/templates/explorer/explorer-results.hdb b/code/services-application/explorer-service/src/main/resources/templates/explorer/explorer-results.hdb similarity index 100% rename from code/services-satellite/explorer-service/src/main/resources/templates/explorer/explorer-results.hdb rename to code/services-application/explorer-service/src/main/resources/templates/explorer/explorer-results.hdb diff --git a/code/services-satellite/explorer-service/src/main/resources/templates/explorer/explorer-search.hdb b/code/services-application/explorer-service/src/main/resources/templates/explorer/explorer-search.hdb similarity index 100% rename from code/services-satellite/explorer-service/src/main/resources/templates/explorer/explorer-search.hdb rename to code/services-application/explorer-service/src/main/resources/templates/explorer/explorer-search.hdb diff --git a/code/services-satellite/explorer-service/src/main/resources/templates/explorer/explorer.hdb b/code/services-application/explorer-service/src/main/resources/templates/explorer/explorer.hdb similarity index 100% rename from code/services-satellite/explorer-service/src/main/resources/templates/explorer/explorer.hdb rename to code/services-application/explorer-service/src/main/resources/templates/explorer/explorer.hdb diff --git a/code/services-satellite/readme.md b/code/services-application/readme.md similarity index 100% rename from code/services-satellite/readme.md rename to code/services-application/readme.md diff --git a/code/services-satellite/search-service/build.gradle b/code/services-application/search-service/build.gradle similarity index 100% rename from code/services-satellite/search-service/build.gradle rename to code/services-application/search-service/build.gradle diff --git a/code/services-satellite/search-service/readme.md b/code/services-application/search-service/readme.md similarity index 100% rename from code/services-satellite/search-service/readme.md rename to code/services-application/search-service/readme.md diff --git a/code/services-satellite/search-service/src/main/java/nu/marginalia/search/SearchMain.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/SearchMain.java similarity index 100% rename from code/services-satellite/search-service/src/main/java/nu/marginalia/search/SearchMain.java rename to code/services-application/search-service/src/main/java/nu/marginalia/search/SearchMain.java diff --git a/code/services-satellite/search-service/src/main/java/nu/marginalia/search/SearchModule.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/SearchModule.java similarity index 100% rename from code/services-satellite/search-service/src/main/java/nu/marginalia/search/SearchModule.java rename to code/services-application/search-service/src/main/java/nu/marginalia/search/SearchModule.java diff --git a/code/services-satellite/search-service/src/main/java/nu/marginalia/search/SearchOperator.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/SearchOperator.java similarity index 100% rename from code/services-satellite/search-service/src/main/java/nu/marginalia/search/SearchOperator.java rename to code/services-application/search-service/src/main/java/nu/marginalia/search/SearchOperator.java diff --git a/code/services-satellite/search-service/src/main/java/nu/marginalia/search/SearchQueryParamFactory.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/SearchQueryParamFactory.java similarity index 100% rename from code/services-satellite/search-service/src/main/java/nu/marginalia/search/SearchQueryParamFactory.java rename to code/services-application/search-service/src/main/java/nu/marginalia/search/SearchQueryParamFactory.java diff --git a/code/services-satellite/search-service/src/main/java/nu/marginalia/search/SearchService.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/SearchService.java similarity index 100% rename from code/services-satellite/search-service/src/main/java/nu/marginalia/search/SearchService.java rename to code/services-application/search-service/src/main/java/nu/marginalia/search/SearchService.java diff --git a/code/services-satellite/search-service/src/main/java/nu/marginalia/search/command/CommandEvaluator.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/command/CommandEvaluator.java similarity index 100% rename from code/services-satellite/search-service/src/main/java/nu/marginalia/search/command/CommandEvaluator.java rename to code/services-application/search-service/src/main/java/nu/marginalia/search/command/CommandEvaluator.java diff --git a/code/services-satellite/search-service/src/main/java/nu/marginalia/search/command/SearchCommandInterface.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/command/SearchCommandInterface.java similarity index 100% rename from code/services-satellite/search-service/src/main/java/nu/marginalia/search/command/SearchCommandInterface.java rename to code/services-application/search-service/src/main/java/nu/marginalia/search/command/SearchCommandInterface.java diff --git a/code/services-satellite/search-service/src/main/java/nu/marginalia/search/command/SearchJsParameter.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/command/SearchJsParameter.java similarity index 100% rename from code/services-satellite/search-service/src/main/java/nu/marginalia/search/command/SearchJsParameter.java rename to code/services-application/search-service/src/main/java/nu/marginalia/search/command/SearchJsParameter.java diff --git a/code/services-satellite/search-service/src/main/java/nu/marginalia/search/command/SearchParameters.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/command/SearchParameters.java similarity index 100% rename from code/services-satellite/search-service/src/main/java/nu/marginalia/search/command/SearchParameters.java rename to code/services-application/search-service/src/main/java/nu/marginalia/search/command/SearchParameters.java diff --git a/code/services-satellite/search-service/src/main/java/nu/marginalia/search/command/commands/BangCommand.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/command/commands/BangCommand.java similarity index 100% rename from code/services-satellite/search-service/src/main/java/nu/marginalia/search/command/commands/BangCommand.java rename to code/services-application/search-service/src/main/java/nu/marginalia/search/command/commands/BangCommand.java diff --git a/code/services-satellite/search-service/src/main/java/nu/marginalia/search/command/commands/BrowseCommand.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/command/commands/BrowseCommand.java similarity index 100% rename from code/services-satellite/search-service/src/main/java/nu/marginalia/search/command/commands/BrowseCommand.java rename to code/services-application/search-service/src/main/java/nu/marginalia/search/command/commands/BrowseCommand.java diff --git a/code/services-satellite/search-service/src/main/java/nu/marginalia/search/command/commands/ConvertCommand.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/command/commands/ConvertCommand.java similarity index 100% rename from code/services-satellite/search-service/src/main/java/nu/marginalia/search/command/commands/ConvertCommand.java rename to code/services-application/search-service/src/main/java/nu/marginalia/search/command/commands/ConvertCommand.java diff --git a/code/services-satellite/search-service/src/main/java/nu/marginalia/search/command/commands/DefinitionCommand.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/command/commands/DefinitionCommand.java similarity index 100% rename from code/services-satellite/search-service/src/main/java/nu/marginalia/search/command/commands/DefinitionCommand.java rename to code/services-application/search-service/src/main/java/nu/marginalia/search/command/commands/DefinitionCommand.java diff --git a/code/services-satellite/search-service/src/main/java/nu/marginalia/search/command/commands/SearchCommand.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/command/commands/SearchCommand.java similarity index 100% rename from code/services-satellite/search-service/src/main/java/nu/marginalia/search/command/commands/SearchCommand.java rename to code/services-application/search-service/src/main/java/nu/marginalia/search/command/commands/SearchCommand.java diff --git a/code/services-satellite/search-service/src/main/java/nu/marginalia/search/command/commands/SiteListCommand.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/command/commands/SiteListCommand.java similarity index 100% rename from code/services-satellite/search-service/src/main/java/nu/marginalia/search/command/commands/SiteListCommand.java rename to code/services-application/search-service/src/main/java/nu/marginalia/search/command/commands/SiteListCommand.java diff --git a/code/services-satellite/search-service/src/main/java/nu/marginalia/search/db/DbNearDomainsQuery.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/db/DbNearDomainsQuery.java similarity index 100% rename from code/services-satellite/search-service/src/main/java/nu/marginalia/search/db/DbNearDomainsQuery.java rename to code/services-application/search-service/src/main/java/nu/marginalia/search/db/DbNearDomainsQuery.java diff --git a/code/services-satellite/search-service/src/main/java/nu/marginalia/search/exceptions/RedirectException.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/exceptions/RedirectException.java similarity index 100% rename from code/services-satellite/search-service/src/main/java/nu/marginalia/search/exceptions/RedirectException.java rename to code/services-application/search-service/src/main/java/nu/marginalia/search/exceptions/RedirectException.java diff --git a/code/services-satellite/search-service/src/main/java/nu/marginalia/search/model/DecoratedSearchResults.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/model/DecoratedSearchResults.java similarity index 100% rename from code/services-satellite/search-service/src/main/java/nu/marginalia/search/model/DecoratedSearchResults.java rename to code/services-application/search-service/src/main/java/nu/marginalia/search/model/DecoratedSearchResults.java diff --git a/code/services-satellite/search-service/src/main/java/nu/marginalia/search/model/DomainInformation.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/model/DomainInformation.java similarity index 100% rename from code/services-satellite/search-service/src/main/java/nu/marginalia/search/model/DomainInformation.java rename to code/services-application/search-service/src/main/java/nu/marginalia/search/model/DomainInformation.java diff --git a/code/services-satellite/search-service/src/main/java/nu/marginalia/search/model/PageScoreAdjustment.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/model/PageScoreAdjustment.java similarity index 100% rename from code/services-satellite/search-service/src/main/java/nu/marginalia/search/model/PageScoreAdjustment.java rename to code/services-application/search-service/src/main/java/nu/marginalia/search/model/PageScoreAdjustment.java diff --git a/code/services-satellite/search-service/src/main/java/nu/marginalia/search/model/SearchProfile.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/model/SearchProfile.java similarity index 100% rename from code/services-satellite/search-service/src/main/java/nu/marginalia/search/model/SearchProfile.java rename to code/services-application/search-service/src/main/java/nu/marginalia/search/model/SearchProfile.java diff --git a/code/services-satellite/search-service/src/main/java/nu/marginalia/search/model/UrlDetails.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/model/UrlDetails.java similarity index 100% rename from code/services-satellite/search-service/src/main/java/nu/marginalia/search/model/UrlDetails.java rename to code/services-application/search-service/src/main/java/nu/marginalia/search/model/UrlDetails.java diff --git a/code/services-satellite/search-service/src/main/java/nu/marginalia/search/model/UserSearchParameters.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/model/UserSearchParameters.java similarity index 100% rename from code/services-satellite/search-service/src/main/java/nu/marginalia/search/model/UserSearchParameters.java rename to code/services-application/search-service/src/main/java/nu/marginalia/search/model/UserSearchParameters.java diff --git a/code/services-satellite/search-service/src/main/java/nu/marginalia/search/results/BrowseResultCleaner.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/results/BrowseResultCleaner.java similarity index 100% rename from code/services-satellite/search-service/src/main/java/nu/marginalia/search/results/BrowseResultCleaner.java rename to code/services-application/search-service/src/main/java/nu/marginalia/search/results/BrowseResultCleaner.java diff --git a/code/services-satellite/search-service/src/main/java/nu/marginalia/search/results/SearchResultDecorator.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/results/SearchResultDecorator.java similarity index 100% rename from code/services-satellite/search-service/src/main/java/nu/marginalia/search/results/SearchResultDecorator.java rename to code/services-application/search-service/src/main/java/nu/marginalia/search/results/SearchResultDecorator.java diff --git a/code/services-satellite/search-service/src/main/java/nu/marginalia/search/results/UrlDeduplicator.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/results/UrlDeduplicator.java similarity index 100% rename from code/services-satellite/search-service/src/main/java/nu/marginalia/search/results/UrlDeduplicator.java rename to code/services-application/search-service/src/main/java/nu/marginalia/search/results/UrlDeduplicator.java diff --git a/code/services-satellite/search-service/src/main/java/nu/marginalia/search/siteinfo/DomainInformationService.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/siteinfo/DomainInformationService.java similarity index 100% rename from code/services-satellite/search-service/src/main/java/nu/marginalia/search/siteinfo/DomainInformationService.java rename to code/services-application/search-service/src/main/java/nu/marginalia/search/siteinfo/DomainInformationService.java diff --git a/code/services-satellite/search-service/src/main/java/nu/marginalia/search/svc/SearchAddToCrawlQueueService.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchAddToCrawlQueueService.java similarity index 100% rename from code/services-satellite/search-service/src/main/java/nu/marginalia/search/svc/SearchAddToCrawlQueueService.java rename to code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchAddToCrawlQueueService.java diff --git a/code/services-satellite/search-service/src/main/java/nu/marginalia/search/svc/SearchApiQueryService.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchApiQueryService.java similarity index 100% rename from code/services-satellite/search-service/src/main/java/nu/marginalia/search/svc/SearchApiQueryService.java rename to code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchApiQueryService.java diff --git a/code/services-satellite/search-service/src/main/java/nu/marginalia/search/svc/SearchErrorPageService.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchErrorPageService.java similarity index 100% rename from code/services-satellite/search-service/src/main/java/nu/marginalia/search/svc/SearchErrorPageService.java rename to code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchErrorPageService.java diff --git a/code/services-satellite/search-service/src/main/java/nu/marginalia/search/svc/SearchFlagSiteService.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchFlagSiteService.java similarity index 100% rename from code/services-satellite/search-service/src/main/java/nu/marginalia/search/svc/SearchFlagSiteService.java rename to code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchFlagSiteService.java diff --git a/code/services-satellite/search-service/src/main/java/nu/marginalia/search/svc/SearchFrontPageService.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchFrontPageService.java similarity index 100% rename from code/services-satellite/search-service/src/main/java/nu/marginalia/search/svc/SearchFrontPageService.java rename to code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchFrontPageService.java diff --git a/code/services-satellite/search-service/src/main/java/nu/marginalia/search/svc/SearchQueryCountService.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchQueryCountService.java similarity index 100% rename from code/services-satellite/search-service/src/main/java/nu/marginalia/search/svc/SearchQueryCountService.java rename to code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchQueryCountService.java diff --git a/code/services-satellite/search-service/src/main/java/nu/marginalia/search/svc/SearchQueryIndexService.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchQueryIndexService.java similarity index 100% rename from code/services-satellite/search-service/src/main/java/nu/marginalia/search/svc/SearchQueryIndexService.java rename to code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchQueryIndexService.java diff --git a/code/services-satellite/search-service/src/main/java/nu/marginalia/search/svc/SearchQueryService.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchQueryService.java similarity index 100% rename from code/services-satellite/search-service/src/main/java/nu/marginalia/search/svc/SearchQueryService.java rename to code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchQueryService.java diff --git a/code/services-satellite/search-service/src/main/java/nu/marginalia/search/svc/SearchUnitConversionService.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchUnitConversionService.java similarity index 100% rename from code/services-satellite/search-service/src/main/java/nu/marginalia/search/svc/SearchUnitConversionService.java rename to code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchUnitConversionService.java diff --git a/code/services-satellite/search-service/src/main/resources/static/search/crawler-ips.txt b/code/services-application/search-service/src/main/resources/static/search/crawler-ips.txt similarity index 100% rename from code/services-satellite/search-service/src/main/resources/static/search/crawler-ips.txt rename to code/services-application/search-service/src/main/resources/static/search/crawler-ips.txt diff --git a/code/services-satellite/search-service/src/main/resources/static/search/favicon.ico b/code/services-application/search-service/src/main/resources/static/search/favicon.ico similarity index 100% rename from code/services-satellite/search-service/src/main/resources/static/search/favicon.ico rename to code/services-application/search-service/src/main/resources/static/search/favicon.ico diff --git a/code/services-satellite/search-service/src/main/resources/static/search/opensearch.xml b/code/services-application/search-service/src/main/resources/static/search/opensearch.xml similarity index 100% rename from code/services-satellite/search-service/src/main/resources/static/search/opensearch.xml rename to code/services-application/search-service/src/main/resources/static/search/opensearch.xml diff --git a/code/services-satellite/search-service/src/main/resources/static/search/robots.txt b/code/services-application/search-service/src/main/resources/static/search/robots.txt similarity index 100% rename from code/services-satellite/search-service/src/main/resources/static/search/robots.txt rename to code/services-application/search-service/src/main/resources/static/search/robots.txt diff --git a/code/services-satellite/search-service/src/main/resources/static/search/style-new.css b/code/services-application/search-service/src/main/resources/static/search/style-new.css similarity index 100% rename from code/services-satellite/search-service/src/main/resources/static/search/style-new.css rename to code/services-application/search-service/src/main/resources/static/search/style-new.css diff --git a/code/services-satellite/search-service/src/main/resources/static/search/tts.js b/code/services-application/search-service/src/main/resources/static/search/tts.js similarity index 100% rename from code/services-satellite/search-service/src/main/resources/static/search/tts.js rename to code/services-application/search-service/src/main/resources/static/search/tts.js diff --git a/code/services-satellite/search-service/src/main/resources/templates/search/browse-result.hdb b/code/services-application/search-service/src/main/resources/templates/search/browse-result.hdb similarity index 100% rename from code/services-satellite/search-service/src/main/resources/templates/search/browse-result.hdb rename to code/services-application/search-service/src/main/resources/templates/search/browse-result.hdb diff --git a/code/services-satellite/search-service/src/main/resources/templates/search/browse-results.hdb b/code/services-application/search-service/src/main/resources/templates/search/browse-results.hdb similarity index 100% rename from code/services-satellite/search-service/src/main/resources/templates/search/browse-results.hdb rename to code/services-application/search-service/src/main/resources/templates/search/browse-results.hdb diff --git a/code/services-satellite/search-service/src/main/resources/templates/search/conversion-results.hdb b/code/services-application/search-service/src/main/resources/templates/search/conversion-results.hdb similarity index 100% rename from code/services-satellite/search-service/src/main/resources/templates/search/conversion-results.hdb rename to code/services-application/search-service/src/main/resources/templates/search/conversion-results.hdb diff --git a/code/services-satellite/search-service/src/main/resources/templates/search/dictionary-results.hdb b/code/services-application/search-service/src/main/resources/templates/search/dictionary-results.hdb similarity index 100% rename from code/services-satellite/search-service/src/main/resources/templates/search/dictionary-results.hdb rename to code/services-application/search-service/src/main/resources/templates/search/dictionary-results.hdb diff --git a/code/services-satellite/search-service/src/main/resources/templates/search/error-page-search.hdb b/code/services-application/search-service/src/main/resources/templates/search/error-page-search.hdb similarity index 100% rename from code/services-satellite/search-service/src/main/resources/templates/search/error-page-search.hdb rename to code/services-application/search-service/src/main/resources/templates/search/error-page-search.hdb diff --git a/code/services-satellite/search-service/src/main/resources/templates/search/error-page.hdb b/code/services-application/search-service/src/main/resources/templates/search/error-page.hdb similarity index 100% rename from code/services-satellite/search-service/src/main/resources/templates/search/error-page.hdb rename to code/services-application/search-service/src/main/resources/templates/search/error-page.hdb diff --git a/code/services-satellite/search-service/src/main/resources/templates/search/index/index-about.hdb b/code/services-application/search-service/src/main/resources/templates/search/index/index-about.hdb similarity index 100% rename from code/services-satellite/search-service/src/main/resources/templates/search/index/index-about.hdb rename to code/services-application/search-service/src/main/resources/templates/search/index/index-about.hdb diff --git a/code/services-satellite/search-service/src/main/resources/templates/search/index/index-news.hdb b/code/services-application/search-service/src/main/resources/templates/search/index/index-news.hdb similarity index 100% rename from code/services-satellite/search-service/src/main/resources/templates/search/index/index-news.hdb rename to code/services-application/search-service/src/main/resources/templates/search/index/index-news.hdb diff --git a/code/services-satellite/search-service/src/main/resources/templates/search/index/index-tips.hdb b/code/services-application/search-service/src/main/resources/templates/search/index/index-tips.hdb similarity index 100% rename from code/services-satellite/search-service/src/main/resources/templates/search/index/index-tips.hdb rename to code/services-application/search-service/src/main/resources/templates/search/index/index-tips.hdb diff --git a/code/services-satellite/search-service/src/main/resources/templates/search/index/index-updates.hdb b/code/services-application/search-service/src/main/resources/templates/search/index/index-updates.hdb similarity index 100% rename from code/services-satellite/search-service/src/main/resources/templates/search/index/index-updates.hdb rename to code/services-application/search-service/src/main/resources/templates/search/index/index-updates.hdb diff --git a/code/services-satellite/search-service/src/main/resources/templates/search/index/index.hdb b/code/services-application/search-service/src/main/resources/templates/search/index/index.hdb similarity index 100% rename from code/services-satellite/search-service/src/main/resources/templates/search/index/index.hdb rename to code/services-application/search-service/src/main/resources/templates/search/index/index.hdb diff --git a/code/services-satellite/search-service/src/main/resources/templates/search/indict/indict-form.hdb b/code/services-application/search-service/src/main/resources/templates/search/indict/indict-form.hdb similarity index 100% rename from code/services-satellite/search-service/src/main/resources/templates/search/indict/indict-form.hdb rename to code/services-application/search-service/src/main/resources/templates/search/indict/indict-form.hdb diff --git a/code/services-satellite/search-service/src/main/resources/templates/search/parts/search-footer.hdb b/code/services-application/search-service/src/main/resources/templates/search/parts/search-footer.hdb similarity index 100% rename from code/services-satellite/search-service/src/main/resources/templates/search/parts/search-footer.hdb rename to code/services-application/search-service/src/main/resources/templates/search/parts/search-footer.hdb diff --git a/code/services-satellite/search-service/src/main/resources/templates/search/parts/search-form.hdb b/code/services-application/search-service/src/main/resources/templates/search/parts/search-form.hdb similarity index 100% rename from code/services-satellite/search-service/src/main/resources/templates/search/parts/search-form.hdb rename to code/services-application/search-service/src/main/resources/templates/search/parts/search-form.hdb diff --git a/code/services-satellite/search-service/src/main/resources/templates/search/parts/search-header.hdb b/code/services-application/search-service/src/main/resources/templates/search/parts/search-header.hdb similarity index 100% rename from code/services-satellite/search-service/src/main/resources/templates/search/parts/search-header.hdb rename to code/services-application/search-service/src/main/resources/templates/search/parts/search-header.hdb diff --git a/code/services-satellite/search-service/src/main/resources/templates/search/parts/site-info-index.hdb b/code/services-application/search-service/src/main/resources/templates/search/parts/site-info-index.hdb similarity index 100% rename from code/services-satellite/search-service/src/main/resources/templates/search/parts/site-info-index.hdb rename to code/services-application/search-service/src/main/resources/templates/search/parts/site-info-index.hdb diff --git a/code/services-satellite/search-service/src/main/resources/templates/search/parts/site-info-links.hdb b/code/services-application/search-service/src/main/resources/templates/search/parts/site-info-links.hdb similarity index 100% rename from code/services-satellite/search-service/src/main/resources/templates/search/parts/site-info-links.hdb rename to code/services-application/search-service/src/main/resources/templates/search/parts/site-info-links.hdb diff --git a/code/services-satellite/search-service/src/main/resources/templates/search/search-result-metadata.hdb b/code/services-application/search-service/src/main/resources/templates/search/search-result-metadata.hdb similarity index 100% rename from code/services-satellite/search-service/src/main/resources/templates/search/search-result-metadata.hdb rename to code/services-application/search-service/src/main/resources/templates/search/search-result-metadata.hdb diff --git a/code/services-satellite/search-service/src/main/resources/templates/search/search-result.hdb b/code/services-application/search-service/src/main/resources/templates/search/search-result.hdb similarity index 100% rename from code/services-satellite/search-service/src/main/resources/templates/search/search-result.hdb rename to code/services-application/search-service/src/main/resources/templates/search/search-result.hdb diff --git a/code/services-satellite/search-service/src/main/resources/templates/search/search-results.hdb b/code/services-application/search-service/src/main/resources/templates/search/search-results.hdb similarity index 100% rename from code/services-satellite/search-service/src/main/resources/templates/search/search-results.hdb rename to code/services-application/search-service/src/main/resources/templates/search/search-results.hdb diff --git a/code/services-satellite/search-service/src/main/resources/templates/search/site-info.hdb b/code/services-application/search-service/src/main/resources/templates/search/site-info.hdb similarity index 100% rename from code/services-satellite/search-service/src/main/resources/templates/search/site-info.hdb rename to code/services-application/search-service/src/main/resources/templates/search/site-info.hdb diff --git a/code/services-satellite/search-service/src/test/java/nu/marginalia/search/command/commands/BangCommandTest.java b/code/services-application/search-service/src/test/java/nu/marginalia/search/command/commands/BangCommandTest.java similarity index 100% rename from code/services-satellite/search-service/src/test/java/nu/marginalia/search/command/commands/BangCommandTest.java rename to code/services-application/search-service/src/test/java/nu/marginalia/search/command/commands/BangCommandTest.java diff --git a/code/services-satellite/search-service/src/test/java/nu/marginalia/util/TestLanguageModels.java b/code/services-application/search-service/src/test/java/nu/marginalia/util/TestLanguageModels.java similarity index 100% rename from code/services-satellite/search-service/src/test/java/nu/marginalia/util/TestLanguageModels.java rename to code/services-application/search-service/src/test/java/nu/marginalia/util/TestLanguageModels.java diff --git a/code/tools/website-adjacencies-calculator/readme.md b/code/tools/website-adjacencies-calculator/readme.md index baeec469..6a69a10a 100644 --- a/code/tools/website-adjacencies-calculator/readme.md +++ b/code/tools/website-adjacencies-calculator/readme.md @@ -4,5 +4,5 @@ This job updates the website similarity table based on the data in the domain an It performs a brute force cosine similarity calculation across the entire link graph. -These adjacencies power the [explorer service](../../services-satellite/explorer-service) and +These adjacencies power the [explorer service](../../services-application/explorer-service) and [random websites](../../features-search/random-websites)-functionality. \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index eabbcd41..29e76e76 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,10 +5,10 @@ include 'code:services-core:assistant-service' include 'code:services-core:control-service' include 'code:services-core:query-service' -include 'code:services-satellite:search-service' -include 'code:services-satellite:api-service' -include 'code:services-satellite:dating-service' -include 'code:services-satellite:explorer-service' +include 'code:services-application:search-service' +include 'code:services-application:api-service' +include 'code:services-application:dating-service' +include 'code:services-application:explorer-service' include 'code:libraries:array' include 'code:libraries:btree'