diff --git a/api/assistant-api/build.gradle b/code/api/assistant-api/build.gradle similarity index 77% rename from api/assistant-api/build.gradle rename to code/api/assistant-api/build.gradle index 47f4a425..6a46e5ef 100644 --- a/api/assistant-api/build.gradle +++ b/code/api/assistant-api/build.gradle @@ -12,10 +12,10 @@ java { } dependencies { implementation project(':third-party') - implementation project(':common:model') - implementation project(':common:config') - implementation project(':common:service-discovery') - implementation project(':common:service-client') + implementation project(':code:common:model') + implementation project(':code:common:config') + implementation project(':code:common:service-discovery') + implementation project(':code:common:service-client') implementation libs.lombok annotationProcessor libs.lombok diff --git a/api/assistant-api/readme.md b/code/api/assistant-api/readme.md similarity index 100% rename from api/assistant-api/readme.md rename to code/api/assistant-api/readme.md diff --git a/api/assistant-api/src/main/java/nu/marginalia/assistant/client/AssistantClient.java b/code/api/assistant-api/src/main/java/nu/marginalia/assistant/client/AssistantClient.java similarity index 100% rename from api/assistant-api/src/main/java/nu/marginalia/assistant/client/AssistantClient.java rename to code/api/assistant-api/src/main/java/nu/marginalia/assistant/client/AssistantClient.java diff --git a/api/assistant-api/src/main/java/nu/marginalia/assistant/client/model/DictionaryEntry.java b/code/api/assistant-api/src/main/java/nu/marginalia/assistant/client/model/DictionaryEntry.java similarity index 100% rename from api/assistant-api/src/main/java/nu/marginalia/assistant/client/model/DictionaryEntry.java rename to code/api/assistant-api/src/main/java/nu/marginalia/assistant/client/model/DictionaryEntry.java diff --git a/api/assistant-api/src/main/java/nu/marginalia/assistant/client/model/DictionaryResponse.java b/code/api/assistant-api/src/main/java/nu/marginalia/assistant/client/model/DictionaryResponse.java similarity index 100% rename from api/assistant-api/src/main/java/nu/marginalia/assistant/client/model/DictionaryResponse.java rename to code/api/assistant-api/src/main/java/nu/marginalia/assistant/client/model/DictionaryResponse.java diff --git a/api/index-api/build.gradle b/code/api/index-api/build.gradle similarity index 74% rename from api/index-api/build.gradle rename to code/api/index-api/build.gradle index 7dbe7252..93672230 100644 --- a/api/index-api/build.gradle +++ b/code/api/index-api/build.gradle @@ -13,12 +13,12 @@ java { dependencies { implementation project(':third-party') - implementation project(':common:model') - implementation project(':common:config') - implementation project(':common:service-discovery') - implementation project(':common:service-client') + implementation project(':code:common:model') + implementation project(':code:common:config') + implementation project(':code:common:service-discovery') + implementation project(':code:common:service-client') - implementation project(':index:index-query') + implementation project(':code:index:index-query') implementation libs.lombok annotationProcessor libs.lombok diff --git a/api/index-api/readme.md b/code/api/index-api/readme.md similarity index 100% rename from api/index-api/readme.md rename to code/api/index-api/readme.md diff --git a/api/index-api/src/main/java/nu/marginalia/index/client/IndexClient.java b/code/api/index-api/src/main/java/nu/marginalia/index/client/IndexClient.java similarity index 100% rename from api/index-api/src/main/java/nu/marginalia/index/client/IndexClient.java rename to code/api/index-api/src/main/java/nu/marginalia/index/client/IndexClient.java diff --git a/api/index-api/src/main/java/nu/marginalia/index/client/model/domain/EdgeDomainSearchResults.java b/code/api/index-api/src/main/java/nu/marginalia/index/client/model/domain/EdgeDomainSearchResults.java similarity index 100% rename from api/index-api/src/main/java/nu/marginalia/index/client/model/domain/EdgeDomainSearchResults.java rename to code/api/index-api/src/main/java/nu/marginalia/index/client/model/domain/EdgeDomainSearchResults.java diff --git a/api/index-api/src/main/java/nu/marginalia/index/client/model/domain/EdgeDomainSearchSpecification.java b/code/api/index-api/src/main/java/nu/marginalia/index/client/model/domain/EdgeDomainSearchSpecification.java similarity index 100% rename from api/index-api/src/main/java/nu/marginalia/index/client/model/domain/EdgeDomainSearchSpecification.java rename to code/api/index-api/src/main/java/nu/marginalia/index/client/model/domain/EdgeDomainSearchSpecification.java diff --git a/api/index-api/src/main/java/nu/marginalia/index/client/model/query/EdgeSearchSpecification.java b/code/api/index-api/src/main/java/nu/marginalia/index/client/model/query/EdgeSearchSpecification.java similarity index 100% rename from api/index-api/src/main/java/nu/marginalia/index/client/model/query/EdgeSearchSpecification.java rename to code/api/index-api/src/main/java/nu/marginalia/index/client/model/query/EdgeSearchSpecification.java diff --git a/api/index-api/src/main/java/nu/marginalia/index/client/model/query/EdgeSearchSubquery.java b/code/api/index-api/src/main/java/nu/marginalia/index/client/model/query/EdgeSearchSubquery.java similarity index 100% rename from api/index-api/src/main/java/nu/marginalia/index/client/model/query/EdgeSearchSubquery.java rename to code/api/index-api/src/main/java/nu/marginalia/index/client/model/query/EdgeSearchSubquery.java diff --git a/api/index-api/src/main/java/nu/marginalia/index/client/model/query/SearchSetIdentifier.java b/code/api/index-api/src/main/java/nu/marginalia/index/client/model/query/SearchSetIdentifier.java similarity index 100% rename from api/index-api/src/main/java/nu/marginalia/index/client/model/query/SearchSetIdentifier.java rename to code/api/index-api/src/main/java/nu/marginalia/index/client/model/query/SearchSetIdentifier.java diff --git a/api/index-api/src/main/java/nu/marginalia/index/client/model/results/EdgeSearchResultItem.java b/code/api/index-api/src/main/java/nu/marginalia/index/client/model/results/EdgeSearchResultItem.java similarity index 100% rename from api/index-api/src/main/java/nu/marginalia/index/client/model/results/EdgeSearchResultItem.java rename to code/api/index-api/src/main/java/nu/marginalia/index/client/model/results/EdgeSearchResultItem.java diff --git a/api/index-api/src/main/java/nu/marginalia/index/client/model/results/EdgeSearchResultKeywordScore.java b/code/api/index-api/src/main/java/nu/marginalia/index/client/model/results/EdgeSearchResultKeywordScore.java similarity index 100% rename from api/index-api/src/main/java/nu/marginalia/index/client/model/results/EdgeSearchResultKeywordScore.java rename to code/api/index-api/src/main/java/nu/marginalia/index/client/model/results/EdgeSearchResultKeywordScore.java diff --git a/api/index-api/src/main/java/nu/marginalia/index/client/model/results/EdgeSearchResultSet.java b/code/api/index-api/src/main/java/nu/marginalia/index/client/model/results/EdgeSearchResultSet.java similarity index 100% rename from api/index-api/src/main/java/nu/marginalia/index/client/model/results/EdgeSearchResultSet.java rename to code/api/index-api/src/main/java/nu/marginalia/index/client/model/results/EdgeSearchResultSet.java diff --git a/api/index-api/src/main/java/nu/marginalia/index/client/model/results/EdgeSearchResults.java b/code/api/index-api/src/main/java/nu/marginalia/index/client/model/results/EdgeSearchResults.java similarity index 100% rename from api/index-api/src/main/java/nu/marginalia/index/client/model/results/EdgeSearchResults.java rename to code/api/index-api/src/main/java/nu/marginalia/index/client/model/results/EdgeSearchResults.java diff --git a/api/readme.md b/code/api/readme.md similarity index 100% rename from api/readme.md rename to code/api/readme.md diff --git a/api/search-api/build.gradle b/code/api/search-api/build.gradle similarity index 77% rename from api/search-api/build.gradle rename to code/api/search-api/build.gradle index 8f6cf580..a314ea6c 100644 --- a/api/search-api/build.gradle +++ b/code/api/search-api/build.gradle @@ -13,10 +13,10 @@ java { dependencies { implementation project(':third-party') - implementation project(':common:model') - implementation project(':common:config') - implementation project(':common:service-discovery') - implementation project(':common:service-client') + implementation project(':code:common:model') + implementation project(':code:common:config') + implementation project(':code:common:service-discovery') + implementation project(':code:common:service-client') implementation libs.lombok annotationProcessor libs.lombok diff --git a/api/search-api/readme.md b/code/api/search-api/readme.md similarity index 100% rename from api/search-api/readme.md rename to code/api/search-api/readme.md diff --git a/api/search-api/src/main/java/nu/marginalia/search/client/SearchClient.java b/code/api/search-api/src/main/java/nu/marginalia/search/client/SearchClient.java similarity index 100% rename from api/search-api/src/main/java/nu/marginalia/search/client/SearchClient.java rename to code/api/search-api/src/main/java/nu/marginalia/search/client/SearchClient.java diff --git a/api/search-api/src/main/java/nu/marginalia/search/client/model/ApiSearchResult.java b/code/api/search-api/src/main/java/nu/marginalia/search/client/model/ApiSearchResult.java similarity index 100% rename from api/search-api/src/main/java/nu/marginalia/search/client/model/ApiSearchResult.java rename to code/api/search-api/src/main/java/nu/marginalia/search/client/model/ApiSearchResult.java diff --git a/api/search-api/src/main/java/nu/marginalia/search/client/model/ApiSearchResultQueryDetails.java b/code/api/search-api/src/main/java/nu/marginalia/search/client/model/ApiSearchResultQueryDetails.java similarity index 100% rename from api/search-api/src/main/java/nu/marginalia/search/client/model/ApiSearchResultQueryDetails.java rename to code/api/search-api/src/main/java/nu/marginalia/search/client/model/ApiSearchResultQueryDetails.java diff --git a/api/search-api/src/main/java/nu/marginalia/search/client/model/ApiSearchResults.java b/code/api/search-api/src/main/java/nu/marginalia/search/client/model/ApiSearchResults.java similarity index 100% rename from api/search-api/src/main/java/nu/marginalia/search/client/model/ApiSearchResults.java rename to code/api/search-api/src/main/java/nu/marginalia/search/client/model/ApiSearchResults.java diff --git a/common/config/build.gradle b/code/common/config/build.gradle similarity index 75% rename from common/config/build.gradle rename to code/common/config/build.gradle index 211a3465..ab1b30b4 100644 --- a/common/config/build.gradle +++ b/code/common/config/build.gradle @@ -12,9 +12,9 @@ java { } dependencies { - implementation project(':common:service-discovery') - implementation project(':common:service-client') - implementation project(':libraries:misc') + implementation project(':code:common:service-discovery') + implementation project(':code:common:service-client') + implementation project(':code:libraries:misc') } test { diff --git a/common/config/readme.md b/code/common/config/readme.md similarity index 100% rename from common/config/readme.md rename to code/common/config/readme.md diff --git a/common/config/src/main/java/nu/marginalia/LanguageModels.java b/code/common/config/src/main/java/nu/marginalia/LanguageModels.java similarity index 100% rename from common/config/src/main/java/nu/marginalia/LanguageModels.java rename to code/common/config/src/main/java/nu/marginalia/LanguageModels.java diff --git a/common/config/src/main/java/nu/marginalia/UserAgent.java b/code/common/config/src/main/java/nu/marginalia/UserAgent.java similarity index 100% rename from common/config/src/main/java/nu/marginalia/UserAgent.java rename to code/common/config/src/main/java/nu/marginalia/UserAgent.java diff --git a/common/config/src/main/java/nu/marginalia/WebsiteUrl.java b/code/common/config/src/main/java/nu/marginalia/WebsiteUrl.java similarity index 100% rename from common/config/src/main/java/nu/marginalia/WebsiteUrl.java rename to code/common/config/src/main/java/nu/marginalia/WebsiteUrl.java diff --git a/common/config/src/main/java/nu/marginalia/WmsaHome.java b/code/common/config/src/main/java/nu/marginalia/WmsaHome.java similarity index 100% rename from common/config/src/main/java/nu/marginalia/WmsaHome.java rename to code/common/config/src/main/java/nu/marginalia/WmsaHome.java diff --git a/common/model/build.gradle b/code/common/model/build.gradle similarity index 85% rename from common/model/build.gradle rename to code/common/model/build.gradle index fb31e0c7..a6e67963 100644 --- a/common/model/build.gradle +++ b/code/common/model/build.gradle @@ -11,9 +11,9 @@ java { } dependencies { - implementation project(':common:service-discovery') - implementation project(':common:service-client') - implementation project(':libraries:big-string') + implementation project(':code:common:service-discovery') + implementation project(':code:common:service-client') + implementation project(':code:libraries:big-string') implementation libs.lombok annotationProcessor libs.lombok diff --git a/common/model/readme.md b/code/common/model/readme.md similarity index 100% rename from common/model/readme.md rename to code/common/model/readme.md diff --git a/common/model/src/main/java/nu/marginalia/model/EdgeDomain.java b/code/common/model/src/main/java/nu/marginalia/model/EdgeDomain.java similarity index 100% rename from common/model/src/main/java/nu/marginalia/model/EdgeDomain.java rename to code/common/model/src/main/java/nu/marginalia/model/EdgeDomain.java diff --git a/common/model/src/main/java/nu/marginalia/model/EdgeUrl.java b/code/common/model/src/main/java/nu/marginalia/model/EdgeUrl.java similarity index 100% rename from common/model/src/main/java/nu/marginalia/model/EdgeUrl.java rename to code/common/model/src/main/java/nu/marginalia/model/EdgeUrl.java diff --git a/common/model/src/main/java/nu/marginalia/model/crawl/EdgeContentType.java b/code/common/model/src/main/java/nu/marginalia/model/crawl/EdgeContentType.java similarity index 100% rename from common/model/src/main/java/nu/marginalia/model/crawl/EdgeContentType.java rename to code/common/model/src/main/java/nu/marginalia/model/crawl/EdgeContentType.java diff --git a/common/model/src/main/java/nu/marginalia/model/crawl/EdgeDomainIndexingState.java b/code/common/model/src/main/java/nu/marginalia/model/crawl/EdgeDomainIndexingState.java similarity index 100% rename from common/model/src/main/java/nu/marginalia/model/crawl/EdgeDomainIndexingState.java rename to code/common/model/src/main/java/nu/marginalia/model/crawl/EdgeDomainIndexingState.java diff --git a/common/model/src/main/java/nu/marginalia/model/crawl/EdgeHtmlStandard.java b/code/common/model/src/main/java/nu/marginalia/model/crawl/EdgeHtmlStandard.java similarity index 100% rename from common/model/src/main/java/nu/marginalia/model/crawl/EdgeHtmlStandard.java rename to code/common/model/src/main/java/nu/marginalia/model/crawl/EdgeHtmlStandard.java diff --git a/common/model/src/main/java/nu/marginalia/model/crawl/EdgePageDocumentFlags.java b/code/common/model/src/main/java/nu/marginalia/model/crawl/EdgePageDocumentFlags.java similarity index 100% rename from common/model/src/main/java/nu/marginalia/model/crawl/EdgePageDocumentFlags.java rename to code/common/model/src/main/java/nu/marginalia/model/crawl/EdgePageDocumentFlags.java diff --git a/common/model/src/main/java/nu/marginalia/model/crawl/EdgePageWordFlags.java b/code/common/model/src/main/java/nu/marginalia/model/crawl/EdgePageWordFlags.java similarity index 100% rename from common/model/src/main/java/nu/marginalia/model/crawl/EdgePageWordFlags.java rename to code/common/model/src/main/java/nu/marginalia/model/crawl/EdgePageWordFlags.java diff --git a/common/model/src/main/java/nu/marginalia/model/crawl/EdgeUrlState.java b/code/common/model/src/main/java/nu/marginalia/model/crawl/EdgeUrlState.java similarity index 100% rename from common/model/src/main/java/nu/marginalia/model/crawl/EdgeUrlState.java rename to code/common/model/src/main/java/nu/marginalia/model/crawl/EdgeUrlState.java diff --git a/common/model/src/main/java/nu/marginalia/model/crawl/HtmlFeature.java b/code/common/model/src/main/java/nu/marginalia/model/crawl/HtmlFeature.java similarity index 100% rename from common/model/src/main/java/nu/marginalia/model/crawl/HtmlFeature.java rename to code/common/model/src/main/java/nu/marginalia/model/crawl/HtmlFeature.java diff --git a/common/model/src/main/java/nu/marginalia/model/crawl/PubDate.java b/code/common/model/src/main/java/nu/marginalia/model/crawl/PubDate.java similarity index 100% rename from common/model/src/main/java/nu/marginalia/model/crawl/PubDate.java rename to code/common/model/src/main/java/nu/marginalia/model/crawl/PubDate.java diff --git a/common/model/src/main/java/nu/marginalia/model/dbcommon/DbDomainQueries.java b/code/common/model/src/main/java/nu/marginalia/model/dbcommon/DbDomainQueries.java similarity index 100% rename from common/model/src/main/java/nu/marginalia/model/dbcommon/DbDomainQueries.java rename to code/common/model/src/main/java/nu/marginalia/model/dbcommon/DbDomainQueries.java diff --git a/common/model/src/main/java/nu/marginalia/model/dbcommon/EdgeDomainBlacklist.java b/code/common/model/src/main/java/nu/marginalia/model/dbcommon/EdgeDomainBlacklist.java similarity index 100% rename from common/model/src/main/java/nu/marginalia/model/dbcommon/EdgeDomainBlacklist.java rename to code/common/model/src/main/java/nu/marginalia/model/dbcommon/EdgeDomainBlacklist.java diff --git a/common/model/src/main/java/nu/marginalia/model/dbcommon/EdgeDomainBlacklistImpl.java b/code/common/model/src/main/java/nu/marginalia/model/dbcommon/EdgeDomainBlacklistImpl.java similarity index 100% rename from common/model/src/main/java/nu/marginalia/model/dbcommon/EdgeDomainBlacklistImpl.java rename to code/common/model/src/main/java/nu/marginalia/model/dbcommon/EdgeDomainBlacklistImpl.java diff --git a/common/model/src/main/java/nu/marginalia/model/gson/GsonFactory.java b/code/common/model/src/main/java/nu/marginalia/model/gson/GsonFactory.java similarity index 100% rename from common/model/src/main/java/nu/marginalia/model/gson/GsonFactory.java rename to code/common/model/src/main/java/nu/marginalia/model/gson/GsonFactory.java diff --git a/common/model/src/main/java/nu/marginalia/model/id/EdgeId.java b/code/common/model/src/main/java/nu/marginalia/model/id/EdgeId.java similarity index 100% rename from common/model/src/main/java/nu/marginalia/model/id/EdgeId.java rename to code/common/model/src/main/java/nu/marginalia/model/id/EdgeId.java diff --git a/common/model/src/main/java/nu/marginalia/model/id/EdgeIdArray.java b/code/common/model/src/main/java/nu/marginalia/model/id/EdgeIdArray.java similarity index 100% rename from common/model/src/main/java/nu/marginalia/model/id/EdgeIdArray.java rename to code/common/model/src/main/java/nu/marginalia/model/id/EdgeIdArray.java diff --git a/common/model/src/main/java/nu/marginalia/model/id/EdgeIdCollection.java b/code/common/model/src/main/java/nu/marginalia/model/id/EdgeIdCollection.java similarity index 100% rename from common/model/src/main/java/nu/marginalia/model/id/EdgeIdCollection.java rename to code/common/model/src/main/java/nu/marginalia/model/id/EdgeIdCollection.java diff --git a/common/model/src/main/java/nu/marginalia/model/id/EdgeIdCollectionMutable.java b/code/common/model/src/main/java/nu/marginalia/model/id/EdgeIdCollectionMutable.java similarity index 100% rename from common/model/src/main/java/nu/marginalia/model/id/EdgeIdCollectionMutable.java rename to code/common/model/src/main/java/nu/marginalia/model/id/EdgeIdCollectionMutable.java diff --git a/common/model/src/main/java/nu/marginalia/model/id/EdgeIdList.java b/code/common/model/src/main/java/nu/marginalia/model/id/EdgeIdList.java similarity index 100% rename from common/model/src/main/java/nu/marginalia/model/id/EdgeIdList.java rename to code/common/model/src/main/java/nu/marginalia/model/id/EdgeIdList.java diff --git a/common/model/src/main/java/nu/marginalia/model/id/EdgeIdSet.java b/code/common/model/src/main/java/nu/marginalia/model/id/EdgeIdSet.java similarity index 100% rename from common/model/src/main/java/nu/marginalia/model/id/EdgeIdSet.java rename to code/common/model/src/main/java/nu/marginalia/model/id/EdgeIdSet.java diff --git a/common/model/src/main/java/nu/marginalia/model/idx/DocumentMetadata.java b/code/common/model/src/main/java/nu/marginalia/model/idx/DocumentMetadata.java similarity index 100% rename from common/model/src/main/java/nu/marginalia/model/idx/DocumentMetadata.java rename to code/common/model/src/main/java/nu/marginalia/model/idx/DocumentMetadata.java diff --git a/common/model/src/main/java/nu/marginalia/model/idx/WordMetadata.java b/code/common/model/src/main/java/nu/marginalia/model/idx/WordMetadata.java similarity index 100% rename from common/model/src/main/java/nu/marginalia/model/idx/WordMetadata.java rename to code/common/model/src/main/java/nu/marginalia/model/idx/WordMetadata.java diff --git a/common/model/src/main/java/nu/marginalia/util/BrailleBlockPunchCards.java b/code/common/model/src/main/java/nu/marginalia/util/BrailleBlockPunchCards.java similarity index 100% rename from common/model/src/main/java/nu/marginalia/util/BrailleBlockPunchCards.java rename to code/common/model/src/main/java/nu/marginalia/util/BrailleBlockPunchCards.java diff --git a/common/model/src/main/java/nu/marginalia/util/DenseBitMap.java b/code/common/model/src/main/java/nu/marginalia/util/DenseBitMap.java similarity index 100% rename from common/model/src/main/java/nu/marginalia/util/DenseBitMap.java rename to code/common/model/src/main/java/nu/marginalia/util/DenseBitMap.java diff --git a/common/model/src/main/java/nu/marginalia/util/LineUtils.java b/code/common/model/src/main/java/nu/marginalia/util/LineUtils.java similarity index 100% rename from common/model/src/main/java/nu/marginalia/util/LineUtils.java rename to code/common/model/src/main/java/nu/marginalia/util/LineUtils.java diff --git a/common/model/src/main/java/nu/marginalia/util/ParallelPipe.java b/code/common/model/src/main/java/nu/marginalia/util/ParallelPipe.java similarity index 100% rename from common/model/src/main/java/nu/marginalia/util/ParallelPipe.java rename to code/common/model/src/main/java/nu/marginalia/util/ParallelPipe.java diff --git a/common/model/src/main/java/nu/marginalia/util/QueryParams.java b/code/common/model/src/main/java/nu/marginalia/util/QueryParams.java similarity index 100% rename from common/model/src/main/java/nu/marginalia/util/QueryParams.java rename to code/common/model/src/main/java/nu/marginalia/util/QueryParams.java diff --git a/common/model/src/main/java/nu/marginalia/util/StringPool.java b/code/common/model/src/main/java/nu/marginalia/util/StringPool.java similarity index 100% rename from common/model/src/main/java/nu/marginalia/util/StringPool.java rename to code/common/model/src/main/java/nu/marginalia/util/StringPool.java diff --git a/common/model/src/main/resources/sql/edge-crawler-cache.sql b/code/common/model/src/main/resources/sql/edge-crawler-cache.sql similarity index 100% rename from common/model/src/main/resources/sql/edge-crawler-cache.sql rename to code/common/model/src/main/resources/sql/edge-crawler-cache.sql diff --git a/common/model/src/test/java/nu/marginalia/model/EdgeDomainTest.java b/code/common/model/src/test/java/nu/marginalia/model/EdgeDomainTest.java similarity index 100% rename from common/model/src/test/java/nu/marginalia/model/EdgeDomainTest.java rename to code/common/model/src/test/java/nu/marginalia/model/EdgeDomainTest.java diff --git a/common/model/src/test/java/nu/marginalia/model/EdgeUrlTest.java b/code/common/model/src/test/java/nu/marginalia/model/EdgeUrlTest.java similarity index 100% rename from common/model/src/test/java/nu/marginalia/model/EdgeUrlTest.java rename to code/common/model/src/test/java/nu/marginalia/model/EdgeUrlTest.java diff --git a/common/model/src/test/java/nu/marginalia/model/WordMetadataTest.java b/code/common/model/src/test/java/nu/marginalia/model/WordMetadataTest.java similarity index 100% rename from common/model/src/test/java/nu/marginalia/model/WordMetadataTest.java rename to code/common/model/src/test/java/nu/marginalia/model/WordMetadataTest.java diff --git a/common/model/src/test/java/nu/marginalia/util/BrailleBlockPunchCardsTest.java b/code/common/model/src/test/java/nu/marginalia/util/BrailleBlockPunchCardsTest.java similarity index 100% rename from common/model/src/test/java/nu/marginalia/util/BrailleBlockPunchCardsTest.java rename to code/common/model/src/test/java/nu/marginalia/util/BrailleBlockPunchCardsTest.java diff --git a/common/model/src/test/java/nu/marginalia/util/DenseBitMapTest.java b/code/common/model/src/test/java/nu/marginalia/util/DenseBitMapTest.java similarity index 100% rename from common/model/src/test/java/nu/marginalia/util/DenseBitMapTest.java rename to code/common/model/src/test/java/nu/marginalia/util/DenseBitMapTest.java diff --git a/common/model/src/test/java/nu/marginalia/util/LineUtilsTest.java b/code/common/model/src/test/java/nu/marginalia/util/LineUtilsTest.java similarity index 100% rename from common/model/src/test/java/nu/marginalia/util/LineUtilsTest.java rename to code/common/model/src/test/java/nu/marginalia/util/LineUtilsTest.java diff --git a/common/readme.md b/code/common/readme.md similarity index 100% rename from common/readme.md rename to code/common/readme.md diff --git a/common/renderer/build.gradle b/code/common/renderer/build.gradle similarity index 100% rename from common/renderer/build.gradle rename to code/common/renderer/build.gradle diff --git a/common/renderer/readme.md b/code/common/renderer/readme.md similarity index 100% rename from common/renderer/readme.md rename to code/common/renderer/readme.md diff --git a/common/renderer/src/main/java/nu/marginalia/renderer/MustacheRenderer.java b/code/common/renderer/src/main/java/nu/marginalia/renderer/MustacheRenderer.java similarity index 100% rename from common/renderer/src/main/java/nu/marginalia/renderer/MustacheRenderer.java rename to code/common/renderer/src/main/java/nu/marginalia/renderer/MustacheRenderer.java diff --git a/common/renderer/src/main/java/nu/marginalia/renderer/RendererFactory.java b/code/common/renderer/src/main/java/nu/marginalia/renderer/RendererFactory.java similarity index 100% rename from common/renderer/src/main/java/nu/marginalia/renderer/RendererFactory.java rename to code/common/renderer/src/main/java/nu/marginalia/renderer/RendererFactory.java diff --git a/common/renderer/src/main/java/nu/marginalia/renderer/RenderingException.java b/code/common/renderer/src/main/java/nu/marginalia/renderer/RenderingException.java similarity index 100% rename from common/renderer/src/main/java/nu/marginalia/renderer/RenderingException.java rename to code/common/renderer/src/main/java/nu/marginalia/renderer/RenderingException.java diff --git a/common/service-client/build.gradle b/code/common/service-client/build.gradle similarity index 95% rename from common/service-client/build.gradle rename to code/common/service-client/build.gradle index d04e2f10..834fc45f 100644 --- a/common/service-client/build.gradle +++ b/code/common/service-client/build.gradle @@ -13,7 +13,7 @@ java { dependencies { implementation project(':third-party') - implementation project(':common:service-discovery') + implementation project(':code:common:service-discovery') implementation libs.lombok diff --git a/common/service-client/readme.md b/code/common/service-client/readme.md similarity index 100% rename from common/service-client/readme.md rename to code/common/service-client/readme.md diff --git a/common/service-client/src/main/java/nu/marginalia/client/AbortingScheduler.java b/code/common/service-client/src/main/java/nu/marginalia/client/AbortingScheduler.java similarity index 100% rename from common/service-client/src/main/java/nu/marginalia/client/AbortingScheduler.java rename to code/common/service-client/src/main/java/nu/marginalia/client/AbortingScheduler.java diff --git a/common/service-client/src/main/java/nu/marginalia/client/AbstractClient.java b/code/common/service-client/src/main/java/nu/marginalia/client/AbstractClient.java similarity index 100% rename from common/service-client/src/main/java/nu/marginalia/client/AbstractClient.java rename to code/common/service-client/src/main/java/nu/marginalia/client/AbstractClient.java diff --git a/common/service-client/src/main/java/nu/marginalia/client/AbstractDynamicClient.java b/code/common/service-client/src/main/java/nu/marginalia/client/AbstractDynamicClient.java similarity index 100% rename from common/service-client/src/main/java/nu/marginalia/client/AbstractDynamicClient.java rename to code/common/service-client/src/main/java/nu/marginalia/client/AbstractDynamicClient.java diff --git a/common/service-client/src/main/java/nu/marginalia/client/Context.java b/code/common/service-client/src/main/java/nu/marginalia/client/Context.java similarity index 100% rename from common/service-client/src/main/java/nu/marginalia/client/Context.java rename to code/common/service-client/src/main/java/nu/marginalia/client/Context.java diff --git a/common/service-client/src/main/java/nu/marginalia/client/ContextScrambler.java b/code/common/service-client/src/main/java/nu/marginalia/client/ContextScrambler.java similarity index 100% rename from common/service-client/src/main/java/nu/marginalia/client/ContextScrambler.java rename to code/common/service-client/src/main/java/nu/marginalia/client/ContextScrambler.java diff --git a/common/service-client/src/main/java/nu/marginalia/client/HttpStatusCode.java b/code/common/service-client/src/main/java/nu/marginalia/client/HttpStatusCode.java similarity index 100% rename from common/service-client/src/main/java/nu/marginalia/client/HttpStatusCode.java rename to code/common/service-client/src/main/java/nu/marginalia/client/HttpStatusCode.java diff --git a/common/service-client/src/main/java/nu/marginalia/client/exception/LocalException.java b/code/common/service-client/src/main/java/nu/marginalia/client/exception/LocalException.java similarity index 100% rename from common/service-client/src/main/java/nu/marginalia/client/exception/LocalException.java rename to code/common/service-client/src/main/java/nu/marginalia/client/exception/LocalException.java diff --git a/common/service-client/src/main/java/nu/marginalia/client/exception/MessagingException.java b/code/common/service-client/src/main/java/nu/marginalia/client/exception/MessagingException.java similarity index 100% rename from common/service-client/src/main/java/nu/marginalia/client/exception/MessagingException.java rename to code/common/service-client/src/main/java/nu/marginalia/client/exception/MessagingException.java diff --git a/common/service-client/src/main/java/nu/marginalia/client/exception/NetworkException.java b/code/common/service-client/src/main/java/nu/marginalia/client/exception/NetworkException.java similarity index 100% rename from common/service-client/src/main/java/nu/marginalia/client/exception/NetworkException.java rename to code/common/service-client/src/main/java/nu/marginalia/client/exception/NetworkException.java diff --git a/common/service-client/src/main/java/nu/marginalia/client/exception/RemoteException.java b/code/common/service-client/src/main/java/nu/marginalia/client/exception/RemoteException.java similarity index 100% rename from common/service-client/src/main/java/nu/marginalia/client/exception/RemoteException.java rename to code/common/service-client/src/main/java/nu/marginalia/client/exception/RemoteException.java diff --git a/common/service-client/src/main/java/nu/marginalia/client/exception/RouteNotConfiguredException.java b/code/common/service-client/src/main/java/nu/marginalia/client/exception/RouteNotConfiguredException.java similarity index 100% rename from common/service-client/src/main/java/nu/marginalia/client/exception/RouteNotConfiguredException.java rename to code/common/service-client/src/main/java/nu/marginalia/client/exception/RouteNotConfiguredException.java diff --git a/common/service-client/src/main/java/nu/marginalia/client/exception/TimeoutException.java b/code/common/service-client/src/main/java/nu/marginalia/client/exception/TimeoutException.java similarity index 100% rename from common/service-client/src/main/java/nu/marginalia/client/exception/TimeoutException.java rename to code/common/service-client/src/main/java/nu/marginalia/client/exception/TimeoutException.java diff --git a/common/service-client/src/test/java/nu/marginalia/client/AbstractClientTest.java b/code/common/service-client/src/test/java/nu/marginalia/client/AbstractClientTest.java similarity index 100% rename from common/service-client/src/test/java/nu/marginalia/client/AbstractClientTest.java rename to code/common/service-client/src/test/java/nu/marginalia/client/AbstractClientTest.java diff --git a/common/service-client/src/test/java/nu/marginalia/client/TestServer.java b/code/common/service-client/src/test/java/nu/marginalia/client/TestServer.java similarity index 100% rename from common/service-client/src/test/java/nu/marginalia/client/TestServer.java rename to code/common/service-client/src/test/java/nu/marginalia/client/TestServer.java diff --git a/common/service-discovery/build.gradle b/code/common/service-discovery/build.gradle similarity index 100% rename from common/service-discovery/build.gradle rename to code/common/service-discovery/build.gradle diff --git a/common/service-discovery/readme.md b/code/common/service-discovery/readme.md similarity index 100% rename from common/service-discovery/readme.md rename to code/common/service-discovery/readme.md diff --git a/common/service-discovery/src/main/java/nu/marginalia/service/SearchServiceDescriptors.java b/code/common/service-discovery/src/main/java/nu/marginalia/service/SearchServiceDescriptors.java similarity index 100% rename from common/service-discovery/src/main/java/nu/marginalia/service/SearchServiceDescriptors.java rename to code/common/service-discovery/src/main/java/nu/marginalia/service/SearchServiceDescriptors.java diff --git a/common/service-discovery/src/main/java/nu/marginalia/service/descriptor/HostsFile.java b/code/common/service-discovery/src/main/java/nu/marginalia/service/descriptor/HostsFile.java similarity index 100% rename from common/service-discovery/src/main/java/nu/marginalia/service/descriptor/HostsFile.java rename to code/common/service-discovery/src/main/java/nu/marginalia/service/descriptor/HostsFile.java diff --git a/common/service-discovery/src/main/java/nu/marginalia/service/descriptor/ServiceDescriptor.java b/code/common/service-discovery/src/main/java/nu/marginalia/service/descriptor/ServiceDescriptor.java similarity index 100% rename from common/service-discovery/src/main/java/nu/marginalia/service/descriptor/ServiceDescriptor.java rename to code/common/service-discovery/src/main/java/nu/marginalia/service/descriptor/ServiceDescriptor.java diff --git a/common/service-discovery/src/main/java/nu/marginalia/service/descriptor/ServiceDescriptors.java b/code/common/service-discovery/src/main/java/nu/marginalia/service/descriptor/ServiceDescriptors.java similarity index 100% rename from common/service-discovery/src/main/java/nu/marginalia/service/descriptor/ServiceDescriptors.java rename to code/common/service-discovery/src/main/java/nu/marginalia/service/descriptor/ServiceDescriptors.java diff --git a/common/service-discovery/src/main/java/nu/marginalia/service/id/ServiceId.java b/code/common/service-discovery/src/main/java/nu/marginalia/service/id/ServiceId.java similarity index 100% rename from common/service-discovery/src/main/java/nu/marginalia/service/id/ServiceId.java rename to code/common/service-discovery/src/main/java/nu/marginalia/service/id/ServiceId.java diff --git a/common/service/build.gradle b/code/common/service/build.gradle similarity index 78% rename from common/service/build.gradle rename to code/common/service/build.gradle index 45f9a740..2c7a3942 100644 --- a/common/service/build.gradle +++ b/code/common/service/build.gradle @@ -10,9 +10,9 @@ java { } dependencies { - implementation project(':common:service-client') - implementation project(':common:service-discovery') - implementation project(':libraries:misc') + implementation project(':code:common:service-client') + implementation project(':code:common:service-discovery') + implementation project(':code:libraries:misc') implementation libs.lombok annotationProcessor libs.lombok diff --git a/common/service/readme.md b/code/common/service/readme.md similarity index 100% rename from common/service/readme.md rename to code/common/service/readme.md diff --git a/common/service/src/main/java/nu/marginalia/service/MainClass.java b/code/common/service/src/main/java/nu/marginalia/service/MainClass.java similarity index 100% rename from common/service/src/main/java/nu/marginalia/service/MainClass.java rename to code/common/service/src/main/java/nu/marginalia/service/MainClass.java diff --git a/common/service/src/main/java/nu/marginalia/service/module/ConfigurationModule.java b/code/common/service/src/main/java/nu/marginalia/service/module/ConfigurationModule.java similarity index 100% rename from common/service/src/main/java/nu/marginalia/service/module/ConfigurationModule.java rename to code/common/service/src/main/java/nu/marginalia/service/module/ConfigurationModule.java diff --git a/common/service/src/main/java/nu/marginalia/service/module/DatabaseModule.java b/code/common/service/src/main/java/nu/marginalia/service/module/DatabaseModule.java similarity index 100% rename from common/service/src/main/java/nu/marginalia/service/module/DatabaseModule.java rename to code/common/service/src/main/java/nu/marginalia/service/module/DatabaseModule.java diff --git a/common/service/src/main/java/nu/marginalia/service/module/LoggerConfiguration.java b/code/common/service/src/main/java/nu/marginalia/service/module/LoggerConfiguration.java similarity index 100% rename from common/service/src/main/java/nu/marginalia/service/module/LoggerConfiguration.java rename to code/common/service/src/main/java/nu/marginalia/service/module/LoggerConfiguration.java diff --git a/common/service/src/main/java/nu/marginalia/service/module/MetricsPortProvider.java b/code/common/service/src/main/java/nu/marginalia/service/module/MetricsPortProvider.java similarity index 100% rename from common/service/src/main/java/nu/marginalia/service/module/MetricsPortProvider.java rename to code/common/service/src/main/java/nu/marginalia/service/module/MetricsPortProvider.java diff --git a/common/service/src/main/java/nu/marginalia/service/server/Initialization.java b/code/common/service/src/main/java/nu/marginalia/service/server/Initialization.java similarity index 100% rename from common/service/src/main/java/nu/marginalia/service/server/Initialization.java rename to code/common/service/src/main/java/nu/marginalia/service/server/Initialization.java diff --git a/common/service/src/main/java/nu/marginalia/service/server/MetricsServer.java b/code/common/service/src/main/java/nu/marginalia/service/server/MetricsServer.java similarity index 100% rename from common/service/src/main/java/nu/marginalia/service/server/MetricsServer.java rename to code/common/service/src/main/java/nu/marginalia/service/server/MetricsServer.java diff --git a/common/service/src/main/java/nu/marginalia/service/server/RateLimiter.java b/code/common/service/src/main/java/nu/marginalia/service/server/RateLimiter.java similarity index 100% rename from common/service/src/main/java/nu/marginalia/service/server/RateLimiter.java rename to code/common/service/src/main/java/nu/marginalia/service/server/RateLimiter.java diff --git a/common/service/src/main/java/nu/marginalia/service/server/Service.java b/code/common/service/src/main/java/nu/marginalia/service/server/Service.java similarity index 100% rename from common/service/src/main/java/nu/marginalia/service/server/Service.java rename to code/common/service/src/main/java/nu/marginalia/service/server/Service.java diff --git a/common/service/src/main/java/nu/marginalia/service/server/StaticResources.java b/code/common/service/src/main/java/nu/marginalia/service/server/StaticResources.java similarity index 100% rename from common/service/src/main/java/nu/marginalia/service/server/StaticResources.java rename to code/common/service/src/main/java/nu/marginalia/service/server/StaticResources.java diff --git a/common/service/src/main/resources/log4j2.properties b/code/common/service/src/main/resources/log4j2.properties similarity index 100% rename from common/service/src/main/resources/log4j2.properties rename to code/common/service/src/main/resources/log4j2.properties diff --git a/crawl/common/build.gradle b/code/crawl/common/build.gradle similarity index 81% rename from crawl/common/build.gradle rename to code/crawl/common/build.gradle index 6eb50387..67174793 100644 --- a/crawl/common/build.gradle +++ b/code/crawl/common/build.gradle @@ -13,10 +13,10 @@ java { dependencies { implementation project(':third-party') - implementation project(':common:model') - implementation project(':common:config') - implementation project(':libraries:guarded-regex') - implementation project(':crawl:crawling-model') + implementation project(':code:common:model') + implementation project(':code:common:config') + implementation project(':code:libraries:guarded-regex') + implementation project(':code:crawl:crawling-model') implementation libs.notnull implementation libs.lombok diff --git a/crawl/common/readme.md b/code/crawl/common/readme.md similarity index 100% rename from crawl/common/readme.md rename to code/crawl/common/readme.md diff --git a/crawl/common/src/main/java/nu/marginalia/crawling/common/AbortMonitor.java b/code/crawl/common/src/main/java/nu/marginalia/crawling/common/AbortMonitor.java similarity index 100% rename from crawl/common/src/main/java/nu/marginalia/crawling/common/AbortMonitor.java rename to code/crawl/common/src/main/java/nu/marginalia/crawling/common/AbortMonitor.java diff --git a/crawl/common/src/main/java/nu/marginalia/crawling/common/TaskStats.java b/code/crawl/common/src/main/java/nu/marginalia/crawling/common/TaskStats.java similarity index 100% rename from crawl/common/src/main/java/nu/marginalia/crawling/common/TaskStats.java rename to code/crawl/common/src/main/java/nu/marginalia/crawling/common/TaskStats.java diff --git a/crawl/common/src/main/java/nu/marginalia/crawling/common/WorkLog.java b/code/crawl/common/src/main/java/nu/marginalia/crawling/common/WorkLog.java similarity index 100% rename from crawl/common/src/main/java/nu/marginalia/crawling/common/WorkLog.java rename to code/crawl/common/src/main/java/nu/marginalia/crawling/common/WorkLog.java diff --git a/crawl/common/src/main/java/nu/marginalia/crawling/common/blocklist/GeoIpBlocklist.java b/code/crawl/common/src/main/java/nu/marginalia/crawling/common/blocklist/GeoIpBlocklist.java similarity index 100% rename from crawl/common/src/main/java/nu/marginalia/crawling/common/blocklist/GeoIpBlocklist.java rename to code/crawl/common/src/main/java/nu/marginalia/crawling/common/blocklist/GeoIpBlocklist.java diff --git a/crawl/common/src/main/java/nu/marginalia/crawling/common/blocklist/InetAddressCache.java b/code/crawl/common/src/main/java/nu/marginalia/crawling/common/blocklist/InetAddressCache.java similarity index 100% rename from crawl/common/src/main/java/nu/marginalia/crawling/common/blocklist/InetAddressCache.java rename to code/crawl/common/src/main/java/nu/marginalia/crawling/common/blocklist/InetAddressCache.java diff --git a/crawl/common/src/main/java/nu/marginalia/crawling/common/blocklist/IpBlockList.java b/code/crawl/common/src/main/java/nu/marginalia/crawling/common/blocklist/IpBlockList.java similarity index 100% rename from crawl/common/src/main/java/nu/marginalia/crawling/common/blocklist/IpBlockList.java rename to code/crawl/common/src/main/java/nu/marginalia/crawling/common/blocklist/IpBlockList.java diff --git a/crawl/common/src/main/java/nu/marginalia/crawling/common/blocklist/UrlBlocklist.java b/code/crawl/common/src/main/java/nu/marginalia/crawling/common/blocklist/UrlBlocklist.java similarity index 100% rename from crawl/common/src/main/java/nu/marginalia/crawling/common/blocklist/UrlBlocklist.java rename to code/crawl/common/src/main/java/nu/marginalia/crawling/common/blocklist/UrlBlocklist.java diff --git a/crawl/common/src/main/java/nu/marginalia/crawling/common/link/LinkParser.java b/code/crawl/common/src/main/java/nu/marginalia/crawling/common/link/LinkParser.java similarity index 100% rename from crawl/common/src/main/java/nu/marginalia/crawling/common/link/LinkParser.java rename to code/crawl/common/src/main/java/nu/marginalia/crawling/common/link/LinkParser.java diff --git a/crawl/common/src/main/java/nu/marginalia/crawling/common/plan/CrawlPlanLoader.java b/code/crawl/common/src/main/java/nu/marginalia/crawling/common/plan/CrawlPlanLoader.java similarity index 100% rename from crawl/common/src/main/java/nu/marginalia/crawling/common/plan/CrawlPlanLoader.java rename to code/crawl/common/src/main/java/nu/marginalia/crawling/common/plan/CrawlPlanLoader.java diff --git a/crawl/common/src/main/java/nu/marginalia/crawling/common/plan/CrawlerSpecificationLoader.java b/code/crawl/common/src/main/java/nu/marginalia/crawling/common/plan/CrawlerSpecificationLoader.java similarity index 100% rename from crawl/common/src/main/java/nu/marginalia/crawling/common/plan/CrawlerSpecificationLoader.java rename to code/crawl/common/src/main/java/nu/marginalia/crawling/common/plan/CrawlerSpecificationLoader.java diff --git a/crawl/common/src/main/java/nu/marginalia/crawling/common/plan/EdgeCrawlPlan.java b/code/crawl/common/src/main/java/nu/marginalia/crawling/common/plan/EdgeCrawlPlan.java similarity index 100% rename from crawl/common/src/main/java/nu/marginalia/crawling/common/plan/EdgeCrawlPlan.java rename to code/crawl/common/src/main/java/nu/marginalia/crawling/common/plan/EdgeCrawlPlan.java diff --git a/crawl/common/src/main/resources/log4j2.properties b/code/crawl/common/src/main/resources/log4j2.properties similarity index 100% rename from crawl/common/src/main/resources/log4j2.properties rename to code/crawl/common/src/main/resources/log4j2.properties diff --git a/crawl/converting-model/build.gradle b/code/crawl/converting-model/build.gradle similarity index 69% rename from crawl/converting-model/build.gradle rename to code/crawl/converting-model/build.gradle index 7dc51c8b..99ca5c95 100644 --- a/crawl/converting-model/build.gradle +++ b/code/crawl/converting-model/build.gradle @@ -12,11 +12,11 @@ java { } dependencies { implementation project(':third-party') - implementation project(':common:model') - implementation project(':api:index-api') - implementation project(':common:service-discovery') - implementation project(':common:service-client') - implementation project(':libraries:language-processing') + implementation project(':code:common:model') + implementation project(':code:api:index-api') + implementation project(':code:common:service-discovery') + implementation project(':code:common:service-client') + implementation project(':code:libraries:language-processing') implementation libs.lombok annotationProcessor libs.lombok diff --git a/crawl/converting-model/readme.md b/code/crawl/converting-model/readme.md similarity index 100% rename from crawl/converting-model/readme.md rename to code/crawl/converting-model/readme.md diff --git a/crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/Instruction.java b/code/crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/Instruction.java similarity index 100% rename from crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/Instruction.java rename to code/crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/Instruction.java diff --git a/crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/InstructionTag.java b/code/crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/InstructionTag.java similarity index 100% rename from crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/InstructionTag.java rename to code/crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/InstructionTag.java diff --git a/crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/Interpreter.java b/code/crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/Interpreter.java similarity index 100% rename from crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/Interpreter.java rename to code/crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/Interpreter.java diff --git a/crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/instructions/DomainLink.java b/code/crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/instructions/DomainLink.java similarity index 100% rename from crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/instructions/DomainLink.java rename to code/crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/instructions/DomainLink.java diff --git a/crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/instructions/LoadDomain.java b/code/crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/instructions/LoadDomain.java similarity index 100% rename from crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/instructions/LoadDomain.java rename to code/crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/instructions/LoadDomain.java diff --git a/crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/instructions/LoadDomainLink.java b/code/crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/instructions/LoadDomainLink.java similarity index 100% rename from crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/instructions/LoadDomainLink.java rename to code/crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/instructions/LoadDomainLink.java diff --git a/crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/instructions/LoadDomainRedirect.java b/code/crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/instructions/LoadDomainRedirect.java similarity index 100% rename from crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/instructions/LoadDomainRedirect.java rename to code/crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/instructions/LoadDomainRedirect.java diff --git a/crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/instructions/LoadKeywords.java b/code/crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/instructions/LoadKeywords.java similarity index 100% rename from crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/instructions/LoadKeywords.java rename to code/crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/instructions/LoadKeywords.java diff --git a/crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/instructions/LoadProcessedDocument.java b/code/crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/instructions/LoadProcessedDocument.java similarity index 100% rename from crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/instructions/LoadProcessedDocument.java rename to code/crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/instructions/LoadProcessedDocument.java diff --git a/crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/instructions/LoadProcessedDocumentWithError.java b/code/crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/instructions/LoadProcessedDocumentWithError.java similarity index 100% rename from crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/instructions/LoadProcessedDocumentWithError.java rename to code/crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/instructions/LoadProcessedDocumentWithError.java diff --git a/crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/instructions/LoadProcessedDomain.java b/code/crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/instructions/LoadProcessedDomain.java similarity index 100% rename from crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/instructions/LoadProcessedDomain.java rename to code/crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/instructions/LoadProcessedDomain.java diff --git a/crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/instructions/LoadRssFeed.java b/code/crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/instructions/LoadRssFeed.java similarity index 100% rename from crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/instructions/LoadRssFeed.java rename to code/crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/instructions/LoadRssFeed.java diff --git a/crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/instructions/LoadUrl.java b/code/crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/instructions/LoadUrl.java similarity index 100% rename from crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/instructions/LoadUrl.java rename to code/crawl/converting-model/src/main/java/nu/marginalia/converting/instruction/instructions/LoadUrl.java diff --git a/crawl/converting-model/src/main/java/nu/marginalia/converting/model/DocumentKeywords.java b/code/crawl/converting-model/src/main/java/nu/marginalia/converting/model/DocumentKeywords.java similarity index 100% rename from crawl/converting-model/src/main/java/nu/marginalia/converting/model/DocumentKeywords.java rename to code/crawl/converting-model/src/main/java/nu/marginalia/converting/model/DocumentKeywords.java diff --git a/crawl/converting-model/src/main/java/nu/marginalia/converting/model/DocumentKeywordsBuilder.java b/code/crawl/converting-model/src/main/java/nu/marginalia/converting/model/DocumentKeywordsBuilder.java similarity index 100% rename from crawl/converting-model/src/main/java/nu/marginalia/converting/model/DocumentKeywordsBuilder.java rename to code/crawl/converting-model/src/main/java/nu/marginalia/converting/model/DocumentKeywordsBuilder.java diff --git a/crawl/converting-process/build.gradle b/code/crawl/converting-process/build.gradle similarity index 60% rename from crawl/converting-process/build.gradle rename to code/crawl/converting-process/build.gradle index bc31e1bd..017503ec 100644 --- a/crawl/converting-process/build.gradle +++ b/code/crawl/converting-process/build.gradle @@ -18,19 +18,19 @@ application { dependencies { implementation project(':third-party') - implementation project(':common:model') - implementation project(':common:service') - implementation project(':common:config') - implementation project(':libraries:guarded-regex') - implementation project(':libraries:easy-lsh') - implementation project(':libraries:big-string') - implementation project(':api:index-api') - implementation project(':common:service-discovery') - implementation project(':common:service-client') - implementation project(':libraries:language-processing') - implementation project(':crawl:common') - implementation project(':crawl:converting-model') - implementation project(':crawl:crawling-model') + implementation project(':code:common:model') + implementation project(':code:common:service') + implementation project(':code:common:config') + implementation project(':code:libraries:guarded-regex') + implementation project(':code:libraries:easy-lsh') + implementation project(':code:libraries:big-string') + implementation project(':code:api:index-api') + implementation project(':code:common:service-discovery') + implementation project(':code:common:service-client') + implementation project(':code:libraries:language-processing') + implementation project(':code:crawl:common') + implementation project(':code:crawl:converting-model') + implementation project(':code:crawl:crawling-model') implementation libs.lombok annotationProcessor libs.lombok diff --git a/crawl/converting-process/readme.md b/code/crawl/converting-process/readme.md similarity index 100% rename from crawl/converting-process/readme.md rename to code/crawl/converting-process/readme.md diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/ConversionLog.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/ConversionLog.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/ConversionLog.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/ConversionLog.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/ConverterMain.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/ConverterMain.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/ConverterMain.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/ConverterMain.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/ConverterModule.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/ConverterModule.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/ConverterModule.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/ConverterModule.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/InstructionWriter.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/InstructionWriter.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/InstructionWriter.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/InstructionWriter.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/UpdateDomainStatistics.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/UpdateDomainStatistics.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/UpdateDomainStatistics.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/UpdateDomainStatistics.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/compiler/DocumentsCompiler.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/compiler/DocumentsCompiler.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/compiler/DocumentsCompiler.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/compiler/DocumentsCompiler.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/compiler/FeedsCompiler.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/compiler/FeedsCompiler.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/compiler/FeedsCompiler.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/compiler/FeedsCompiler.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/compiler/InstructionsCompiler.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/compiler/InstructionsCompiler.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/compiler/InstructionsCompiler.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/compiler/InstructionsCompiler.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/compiler/LinksCompiler.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/compiler/LinksCompiler.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/compiler/LinksCompiler.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/compiler/LinksCompiler.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/compiler/RedirectCompiler.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/compiler/RedirectCompiler.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/compiler/RedirectCompiler.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/compiler/RedirectCompiler.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/compiler/UrlsCompiler.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/compiler/UrlsCompiler.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/compiler/UrlsCompiler.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/compiler/UrlsCompiler.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/model/DisqualifiedException.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/model/DisqualifiedException.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/model/DisqualifiedException.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/model/DisqualifiedException.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/model/ProcessedDocument.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/model/ProcessedDocument.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/model/ProcessedDocument.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/model/ProcessedDocument.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/model/ProcessedDocumentDetails.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/model/ProcessedDocumentDetails.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/model/ProcessedDocumentDetails.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/model/ProcessedDocumentDetails.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/model/ProcessedDomain.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/model/ProcessedDomain.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/model/ProcessedDomain.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/model/ProcessedDomain.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/AcceptableAds.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/AcceptableAds.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/AcceptableAds.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/AcceptableAds.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/DocumentProcessor.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/DocumentProcessor.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/DocumentProcessor.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/DocumentProcessor.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/DomainProcessor.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/DomainProcessor.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/DomainProcessor.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/DomainProcessor.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/SiteWords.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/SiteWords.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/SiteWords.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/SiteWords.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/keywords/DocumentKeywordExtractor.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/keywords/DocumentKeywordExtractor.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/keywords/DocumentKeywordExtractor.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/keywords/DocumentKeywordExtractor.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/keywords/KeywordCounter.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/keywords/KeywordCounter.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/keywords/KeywordCounter.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/keywords/KeywordCounter.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/keywords/NameCounter.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/keywords/NameCounter.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/keywords/NameCounter.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/keywords/NameCounter.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/keywords/SubjectCounter.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/keywords/SubjectCounter.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/keywords/SubjectCounter.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/keywords/SubjectCounter.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/DocumentValuator.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/DocumentValuator.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/DocumentValuator.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/DocumentValuator.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/DomPruningFilter.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/DomPruningFilter.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/DomPruningFilter.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/DomPruningFilter.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/FeatureExtractor.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/FeatureExtractor.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/FeatureExtractor.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/FeatureExtractor.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/FeedExtractor.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/FeedExtractor.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/FeedExtractor.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/FeedExtractor.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/HtmlStandardExtractor.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/HtmlStandardExtractor.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/HtmlStandardExtractor.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/HtmlStandardExtractor.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/LshDocumentDeduplicator.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/LshDocumentDeduplicator.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/LshDocumentDeduplicator.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/LshDocumentDeduplicator.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/PlainTextLogic.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/PlainTextLogic.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/PlainTextLogic.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/PlainTextLogic.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/TitleExtractor.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/TitleExtractor.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/TitleExtractor.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/TitleExtractor.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/links/CommonKeywordExtractor.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/links/CommonKeywordExtractor.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/links/CommonKeywordExtractor.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/links/CommonKeywordExtractor.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/links/InternalLinkGraph.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/links/InternalLinkGraph.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/links/InternalLinkGraph.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/links/InternalLinkGraph.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/links/LinkProcessor.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/links/LinkProcessor.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/links/LinkProcessor.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/links/LinkProcessor.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/PubDateEffortLevel.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/PubDateEffortLevel.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/PubDateEffortLevel.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/PubDateEffortLevel.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/PubDateHeuristic.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/PubDateHeuristic.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/PubDateHeuristic.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/PubDateHeuristic.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/PubDateParser.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/PubDateParser.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/PubDateParser.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/PubDateParser.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/PubDateSniffer.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/PubDateSniffer.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/PubDateSniffer.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/PubDateSniffer.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicDOMParsingPass1.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicDOMParsingPass1.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicDOMParsingPass1.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicDOMParsingPass1.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicDOMParsingPass2.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicDOMParsingPass2.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicDOMParsingPass2.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicDOMParsingPass2.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicGuessFromHtmlStandard.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicGuessFromHtmlStandard.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicGuessFromHtmlStandard.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicGuessFromHtmlStandard.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicHtml5AnyTimeTag.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicHtml5AnyTimeTag.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicHtml5AnyTimeTag.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicHtml5AnyTimeTag.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicHtml5ArticleDateTag.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicHtml5ArticleDateTag.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicHtml5ArticleDateTag.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicHtml5ArticleDateTag.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicHtml5ItempropDateTag.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicHtml5ItempropDateTag.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicHtml5ItempropDateTag.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicHtml5ItempropDateTag.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicJSONLD.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicJSONLD.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicJSONLD.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicJSONLD.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicLastModified.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicLastModified.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicLastModified.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicLastModified.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicMicrodata.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicMicrodata.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicMicrodata.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicMicrodata.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicOpenGraph.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicOpenGraph.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicOpenGraph.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicOpenGraph.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicRDFaTag.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicRDFaTag.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicRDFaTag.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicRDFaTag.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicUrlPatternPass1.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicUrlPatternPass1.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicUrlPatternPass1.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicUrlPatternPass1.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicUrlPatternPass2.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicUrlPatternPass2.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicUrlPatternPass2.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/pubdate/heuristic/PubDateHeuristicUrlPatternPass2.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/summary/SummaryExtractionFilter.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/summary/SummaryExtractionFilter.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/summary/SummaryExtractionFilter.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/summary/SummaryExtractionFilter.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/summary/SummaryExtractor.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/summary/SummaryExtractor.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/summary/SummaryExtractor.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/summary/SummaryExtractor.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/topic/AdblockSimulator.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/topic/AdblockSimulator.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/topic/AdblockSimulator.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/topic/AdblockSimulator.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/topic/GoogleAnwersSpamDetector.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/topic/GoogleAnwersSpamDetector.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/topic/GoogleAnwersSpamDetector.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/topic/GoogleAnwersSpamDetector.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/topic/RecipeDetector.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/topic/RecipeDetector.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/topic/RecipeDetector.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/topic/RecipeDetector.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/topic/TextileCraftDetector.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/topic/TextileCraftDetector.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/topic/TextileCraftDetector.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/topic/TextileCraftDetector.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/topic/WoodworkingDetector.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/topic/WoodworkingDetector.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/topic/WoodworkingDetector.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/logic/topic/WoodworkingDetector.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/plugin/AbstractDocumentProcessorPlugin.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/plugin/AbstractDocumentProcessorPlugin.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/plugin/AbstractDocumentProcessorPlugin.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/plugin/AbstractDocumentProcessorPlugin.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/plugin/HtmlDocumentProcessorPlugin.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/plugin/HtmlDocumentProcessorPlugin.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/plugin/HtmlDocumentProcessorPlugin.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/plugin/HtmlDocumentProcessorPlugin.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/plugin/PlainTextDocumentProcessorPlugin.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/plugin/PlainTextDocumentProcessorPlugin.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/processor/plugin/PlainTextDocumentProcessorPlugin.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/processor/plugin/PlainTextDocumentProcessorPlugin.java diff --git a/crawl/converting-process/src/main/java/nu/marginalia/converting/tool/DocumentDebugger.java b/code/crawl/converting-process/src/main/java/nu/marginalia/converting/tool/DocumentDebugger.java similarity index 100% rename from crawl/converting-process/src/main/java/nu/marginalia/converting/tool/DocumentDebugger.java rename to code/crawl/converting-process/src/main/java/nu/marginalia/converting/tool/DocumentDebugger.java diff --git a/crawl/converting-process/src/test/java/nu/marginalia/converting/logic/DomPruningFilterTest.java b/code/crawl/converting-process/src/test/java/nu/marginalia/converting/logic/DomPruningFilterTest.java similarity index 100% rename from crawl/converting-process/src/test/java/nu/marginalia/converting/logic/DomPruningFilterTest.java rename to code/crawl/converting-process/src/test/java/nu/marginalia/converting/logic/DomPruningFilterTest.java diff --git a/crawl/converting-process/src/test/java/nu/marginalia/converting/logic/PlainTextLogicTest.java b/code/crawl/converting-process/src/test/java/nu/marginalia/converting/logic/PlainTextLogicTest.java similarity index 100% rename from crawl/converting-process/src/test/java/nu/marginalia/converting/logic/PlainTextLogicTest.java rename to code/crawl/converting-process/src/test/java/nu/marginalia/converting/logic/PlainTextLogicTest.java diff --git a/crawl/converting-process/src/test/java/nu/marginalia/converting/logic/PubDateSnifferTest.java b/code/crawl/converting-process/src/test/java/nu/marginalia/converting/logic/PubDateSnifferTest.java similarity index 100% rename from crawl/converting-process/src/test/java/nu/marginalia/converting/logic/PubDateSnifferTest.java rename to code/crawl/converting-process/src/test/java/nu/marginalia/converting/logic/PubDateSnifferTest.java diff --git a/crawl/converting-process/src/test/java/nu/marginalia/converting/logic/SummaryExtractorTest.java b/code/crawl/converting-process/src/test/java/nu/marginalia/converting/logic/SummaryExtractorTest.java similarity index 100% rename from crawl/converting-process/src/test/java/nu/marginalia/converting/logic/SummaryExtractorTest.java rename to code/crawl/converting-process/src/test/java/nu/marginalia/converting/logic/SummaryExtractorTest.java diff --git a/crawl/converting-process/src/test/java/nu/marginalia/converting/logic/pubdate/PubDateTest.java b/code/crawl/converting-process/src/test/java/nu/marginalia/converting/logic/pubdate/PubDateTest.java similarity index 100% rename from crawl/converting-process/src/test/java/nu/marginalia/converting/logic/pubdate/PubDateTest.java rename to code/crawl/converting-process/src/test/java/nu/marginalia/converting/logic/pubdate/PubDateTest.java diff --git a/crawl/converting-process/src/test/java/nu/marginalia/converting/processor/keywords/SentenceExtractorTest.java b/code/crawl/converting-process/src/test/java/nu/marginalia/converting/processor/keywords/SentenceExtractorTest.java similarity index 100% rename from crawl/converting-process/src/test/java/nu/marginalia/converting/processor/keywords/SentenceExtractorTest.java rename to code/crawl/converting-process/src/test/java/nu/marginalia/converting/processor/keywords/SentenceExtractorTest.java diff --git a/crawl/converting-process/src/test/java/nu/marginalia/test/util/TestLanguageModels.java b/code/crawl/converting-process/src/test/java/nu/marginalia/test/util/TestLanguageModels.java similarity index 100% rename from crawl/converting-process/src/test/java/nu/marginalia/test/util/TestLanguageModels.java rename to code/crawl/converting-process/src/test/java/nu/marginalia/test/util/TestLanguageModels.java diff --git a/crawl/converting-process/src/test/resources/html/monadnock.html b/code/crawl/converting-process/src/test/resources/html/monadnock.html similarity index 100% rename from crawl/converting-process/src/test/resources/html/monadnock.html rename to code/crawl/converting-process/src/test/resources/html/monadnock.html diff --git a/crawl/converting-process/src/test/resources/html/readme.md b/code/crawl/converting-process/src/test/resources/html/readme.md similarity index 100% rename from crawl/converting-process/src/test/resources/html/readme.md rename to code/crawl/converting-process/src/test/resources/html/readme.md diff --git a/crawl/converting-process/src/test/resources/html/summarization/187.shtml b/code/crawl/converting-process/src/test/resources/html/summarization/187.shtml similarity index 100% rename from crawl/converting-process/src/test/resources/html/summarization/187.shtml rename to code/crawl/converting-process/src/test/resources/html/summarization/187.shtml diff --git a/crawl/converting-process/src/test/resources/html/summarization/surrey.html b/code/crawl/converting-process/src/test/resources/html/summarization/surrey.html similarity index 100% rename from crawl/converting-process/src/test/resources/html/summarization/surrey.html rename to code/crawl/converting-process/src/test/resources/html/summarization/surrey.html diff --git a/crawl/converting-process/src/test/resources/html/summarization/surrey.html.1 b/code/crawl/converting-process/src/test/resources/html/summarization/surrey.html.1 similarity index 100% rename from crawl/converting-process/src/test/resources/html/summarization/surrey.html.1 rename to code/crawl/converting-process/src/test/resources/html/summarization/surrey.html.1 diff --git a/crawl/converting-process/src/test/resources/html/work-set/index b/code/crawl/converting-process/src/test/resources/html/work-set/index similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/index rename to code/crawl/converting-process/src/test/resources/html/work-set/index diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--1021546012 b/code/crawl/converting-process/src/test/resources/html/work-set/url--1021546012 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--1021546012 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--1021546012 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--1028592943 b/code/crawl/converting-process/src/test/resources/html/work-set/url--1028592943 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--1028592943 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--1028592943 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--1081293162 b/code/crawl/converting-process/src/test/resources/html/work-set/url--1081293162 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--1081293162 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--1081293162 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--1105046394 b/code/crawl/converting-process/src/test/resources/html/work-set/url--1105046394 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--1105046394 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--1105046394 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--1146923296 b/code/crawl/converting-process/src/test/resources/html/work-set/url--1146923296 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--1146923296 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--1146923296 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--1194694074 b/code/crawl/converting-process/src/test/resources/html/work-set/url--1194694074 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--1194694074 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--1194694074 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--1207898281 b/code/crawl/converting-process/src/test/resources/html/work-set/url--1207898281 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--1207898281 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--1207898281 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--1268145073 b/code/crawl/converting-process/src/test/resources/html/work-set/url--1268145073 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--1268145073 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--1268145073 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--1294876331 b/code/crawl/converting-process/src/test/resources/html/work-set/url--1294876331 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--1294876331 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--1294876331 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--1314767420 b/code/crawl/converting-process/src/test/resources/html/work-set/url--1314767420 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--1314767420 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--1314767420 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--1316269786 b/code/crawl/converting-process/src/test/resources/html/work-set/url--1316269786 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--1316269786 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--1316269786 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--1316766580 b/code/crawl/converting-process/src/test/resources/html/work-set/url--1316766580 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--1316766580 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--1316766580 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--1319968043 b/code/crawl/converting-process/src/test/resources/html/work-set/url--1319968043 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--1319968043 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--1319968043 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--1338576987 b/code/crawl/converting-process/src/test/resources/html/work-set/url--1338576987 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--1338576987 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--1338576987 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--1341909571 b/code/crawl/converting-process/src/test/resources/html/work-set/url--1341909571 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--1341909571 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--1341909571 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--1369578579 b/code/crawl/converting-process/src/test/resources/html/work-set/url--1369578579 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--1369578579 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--1369578579 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--1437315645 b/code/crawl/converting-process/src/test/resources/html/work-set/url--1437315645 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--1437315645 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--1437315645 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--1458954960 b/code/crawl/converting-process/src/test/resources/html/work-set/url--1458954960 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--1458954960 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--1458954960 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--1475681345 b/code/crawl/converting-process/src/test/resources/html/work-set/url--1475681345 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--1475681345 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--1475681345 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--1498328446 b/code/crawl/converting-process/src/test/resources/html/work-set/url--1498328446 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--1498328446 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--1498328446 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--1507779664 b/code/crawl/converting-process/src/test/resources/html/work-set/url--1507779664 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--1507779664 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--1507779664 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--1540303379 b/code/crawl/converting-process/src/test/resources/html/work-set/url--1540303379 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--1540303379 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--1540303379 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--154898476 b/code/crawl/converting-process/src/test/resources/html/work-set/url--154898476 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--154898476 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--154898476 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--1552059399 b/code/crawl/converting-process/src/test/resources/html/work-set/url--1552059399 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--1552059399 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--1552059399 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--1557688340 b/code/crawl/converting-process/src/test/resources/html/work-set/url--1557688340 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--1557688340 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--1557688340 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--1584145751 b/code/crawl/converting-process/src/test/resources/html/work-set/url--1584145751 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--1584145751 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--1584145751 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--1605151204 b/code/crawl/converting-process/src/test/resources/html/work-set/url--1605151204 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--1605151204 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--1605151204 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--162269247 b/code/crawl/converting-process/src/test/resources/html/work-set/url--162269247 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--162269247 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--162269247 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--1624294488 b/code/crawl/converting-process/src/test/resources/html/work-set/url--1624294488 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--1624294488 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--1624294488 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--164108285 b/code/crawl/converting-process/src/test/resources/html/work-set/url--164108285 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--164108285 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--164108285 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--1645688243 b/code/crawl/converting-process/src/test/resources/html/work-set/url--1645688243 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--1645688243 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--1645688243 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--1658004609 b/code/crawl/converting-process/src/test/resources/html/work-set/url--1658004609 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--1658004609 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--1658004609 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--1658558834 b/code/crawl/converting-process/src/test/resources/html/work-set/url--1658558834 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--1658558834 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--1658558834 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--1698664879 b/code/crawl/converting-process/src/test/resources/html/work-set/url--1698664879 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--1698664879 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--1698664879 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--169975195 b/code/crawl/converting-process/src/test/resources/html/work-set/url--169975195 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--169975195 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--169975195 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--1701203332 b/code/crawl/converting-process/src/test/resources/html/work-set/url--1701203332 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--1701203332 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--1701203332 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--17281998 b/code/crawl/converting-process/src/test/resources/html/work-set/url--17281998 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--17281998 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--17281998 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--1742070028 b/code/crawl/converting-process/src/test/resources/html/work-set/url--1742070028 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--1742070028 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--1742070028 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--1745376814 b/code/crawl/converting-process/src/test/resources/html/work-set/url--1745376814 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--1745376814 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--1745376814 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--1749889035 b/code/crawl/converting-process/src/test/resources/html/work-set/url--1749889035 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--1749889035 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--1749889035 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--176177364 b/code/crawl/converting-process/src/test/resources/html/work-set/url--176177364 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--176177364 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--176177364 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--177014197 b/code/crawl/converting-process/src/test/resources/html/work-set/url--177014197 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--177014197 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--177014197 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--1794527707 b/code/crawl/converting-process/src/test/resources/html/work-set/url--1794527707 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--1794527707 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--1794527707 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--1797740201 b/code/crawl/converting-process/src/test/resources/html/work-set/url--1797740201 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--1797740201 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--1797740201 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--1799098579 b/code/crawl/converting-process/src/test/resources/html/work-set/url--1799098579 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--1799098579 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--1799098579 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--1959637826 b/code/crawl/converting-process/src/test/resources/html/work-set/url--1959637826 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--1959637826 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--1959637826 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--1971916964 b/code/crawl/converting-process/src/test/resources/html/work-set/url--1971916964 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--1971916964 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--1971916964 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--1985840368 b/code/crawl/converting-process/src/test/resources/html/work-set/url--1985840368 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--1985840368 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--1985840368 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--2012610859 b/code/crawl/converting-process/src/test/resources/html/work-set/url--2012610859 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--2012610859 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--2012610859 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--202178680 b/code/crawl/converting-process/src/test/resources/html/work-set/url--202178680 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--202178680 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--202178680 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--2043528727 b/code/crawl/converting-process/src/test/resources/html/work-set/url--2043528727 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--2043528727 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--2043528727 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--2081757477 b/code/crawl/converting-process/src/test/resources/html/work-set/url--2081757477 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--2081757477 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--2081757477 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--2103982576 b/code/crawl/converting-process/src/test/resources/html/work-set/url--2103982576 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--2103982576 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--2103982576 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--2111558769 b/code/crawl/converting-process/src/test/resources/html/work-set/url--2111558769 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--2111558769 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--2111558769 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--213168798 b/code/crawl/converting-process/src/test/resources/html/work-set/url--213168798 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--213168798 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--213168798 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--232544032 b/code/crawl/converting-process/src/test/resources/html/work-set/url--232544032 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--232544032 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--232544032 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--253010011 b/code/crawl/converting-process/src/test/resources/html/work-set/url--253010011 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--253010011 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--253010011 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--274250994 b/code/crawl/converting-process/src/test/resources/html/work-set/url--274250994 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--274250994 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--274250994 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--332442790 b/code/crawl/converting-process/src/test/resources/html/work-set/url--332442790 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--332442790 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--332442790 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--353437903 b/code/crawl/converting-process/src/test/resources/html/work-set/url--353437903 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--353437903 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--353437903 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--364546777 b/code/crawl/converting-process/src/test/resources/html/work-set/url--364546777 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--364546777 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--364546777 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--379129416 b/code/crawl/converting-process/src/test/resources/html/work-set/url--379129416 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--379129416 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--379129416 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--399428149 b/code/crawl/converting-process/src/test/resources/html/work-set/url--399428149 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--399428149 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--399428149 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--425233170 b/code/crawl/converting-process/src/test/resources/html/work-set/url--425233170 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--425233170 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--425233170 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--434612307 b/code/crawl/converting-process/src/test/resources/html/work-set/url--434612307 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--434612307 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--434612307 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--439772328 b/code/crawl/converting-process/src/test/resources/html/work-set/url--439772328 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--439772328 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--439772328 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--458002611 b/code/crawl/converting-process/src/test/resources/html/work-set/url--458002611 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--458002611 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--458002611 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--506010305 b/code/crawl/converting-process/src/test/resources/html/work-set/url--506010305 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--506010305 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--506010305 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--546773534 b/code/crawl/converting-process/src/test/resources/html/work-set/url--546773534 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--546773534 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--546773534 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--551288516 b/code/crawl/converting-process/src/test/resources/html/work-set/url--551288516 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--551288516 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--551288516 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--602577763 b/code/crawl/converting-process/src/test/resources/html/work-set/url--602577763 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--602577763 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--602577763 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--611668054 b/code/crawl/converting-process/src/test/resources/html/work-set/url--611668054 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--611668054 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--611668054 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--634771245 b/code/crawl/converting-process/src/test/resources/html/work-set/url--634771245 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--634771245 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--634771245 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--639320493 b/code/crawl/converting-process/src/test/resources/html/work-set/url--639320493 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--639320493 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--639320493 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--643179018 b/code/crawl/converting-process/src/test/resources/html/work-set/url--643179018 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--643179018 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--643179018 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--663772351 b/code/crawl/converting-process/src/test/resources/html/work-set/url--663772351 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--663772351 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--663772351 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--670789152 b/code/crawl/converting-process/src/test/resources/html/work-set/url--670789152 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--670789152 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--670789152 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--6797317 b/code/crawl/converting-process/src/test/resources/html/work-set/url--6797317 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--6797317 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--6797317 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--700978490 b/code/crawl/converting-process/src/test/resources/html/work-set/url--700978490 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--700978490 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--700978490 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--708035332 b/code/crawl/converting-process/src/test/resources/html/work-set/url--708035332 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--708035332 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--708035332 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--804917062 b/code/crawl/converting-process/src/test/resources/html/work-set/url--804917062 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--804917062 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--804917062 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--819771302 b/code/crawl/converting-process/src/test/resources/html/work-set/url--819771302 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--819771302 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--819771302 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--840796372 b/code/crawl/converting-process/src/test/resources/html/work-set/url--840796372 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--840796372 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--840796372 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--841445362 b/code/crawl/converting-process/src/test/resources/html/work-set/url--841445362 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--841445362 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--841445362 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--862385354 b/code/crawl/converting-process/src/test/resources/html/work-set/url--862385354 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--862385354 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--862385354 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--879796466 b/code/crawl/converting-process/src/test/resources/html/work-set/url--879796466 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--879796466 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--879796466 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--89134993 b/code/crawl/converting-process/src/test/resources/html/work-set/url--89134993 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--89134993 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--89134993 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--905197876 b/code/crawl/converting-process/src/test/resources/html/work-set/url--905197876 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--905197876 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--905197876 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--920328354 b/code/crawl/converting-process/src/test/resources/html/work-set/url--920328354 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--920328354 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--920328354 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--952827759 b/code/crawl/converting-process/src/test/resources/html/work-set/url--952827759 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--952827759 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--952827759 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--964018507 b/code/crawl/converting-process/src/test/resources/html/work-set/url--964018507 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--964018507 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--964018507 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url--972614909 b/code/crawl/converting-process/src/test/resources/html/work-set/url--972614909 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url--972614909 rename to code/crawl/converting-process/src/test/resources/html/work-set/url--972614909 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-10088520 b/code/crawl/converting-process/src/test/resources/html/work-set/url-10088520 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-10088520 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-10088520 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-1013281103 b/code/crawl/converting-process/src/test/resources/html/work-set/url-1013281103 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-1013281103 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-1013281103 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-1019241851 b/code/crawl/converting-process/src/test/resources/html/work-set/url-1019241851 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-1019241851 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-1019241851 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-1059944953 b/code/crawl/converting-process/src/test/resources/html/work-set/url-1059944953 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-1059944953 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-1059944953 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-1118681302 b/code/crawl/converting-process/src/test/resources/html/work-set/url-1118681302 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-1118681302 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-1118681302 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-1179298706 b/code/crawl/converting-process/src/test/resources/html/work-set/url-1179298706 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-1179298706 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-1179298706 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-1191749784 b/code/crawl/converting-process/src/test/resources/html/work-set/url-1191749784 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-1191749784 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-1191749784 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-1207094790 b/code/crawl/converting-process/src/test/resources/html/work-set/url-1207094790 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-1207094790 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-1207094790 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-1213989666 b/code/crawl/converting-process/src/test/resources/html/work-set/url-1213989666 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-1213989666 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-1213989666 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-1222442301 b/code/crawl/converting-process/src/test/resources/html/work-set/url-1222442301 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-1222442301 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-1222442301 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-130332455 b/code/crawl/converting-process/src/test/resources/html/work-set/url-130332455 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-130332455 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-130332455 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-1311055461 b/code/crawl/converting-process/src/test/resources/html/work-set/url-1311055461 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-1311055461 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-1311055461 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-1391842722 b/code/crawl/converting-process/src/test/resources/html/work-set/url-1391842722 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-1391842722 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-1391842722 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-1457388763 b/code/crawl/converting-process/src/test/resources/html/work-set/url-1457388763 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-1457388763 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-1457388763 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-1506356272 b/code/crawl/converting-process/src/test/resources/html/work-set/url-1506356272 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-1506356272 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-1506356272 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-1511762169 b/code/crawl/converting-process/src/test/resources/html/work-set/url-1511762169 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-1511762169 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-1511762169 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-1534640058 b/code/crawl/converting-process/src/test/resources/html/work-set/url-1534640058 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-1534640058 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-1534640058 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-1551513871 b/code/crawl/converting-process/src/test/resources/html/work-set/url-1551513871 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-1551513871 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-1551513871 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-1567632447 b/code/crawl/converting-process/src/test/resources/html/work-set/url-1567632447 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-1567632447 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-1567632447 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-1623049502 b/code/crawl/converting-process/src/test/resources/html/work-set/url-1623049502 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-1623049502 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-1623049502 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-163919330 b/code/crawl/converting-process/src/test/resources/html/work-set/url-163919330 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-163919330 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-163919330 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-1661398327 b/code/crawl/converting-process/src/test/resources/html/work-set/url-1661398327 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-1661398327 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-1661398327 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-1724309925 b/code/crawl/converting-process/src/test/resources/html/work-set/url-1724309925 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-1724309925 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-1724309925 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-1736807128 b/code/crawl/converting-process/src/test/resources/html/work-set/url-1736807128 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-1736807128 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-1736807128 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-1739031345 b/code/crawl/converting-process/src/test/resources/html/work-set/url-1739031345 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-1739031345 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-1739031345 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-1755745765 b/code/crawl/converting-process/src/test/resources/html/work-set/url-1755745765 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-1755745765 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-1755745765 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-1802811100 b/code/crawl/converting-process/src/test/resources/html/work-set/url-1802811100 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-1802811100 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-1802811100 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-1805364707 b/code/crawl/converting-process/src/test/resources/html/work-set/url-1805364707 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-1805364707 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-1805364707 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-1832702370 b/code/crawl/converting-process/src/test/resources/html/work-set/url-1832702370 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-1832702370 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-1832702370 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-1853114311 b/code/crawl/converting-process/src/test/resources/html/work-set/url-1853114311 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-1853114311 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-1853114311 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-1924872844 b/code/crawl/converting-process/src/test/resources/html/work-set/url-1924872844 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-1924872844 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-1924872844 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-197772804 b/code/crawl/converting-process/src/test/resources/html/work-set/url-197772804 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-197772804 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-197772804 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-1984259912 b/code/crawl/converting-process/src/test/resources/html/work-set/url-1984259912 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-1984259912 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-1984259912 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-1990903988 b/code/crawl/converting-process/src/test/resources/html/work-set/url-1990903988 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-1990903988 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-1990903988 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-2039310951 b/code/crawl/converting-process/src/test/resources/html/work-set/url-2039310951 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-2039310951 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-2039310951 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-2040857056 b/code/crawl/converting-process/src/test/resources/html/work-set/url-2040857056 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-2040857056 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-2040857056 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-2052613093 b/code/crawl/converting-process/src/test/resources/html/work-set/url-2052613093 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-2052613093 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-2052613093 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-2063899866 b/code/crawl/converting-process/src/test/resources/html/work-set/url-2063899866 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-2063899866 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-2063899866 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-2115548255 b/code/crawl/converting-process/src/test/resources/html/work-set/url-2115548255 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-2115548255 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-2115548255 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-2127148436 b/code/crawl/converting-process/src/test/resources/html/work-set/url-2127148436 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-2127148436 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-2127148436 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-2133781904 b/code/crawl/converting-process/src/test/resources/html/work-set/url-2133781904 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-2133781904 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-2133781904 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-225690385 b/code/crawl/converting-process/src/test/resources/html/work-set/url-225690385 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-225690385 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-225690385 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-226401955 b/code/crawl/converting-process/src/test/resources/html/work-set/url-226401955 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-226401955 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-226401955 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-262970770 b/code/crawl/converting-process/src/test/resources/html/work-set/url-262970770 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-262970770 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-262970770 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-30106798 b/code/crawl/converting-process/src/test/resources/html/work-set/url-30106798 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-30106798 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-30106798 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-302167335 b/code/crawl/converting-process/src/test/resources/html/work-set/url-302167335 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-302167335 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-302167335 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-327999153 b/code/crawl/converting-process/src/test/resources/html/work-set/url-327999153 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-327999153 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-327999153 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-332568225 b/code/crawl/converting-process/src/test/resources/html/work-set/url-332568225 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-332568225 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-332568225 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-343223418 b/code/crawl/converting-process/src/test/resources/html/work-set/url-343223418 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-343223418 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-343223418 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-383103932 b/code/crawl/converting-process/src/test/resources/html/work-set/url-383103932 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-383103932 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-383103932 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-412929678 b/code/crawl/converting-process/src/test/resources/html/work-set/url-412929678 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-412929678 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-412929678 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-475213997 b/code/crawl/converting-process/src/test/resources/html/work-set/url-475213997 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-475213997 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-475213997 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-483403121 b/code/crawl/converting-process/src/test/resources/html/work-set/url-483403121 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-483403121 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-483403121 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-488667993 b/code/crawl/converting-process/src/test/resources/html/work-set/url-488667993 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-488667993 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-488667993 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-50815201 b/code/crawl/converting-process/src/test/resources/html/work-set/url-50815201 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-50815201 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-50815201 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-522685905 b/code/crawl/converting-process/src/test/resources/html/work-set/url-522685905 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-522685905 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-522685905 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-570714305 b/code/crawl/converting-process/src/test/resources/html/work-set/url-570714305 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-570714305 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-570714305 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-58733529 b/code/crawl/converting-process/src/test/resources/html/work-set/url-58733529 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-58733529 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-58733529 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-616518304 b/code/crawl/converting-process/src/test/resources/html/work-set/url-616518304 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-616518304 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-616518304 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-662169426 b/code/crawl/converting-process/src/test/resources/html/work-set/url-662169426 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-662169426 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-662169426 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-677278788 b/code/crawl/converting-process/src/test/resources/html/work-set/url-677278788 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-677278788 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-677278788 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-690486170 b/code/crawl/converting-process/src/test/resources/html/work-set/url-690486170 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-690486170 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-690486170 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-709693331 b/code/crawl/converting-process/src/test/resources/html/work-set/url-709693331 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-709693331 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-709693331 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-734531556 b/code/crawl/converting-process/src/test/resources/html/work-set/url-734531556 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-734531556 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-734531556 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-767530276 b/code/crawl/converting-process/src/test/resources/html/work-set/url-767530276 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-767530276 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-767530276 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-783154014 b/code/crawl/converting-process/src/test/resources/html/work-set/url-783154014 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-783154014 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-783154014 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-796905237 b/code/crawl/converting-process/src/test/resources/html/work-set/url-796905237 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-796905237 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-796905237 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-800099955 b/code/crawl/converting-process/src/test/resources/html/work-set/url-800099955 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-800099955 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-800099955 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-804101946 b/code/crawl/converting-process/src/test/resources/html/work-set/url-804101946 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-804101946 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-804101946 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-830664902 b/code/crawl/converting-process/src/test/resources/html/work-set/url-830664902 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-830664902 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-830664902 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-876060686 b/code/crawl/converting-process/src/test/resources/html/work-set/url-876060686 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-876060686 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-876060686 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-892584998 b/code/crawl/converting-process/src/test/resources/html/work-set/url-892584998 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-892584998 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-892584998 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-942458463 b/code/crawl/converting-process/src/test/resources/html/work-set/url-942458463 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-942458463 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-942458463 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-952036171 b/code/crawl/converting-process/src/test/resources/html/work-set/url-952036171 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-952036171 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-952036171 diff --git a/crawl/converting-process/src/test/resources/html/work-set/url-968207276 b/code/crawl/converting-process/src/test/resources/html/work-set/url-968207276 similarity index 100% rename from crawl/converting-process/src/test/resources/html/work-set/url-968207276 rename to code/crawl/converting-process/src/test/resources/html/work-set/url-968207276 diff --git a/crawl/crawl-job-extractor-process/build.gradle b/code/crawl/crawl-job-extractor-process/build.gradle similarity index 80% rename from crawl/crawl-job-extractor-process/build.gradle rename to code/crawl/crawl-job-extractor-process/build.gradle index 0b5d6057..a4039e24 100644 --- a/crawl/crawl-job-extractor-process/build.gradle +++ b/code/crawl/crawl-job-extractor-process/build.gradle @@ -17,10 +17,10 @@ application { } dependencies { - implementation project(':common:model') - implementation project(':common:service') - implementation project(':crawl:crawling-model') - implementation project(':crawl:common') + implementation project(':code:common:model') + implementation project(':code:common:service') + implementation project(':code:crawl:crawling-model') + implementation project(':code:crawl:common') implementation libs.lombok annotationProcessor libs.lombok diff --git a/crawl/crawl-job-extractor-process/readme.md b/code/crawl/crawl-job-extractor-process/readme.md similarity index 100% rename from crawl/crawl-job-extractor-process/readme.md rename to code/crawl/crawl-job-extractor-process/readme.md diff --git a/crawl/crawl-job-extractor-process/src/main/java/nu/marginalia/crawl/CrawlJobDomainExtractor.java b/code/crawl/crawl-job-extractor-process/src/main/java/nu/marginalia/crawl/CrawlJobDomainExtractor.java similarity index 100% rename from crawl/crawl-job-extractor-process/src/main/java/nu/marginalia/crawl/CrawlJobDomainExtractor.java rename to code/crawl/crawl-job-extractor-process/src/main/java/nu/marginalia/crawl/CrawlJobDomainExtractor.java diff --git a/crawl/crawl-job-extractor-process/src/main/java/nu/marginalia/crawl/CrawlJobExtractorMain.java b/code/crawl/crawl-job-extractor-process/src/main/java/nu/marginalia/crawl/CrawlJobExtractorMain.java similarity index 100% rename from crawl/crawl-job-extractor-process/src/main/java/nu/marginalia/crawl/CrawlJobExtractorMain.java rename to code/crawl/crawl-job-extractor-process/src/main/java/nu/marginalia/crawl/CrawlJobExtractorMain.java diff --git a/crawl/crawl-job-extractor-process/src/main/java/nu/marginalia/crawl/CrawlJobSpecWriter.java b/code/crawl/crawl-job-extractor-process/src/main/java/nu/marginalia/crawl/CrawlJobSpecWriter.java similarity index 100% rename from crawl/crawl-job-extractor-process/src/main/java/nu/marginalia/crawl/CrawlJobSpecWriter.java rename to code/crawl/crawl-job-extractor-process/src/main/java/nu/marginalia/crawl/CrawlJobSpecWriter.java diff --git a/crawl/crawl-job-extractor-process/src/test/java/nu/marginalia/crawl/CrawlJobSpecWriterTest.java b/code/crawl/crawl-job-extractor-process/src/test/java/nu/marginalia/crawl/CrawlJobSpecWriterTest.java similarity index 100% rename from crawl/crawl-job-extractor-process/src/test/java/nu/marginalia/crawl/CrawlJobSpecWriterTest.java rename to code/crawl/crawl-job-extractor-process/src/test/java/nu/marginalia/crawl/CrawlJobSpecWriterTest.java diff --git a/crawl/crawling-model/build.gradle b/code/crawl/crawling-model/build.gradle similarity index 66% rename from crawl/crawling-model/build.gradle rename to code/crawl/crawling-model/build.gradle index a4b0f25d..e9cdbc01 100644 --- a/crawl/crawling-model/build.gradle +++ b/code/crawl/crawling-model/build.gradle @@ -14,12 +14,12 @@ java { dependencies { implementation project(':third-party') - implementation project(':common:model') - implementation project(':libraries:big-string') - implementation project(':api:index-api') - implementation project(':common:service-discovery') - implementation project(':common:service-client') - implementation project(':libraries:language-processing') + implementation project(':code:common:model') + implementation project(':code:libraries:big-string') + implementation project(':code:api:index-api') + implementation project(':code:common:service-discovery') + implementation project(':code:common:service-client') + implementation project(':code:libraries:language-processing') implementation libs.lombok annotationProcessor libs.lombok diff --git a/crawl/crawling-model/readme.md b/code/crawl/crawling-model/readme.md similarity index 100% rename from crawl/crawling-model/readme.md rename to code/crawl/crawling-model/readme.md diff --git a/crawl/crawling-model/src/main/java/nu/marginalia/crawling/io/CrawledDomainReader.java b/code/crawl/crawling-model/src/main/java/nu/marginalia/crawling/io/CrawledDomainReader.java similarity index 100% rename from crawl/crawling-model/src/main/java/nu/marginalia/crawling/io/CrawledDomainReader.java rename to code/crawl/crawling-model/src/main/java/nu/marginalia/crawling/io/CrawledDomainReader.java diff --git a/crawl/crawling-model/src/main/java/nu/marginalia/crawling/io/CrawledDomainWriter.java b/code/crawl/crawling-model/src/main/java/nu/marginalia/crawling/io/CrawledDomainWriter.java similarity index 100% rename from crawl/crawling-model/src/main/java/nu/marginalia/crawling/io/CrawledDomainWriter.java rename to code/crawl/crawling-model/src/main/java/nu/marginalia/crawling/io/CrawledDomainWriter.java diff --git a/crawl/crawling-model/src/main/java/nu/marginalia/crawling/model/CrawlLogEntry.java b/code/crawl/crawling-model/src/main/java/nu/marginalia/crawling/model/CrawlLogEntry.java similarity index 100% rename from crawl/crawling-model/src/main/java/nu/marginalia/crawling/model/CrawlLogEntry.java rename to code/crawl/crawling-model/src/main/java/nu/marginalia/crawling/model/CrawlLogEntry.java diff --git a/crawl/crawling-model/src/main/java/nu/marginalia/crawling/model/CrawledDocument.java b/code/crawl/crawling-model/src/main/java/nu/marginalia/crawling/model/CrawledDocument.java similarity index 100% rename from crawl/crawling-model/src/main/java/nu/marginalia/crawling/model/CrawledDocument.java rename to code/crawl/crawling-model/src/main/java/nu/marginalia/crawling/model/CrawledDocument.java diff --git a/crawl/crawling-model/src/main/java/nu/marginalia/crawling/model/CrawledDomain.java b/code/crawl/crawling-model/src/main/java/nu/marginalia/crawling/model/CrawledDomain.java similarity index 100% rename from crawl/crawling-model/src/main/java/nu/marginalia/crawling/model/CrawledDomain.java rename to code/crawl/crawling-model/src/main/java/nu/marginalia/crawling/model/CrawledDomain.java diff --git a/crawl/crawling-model/src/main/java/nu/marginalia/crawling/model/CrawlerDocumentStatus.java b/code/crawl/crawling-model/src/main/java/nu/marginalia/crawling/model/CrawlerDocumentStatus.java similarity index 100% rename from crawl/crawling-model/src/main/java/nu/marginalia/crawling/model/CrawlerDocumentStatus.java rename to code/crawl/crawling-model/src/main/java/nu/marginalia/crawling/model/CrawlerDocumentStatus.java diff --git a/crawl/crawling-model/src/main/java/nu/marginalia/crawling/model/CrawlerDomainStatus.java b/code/crawl/crawling-model/src/main/java/nu/marginalia/crawling/model/CrawlerDomainStatus.java similarity index 100% rename from crawl/crawling-model/src/main/java/nu/marginalia/crawling/model/CrawlerDomainStatus.java rename to code/crawl/crawling-model/src/main/java/nu/marginalia/crawling/model/CrawlerDomainStatus.java diff --git a/crawl/crawling-model/src/main/java/nu/marginalia/crawling/model/CrawlingSpecification.java b/code/crawl/crawling-model/src/main/java/nu/marginalia/crawling/model/CrawlingSpecification.java similarity index 100% rename from crawl/crawling-model/src/main/java/nu/marginalia/crawling/model/CrawlingSpecification.java rename to code/crawl/crawling-model/src/main/java/nu/marginalia/crawling/model/CrawlingSpecification.java diff --git a/crawl/crawling-model/src/main/java/nu/marginalia/crawling/model/SerializableCrawlData.java b/code/crawl/crawling-model/src/main/java/nu/marginalia/crawling/model/SerializableCrawlData.java similarity index 100% rename from crawl/crawling-model/src/main/java/nu/marginalia/crawling/model/SerializableCrawlData.java rename to code/crawl/crawling-model/src/main/java/nu/marginalia/crawling/model/SerializableCrawlData.java diff --git a/crawl/crawling-process/build.gradle b/code/crawl/crawling-process/build.gradle similarity index 63% rename from crawl/crawling-process/build.gradle rename to code/crawl/crawling-process/build.gradle index 8c653a61..5adb5bf9 100644 --- a/crawl/crawling-process/build.gradle +++ b/code/crawl/crawling-process/build.gradle @@ -18,17 +18,17 @@ application { dependencies { implementation project(':third-party') - implementation project(':common:model') - implementation project(':common:config') - implementation project(':common:service') - implementation project(':libraries:big-string') - implementation project(':api:index-api') - implementation project(':common:service-discovery') - implementation project(':common:service-client') - implementation project(':libraries:language-processing') - implementation project(':crawl:common') - implementation project(':crawl:crawling-model') - implementation project(':crawl:converting-model') + implementation project(':code:common:model') + implementation project(':code:common:config') + implementation project(':code:common:service') + implementation project(':code:libraries:big-string') + implementation project(':code:api:index-api') + implementation project(':code:common:service-discovery') + implementation project(':code:common:service-client') + implementation project(':code:libraries:language-processing') + implementation project(':code:crawl:common') + implementation project(':code:crawl:crawling-model') + implementation project(':code:crawl:converting-model') implementation libs.lombok annotationProcessor libs.lombok diff --git a/crawl/crawling-process/readme.md b/code/crawl/crawling-process/readme.md similarity index 100% rename from crawl/crawling-process/readme.md rename to code/crawl/crawling-process/readme.md diff --git a/crawl/crawling-process/src/main/java/nu/marginalia/crawl/CrawlerMain.java b/code/crawl/crawling-process/src/main/java/nu/marginalia/crawl/CrawlerMain.java similarity index 100% rename from crawl/crawling-process/src/main/java/nu/marginalia/crawl/CrawlerMain.java rename to code/crawl/crawling-process/src/main/java/nu/marginalia/crawl/CrawlerMain.java diff --git a/crawl/crawling-process/src/main/java/nu/marginalia/crawl/retreival/Cookies.java b/code/crawl/crawling-process/src/main/java/nu/marginalia/crawl/retreival/Cookies.java similarity index 100% rename from crawl/crawling-process/src/main/java/nu/marginalia/crawl/retreival/Cookies.java rename to code/crawl/crawling-process/src/main/java/nu/marginalia/crawl/retreival/Cookies.java diff --git a/crawl/crawling-process/src/main/java/nu/marginalia/crawl/retreival/CrawlerRetreiver.java b/code/crawl/crawling-process/src/main/java/nu/marginalia/crawl/retreival/CrawlerRetreiver.java similarity index 100% rename from crawl/crawling-process/src/main/java/nu/marginalia/crawl/retreival/CrawlerRetreiver.java rename to code/crawl/crawling-process/src/main/java/nu/marginalia/crawl/retreival/CrawlerRetreiver.java diff --git a/crawl/crawling-process/src/main/java/nu/marginalia/crawl/retreival/FastTerminatingSocketFactory.java b/code/crawl/crawling-process/src/main/java/nu/marginalia/crawl/retreival/FastTerminatingSocketFactory.java similarity index 100% rename from crawl/crawling-process/src/main/java/nu/marginalia/crawl/retreival/FastTerminatingSocketFactory.java rename to code/crawl/crawling-process/src/main/java/nu/marginalia/crawl/retreival/FastTerminatingSocketFactory.java diff --git a/crawl/crawling-process/src/main/java/nu/marginalia/crawl/retreival/HttpFetcher.java b/code/crawl/crawling-process/src/main/java/nu/marginalia/crawl/retreival/HttpFetcher.java similarity index 100% rename from crawl/crawling-process/src/main/java/nu/marginalia/crawl/retreival/HttpFetcher.java rename to code/crawl/crawling-process/src/main/java/nu/marginalia/crawl/retreival/HttpFetcher.java diff --git a/crawl/crawling-process/src/main/java/nu/marginalia/crawl/retreival/HttpRedirectResolver.java b/code/crawl/crawling-process/src/main/java/nu/marginalia/crawl/retreival/HttpRedirectResolver.java similarity index 100% rename from crawl/crawling-process/src/main/java/nu/marginalia/crawl/retreival/HttpRedirectResolver.java rename to code/crawl/crawling-process/src/main/java/nu/marginalia/crawl/retreival/HttpRedirectResolver.java diff --git a/crawl/crawling-process/src/main/java/nu/marginalia/crawl/retreival/NoSecuritySSL.java b/code/crawl/crawling-process/src/main/java/nu/marginalia/crawl/retreival/NoSecuritySSL.java similarity index 100% rename from crawl/crawling-process/src/main/java/nu/marginalia/crawl/retreival/NoSecuritySSL.java rename to code/crawl/crawling-process/src/main/java/nu/marginalia/crawl/retreival/NoSecuritySSL.java diff --git a/crawl/crawling-process/src/main/java/nu/marginalia/crawl/retreival/RateLimitException.java b/code/crawl/crawling-process/src/main/java/nu/marginalia/crawl/retreival/RateLimitException.java similarity index 100% rename from crawl/crawling-process/src/main/java/nu/marginalia/crawl/retreival/RateLimitException.java rename to code/crawl/crawling-process/src/main/java/nu/marginalia/crawl/retreival/RateLimitException.java diff --git a/crawl/crawling-process/src/main/java/nu/marginalia/crawl/retreival/logic/ContentTypeLogic.java b/code/crawl/crawling-process/src/main/java/nu/marginalia/crawl/retreival/logic/ContentTypeLogic.java similarity index 100% rename from crawl/crawling-process/src/main/java/nu/marginalia/crawl/retreival/logic/ContentTypeLogic.java rename to code/crawl/crawling-process/src/main/java/nu/marginalia/crawl/retreival/logic/ContentTypeLogic.java diff --git a/crawl/crawling-process/src/main/java/nu/marginalia/crawl/retreival/logic/ContentTypeParser.java b/code/crawl/crawling-process/src/main/java/nu/marginalia/crawl/retreival/logic/ContentTypeParser.java similarity index 100% rename from crawl/crawling-process/src/main/java/nu/marginalia/crawl/retreival/logic/ContentTypeParser.java rename to code/crawl/crawling-process/src/main/java/nu/marginalia/crawl/retreival/logic/ContentTypeParser.java diff --git a/crawl/crawling-process/src/main/resources/ip-banned-cidr.txt b/code/crawl/crawling-process/src/main/resources/ip-banned-cidr.txt similarity index 100% rename from crawl/crawling-process/src/main/resources/ip-banned-cidr.txt rename to code/crawl/crawling-process/src/main/resources/ip-banned-cidr.txt diff --git a/crawl/crawling-process/src/test/java/nu/marginalia/crawling/CrawlPlanLoaderTest.java b/code/crawl/crawling-process/src/test/java/nu/marginalia/crawling/CrawlPlanLoaderTest.java similarity index 100% rename from crawl/crawling-process/src/test/java/nu/marginalia/crawling/CrawlPlanLoaderTest.java rename to code/crawl/crawling-process/src/test/java/nu/marginalia/crawling/CrawlPlanLoaderTest.java diff --git a/crawl/crawling-process/src/test/java/nu/marginalia/crawling/DomainCrawlerRobotsTxtTest.java b/code/crawl/crawling-process/src/test/java/nu/marginalia/crawling/DomainCrawlerRobotsTxtTest.java similarity index 100% rename from crawl/crawling-process/src/test/java/nu/marginalia/crawling/DomainCrawlerRobotsTxtTest.java rename to code/crawl/crawling-process/src/test/java/nu/marginalia/crawling/DomainCrawlerRobotsTxtTest.java diff --git a/crawl/crawling-process/src/test/java/nu/marginalia/crawling/HtmlTagCleanerTest.java b/code/crawl/crawling-process/src/test/java/nu/marginalia/crawling/HtmlTagCleanerTest.java similarity index 100% rename from crawl/crawling-process/src/test/java/nu/marginalia/crawling/HtmlTagCleanerTest.java rename to code/crawl/crawling-process/src/test/java/nu/marginalia/crawling/HtmlTagCleanerTest.java diff --git a/crawl/crawling-process/src/test/java/nu/marginalia/crawling/HttpFetcherTest.java b/code/crawl/crawling-process/src/test/java/nu/marginalia/crawling/HttpFetcherTest.java similarity index 100% rename from crawl/crawling-process/src/test/java/nu/marginalia/crawling/HttpFetcherTest.java rename to code/crawl/crawling-process/src/test/java/nu/marginalia/crawling/HttpFetcherTest.java diff --git a/crawl/crawling-process/src/test/java/nu/marginalia/crawling/LanguageFilterTest.java b/code/crawl/crawling-process/src/test/java/nu/marginalia/crawling/LanguageFilterTest.java similarity index 100% rename from crawl/crawling-process/src/test/java/nu/marginalia/crawling/LanguageFilterTest.java rename to code/crawl/crawling-process/src/test/java/nu/marginalia/crawling/LanguageFilterTest.java diff --git a/crawl/crawling-process/src/test/java/nu/marginalia/crawling/LinkParserTest.java b/code/crawl/crawling-process/src/test/java/nu/marginalia/crawling/LinkParserTest.java similarity index 100% rename from crawl/crawling-process/src/test/java/nu/marginalia/crawling/LinkParserTest.java rename to code/crawl/crawling-process/src/test/java/nu/marginalia/crawling/LinkParserTest.java diff --git a/crawl/crawling-process/src/test/java/nu/marginalia/crawling/RssCrawlerTest.java b/code/crawl/crawling-process/src/test/java/nu/marginalia/crawling/RssCrawlerTest.java similarity index 100% rename from crawl/crawling-process/src/test/java/nu/marginalia/crawling/RssCrawlerTest.java rename to code/crawl/crawling-process/src/test/java/nu/marginalia/crawling/RssCrawlerTest.java diff --git a/crawl/crawling-process/src/test/java/nu/marginalia/crawling/UrlBlocklistTest.java b/code/crawl/crawling-process/src/test/java/nu/marginalia/crawling/UrlBlocklistTest.java similarity index 100% rename from crawl/crawling-process/src/test/java/nu/marginalia/crawling/UrlBlocklistTest.java rename to code/crawl/crawling-process/src/test/java/nu/marginalia/crawling/UrlBlocklistTest.java diff --git a/crawl/crawling-process/src/test/java/nu/marginalia/crawling/WorkLogTest.java b/code/crawl/crawling-process/src/test/java/nu/marginalia/crawling/WorkLogTest.java similarity index 100% rename from crawl/crawling-process/src/test/java/nu/marginalia/crawling/WorkLogTest.java rename to code/crawl/crawling-process/src/test/java/nu/marginalia/crawling/WorkLogTest.java diff --git a/crawl/crawling-process/src/test/java/nu/marginalia/crawling/retreival/CrawlerRetreiverTest.java b/code/crawl/crawling-process/src/test/java/nu/marginalia/crawling/retreival/CrawlerRetreiverTest.java similarity index 100% rename from crawl/crawling-process/src/test/java/nu/marginalia/crawling/retreival/CrawlerRetreiverTest.java rename to code/crawl/crawling-process/src/test/java/nu/marginalia/crawling/retreival/CrawlerRetreiverTest.java diff --git a/crawl/experimental/build.gradle b/code/crawl/experimental/build.gradle similarity index 53% rename from crawl/experimental/build.gradle rename to code/crawl/experimental/build.gradle index ad36a919..52939ce0 100644 --- a/crawl/experimental/build.gradle +++ b/code/crawl/experimental/build.gradle @@ -13,17 +13,17 @@ java { dependencies { implementation project(':third-party') - implementation project(':common:model') - implementation project(':common:config') - implementation project(':common:service') - implementation project(':libraries:big-string') - implementation project(':api:index-api') - implementation project(':common:service-discovery') - implementation project(':common:service-client') - implementation project(':libraries:language-processing') - implementation project(':crawl:common') - implementation project(':crawl:crawling-model') - implementation project(':crawl:converting-process') + implementation project(':code:common:model') + implementation project(':code:common:config') + implementation project(':code:common:service') + implementation project(':code:libraries:big-string') + implementation project(':code:api:index-api') + implementation project(':code:common:service-discovery') + implementation project(':code:common:service-client') + implementation project(':code:libraries:language-processing') + implementation project(':code:crawl:common') + implementation project(':code:crawl:crawling-model') + implementation project(':code:crawl:converting-process') implementation libs.lombok annotationProcessor libs.lombok diff --git a/crawl/experimental/readme.md b/code/crawl/experimental/readme.md similarity index 100% rename from crawl/experimental/readme.md rename to code/crawl/experimental/readme.md diff --git a/crawl/experimental/src/main/java/nu/marginalia/experimental/AdblockTesterTool.java b/code/crawl/experimental/src/main/java/nu/marginalia/experimental/AdblockTesterTool.java similarity index 100% rename from crawl/experimental/src/main/java/nu/marginalia/experimental/AdblockTesterTool.java rename to code/crawl/experimental/src/main/java/nu/marginalia/experimental/AdblockTesterTool.java diff --git a/crawl/experimental/src/main/java/nu/marginalia/experimental/ConverterLogicTestTool.java b/code/crawl/experimental/src/main/java/nu/marginalia/experimental/ConverterLogicTestTool.java similarity index 100% rename from crawl/experimental/src/main/java/nu/marginalia/experimental/ConverterLogicTestTool.java rename to code/crawl/experimental/src/main/java/nu/marginalia/experimental/ConverterLogicTestTool.java diff --git a/crawl/experimental/src/main/java/nu/marginalia/experimental/CrawlDataExtractorTool.java b/code/crawl/experimental/src/main/java/nu/marginalia/experimental/CrawlDataExtractorTool.java similarity index 100% rename from crawl/experimental/src/main/java/nu/marginalia/experimental/CrawlDataExtractorTool.java rename to code/crawl/experimental/src/main/java/nu/marginalia/experimental/CrawlDataExtractorTool.java diff --git a/crawl/loading-process/build.gradle b/code/crawl/loading-process/build.gradle similarity index 60% rename from crawl/loading-process/build.gradle rename to code/crawl/loading-process/build.gradle index 69294eae..ebb42fa7 100644 --- a/crawl/loading-process/build.gradle +++ b/code/crawl/loading-process/build.gradle @@ -17,22 +17,22 @@ application { dependencies { implementation project(':third-party') - implementation project(':api:index-api') - implementation project(':common:model') - implementation project(':common:config') - implementation project(':common:service') - implementation project(':common:service-discovery') - implementation project(':common:service-client') - implementation project(':index:lexicon') - implementation project(':index:index-journal') - implementation project(':libraries:language-processing') - implementation project(':libraries:misc') + implementation project(':code:api:index-api') + implementation project(':code:common:model') + implementation project(':code:common:config') + implementation project(':code:common:service') + implementation project(':code:common:service-discovery') + implementation project(':code:common:service-client') + implementation project(':code:index:lexicon') + implementation project(':code:index:index-journal') + implementation project(':code:libraries:language-processing') + implementation project(':code:libraries:misc') - testImplementation project(':services-core:search-service') + testImplementation project(':code:services-core:search-service') - implementation project(':crawl:common') - implementation project(':crawl:crawling-model') - implementation project(':crawl:converting-model') + implementation project(':code:crawl:common') + implementation project(':code:crawl:crawling-model') + implementation project(':code:crawl:converting-model') implementation libs.lombok diff --git a/crawl/loading-process/readme.md b/code/crawl/loading-process/readme.md similarity index 100% rename from crawl/loading-process/readme.md rename to code/crawl/loading-process/readme.md diff --git a/crawl/loading-process/src/main/java/nu/marginalia/loading/ConvertedDomainReader.java b/code/crawl/loading-process/src/main/java/nu/marginalia/loading/ConvertedDomainReader.java similarity index 100% rename from crawl/loading-process/src/main/java/nu/marginalia/loading/ConvertedDomainReader.java rename to code/crawl/loading-process/src/main/java/nu/marginalia/loading/ConvertedDomainReader.java diff --git a/crawl/loading-process/src/main/java/nu/marginalia/loading/LoaderMain.java b/code/crawl/loading-process/src/main/java/nu/marginalia/loading/LoaderMain.java similarity index 100% rename from crawl/loading-process/src/main/java/nu/marginalia/loading/LoaderMain.java rename to code/crawl/loading-process/src/main/java/nu/marginalia/loading/LoaderMain.java diff --git a/crawl/loading-process/src/main/java/nu/marginalia/loading/LoaderModule.java b/code/crawl/loading-process/src/main/java/nu/marginalia/loading/LoaderModule.java similarity index 100% rename from crawl/loading-process/src/main/java/nu/marginalia/loading/LoaderModule.java rename to code/crawl/loading-process/src/main/java/nu/marginalia/loading/LoaderModule.java diff --git a/crawl/loading-process/src/main/java/nu/marginalia/loading/loader/IndexLoadKeywords.java b/code/crawl/loading-process/src/main/java/nu/marginalia/loading/loader/IndexLoadKeywords.java similarity index 100% rename from crawl/loading-process/src/main/java/nu/marginalia/loading/loader/IndexLoadKeywords.java rename to code/crawl/loading-process/src/main/java/nu/marginalia/loading/loader/IndexLoadKeywords.java diff --git a/crawl/loading-process/src/main/java/nu/marginalia/loading/loader/KeywordListChunker.java b/code/crawl/loading-process/src/main/java/nu/marginalia/loading/loader/KeywordListChunker.java similarity index 100% rename from crawl/loading-process/src/main/java/nu/marginalia/loading/loader/KeywordListChunker.java rename to code/crawl/loading-process/src/main/java/nu/marginalia/loading/loader/KeywordListChunker.java diff --git a/crawl/loading-process/src/main/java/nu/marginalia/loading/loader/Loader.java b/code/crawl/loading-process/src/main/java/nu/marginalia/loading/loader/Loader.java similarity index 100% rename from crawl/loading-process/src/main/java/nu/marginalia/loading/loader/Loader.java rename to code/crawl/loading-process/src/main/java/nu/marginalia/loading/loader/Loader.java diff --git a/crawl/loading-process/src/main/java/nu/marginalia/loading/loader/LoaderData.java b/code/crawl/loading-process/src/main/java/nu/marginalia/loading/loader/LoaderData.java similarity index 100% rename from crawl/loading-process/src/main/java/nu/marginalia/loading/loader/LoaderData.java rename to code/crawl/loading-process/src/main/java/nu/marginalia/loading/loader/LoaderData.java diff --git a/crawl/loading-process/src/main/java/nu/marginalia/loading/loader/LoaderFactory.java b/code/crawl/loading-process/src/main/java/nu/marginalia/loading/loader/LoaderFactory.java similarity index 100% rename from crawl/loading-process/src/main/java/nu/marginalia/loading/loader/LoaderFactory.java rename to code/crawl/loading-process/src/main/java/nu/marginalia/loading/loader/LoaderFactory.java diff --git a/crawl/loading-process/src/main/java/nu/marginalia/loading/loader/LoaderIndexJournalWriter.java b/code/crawl/loading-process/src/main/java/nu/marginalia/loading/loader/LoaderIndexJournalWriter.java similarity index 100% rename from crawl/loading-process/src/main/java/nu/marginalia/loading/loader/LoaderIndexJournalWriter.java rename to code/crawl/loading-process/src/main/java/nu/marginalia/loading/loader/LoaderIndexJournalWriter.java diff --git a/crawl/loading-process/src/main/java/nu/marginalia/loading/loader/SqlLoadDomainLinks.java b/code/crawl/loading-process/src/main/java/nu/marginalia/loading/loader/SqlLoadDomainLinks.java similarity index 100% rename from crawl/loading-process/src/main/java/nu/marginalia/loading/loader/SqlLoadDomainLinks.java rename to code/crawl/loading-process/src/main/java/nu/marginalia/loading/loader/SqlLoadDomainLinks.java diff --git a/crawl/loading-process/src/main/java/nu/marginalia/loading/loader/SqlLoadDomains.java b/code/crawl/loading-process/src/main/java/nu/marginalia/loading/loader/SqlLoadDomains.java similarity index 100% rename from crawl/loading-process/src/main/java/nu/marginalia/loading/loader/SqlLoadDomains.java rename to code/crawl/loading-process/src/main/java/nu/marginalia/loading/loader/SqlLoadDomains.java diff --git a/crawl/loading-process/src/main/java/nu/marginalia/loading/loader/SqlLoadProcessedDocument.java b/code/crawl/loading-process/src/main/java/nu/marginalia/loading/loader/SqlLoadProcessedDocument.java similarity index 100% rename from crawl/loading-process/src/main/java/nu/marginalia/loading/loader/SqlLoadProcessedDocument.java rename to code/crawl/loading-process/src/main/java/nu/marginalia/loading/loader/SqlLoadProcessedDocument.java diff --git a/crawl/loading-process/src/main/java/nu/marginalia/loading/loader/SqlLoadProcessedDomain.java b/code/crawl/loading-process/src/main/java/nu/marginalia/loading/loader/SqlLoadProcessedDomain.java similarity index 100% rename from crawl/loading-process/src/main/java/nu/marginalia/loading/loader/SqlLoadProcessedDomain.java rename to code/crawl/loading-process/src/main/java/nu/marginalia/loading/loader/SqlLoadProcessedDomain.java diff --git a/crawl/loading-process/src/main/java/nu/marginalia/loading/loader/SqlLoadUrls.java b/code/crawl/loading-process/src/main/java/nu/marginalia/loading/loader/SqlLoadUrls.java similarity index 100% rename from crawl/loading-process/src/main/java/nu/marginalia/loading/loader/SqlLoadUrls.java rename to code/crawl/loading-process/src/main/java/nu/marginalia/loading/loader/SqlLoadUrls.java diff --git a/crawl/loading-process/src/test/java/nu/marginalia/loader/DbTestUtil.java b/code/crawl/loading-process/src/test/java/nu/marginalia/loader/DbTestUtil.java similarity index 100% rename from crawl/loading-process/src/test/java/nu/marginalia/loader/DbTestUtil.java rename to code/crawl/loading-process/src/test/java/nu/marginalia/loader/DbTestUtil.java diff --git a/crawl/loading-process/src/test/java/nu/marginalia/loader/SqlLoadDomainLinksTest.java b/code/crawl/loading-process/src/test/java/nu/marginalia/loader/SqlLoadDomainLinksTest.java similarity index 100% rename from crawl/loading-process/src/test/java/nu/marginalia/loader/SqlLoadDomainLinksTest.java rename to code/crawl/loading-process/src/test/java/nu/marginalia/loader/SqlLoadDomainLinksTest.java diff --git a/crawl/loading-process/src/test/java/nu/marginalia/loader/SqlLoadDomainsTest.java b/code/crawl/loading-process/src/test/java/nu/marginalia/loader/SqlLoadDomainsTest.java similarity index 100% rename from crawl/loading-process/src/test/java/nu/marginalia/loader/SqlLoadDomainsTest.java rename to code/crawl/loading-process/src/test/java/nu/marginalia/loader/SqlLoadDomainsTest.java diff --git a/crawl/loading-process/src/test/java/nu/marginalia/loader/SqlLoadProcessedDocumentTest.java b/code/crawl/loading-process/src/test/java/nu/marginalia/loader/SqlLoadProcessedDocumentTest.java similarity index 100% rename from crawl/loading-process/src/test/java/nu/marginalia/loader/SqlLoadProcessedDocumentTest.java rename to code/crawl/loading-process/src/test/java/nu/marginalia/loader/SqlLoadProcessedDocumentTest.java diff --git a/crawl/loading-process/src/test/java/nu/marginalia/loader/SqlLoadProcessedDomainTest.java b/code/crawl/loading-process/src/test/java/nu/marginalia/loader/SqlLoadProcessedDomainTest.java similarity index 100% rename from crawl/loading-process/src/test/java/nu/marginalia/loader/SqlLoadProcessedDomainTest.java rename to code/crawl/loading-process/src/test/java/nu/marginalia/loader/SqlLoadProcessedDomainTest.java diff --git a/crawl/loading-process/src/test/java/nu/marginalia/loader/SqlLoadUrlsTest.java b/code/crawl/loading-process/src/test/java/nu/marginalia/loader/SqlLoadUrlsTest.java similarity index 100% rename from crawl/loading-process/src/test/java/nu/marginalia/loader/SqlLoadUrlsTest.java rename to code/crawl/loading-process/src/test/java/nu/marginalia/loader/SqlLoadUrlsTest.java diff --git a/crawl/readme.md b/code/crawl/readme.md similarity index 100% rename from crawl/readme.md rename to code/crawl/readme.md diff --git a/features/domain-ranking/build.gradle b/code/features/domain-ranking/build.gradle similarity index 89% rename from features/domain-ranking/build.gradle rename to code/features/domain-ranking/build.gradle index ab6c8c40..1c6dfe91 100644 --- a/features/domain-ranking/build.gradle +++ b/code/features/domain-ranking/build.gradle @@ -14,8 +14,8 @@ java { } dependencies { - implementation project(':common:model') - implementation project(':common:service') + implementation project(':code:common:model') + implementation project(':code:common:service') implementation libs.lombok annotationProcessor libs.lombok diff --git a/features/domain-ranking/readme.md b/code/features/domain-ranking/readme.md similarity index 100% rename from features/domain-ranking/readme.md rename to code/features/domain-ranking/readme.md diff --git a/features/domain-ranking/src/main/java/nu/marginalia/ranking/DomainRankings.java b/code/features/domain-ranking/src/main/java/nu/marginalia/ranking/DomainRankings.java similarity index 100% rename from features/domain-ranking/src/main/java/nu/marginalia/ranking/DomainRankings.java rename to code/features/domain-ranking/src/main/java/nu/marginalia/ranking/DomainRankings.java diff --git a/features/domain-ranking/src/main/java/nu/marginalia/ranking/RankingAlgorithm.java b/code/features/domain-ranking/src/main/java/nu/marginalia/ranking/RankingAlgorithm.java similarity index 100% rename from features/domain-ranking/src/main/java/nu/marginalia/ranking/RankingAlgorithm.java rename to code/features/domain-ranking/src/main/java/nu/marginalia/ranking/RankingAlgorithm.java diff --git a/features/domain-ranking/src/main/java/nu/marginalia/ranking/ReversePageRank.java b/code/features/domain-ranking/src/main/java/nu/marginalia/ranking/ReversePageRank.java similarity index 100% rename from features/domain-ranking/src/main/java/nu/marginalia/ranking/ReversePageRank.java rename to code/features/domain-ranking/src/main/java/nu/marginalia/ranking/ReversePageRank.java diff --git a/features/domain-ranking/src/main/java/nu/marginalia/ranking/StandardPageRank.java b/code/features/domain-ranking/src/main/java/nu/marginalia/ranking/StandardPageRank.java similarity index 100% rename from features/domain-ranking/src/main/java/nu/marginalia/ranking/StandardPageRank.java rename to code/features/domain-ranking/src/main/java/nu/marginalia/ranking/StandardPageRank.java diff --git a/features/domain-ranking/src/main/java/nu/marginalia/ranking/accumulator/RankingResultAccumulator.java b/code/features/domain-ranking/src/main/java/nu/marginalia/ranking/accumulator/RankingResultAccumulator.java similarity index 100% rename from features/domain-ranking/src/main/java/nu/marginalia/ranking/accumulator/RankingResultAccumulator.java rename to code/features/domain-ranking/src/main/java/nu/marginalia/ranking/accumulator/RankingResultAccumulator.java diff --git a/features/domain-ranking/src/main/java/nu/marginalia/ranking/accumulator/RankingResultBitSetAccumulator.java b/code/features/domain-ranking/src/main/java/nu/marginalia/ranking/accumulator/RankingResultBitSetAccumulator.java similarity index 100% rename from features/domain-ranking/src/main/java/nu/marginalia/ranking/accumulator/RankingResultBitSetAccumulator.java rename to code/features/domain-ranking/src/main/java/nu/marginalia/ranking/accumulator/RankingResultBitSetAccumulator.java diff --git a/features/domain-ranking/src/main/java/nu/marginalia/ranking/accumulator/RankingResultHashMapAccumulator.java b/code/features/domain-ranking/src/main/java/nu/marginalia/ranking/accumulator/RankingResultHashMapAccumulator.java similarity index 100% rename from features/domain-ranking/src/main/java/nu/marginalia/ranking/accumulator/RankingResultHashMapAccumulator.java rename to code/features/domain-ranking/src/main/java/nu/marginalia/ranking/accumulator/RankingResultHashMapAccumulator.java diff --git a/features/domain-ranking/src/main/java/nu/marginalia/ranking/accumulator/RankingResultListAccumulator.java b/code/features/domain-ranking/src/main/java/nu/marginalia/ranking/accumulator/RankingResultListAccumulator.java similarity index 100% rename from features/domain-ranking/src/main/java/nu/marginalia/ranking/accumulator/RankingResultListAccumulator.java rename to code/features/domain-ranking/src/main/java/nu/marginalia/ranking/accumulator/RankingResultListAccumulator.java diff --git a/features/domain-ranking/src/main/java/nu/marginalia/ranking/data/RankingDomainData.java b/code/features/domain-ranking/src/main/java/nu/marginalia/ranking/data/RankingDomainData.java similarity index 100% rename from features/domain-ranking/src/main/java/nu/marginalia/ranking/data/RankingDomainData.java rename to code/features/domain-ranking/src/main/java/nu/marginalia/ranking/data/RankingDomainData.java diff --git a/features/domain-ranking/src/main/java/nu/marginalia/ranking/data/RankingDomainFetcher.java b/code/features/domain-ranking/src/main/java/nu/marginalia/ranking/data/RankingDomainFetcher.java similarity index 100% rename from features/domain-ranking/src/main/java/nu/marginalia/ranking/data/RankingDomainFetcher.java rename to code/features/domain-ranking/src/main/java/nu/marginalia/ranking/data/RankingDomainFetcher.java diff --git a/features/domain-ranking/src/main/java/nu/marginalia/ranking/data/RankingDomainFetcherForSimilarityData.java b/code/features/domain-ranking/src/main/java/nu/marginalia/ranking/data/RankingDomainFetcherForSimilarityData.java similarity index 100% rename from features/domain-ranking/src/main/java/nu/marginalia/ranking/data/RankingDomainFetcherForSimilarityData.java rename to code/features/domain-ranking/src/main/java/nu/marginalia/ranking/data/RankingDomainFetcherForSimilarityData.java diff --git a/features/domain-ranking/src/main/java/nu/marginalia/ranking/tool/CreateBrowseDomainRanksTool.java b/code/features/domain-ranking/src/main/java/nu/marginalia/ranking/tool/CreateBrowseDomainRanksTool.java similarity index 100% rename from features/domain-ranking/src/main/java/nu/marginalia/ranking/tool/CreateBrowseDomainRanksTool.java rename to code/features/domain-ranking/src/main/java/nu/marginalia/ranking/tool/CreateBrowseDomainRanksTool.java diff --git a/features/domain-ranking/src/main/java/nu/marginalia/ranking/tool/PerusePageRankV2.java b/code/features/domain-ranking/src/main/java/nu/marginalia/ranking/tool/PerusePageRankV2.java similarity index 100% rename from features/domain-ranking/src/main/java/nu/marginalia/ranking/tool/PerusePageRankV2.java rename to code/features/domain-ranking/src/main/java/nu/marginalia/ranking/tool/PerusePageRankV2.java diff --git a/features/domain-ranking/src/main/java/nu/marginalia/ranking/tool/PrintDomainRanksTool.java b/code/features/domain-ranking/src/main/java/nu/marginalia/ranking/tool/PrintDomainRanksTool.java similarity index 100% rename from features/domain-ranking/src/main/java/nu/marginalia/ranking/tool/PrintDomainRanksTool.java rename to code/features/domain-ranking/src/main/java/nu/marginalia/ranking/tool/PrintDomainRanksTool.java diff --git a/features/domain-ranking/src/main/java/nu/marginalia/ranking/tool/UpdateDomainRanksTool.java b/code/features/domain-ranking/src/main/java/nu/marginalia/ranking/tool/UpdateDomainRanksTool.java similarity index 100% rename from features/domain-ranking/src/main/java/nu/marginalia/ranking/tool/UpdateDomainRanksTool.java rename to code/features/domain-ranking/src/main/java/nu/marginalia/ranking/tool/UpdateDomainRanksTool.java diff --git a/features/query-parser/build.gradle b/code/features/query-parser/build.gradle similarity index 75% rename from features/query-parser/build.gradle rename to code/features/query-parser/build.gradle index 422170ff..ee29e5aa 100644 --- a/features/query-parser/build.gradle +++ b/code/features/query-parser/build.gradle @@ -12,10 +12,10 @@ java { } } dependencies { - implementation project(':libraries:language-processing') - implementation project(':libraries:misc') - implementation project(':common:config') - implementation project(':common:model') + implementation project(':code:libraries:language-processing') + implementation project(':code:libraries:misc') + implementation project(':code:common:config') + implementation project(':code:common:model') implementation libs.lombok annotationProcessor libs.lombok diff --git a/features/query-parser/readme.md b/code/features/query-parser/readme.md similarity index 100% rename from features/query-parser/readme.md rename to code/features/query-parser/readme.md diff --git a/features/query-parser/src/main/java/nu/marginalia/query_parser/QueryParser.java b/code/features/query-parser/src/main/java/nu/marginalia/query_parser/QueryParser.java similarity index 100% rename from features/query-parser/src/main/java/nu/marginalia/query_parser/QueryParser.java rename to code/features/query-parser/src/main/java/nu/marginalia/query_parser/QueryParser.java diff --git a/features/query-parser/src/main/java/nu/marginalia/query_parser/QueryPermutation.java b/code/features/query-parser/src/main/java/nu/marginalia/query_parser/QueryPermutation.java similarity index 100% rename from features/query-parser/src/main/java/nu/marginalia/query_parser/QueryPermutation.java rename to code/features/query-parser/src/main/java/nu/marginalia/query_parser/QueryPermutation.java diff --git a/features/query-parser/src/main/java/nu/marginalia/query_parser/QueryTokenizer.java b/code/features/query-parser/src/main/java/nu/marginalia/query_parser/QueryTokenizer.java similarity index 100% rename from features/query-parser/src/main/java/nu/marginalia/query_parser/QueryTokenizer.java rename to code/features/query-parser/src/main/java/nu/marginalia/query_parser/QueryTokenizer.java diff --git a/features/query-parser/src/main/java/nu/marginalia/query_parser/QueryVariants.java b/code/features/query-parser/src/main/java/nu/marginalia/query_parser/QueryVariants.java similarity index 100% rename from features/query-parser/src/main/java/nu/marginalia/query_parser/QueryVariants.java rename to code/features/query-parser/src/main/java/nu/marginalia/query_parser/QueryVariants.java diff --git a/features/query-parser/src/main/java/nu/marginalia/query_parser/token/Token.java b/code/features/query-parser/src/main/java/nu/marginalia/query_parser/token/Token.java similarity index 100% rename from features/query-parser/src/main/java/nu/marginalia/query_parser/token/Token.java rename to code/features/query-parser/src/main/java/nu/marginalia/query_parser/token/Token.java diff --git a/features/query-parser/src/main/java/nu/marginalia/query_parser/token/TokenType.java b/code/features/query-parser/src/main/java/nu/marginalia/query_parser/token/TokenType.java similarity index 100% rename from features/query-parser/src/main/java/nu/marginalia/query_parser/token/TokenType.java rename to code/features/query-parser/src/main/java/nu/marginalia/query_parser/token/TokenType.java diff --git a/features/query-parser/src/test/java/nu/marginalia/query_parser/BodyQueryParserTest.java b/code/features/query-parser/src/test/java/nu/marginalia/query_parser/BodyQueryParserTest.java similarity index 100% rename from features/query-parser/src/test/java/nu/marginalia/query_parser/BodyQueryParserTest.java rename to code/features/query-parser/src/test/java/nu/marginalia/query_parser/BodyQueryParserTest.java diff --git a/features/query-parser/src/test/java/nu/marginalia/query_parser/QueryParserTest.java b/code/features/query-parser/src/test/java/nu/marginalia/query_parser/QueryParserTest.java similarity index 100% rename from features/query-parser/src/test/java/nu/marginalia/query_parser/QueryParserTest.java rename to code/features/query-parser/src/test/java/nu/marginalia/query_parser/QueryParserTest.java diff --git a/features/query-parser/src/test/java/nu/marginalia/query_parser/QueryVariantsTest.java b/code/features/query-parser/src/test/java/nu/marginalia/query_parser/QueryVariantsTest.java similarity index 100% rename from features/query-parser/src/test/java/nu/marginalia/query_parser/QueryVariantsTest.java rename to code/features/query-parser/src/test/java/nu/marginalia/query_parser/QueryVariantsTest.java diff --git a/features/query-parser/src/test/java/nu/marginalia/util/TestLanguageModels.java b/code/features/query-parser/src/test/java/nu/marginalia/util/TestLanguageModels.java similarity index 100% rename from features/query-parser/src/test/java/nu/marginalia/util/TestLanguageModels.java rename to code/features/query-parser/src/test/java/nu/marginalia/util/TestLanguageModels.java diff --git a/features/random-websites/build.gradle b/code/features/random-websites/build.gradle similarity index 91% rename from features/random-websites/build.gradle rename to code/features/random-websites/build.gradle index 091774d1..4e1ff560 100644 --- a/features/random-websites/build.gradle +++ b/code/features/random-websites/build.gradle @@ -16,8 +16,8 @@ java { dependencies { implementation project(':third-party') - implementation project(':common:model') - implementation project(':common:service') + implementation project(':code:common:model') + implementation project(':code:common:service') implementation libs.lombok annotationProcessor libs.lombok diff --git a/features/random-websites/src/main/java/nu/marginalia/browse/DbBrowseDomainsFromUrlId.java b/code/features/random-websites/src/main/java/nu/marginalia/browse/DbBrowseDomainsFromUrlId.java similarity index 100% rename from features/random-websites/src/main/java/nu/marginalia/browse/DbBrowseDomainsFromUrlId.java rename to code/features/random-websites/src/main/java/nu/marginalia/browse/DbBrowseDomainsFromUrlId.java diff --git a/features/random-websites/src/main/java/nu/marginalia/browse/DbBrowseDomainsRandom.java b/code/features/random-websites/src/main/java/nu/marginalia/browse/DbBrowseDomainsRandom.java similarity index 100% rename from features/random-websites/src/main/java/nu/marginalia/browse/DbBrowseDomainsRandom.java rename to code/features/random-websites/src/main/java/nu/marginalia/browse/DbBrowseDomainsRandom.java diff --git a/features/random-websites/src/main/java/nu/marginalia/browse/DbBrowseDomainsSimilarCosine.java b/code/features/random-websites/src/main/java/nu/marginalia/browse/DbBrowseDomainsSimilarCosine.java similarity index 100% rename from features/random-websites/src/main/java/nu/marginalia/browse/DbBrowseDomainsSimilarCosine.java rename to code/features/random-websites/src/main/java/nu/marginalia/browse/DbBrowseDomainsSimilarCosine.java diff --git a/features/random-websites/src/main/java/nu/marginalia/browse/DbBrowseDomainsSimilarOldAlgo.java b/code/features/random-websites/src/main/java/nu/marginalia/browse/DbBrowseDomainsSimilarOldAlgo.java similarity index 100% rename from features/random-websites/src/main/java/nu/marginalia/browse/DbBrowseDomainsSimilarOldAlgo.java rename to code/features/random-websites/src/main/java/nu/marginalia/browse/DbBrowseDomainsSimilarOldAlgo.java diff --git a/features/random-websites/src/main/java/nu/marginalia/browse/experimental/AndCardIntSet.java b/code/features/random-websites/src/main/java/nu/marginalia/browse/experimental/AndCardIntSet.java similarity index 100% rename from features/random-websites/src/main/java/nu/marginalia/browse/experimental/AndCardIntSet.java rename to code/features/random-websites/src/main/java/nu/marginalia/browse/experimental/AndCardIntSet.java diff --git a/features/random-websites/src/main/java/nu/marginalia/browse/experimental/EdgeDomainLinkConsineSimilarityMain.java b/code/features/random-websites/src/main/java/nu/marginalia/browse/experimental/EdgeDomainLinkConsineSimilarityMain.java similarity index 100% rename from features/random-websites/src/main/java/nu/marginalia/browse/experimental/EdgeDomainLinkConsineSimilarityMain.java rename to code/features/random-websites/src/main/java/nu/marginalia/browse/experimental/EdgeDomainLinkConsineSimilarityMain.java diff --git a/features/random-websites/src/main/java/nu/marginalia/browse/experimental/EdgeWordWordConsineSimilarityMain.java b/code/features/random-websites/src/main/java/nu/marginalia/browse/experimental/EdgeWordWordConsineSimilarityMain.java similarity index 100% rename from features/random-websites/src/main/java/nu/marginalia/browse/experimental/EdgeWordWordConsineSimilarityMain.java rename to code/features/random-websites/src/main/java/nu/marginalia/browse/experimental/EdgeWordWordConsineSimilarityMain.java diff --git a/features/random-websites/src/main/java/nu/marginalia/browse/model/BrowseResult.java b/code/features/random-websites/src/main/java/nu/marginalia/browse/model/BrowseResult.java similarity index 100% rename from features/random-websites/src/main/java/nu/marginalia/browse/model/BrowseResult.java rename to code/features/random-websites/src/main/java/nu/marginalia/browse/model/BrowseResult.java diff --git a/features/random-websites/src/main/java/nu/marginalia/browse/model/BrowseResultSet.java b/code/features/random-websites/src/main/java/nu/marginalia/browse/model/BrowseResultSet.java similarity index 100% rename from features/random-websites/src/main/java/nu/marginalia/browse/model/BrowseResultSet.java rename to code/features/random-websites/src/main/java/nu/marginalia/browse/model/BrowseResultSet.java diff --git a/features/random-websites/src/test/java/nu/marginalia/experimental/AndCardIntSetTest.java b/code/features/random-websites/src/test/java/nu/marginalia/experimental/AndCardIntSetTest.java similarity index 100% rename from features/random-websites/src/test/java/nu/marginalia/experimental/AndCardIntSetTest.java rename to code/features/random-websites/src/test/java/nu/marginalia/experimental/AndCardIntSetTest.java diff --git a/features/readme.md b/code/features/readme.md similarity index 100% rename from features/readme.md rename to code/features/readme.md diff --git a/features/screenshots/build.gradle b/code/features/screenshots/build.gradle similarity index 88% rename from features/screenshots/build.gradle rename to code/features/screenshots/build.gradle index 1aee9c82..db62f15c 100644 --- a/features/screenshots/build.gradle +++ b/code/features/screenshots/build.gradle @@ -12,8 +12,8 @@ java { dependencies { implementation project(':third-party') - implementation project(':common:model') - implementation project(':common:service') + implementation project(':code:common:model') + implementation project(':code:common:service') implementation libs.lombok annotationProcessor libs.lombok diff --git a/features/screenshots/src/main/java/nu/marginalia/screenshot/ScreenshotService.java b/code/features/screenshots/src/main/java/nu/marginalia/screenshot/ScreenshotService.java similarity index 100% rename from features/screenshots/src/main/java/nu/marginalia/screenshot/ScreenshotService.java rename to code/features/screenshots/src/main/java/nu/marginalia/screenshot/ScreenshotService.java diff --git a/index/index-forward/build.gradle b/code/index/index-forward/build.gradle similarity index 63% rename from index/index-forward/build.gradle rename to code/index/index-forward/build.gradle index 371df73a..9dff1fe4 100644 --- a/index/index-forward/build.gradle +++ b/code/index/index-forward/build.gradle @@ -11,14 +11,14 @@ java { } dependencies { - implementation project(':libraries:array') - implementation project(':libraries:btree') - implementation project(':libraries:misc') - implementation project(':features:domain-ranking') - implementation project(':index:index-query') - implementation project(':index:index-journal') - implementation project(':index:lexicon') - implementation project(':common:model') + implementation project(':code:libraries:array') + implementation project(':code:libraries:btree') + implementation project(':code:libraries:misc') + implementation project(':code:features:domain-ranking') + implementation project(':code:index:index-query') + implementation project(':code:index:index-journal') + implementation project(':code:index:lexicon') + implementation project(':code:common:model') implementation project(':third-party') implementation libs.lombok diff --git a/index/index-forward/readme.md b/code/index/index-forward/readme.md similarity index 100% rename from index/index-forward/readme.md rename to code/index/index-forward/readme.md diff --git a/index/index-forward/src/main/java/nu/marginalia/index/forward/ForwardIndexConverter.java b/code/index/index-forward/src/main/java/nu/marginalia/index/forward/ForwardIndexConverter.java similarity index 100% rename from index/index-forward/src/main/java/nu/marginalia/index/forward/ForwardIndexConverter.java rename to code/index/index-forward/src/main/java/nu/marginalia/index/forward/ForwardIndexConverter.java diff --git a/index/index-forward/src/main/java/nu/marginalia/index/forward/ForwardIndexParameters.java b/code/index/index-forward/src/main/java/nu/marginalia/index/forward/ForwardIndexParameters.java similarity index 100% rename from index/index-forward/src/main/java/nu/marginalia/index/forward/ForwardIndexParameters.java rename to code/index/index-forward/src/main/java/nu/marginalia/index/forward/ForwardIndexParameters.java diff --git a/index/index-forward/src/main/java/nu/marginalia/index/forward/ForwardIndexReader.java b/code/index/index-forward/src/main/java/nu/marginalia/index/forward/ForwardIndexReader.java similarity index 100% rename from index/index-forward/src/main/java/nu/marginalia/index/forward/ForwardIndexReader.java rename to code/index/index-forward/src/main/java/nu/marginalia/index/forward/ForwardIndexReader.java diff --git a/index/index-forward/src/main/java/nu/marginalia/index/forward/ParamMatchingQueryFilter.java b/code/index/index-forward/src/main/java/nu/marginalia/index/forward/ParamMatchingQueryFilter.java similarity index 100% rename from index/index-forward/src/main/java/nu/marginalia/index/forward/ParamMatchingQueryFilter.java rename to code/index/index-forward/src/main/java/nu/marginalia/index/forward/ParamMatchingQueryFilter.java diff --git a/index/index-forward/src/test/java/nu/marginalia/index/forward/ForwardIndexConverterTest.java b/code/index/index-forward/src/test/java/nu/marginalia/index/forward/ForwardIndexConverterTest.java similarity index 100% rename from index/index-forward/src/test/java/nu/marginalia/index/forward/ForwardIndexConverterTest.java rename to code/index/index-forward/src/test/java/nu/marginalia/index/forward/ForwardIndexConverterTest.java diff --git a/index/index-forward/src/test/java/nu/marginalia/test/TestUtil.java b/code/index/index-forward/src/test/java/nu/marginalia/test/TestUtil.java similarity index 100% rename from index/index-forward/src/test/java/nu/marginalia/test/TestUtil.java rename to code/index/index-forward/src/test/java/nu/marginalia/test/TestUtil.java diff --git a/index/index-journal/build.gradle b/code/index/index-journal/build.gradle similarity index 84% rename from index/index-journal/build.gradle rename to code/index/index-journal/build.gradle index 6ec38550..65910447 100644 --- a/index/index-journal/build.gradle +++ b/code/index/index-journal/build.gradle @@ -11,10 +11,10 @@ java { } dependencies { - implementation project(':libraries:array') - implementation project(':common:model') + implementation project(':code:libraries:array') + implementation project(':code:common:model') + implementation project(':code:index:lexicon') implementation project(':third-party') - implementation project(':index:lexicon') implementation libs.lombok annotationProcessor libs.lombok diff --git a/index/index-journal/readme.md b/code/index/index-journal/readme.md similarity index 100% rename from index/index-journal/readme.md rename to code/index/index-journal/readme.md diff --git a/index/index-journal/src/main/java/nu.marginalia.index/journal/model/IndexJournalEntry.java b/code/index/index-journal/src/main/java/nu.marginalia.index/journal/model/IndexJournalEntry.java similarity index 100% rename from index/index-journal/src/main/java/nu.marginalia.index/journal/model/IndexJournalEntry.java rename to code/index/index-journal/src/main/java/nu.marginalia.index/journal/model/IndexJournalEntry.java diff --git a/index/index-journal/src/main/java/nu.marginalia.index/journal/model/IndexJournalEntryBuilder.java b/code/index/index-journal/src/main/java/nu.marginalia.index/journal/model/IndexJournalEntryBuilder.java similarity index 100% rename from index/index-journal/src/main/java/nu.marginalia.index/journal/model/IndexJournalEntryBuilder.java rename to code/index/index-journal/src/main/java/nu.marginalia.index/journal/model/IndexJournalEntryBuilder.java diff --git a/index/index-journal/src/main/java/nu.marginalia.index/journal/model/IndexJournalEntryData.java b/code/index/index-journal/src/main/java/nu.marginalia.index/journal/model/IndexJournalEntryData.java similarity index 100% rename from index/index-journal/src/main/java/nu.marginalia.index/journal/model/IndexJournalEntryData.java rename to code/index/index-journal/src/main/java/nu.marginalia.index/journal/model/IndexJournalEntryData.java diff --git a/index/index-journal/src/main/java/nu.marginalia.index/journal/model/IndexJournalEntryHeader.java b/code/index/index-journal/src/main/java/nu.marginalia.index/journal/model/IndexJournalEntryHeader.java similarity index 100% rename from index/index-journal/src/main/java/nu.marginalia.index/journal/model/IndexJournalEntryHeader.java rename to code/index/index-journal/src/main/java/nu.marginalia.index/journal/model/IndexJournalEntryHeader.java diff --git a/index/index-journal/src/main/java/nu.marginalia.index/journal/model/IndexJournalFileHeader.java b/code/index/index-journal/src/main/java/nu.marginalia.index/journal/model/IndexJournalFileHeader.java similarity index 100% rename from index/index-journal/src/main/java/nu.marginalia.index/journal/model/IndexJournalFileHeader.java rename to code/index/index-journal/src/main/java/nu.marginalia.index/journal/model/IndexJournalFileHeader.java diff --git a/index/index-journal/src/main/java/nu.marginalia.index/journal/model/IndexJournalStatistics.java b/code/index/index-journal/src/main/java/nu.marginalia.index/journal/model/IndexJournalStatistics.java similarity index 100% rename from index/index-journal/src/main/java/nu.marginalia.index/journal/model/IndexJournalStatistics.java rename to code/index/index-journal/src/main/java/nu.marginalia.index/journal/model/IndexJournalStatistics.java diff --git a/index/index-journal/src/main/java/nu.marginalia.index/journal/reader/IndexJournalReadEntry.java b/code/index/index-journal/src/main/java/nu.marginalia.index/journal/reader/IndexJournalReadEntry.java similarity index 100% rename from index/index-journal/src/main/java/nu.marginalia.index/journal/reader/IndexJournalReadEntry.java rename to code/index/index-journal/src/main/java/nu.marginalia.index/journal/reader/IndexJournalReadEntry.java diff --git a/index/index-journal/src/main/java/nu.marginalia.index/journal/reader/IndexJournalReader.java b/code/index/index-journal/src/main/java/nu.marginalia.index/journal/reader/IndexJournalReader.java similarity index 100% rename from index/index-journal/src/main/java/nu.marginalia.index/journal/reader/IndexJournalReader.java rename to code/index/index-journal/src/main/java/nu.marginalia.index/journal/reader/IndexJournalReader.java diff --git a/index/index-journal/src/main/java/nu.marginalia.index/journal/reader/IndexJournalReaderSingleCompressedFile.java b/code/index/index-journal/src/main/java/nu.marginalia.index/journal/reader/IndexJournalReaderSingleCompressedFile.java similarity index 100% rename from index/index-journal/src/main/java/nu.marginalia.index/journal/reader/IndexJournalReaderSingleCompressedFile.java rename to code/index/index-journal/src/main/java/nu.marginalia.index/journal/reader/IndexJournalReaderSingleCompressedFile.java diff --git a/index/index-journal/src/main/java/nu.marginalia.index/journal/writer/IndexJournalWriter.java b/code/index/index-journal/src/main/java/nu.marginalia.index/journal/writer/IndexJournalWriter.java similarity index 100% rename from index/index-journal/src/main/java/nu.marginalia.index/journal/writer/IndexJournalWriter.java rename to code/index/index-journal/src/main/java/nu.marginalia.index/journal/writer/IndexJournalWriter.java diff --git a/index/index-journal/src/main/java/nu.marginalia.index/journal/writer/IndexJournalWriterImpl.java b/code/index/index-journal/src/main/java/nu.marginalia.index/journal/writer/IndexJournalWriterImpl.java similarity index 100% rename from index/index-journal/src/main/java/nu.marginalia.index/journal/writer/IndexJournalWriterImpl.java rename to code/index/index-journal/src/main/java/nu.marginalia.index/journal/writer/IndexJournalWriterImpl.java diff --git a/index/index-journal/src/test/java/nu/marginalia/index/journal/IndexJournalTest.java b/code/index/index-journal/src/test/java/nu/marginalia/index/journal/IndexJournalTest.java similarity index 100% rename from index/index-journal/src/test/java/nu/marginalia/index/journal/IndexJournalTest.java rename to code/index/index-journal/src/test/java/nu/marginalia/index/journal/IndexJournalTest.java diff --git a/index/index-query/build.gradle b/code/index/index-query/build.gradle similarity index 91% rename from index/index-query/build.gradle rename to code/index/index-query/build.gradle index 0558edbe..eea851e3 100644 --- a/index/index-query/build.gradle +++ b/code/index/index-query/build.gradle @@ -12,7 +12,7 @@ java { } dependencies { - implementation project(':libraries:array') + implementation project(':code:libraries:array') implementation libs.lombok annotationProcessor libs.lombok diff --git a/index/index-query/readme.md b/code/index/index-query/readme.md similarity index 100% rename from index/index-query/readme.md rename to code/index/index-query/readme.md diff --git a/index/index-query/src/main/java/nu/marginalia/index/query/EmptyEntrySource.java b/code/index/index-query/src/main/java/nu/marginalia/index/query/EmptyEntrySource.java similarity index 100% rename from index/index-query/src/main/java/nu/marginalia/index/query/EmptyEntrySource.java rename to code/index/index-query/src/main/java/nu/marginalia/index/query/EmptyEntrySource.java diff --git a/index/index-query/src/main/java/nu/marginalia/index/query/EntrySource.java b/code/index/index-query/src/main/java/nu/marginalia/index/query/EntrySource.java similarity index 100% rename from index/index-query/src/main/java/nu/marginalia/index/query/EntrySource.java rename to code/index/index-query/src/main/java/nu/marginalia/index/query/EntrySource.java diff --git a/index/index-query/src/main/java/nu/marginalia/index/query/IndexQuery.java b/code/index/index-query/src/main/java/nu/marginalia/index/query/IndexQuery.java similarity index 100% rename from index/index-query/src/main/java/nu/marginalia/index/query/IndexQuery.java rename to code/index/index-query/src/main/java/nu/marginalia/index/query/IndexQuery.java diff --git a/index/index-query/src/main/java/nu/marginalia/index/query/IndexQueryBuilder.java b/code/index/index-query/src/main/java/nu/marginalia/index/query/IndexQueryBuilder.java similarity index 100% rename from index/index-query/src/main/java/nu/marginalia/index/query/IndexQueryBuilder.java rename to code/index/index-query/src/main/java/nu/marginalia/index/query/IndexQueryBuilder.java diff --git a/index/index-query/src/main/java/nu/marginalia/index/query/IndexQueryParams.java b/code/index/index-query/src/main/java/nu/marginalia/index/query/IndexQueryParams.java similarity index 100% rename from index/index-query/src/main/java/nu/marginalia/index/query/IndexQueryParams.java rename to code/index/index-query/src/main/java/nu/marginalia/index/query/IndexQueryParams.java diff --git a/index/index-query/src/main/java/nu/marginalia/index/query/IndexSearchBudget.java b/code/index/index-query/src/main/java/nu/marginalia/index/query/IndexSearchBudget.java similarity index 100% rename from index/index-query/src/main/java/nu/marginalia/index/query/IndexSearchBudget.java rename to code/index/index-query/src/main/java/nu/marginalia/index/query/IndexSearchBudget.java diff --git a/index/index-query/src/main/java/nu/marginalia/index/query/filter/QueryFilterAnyOf.java b/code/index/index-query/src/main/java/nu/marginalia/index/query/filter/QueryFilterAnyOf.java similarity index 100% rename from index/index-query/src/main/java/nu/marginalia/index/query/filter/QueryFilterAnyOf.java rename to code/index/index-query/src/main/java/nu/marginalia/index/query/filter/QueryFilterAnyOf.java diff --git a/index/index-query/src/main/java/nu/marginalia/index/query/filter/QueryFilterLetThrough.java b/code/index/index-query/src/main/java/nu/marginalia/index/query/filter/QueryFilterLetThrough.java similarity index 100% rename from index/index-query/src/main/java/nu/marginalia/index/query/filter/QueryFilterLetThrough.java rename to code/index/index-query/src/main/java/nu/marginalia/index/query/filter/QueryFilterLetThrough.java diff --git a/index/index-query/src/main/java/nu/marginalia/index/query/filter/QueryFilterNoPass.java b/code/index/index-query/src/main/java/nu/marginalia/index/query/filter/QueryFilterNoPass.java similarity index 100% rename from index/index-query/src/main/java/nu/marginalia/index/query/filter/QueryFilterNoPass.java rename to code/index/index-query/src/main/java/nu/marginalia/index/query/filter/QueryFilterNoPass.java diff --git a/index/index-query/src/main/java/nu/marginalia/index/query/filter/QueryFilterStepExcludeFromPredicate.java b/code/index/index-query/src/main/java/nu/marginalia/index/query/filter/QueryFilterStepExcludeFromPredicate.java similarity index 100% rename from index/index-query/src/main/java/nu/marginalia/index/query/filter/QueryFilterStepExcludeFromPredicate.java rename to code/index/index-query/src/main/java/nu/marginalia/index/query/filter/QueryFilterStepExcludeFromPredicate.java diff --git a/index/index-query/src/main/java/nu/marginalia/index/query/filter/QueryFilterStepFromPredicate.java b/code/index/index-query/src/main/java/nu/marginalia/index/query/filter/QueryFilterStepFromPredicate.java similarity index 100% rename from index/index-query/src/main/java/nu/marginalia/index/query/filter/QueryFilterStepFromPredicate.java rename to code/index/index-query/src/main/java/nu/marginalia/index/query/filter/QueryFilterStepFromPredicate.java diff --git a/index/index-query/src/main/java/nu/marginalia/index/query/filter/QueryFilterStepIf.java b/code/index/index-query/src/main/java/nu/marginalia/index/query/filter/QueryFilterStepIf.java similarity index 100% rename from index/index-query/src/main/java/nu/marginalia/index/query/filter/QueryFilterStepIf.java rename to code/index/index-query/src/main/java/nu/marginalia/index/query/filter/QueryFilterStepIf.java diff --git a/index/index-query/src/main/java/nu/marginalia/index/query/limit/QueryLimits.java b/code/index/index-query/src/main/java/nu/marginalia/index/query/limit/QueryLimits.java similarity index 100% rename from index/index-query/src/main/java/nu/marginalia/index/query/limit/QueryLimits.java rename to code/index/index-query/src/main/java/nu/marginalia/index/query/limit/QueryLimits.java diff --git a/index/index-query/src/main/java/nu/marginalia/index/query/limit/QueryStrategy.java b/code/index/index-query/src/main/java/nu/marginalia/index/query/limit/QueryStrategy.java similarity index 100% rename from index/index-query/src/main/java/nu/marginalia/index/query/limit/QueryStrategy.java rename to code/index/index-query/src/main/java/nu/marginalia/index/query/limit/QueryStrategy.java diff --git a/index/index-query/src/main/java/nu/marginalia/index/query/limit/SpecificationLimit.java b/code/index/index-query/src/main/java/nu/marginalia/index/query/limit/SpecificationLimit.java similarity index 100% rename from index/index-query/src/main/java/nu/marginalia/index/query/limit/SpecificationLimit.java rename to code/index/index-query/src/main/java/nu/marginalia/index/query/limit/SpecificationLimit.java diff --git a/index/index-query/src/main/java/nu/marginalia/index/query/limit/SpecificationLimitType.java b/code/index/index-query/src/main/java/nu/marginalia/index/query/limit/SpecificationLimitType.java similarity index 100% rename from index/index-query/src/main/java/nu/marginalia/index/query/limit/SpecificationLimitType.java rename to code/index/index-query/src/main/java/nu/marginalia/index/query/limit/SpecificationLimitType.java diff --git a/index/index-query/src/main/java/nu/marginalia/index/searchset/SearchSet.java b/code/index/index-query/src/main/java/nu/marginalia/index/searchset/SearchSet.java similarity index 100% rename from index/index-query/src/main/java/nu/marginalia/index/searchset/SearchSet.java rename to code/index/index-query/src/main/java/nu/marginalia/index/searchset/SearchSet.java diff --git a/index/index-reverse/build.gradle b/code/index/index-reverse/build.gradle similarity index 57% rename from index/index-reverse/build.gradle rename to code/index/index-reverse/build.gradle index 7005cc64..f971c6a3 100644 --- a/index/index-reverse/build.gradle +++ b/code/index/index-reverse/build.gradle @@ -12,14 +12,14 @@ java { } dependencies { - implementation project(':libraries:array') - implementation project(':libraries:btree') - implementation project(':libraries:random-write-funnel') - implementation project(':features:domain-ranking') - implementation project(':index:index-query') - implementation project(':index:index-journal') - implementation project(':index:lexicon') - implementation project(':common:model') + implementation project(':code:libraries:array') + implementation project(':code:libraries:btree') + implementation project(':code:libraries:random-write-funnel') + implementation project(':code:features:domain-ranking') + implementation project(':code:index:index-query') + implementation project(':code:index:index-journal') + implementation project(':code:index:lexicon') + implementation project(':code:common:model') implementation libs.lombok annotationProcessor libs.lombok diff --git a/index/index-reverse/readme.md b/code/index/index-reverse/readme.md similarity index 100% rename from index/index-reverse/readme.md rename to code/index/index-reverse/readme.md diff --git a/index/index-reverse/src/main/java/nu/marginalia/index/reverse/ReverseIndexConverter.java b/code/index/index-reverse/src/main/java/nu/marginalia/index/reverse/ReverseIndexConverter.java similarity index 100% rename from index/index-reverse/src/main/java/nu/marginalia/index/reverse/ReverseIndexConverter.java rename to code/index/index-reverse/src/main/java/nu/marginalia/index/reverse/ReverseIndexConverter.java diff --git a/index/index-reverse/src/main/java/nu/marginalia/index/reverse/ReverseIndexParameters.java b/code/index/index-reverse/src/main/java/nu/marginalia/index/reverse/ReverseIndexParameters.java similarity index 100% rename from index/index-reverse/src/main/java/nu/marginalia/index/reverse/ReverseIndexParameters.java rename to code/index/index-reverse/src/main/java/nu/marginalia/index/reverse/ReverseIndexParameters.java diff --git a/index/index-reverse/src/main/java/nu/marginalia/index/reverse/ReverseIndexPrioReader.java b/code/index/index-reverse/src/main/java/nu/marginalia/index/reverse/ReverseIndexPrioReader.java similarity index 100% rename from index/index-reverse/src/main/java/nu/marginalia/index/reverse/ReverseIndexPrioReader.java rename to code/index/index-reverse/src/main/java/nu/marginalia/index/reverse/ReverseIndexPrioReader.java diff --git a/index/index-reverse/src/main/java/nu/marginalia/index/reverse/ReverseIndexPriorityParameters.java b/code/index/index-reverse/src/main/java/nu/marginalia/index/reverse/ReverseIndexPriorityParameters.java similarity index 100% rename from index/index-reverse/src/main/java/nu/marginalia/index/reverse/ReverseIndexPriorityParameters.java rename to code/index/index-reverse/src/main/java/nu/marginalia/index/reverse/ReverseIndexPriorityParameters.java diff --git a/index/index-reverse/src/main/java/nu/marginalia/index/reverse/ReverseIndexReader.java b/code/index/index-reverse/src/main/java/nu/marginalia/index/reverse/ReverseIndexReader.java similarity index 100% rename from index/index-reverse/src/main/java/nu/marginalia/index/reverse/ReverseIndexReader.java rename to code/index/index-reverse/src/main/java/nu/marginalia/index/reverse/ReverseIndexReader.java diff --git a/index/index-reverse/src/main/java/nu/marginalia/index/reverse/query/ReverseIndexEntrySource.java b/code/index/index-reverse/src/main/java/nu/marginalia/index/reverse/query/ReverseIndexEntrySource.java similarity index 100% rename from index/index-reverse/src/main/java/nu/marginalia/index/reverse/query/ReverseIndexEntrySource.java rename to code/index/index-reverse/src/main/java/nu/marginalia/index/reverse/query/ReverseIndexEntrySource.java diff --git a/index/index-reverse/src/main/java/nu/marginalia/index/reverse/query/ReverseIndexEntrySourceBehavior.java b/code/index/index-reverse/src/main/java/nu/marginalia/index/reverse/query/ReverseIndexEntrySourceBehavior.java similarity index 100% rename from index/index-reverse/src/main/java/nu/marginalia/index/reverse/query/ReverseIndexEntrySourceBehavior.java rename to code/index/index-reverse/src/main/java/nu/marginalia/index/reverse/query/ReverseIndexEntrySourceBehavior.java diff --git a/index/index-reverse/src/main/java/nu/marginalia/index/reverse/query/ReverseIndexRejectFilter.java b/code/index/index-reverse/src/main/java/nu/marginalia/index/reverse/query/ReverseIndexRejectFilter.java similarity index 100% rename from index/index-reverse/src/main/java/nu/marginalia/index/reverse/query/ReverseIndexRejectFilter.java rename to code/index/index-reverse/src/main/java/nu/marginalia/index/reverse/query/ReverseIndexRejectFilter.java diff --git a/index/index-reverse/src/main/java/nu/marginalia/index/reverse/query/ReverseIndexRetainFilter.java b/code/index/index-reverse/src/main/java/nu/marginalia/index/reverse/query/ReverseIndexRetainFilter.java similarity index 100% rename from index/index-reverse/src/main/java/nu/marginalia/index/reverse/query/ReverseIndexRetainFilter.java rename to code/index/index-reverse/src/main/java/nu/marginalia/index/reverse/query/ReverseIndexRetainFilter.java diff --git a/index/index-reverse/src/test/java/nu/marginalia/index/reverse/ReverseIndexConverterTest.java b/code/index/index-reverse/src/test/java/nu/marginalia/index/reverse/ReverseIndexConverterTest.java similarity index 100% rename from index/index-reverse/src/test/java/nu/marginalia/index/reverse/ReverseIndexConverterTest.java rename to code/index/index-reverse/src/test/java/nu/marginalia/index/reverse/ReverseIndexConverterTest.java diff --git a/index/index-reverse/src/test/java/nu/marginalia/index/reverse/ReverseIndexConverterTest2.java b/code/index/index-reverse/src/test/java/nu/marginalia/index/reverse/ReverseIndexConverterTest2.java similarity index 100% rename from index/index-reverse/src/test/java/nu/marginalia/index/reverse/ReverseIndexConverterTest2.java rename to code/index/index-reverse/src/test/java/nu/marginalia/index/reverse/ReverseIndexConverterTest2.java diff --git a/index/index-reverse/src/test/java/nu/marginalia/test/TestUtil.java b/code/index/index-reverse/src/test/java/nu/marginalia/test/TestUtil.java similarity index 100% rename from index/index-reverse/src/test/java/nu/marginalia/test/TestUtil.java rename to code/index/index-reverse/src/test/java/nu/marginalia/test/TestUtil.java diff --git a/index/lexicon/build.gradle b/code/index/lexicon/build.gradle similarity index 92% rename from index/lexicon/build.gradle rename to code/index/lexicon/build.gradle index 86ba109f..7b0e8dd7 100644 --- a/index/lexicon/build.gradle +++ b/code/index/lexicon/build.gradle @@ -13,7 +13,7 @@ java { } dependencies { - implementation project(':libraries:misc') + implementation project(':code:libraries:misc') implementation libs.lombok annotationProcessor libs.lombok diff --git a/index/lexicon/readme.md b/code/index/lexicon/readme.md similarity index 100% rename from index/lexicon/readme.md rename to code/index/lexicon/readme.md diff --git a/index/lexicon/src/main/java/nu/marginalia/dict/DictionaryData.java b/code/index/lexicon/src/main/java/nu/marginalia/dict/DictionaryData.java similarity index 100% rename from index/lexicon/src/main/java/nu/marginalia/dict/DictionaryData.java rename to code/index/lexicon/src/main/java/nu/marginalia/dict/DictionaryData.java diff --git a/index/lexicon/src/main/java/nu/marginalia/dict/DictionaryDataBank.java b/code/index/lexicon/src/main/java/nu/marginalia/dict/DictionaryDataBank.java similarity index 100% rename from index/lexicon/src/main/java/nu/marginalia/dict/DictionaryDataBank.java rename to code/index/lexicon/src/main/java/nu/marginalia/dict/DictionaryDataBank.java diff --git a/index/lexicon/src/main/java/nu/marginalia/dict/DictionaryMap.java b/code/index/lexicon/src/main/java/nu/marginalia/dict/DictionaryMap.java similarity index 100% rename from index/lexicon/src/main/java/nu/marginalia/dict/DictionaryMap.java rename to code/index/lexicon/src/main/java/nu/marginalia/dict/DictionaryMap.java diff --git a/index/lexicon/src/main/java/nu/marginalia/dict/OffHeapDictionaryHashMap.java b/code/index/lexicon/src/main/java/nu/marginalia/dict/OffHeapDictionaryHashMap.java similarity index 100% rename from index/lexicon/src/main/java/nu/marginalia/dict/OffHeapDictionaryHashMap.java rename to code/index/lexicon/src/main/java/nu/marginalia/dict/OffHeapDictionaryHashMap.java diff --git a/index/lexicon/src/main/java/nu/marginalia/dict/OnHeapDictionaryMap.java b/code/index/lexicon/src/main/java/nu/marginalia/dict/OnHeapDictionaryMap.java similarity index 100% rename from index/lexicon/src/main/java/nu/marginalia/dict/OnHeapDictionaryMap.java rename to code/index/lexicon/src/main/java/nu/marginalia/dict/OnHeapDictionaryMap.java diff --git a/index/lexicon/src/main/java/nu/marginalia/lexicon/KeywordLexicon.java b/code/index/lexicon/src/main/java/nu/marginalia/lexicon/KeywordLexicon.java similarity index 100% rename from index/lexicon/src/main/java/nu/marginalia/lexicon/KeywordLexicon.java rename to code/index/lexicon/src/main/java/nu/marginalia/lexicon/KeywordLexicon.java diff --git a/index/lexicon/src/main/java/nu/marginalia/lexicon/KeywordLexiconReadOnlyView.java b/code/index/lexicon/src/main/java/nu/marginalia/lexicon/KeywordLexiconReadOnlyView.java similarity index 100% rename from index/lexicon/src/main/java/nu/marginalia/lexicon/KeywordLexiconReadOnlyView.java rename to code/index/lexicon/src/main/java/nu/marginalia/lexicon/KeywordLexiconReadOnlyView.java diff --git a/index/lexicon/src/main/java/nu/marginalia/lexicon/journal/KeywordLexiconJournal.java b/code/index/lexicon/src/main/java/nu/marginalia/lexicon/journal/KeywordLexiconJournal.java similarity index 100% rename from index/lexicon/src/main/java/nu/marginalia/lexicon/journal/KeywordLexiconJournal.java rename to code/index/lexicon/src/main/java/nu/marginalia/lexicon/journal/KeywordLexiconJournal.java diff --git a/index/lexicon/src/main/java/nu/marginalia/lexicon/journal/KeywordLexiconJournalCommitQueue.java b/code/index/lexicon/src/main/java/nu/marginalia/lexicon/journal/KeywordLexiconJournalCommitQueue.java similarity index 100% rename from index/lexicon/src/main/java/nu/marginalia/lexicon/journal/KeywordLexiconJournalCommitQueue.java rename to code/index/lexicon/src/main/java/nu/marginalia/lexicon/journal/KeywordLexiconJournalCommitQueue.java diff --git a/index/lexicon/src/main/java/nu/marginalia/lexicon/journal/KeywordLexiconJournalFile.java b/code/index/lexicon/src/main/java/nu/marginalia/lexicon/journal/KeywordLexiconJournalFile.java similarity index 100% rename from index/lexicon/src/main/java/nu/marginalia/lexicon/journal/KeywordLexiconJournalFile.java rename to code/index/lexicon/src/main/java/nu/marginalia/lexicon/journal/KeywordLexiconJournalFile.java diff --git a/index/lexicon/src/test/java/nu/marginalia/lexicon/KeywordLexiconTest.java b/code/index/lexicon/src/test/java/nu/marginalia/lexicon/KeywordLexiconTest.java similarity index 100% rename from index/lexicon/src/test/java/nu/marginalia/lexicon/KeywordLexiconTest.java rename to code/index/lexicon/src/test/java/nu/marginalia/lexicon/KeywordLexiconTest.java diff --git a/index/readme.md b/code/index/readme.md similarity index 100% rename from index/readme.md rename to code/index/readme.md diff --git a/libraries/array/build.gradle b/code/libraries/array/build.gradle similarity index 100% rename from libraries/array/build.gradle rename to code/libraries/array/build.gradle diff --git a/libraries/array/readme.md b/code/libraries/array/readme.md similarity index 100% rename from libraries/array/readme.md rename to code/libraries/array/readme.md diff --git a/libraries/array/src/main/java/nu/marginalia/array/IntArray.java b/code/libraries/array/src/main/java/nu/marginalia/array/IntArray.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/IntArray.java rename to code/libraries/array/src/main/java/nu/marginalia/array/IntArray.java diff --git a/libraries/array/src/main/java/nu/marginalia/array/LongArray.java b/code/libraries/array/src/main/java/nu/marginalia/array/LongArray.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/LongArray.java rename to code/libraries/array/src/main/java/nu/marginalia/array/LongArray.java diff --git a/libraries/array/src/main/java/nu/marginalia/array/algo/BulkTransferArray.java b/code/libraries/array/src/main/java/nu/marginalia/array/algo/BulkTransferArray.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/algo/BulkTransferArray.java rename to code/libraries/array/src/main/java/nu/marginalia/array/algo/BulkTransferArray.java diff --git a/libraries/array/src/main/java/nu/marginalia/array/algo/IntArrayBase.java b/code/libraries/array/src/main/java/nu/marginalia/array/algo/IntArrayBase.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/algo/IntArrayBase.java rename to code/libraries/array/src/main/java/nu/marginalia/array/algo/IntArrayBase.java diff --git a/libraries/array/src/main/java/nu/marginalia/array/algo/IntArraySearch.java b/code/libraries/array/src/main/java/nu/marginalia/array/algo/IntArraySearch.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/algo/IntArraySearch.java rename to code/libraries/array/src/main/java/nu/marginalia/array/algo/IntArraySearch.java diff --git a/libraries/array/src/main/java/nu/marginalia/array/algo/IntArraySort.java b/code/libraries/array/src/main/java/nu/marginalia/array/algo/IntArraySort.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/algo/IntArraySort.java rename to code/libraries/array/src/main/java/nu/marginalia/array/algo/IntArraySort.java diff --git a/libraries/array/src/main/java/nu/marginalia/array/algo/IntArrayTransformations.java b/code/libraries/array/src/main/java/nu/marginalia/array/algo/IntArrayTransformations.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/algo/IntArrayTransformations.java rename to code/libraries/array/src/main/java/nu/marginalia/array/algo/IntArrayTransformations.java diff --git a/libraries/array/src/main/java/nu/marginalia/array/algo/LongArrayBase.java b/code/libraries/array/src/main/java/nu/marginalia/array/algo/LongArrayBase.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/algo/LongArrayBase.java rename to code/libraries/array/src/main/java/nu/marginalia/array/algo/LongArrayBase.java diff --git a/libraries/array/src/main/java/nu/marginalia/array/algo/LongArraySearch.java b/code/libraries/array/src/main/java/nu/marginalia/array/algo/LongArraySearch.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/algo/LongArraySearch.java rename to code/libraries/array/src/main/java/nu/marginalia/array/algo/LongArraySearch.java diff --git a/libraries/array/src/main/java/nu/marginalia/array/algo/LongArraySort.java b/code/libraries/array/src/main/java/nu/marginalia/array/algo/LongArraySort.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/algo/LongArraySort.java rename to code/libraries/array/src/main/java/nu/marginalia/array/algo/LongArraySort.java diff --git a/libraries/array/src/main/java/nu/marginalia/array/algo/LongArrayTransformations.java b/code/libraries/array/src/main/java/nu/marginalia/array/algo/LongArrayTransformations.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/algo/LongArrayTransformations.java rename to code/libraries/array/src/main/java/nu/marginalia/array/algo/LongArrayTransformations.java diff --git a/libraries/array/src/main/java/nu/marginalia/array/algo/SortingContext.java b/code/libraries/array/src/main/java/nu/marginalia/array/algo/SortingContext.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/algo/SortingContext.java rename to code/libraries/array/src/main/java/nu/marginalia/array/algo/SortingContext.java diff --git a/libraries/array/src/main/java/nu/marginalia/array/buffer/IntQueryBuffer.java b/code/libraries/array/src/main/java/nu/marginalia/array/buffer/IntQueryBuffer.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/buffer/IntQueryBuffer.java rename to code/libraries/array/src/main/java/nu/marginalia/array/buffer/IntQueryBuffer.java diff --git a/libraries/array/src/main/java/nu/marginalia/array/buffer/LongQueryBuffer.java b/code/libraries/array/src/main/java/nu/marginalia/array/buffer/LongQueryBuffer.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/buffer/LongQueryBuffer.java rename to code/libraries/array/src/main/java/nu/marginalia/array/buffer/LongQueryBuffer.java diff --git a/libraries/array/src/main/java/nu/marginalia/array/delegate/ReferenceImplIntArrayDelegate.java b/code/libraries/array/src/main/java/nu/marginalia/array/delegate/ReferenceImplIntArrayDelegate.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/delegate/ReferenceImplIntArrayDelegate.java rename to code/libraries/array/src/main/java/nu/marginalia/array/delegate/ReferenceImplIntArrayDelegate.java diff --git a/libraries/array/src/main/java/nu/marginalia/array/delegate/ReferenceImplLongArrayDelegate.java b/code/libraries/array/src/main/java/nu/marginalia/array/delegate/ReferenceImplLongArrayDelegate.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/delegate/ReferenceImplLongArrayDelegate.java rename to code/libraries/array/src/main/java/nu/marginalia/array/delegate/ReferenceImplLongArrayDelegate.java diff --git a/libraries/array/src/main/java/nu/marginalia/array/delegate/ShiftedIntArray.java b/code/libraries/array/src/main/java/nu/marginalia/array/delegate/ShiftedIntArray.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/delegate/ShiftedIntArray.java rename to code/libraries/array/src/main/java/nu/marginalia/array/delegate/ShiftedIntArray.java diff --git a/libraries/array/src/main/java/nu/marginalia/array/delegate/ShiftedLongArray.java b/code/libraries/array/src/main/java/nu/marginalia/array/delegate/ShiftedLongArray.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/delegate/ShiftedLongArray.java rename to code/libraries/array/src/main/java/nu/marginalia/array/delegate/ShiftedLongArray.java diff --git a/libraries/array/src/main/java/nu/marginalia/array/functional/AddressRangeCall.java b/code/libraries/array/src/main/java/nu/marginalia/array/functional/AddressRangeCall.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/functional/AddressRangeCall.java rename to code/libraries/array/src/main/java/nu/marginalia/array/functional/AddressRangeCall.java diff --git a/libraries/array/src/main/java/nu/marginalia/array/functional/AddressRangeCallIO.java b/code/libraries/array/src/main/java/nu/marginalia/array/functional/AddressRangeCallIO.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/functional/AddressRangeCallIO.java rename to code/libraries/array/src/main/java/nu/marginalia/array/functional/AddressRangeCallIO.java diff --git a/libraries/array/src/main/java/nu/marginalia/array/functional/AddressRangeIntFunction.java b/code/libraries/array/src/main/java/nu/marginalia/array/functional/AddressRangeIntFunction.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/functional/AddressRangeIntFunction.java rename to code/libraries/array/src/main/java/nu/marginalia/array/functional/AddressRangeIntFunction.java diff --git a/libraries/array/src/main/java/nu/marginalia/array/functional/AddressRangeLongFunction.java b/code/libraries/array/src/main/java/nu/marginalia/array/functional/AddressRangeLongFunction.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/functional/AddressRangeLongFunction.java rename to code/libraries/array/src/main/java/nu/marginalia/array/functional/AddressRangeLongFunction.java diff --git a/libraries/array/src/main/java/nu/marginalia/array/functional/IntBinaryIOOperation.java b/code/libraries/array/src/main/java/nu/marginalia/array/functional/IntBinaryIOOperation.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/functional/IntBinaryIOOperation.java rename to code/libraries/array/src/main/java/nu/marginalia/array/functional/IntBinaryIOOperation.java diff --git a/libraries/array/src/main/java/nu/marginalia/array/functional/IntIOTransformer.java b/code/libraries/array/src/main/java/nu/marginalia/array/functional/IntIOTransformer.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/functional/IntIOTransformer.java rename to code/libraries/array/src/main/java/nu/marginalia/array/functional/IntIOTransformer.java diff --git a/libraries/array/src/main/java/nu/marginalia/array/functional/IntTransformer.java b/code/libraries/array/src/main/java/nu/marginalia/array/functional/IntTransformer.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/functional/IntTransformer.java rename to code/libraries/array/src/main/java/nu/marginalia/array/functional/IntTransformer.java diff --git a/libraries/array/src/main/java/nu/marginalia/array/functional/LongBinaryIOOperation.java b/code/libraries/array/src/main/java/nu/marginalia/array/functional/LongBinaryIOOperation.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/functional/LongBinaryIOOperation.java rename to code/libraries/array/src/main/java/nu/marginalia/array/functional/LongBinaryIOOperation.java diff --git a/libraries/array/src/main/java/nu/marginalia/array/functional/LongIOTransformer.java b/code/libraries/array/src/main/java/nu/marginalia/array/functional/LongIOTransformer.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/functional/LongIOTransformer.java rename to code/libraries/array/src/main/java/nu/marginalia/array/functional/LongIOTransformer.java diff --git a/libraries/array/src/main/java/nu/marginalia/array/functional/LongIntConsumer.java b/code/libraries/array/src/main/java/nu/marginalia/array/functional/LongIntConsumer.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/functional/LongIntConsumer.java rename to code/libraries/array/src/main/java/nu/marginalia/array/functional/LongIntConsumer.java diff --git a/libraries/array/src/main/java/nu/marginalia/array/functional/LongLongConsumer.java b/code/libraries/array/src/main/java/nu/marginalia/array/functional/LongLongConsumer.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/functional/LongLongConsumer.java rename to code/libraries/array/src/main/java/nu/marginalia/array/functional/LongLongConsumer.java diff --git a/libraries/array/src/main/java/nu/marginalia/array/functional/LongTransformer.java b/code/libraries/array/src/main/java/nu/marginalia/array/functional/LongTransformer.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/functional/LongTransformer.java rename to code/libraries/array/src/main/java/nu/marginalia/array/functional/LongTransformer.java diff --git a/libraries/array/src/main/java/nu/marginalia/array/functor/IntIOFolder.java b/code/libraries/array/src/main/java/nu/marginalia/array/functor/IntIOFolder.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/functor/IntIOFolder.java rename to code/libraries/array/src/main/java/nu/marginalia/array/functor/IntIOFolder.java diff --git a/libraries/array/src/main/java/nu/marginalia/array/functor/LongIOFolder.java b/code/libraries/array/src/main/java/nu/marginalia/array/functor/LongIOFolder.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/functor/LongIOFolder.java rename to code/libraries/array/src/main/java/nu/marginalia/array/functor/LongIOFolder.java diff --git a/libraries/array/src/main/java/nu/marginalia/array/page/AbstractPagingArray.java b/code/libraries/array/src/main/java/nu/marginalia/array/page/AbstractPagingArray.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/page/AbstractPagingArray.java rename to code/libraries/array/src/main/java/nu/marginalia/array/page/AbstractPagingArray.java diff --git a/libraries/array/src/main/java/nu/marginalia/array/page/IntArrayPage.java b/code/libraries/array/src/main/java/nu/marginalia/array/page/IntArrayPage.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/page/IntArrayPage.java rename to code/libraries/array/src/main/java/nu/marginalia/array/page/IntArrayPage.java diff --git a/libraries/array/src/main/java/nu/marginalia/array/page/LongArrayPage.java b/code/libraries/array/src/main/java/nu/marginalia/array/page/LongArrayPage.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/page/LongArrayPage.java rename to code/libraries/array/src/main/java/nu/marginalia/array/page/LongArrayPage.java diff --git a/libraries/array/src/main/java/nu/marginalia/array/page/PagingIntArray.java b/code/libraries/array/src/main/java/nu/marginalia/array/page/PagingIntArray.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/page/PagingIntArray.java rename to code/libraries/array/src/main/java/nu/marginalia/array/page/PagingIntArray.java diff --git a/libraries/array/src/main/java/nu/marginalia/array/page/PagingLongArray.java b/code/libraries/array/src/main/java/nu/marginalia/array/page/PagingLongArray.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/page/PagingLongArray.java rename to code/libraries/array/src/main/java/nu/marginalia/array/page/PagingLongArray.java diff --git a/libraries/array/src/main/java/nu/marginalia/array/page/PartitionPage.java b/code/libraries/array/src/main/java/nu/marginalia/array/page/PartitionPage.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/page/PartitionPage.java rename to code/libraries/array/src/main/java/nu/marginalia/array/page/PartitionPage.java diff --git a/libraries/array/src/main/java/nu/marginalia/array/scheme/ArrayPartitioningScheme.java b/code/libraries/array/src/main/java/nu/marginalia/array/scheme/ArrayPartitioningScheme.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/scheme/ArrayPartitioningScheme.java rename to code/libraries/array/src/main/java/nu/marginalia/array/scheme/ArrayPartitioningScheme.java diff --git a/libraries/array/src/main/java/nu/marginalia/array/scheme/PowerOf2PartitioningScheme.java b/code/libraries/array/src/main/java/nu/marginalia/array/scheme/PowerOf2PartitioningScheme.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/scheme/PowerOf2PartitioningScheme.java rename to code/libraries/array/src/main/java/nu/marginalia/array/scheme/PowerOf2PartitioningScheme.java diff --git a/libraries/array/src/main/java/nu/marginalia/array/scheme/SequentialPartitioningScheme.java b/code/libraries/array/src/main/java/nu/marginalia/array/scheme/SequentialPartitioningScheme.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/scheme/SequentialPartitioningScheme.java rename to code/libraries/array/src/main/java/nu/marginalia/array/scheme/SequentialPartitioningScheme.java diff --git a/libraries/array/src/main/java/nu/marginalia/array/trace/ArrayTrace.java b/code/libraries/array/src/main/java/nu/marginalia/array/trace/ArrayTrace.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/trace/ArrayTrace.java rename to code/libraries/array/src/main/java/nu/marginalia/array/trace/ArrayTrace.java diff --git a/libraries/array/src/main/java/nu/marginalia/array/trace/ArrayTraceViz.java b/code/libraries/array/src/main/java/nu/marginalia/array/trace/ArrayTraceViz.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/trace/ArrayTraceViz.java rename to code/libraries/array/src/main/java/nu/marginalia/array/trace/ArrayTraceViz.java diff --git a/libraries/array/src/main/java/nu/marginalia/array/trace/FileTrace.java b/code/libraries/array/src/main/java/nu/marginalia/array/trace/FileTrace.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/trace/FileTrace.java rename to code/libraries/array/src/main/java/nu/marginalia/array/trace/FileTrace.java diff --git a/libraries/array/src/main/java/nu/marginalia/array/trace/NullTrace.java b/code/libraries/array/src/main/java/nu/marginalia/array/trace/NullTrace.java similarity index 100% rename from libraries/array/src/main/java/nu/marginalia/array/trace/NullTrace.java rename to code/libraries/array/src/main/java/nu/marginalia/array/trace/NullTrace.java diff --git a/libraries/array/src/test/java/nu/marginalia/array/IntLowBitPartitioningSchemeTest.java b/code/libraries/array/src/test/java/nu/marginalia/array/IntLowBitPartitioningSchemeTest.java similarity index 100% rename from libraries/array/src/test/java/nu/marginalia/array/IntLowBitPartitioningSchemeTest.java rename to code/libraries/array/src/test/java/nu/marginalia/array/IntLowBitPartitioningSchemeTest.java diff --git a/libraries/array/src/test/java/nu/marginalia/array/PagingIntArrayTest.java b/code/libraries/array/src/test/java/nu/marginalia/array/PagingIntArrayTest.java similarity index 100% rename from libraries/array/src/test/java/nu/marginalia/array/PagingIntArrayTest.java rename to code/libraries/array/src/test/java/nu/marginalia/array/PagingIntArrayTest.java diff --git a/libraries/array/src/test/java/nu/marginalia/array/algo/IntArraySearchTest.java b/code/libraries/array/src/test/java/nu/marginalia/array/algo/IntArraySearchTest.java similarity index 100% rename from libraries/array/src/test/java/nu/marginalia/array/algo/IntArraySearchTest.java rename to code/libraries/array/src/test/java/nu/marginalia/array/algo/IntArraySearchTest.java diff --git a/libraries/array/src/test/java/nu/marginalia/array/algo/IntArraySortTest.java b/code/libraries/array/src/test/java/nu/marginalia/array/algo/IntArraySortTest.java similarity index 100% rename from libraries/array/src/test/java/nu/marginalia/array/algo/IntArraySortTest.java rename to code/libraries/array/src/test/java/nu/marginalia/array/algo/IntArraySortTest.java diff --git a/libraries/array/src/test/java/nu/marginalia/array/algo/IntArrayTransformationsTest.java b/code/libraries/array/src/test/java/nu/marginalia/array/algo/IntArrayTransformationsTest.java similarity index 100% rename from libraries/array/src/test/java/nu/marginalia/array/algo/IntArrayTransformationsTest.java rename to code/libraries/array/src/test/java/nu/marginalia/array/algo/IntArrayTransformationsTest.java diff --git a/libraries/array/src/test/java/nu/marginalia/array/algo/LongArraySearchTest.java b/code/libraries/array/src/test/java/nu/marginalia/array/algo/LongArraySearchTest.java similarity index 100% rename from libraries/array/src/test/java/nu/marginalia/array/algo/LongArraySearchTest.java rename to code/libraries/array/src/test/java/nu/marginalia/array/algo/LongArraySearchTest.java diff --git a/libraries/array/src/test/java/nu/marginalia/array/algo/LongArraySortTest.java b/code/libraries/array/src/test/java/nu/marginalia/array/algo/LongArraySortTest.java similarity index 100% rename from libraries/array/src/test/java/nu/marginalia/array/algo/LongArraySortTest.java rename to code/libraries/array/src/test/java/nu/marginalia/array/algo/LongArraySortTest.java diff --git a/libraries/array/src/test/java/nu/marginalia/array/algo/LongArrayTransformationsTest.java b/code/libraries/array/src/test/java/nu/marginalia/array/algo/LongArrayTransformationsTest.java similarity index 100% rename from libraries/array/src/test/java/nu/marginalia/array/algo/LongArrayTransformationsTest.java rename to code/libraries/array/src/test/java/nu/marginalia/array/algo/LongArrayTransformationsTest.java diff --git a/libraries/array/src/test/java/nu/marginalia/array/scheme/ArrayPartitioningSchemeTest.java b/code/libraries/array/src/test/java/nu/marginalia/array/scheme/ArrayPartitioningSchemeTest.java similarity index 100% rename from libraries/array/src/test/java/nu/marginalia/array/scheme/ArrayPartitioningSchemeTest.java rename to code/libraries/array/src/test/java/nu/marginalia/array/scheme/ArrayPartitioningSchemeTest.java diff --git a/libraries/array/src/test/java/nu/marginalia/util/test/TestUtil.java b/code/libraries/array/src/test/java/nu/marginalia/util/test/TestUtil.java similarity index 100% rename from libraries/array/src/test/java/nu/marginalia/util/test/TestUtil.java rename to code/libraries/array/src/test/java/nu/marginalia/util/test/TestUtil.java diff --git a/libraries/big-string/build.gradle b/code/libraries/big-string/build.gradle similarity index 100% rename from libraries/big-string/build.gradle rename to code/libraries/big-string/build.gradle diff --git a/libraries/big-string/readme.md b/code/libraries/big-string/readme.md similarity index 100% rename from libraries/big-string/readme.md rename to code/libraries/big-string/readme.md diff --git a/libraries/big-string/src/main/java/nu/marginalia/bigstring/BigString.java b/code/libraries/big-string/src/main/java/nu/marginalia/bigstring/BigString.java similarity index 100% rename from libraries/big-string/src/main/java/nu/marginalia/bigstring/BigString.java rename to code/libraries/big-string/src/main/java/nu/marginalia/bigstring/BigString.java diff --git a/libraries/big-string/src/main/java/nu/marginalia/bigstring/CompressedBigString.java b/code/libraries/big-string/src/main/java/nu/marginalia/bigstring/CompressedBigString.java similarity index 100% rename from libraries/big-string/src/main/java/nu/marginalia/bigstring/CompressedBigString.java rename to code/libraries/big-string/src/main/java/nu/marginalia/bigstring/CompressedBigString.java diff --git a/libraries/big-string/src/main/java/nu/marginalia/bigstring/PlainBigString.java b/code/libraries/big-string/src/main/java/nu/marginalia/bigstring/PlainBigString.java similarity index 100% rename from libraries/big-string/src/main/java/nu/marginalia/bigstring/PlainBigString.java rename to code/libraries/big-string/src/main/java/nu/marginalia/bigstring/PlainBigString.java diff --git a/libraries/btree/build.gradle b/code/libraries/btree/build.gradle similarity index 80% rename from libraries/btree/build.gradle rename to code/libraries/btree/build.gradle index 8a08981d..7c6854a9 100644 --- a/libraries/btree/build.gradle +++ b/code/libraries/btree/build.gradle @@ -10,13 +10,13 @@ java { dependencies { implementation project(':third-party') - implementation project(':libraries:array') + implementation project(':code:libraries:array') implementation libs.lombok annotationProcessor libs.lombok implementation libs.bundles.slf4j - testImplementation project(':libraries:misc') + testImplementation project(':code:libraries:misc') testImplementation libs.bundles.slf4j.test testImplementation libs.bundles.junit testImplementation libs.mockito diff --git a/libraries/btree/readme.md b/code/libraries/btree/readme.md similarity index 100% rename from libraries/btree/readme.md rename to code/libraries/btree/readme.md diff --git a/libraries/btree/src/main/java/nu/marginalia/btree/BTreeDogEar.java b/code/libraries/btree/src/main/java/nu/marginalia/btree/BTreeDogEar.java similarity index 100% rename from libraries/btree/src/main/java/nu/marginalia/btree/BTreeDogEar.java rename to code/libraries/btree/src/main/java/nu/marginalia/btree/BTreeDogEar.java diff --git a/libraries/btree/src/main/java/nu/marginalia/btree/BTreeReader.java b/code/libraries/btree/src/main/java/nu/marginalia/btree/BTreeReader.java similarity index 100% rename from libraries/btree/src/main/java/nu/marginalia/btree/BTreeReader.java rename to code/libraries/btree/src/main/java/nu/marginalia/btree/BTreeReader.java diff --git a/libraries/btree/src/main/java/nu/marginalia/btree/BTreeWriteCallback.java b/code/libraries/btree/src/main/java/nu/marginalia/btree/BTreeWriteCallback.java similarity index 100% rename from libraries/btree/src/main/java/nu/marginalia/btree/BTreeWriteCallback.java rename to code/libraries/btree/src/main/java/nu/marginalia/btree/BTreeWriteCallback.java diff --git a/libraries/btree/src/main/java/nu/marginalia/btree/BTreeWriter.java b/code/libraries/btree/src/main/java/nu/marginalia/btree/BTreeWriter.java similarity index 100% rename from libraries/btree/src/main/java/nu/marginalia/btree/BTreeWriter.java rename to code/libraries/btree/src/main/java/nu/marginalia/btree/BTreeWriter.java diff --git a/libraries/btree/src/main/java/nu/marginalia/btree/model/BTreeBlockSize.java b/code/libraries/btree/src/main/java/nu/marginalia/btree/model/BTreeBlockSize.java similarity index 100% rename from libraries/btree/src/main/java/nu/marginalia/btree/model/BTreeBlockSize.java rename to code/libraries/btree/src/main/java/nu/marginalia/btree/model/BTreeBlockSize.java diff --git a/libraries/btree/src/main/java/nu/marginalia/btree/model/BTreeContext.java b/code/libraries/btree/src/main/java/nu/marginalia/btree/model/BTreeContext.java similarity index 100% rename from libraries/btree/src/main/java/nu/marginalia/btree/model/BTreeContext.java rename to code/libraries/btree/src/main/java/nu/marginalia/btree/model/BTreeContext.java diff --git a/libraries/btree/src/main/java/nu/marginalia/btree/model/BTreeHeader.java b/code/libraries/btree/src/main/java/nu/marginalia/btree/model/BTreeHeader.java similarity index 100% rename from libraries/btree/src/main/java/nu/marginalia/btree/model/BTreeHeader.java rename to code/libraries/btree/src/main/java/nu/marginalia/btree/model/BTreeHeader.java diff --git a/libraries/btree/src/test/java/nu/marginalia/btree/BTreeReaderQueryDataWithIndexTest.java b/code/libraries/btree/src/test/java/nu/marginalia/btree/BTreeReaderQueryDataWithIndexTest.java similarity index 100% rename from libraries/btree/src/test/java/nu/marginalia/btree/BTreeReaderQueryDataWithIndexTest.java rename to code/libraries/btree/src/test/java/nu/marginalia/btree/BTreeReaderQueryDataWithIndexTest.java diff --git a/libraries/btree/src/test/java/nu/marginalia/btree/BTreeReaderQueryDataWithoutIndexTest.java b/code/libraries/btree/src/test/java/nu/marginalia/btree/BTreeReaderQueryDataWithoutIndexTest.java similarity index 100% rename from libraries/btree/src/test/java/nu/marginalia/btree/BTreeReaderQueryDataWithoutIndexTest.java rename to code/libraries/btree/src/test/java/nu/marginalia/btree/BTreeReaderQueryDataWithoutIndexTest.java diff --git a/libraries/btree/src/test/java/nu/marginalia/btree/BTreeReaderRejectRetainWithIndexTest.java b/code/libraries/btree/src/test/java/nu/marginalia/btree/BTreeReaderRejectRetainWithIndexTest.java similarity index 100% rename from libraries/btree/src/test/java/nu/marginalia/btree/BTreeReaderRejectRetainWithIndexTest.java rename to code/libraries/btree/src/test/java/nu/marginalia/btree/BTreeReaderRejectRetainWithIndexTest.java diff --git a/libraries/btree/src/test/java/nu/marginalia/btree/BTreeReaderRejectRetainWithoutIndexTest.java b/code/libraries/btree/src/test/java/nu/marginalia/btree/BTreeReaderRejectRetainWithoutIndexTest.java similarity index 100% rename from libraries/btree/src/test/java/nu/marginalia/btree/BTreeReaderRejectRetainWithoutIndexTest.java rename to code/libraries/btree/src/test/java/nu/marginalia/btree/BTreeReaderRejectRetainWithoutIndexTest.java diff --git a/libraries/btree/src/test/java/nu/marginalia/btree/BTreeWriterTest.java b/code/libraries/btree/src/test/java/nu/marginalia/btree/BTreeWriterTest.java similarity index 100% rename from libraries/btree/src/test/java/nu/marginalia/btree/BTreeWriterTest.java rename to code/libraries/btree/src/test/java/nu/marginalia/btree/BTreeWriterTest.java diff --git a/libraries/easy-lsh/build.gradle b/code/libraries/easy-lsh/build.gradle similarity index 100% rename from libraries/easy-lsh/build.gradle rename to code/libraries/easy-lsh/build.gradle diff --git a/libraries/easy-lsh/readme.md b/code/libraries/easy-lsh/readme.md similarity index 100% rename from libraries/easy-lsh/readme.md rename to code/libraries/easy-lsh/readme.md diff --git a/libraries/easy-lsh/src/main/java/nu/marginalia/lsh/EasyLSH.java b/code/libraries/easy-lsh/src/main/java/nu/marginalia/lsh/EasyLSH.java similarity index 100% rename from libraries/easy-lsh/src/main/java/nu/marginalia/lsh/EasyLSH.java rename to code/libraries/easy-lsh/src/main/java/nu/marginalia/lsh/EasyLSH.java diff --git a/libraries/easy-lsh/src/test/java/nu/marginalia/lsh/EasyLSHTest.java b/code/libraries/easy-lsh/src/test/java/nu/marginalia/lsh/EasyLSHTest.java similarity index 100% rename from libraries/easy-lsh/src/test/java/nu/marginalia/lsh/EasyLSHTest.java rename to code/libraries/easy-lsh/src/test/java/nu/marginalia/lsh/EasyLSHTest.java diff --git a/libraries/guarded-regex/build.gradle b/code/libraries/guarded-regex/build.gradle similarity index 100% rename from libraries/guarded-regex/build.gradle rename to code/libraries/guarded-regex/build.gradle diff --git a/libraries/guarded-regex/readme.md b/code/libraries/guarded-regex/readme.md similarity index 100% rename from libraries/guarded-regex/readme.md rename to code/libraries/guarded-regex/readme.md diff --git a/libraries/guarded-regex/src/main/java/nu/marginalia/gregex/GuardedRegex.java b/code/libraries/guarded-regex/src/main/java/nu/marginalia/gregex/GuardedRegex.java similarity index 100% rename from libraries/guarded-regex/src/main/java/nu/marginalia/gregex/GuardedRegex.java rename to code/libraries/guarded-regex/src/main/java/nu/marginalia/gregex/GuardedRegex.java diff --git a/libraries/guarded-regex/src/main/java/nu/marginalia/gregex/GuardedRegexFactory.java b/code/libraries/guarded-regex/src/main/java/nu/marginalia/gregex/GuardedRegexFactory.java similarity index 100% rename from libraries/guarded-regex/src/main/java/nu/marginalia/gregex/GuardedRegexFactory.java rename to code/libraries/guarded-regex/src/main/java/nu/marginalia/gregex/GuardedRegexFactory.java diff --git a/libraries/language-processing/build.gradle b/code/libraries/language-processing/build.gradle similarity index 85% rename from libraries/language-processing/build.gradle rename to code/libraries/language-processing/build.gradle index 5cc95970..78b686a5 100644 --- a/libraries/language-processing/build.gradle +++ b/code/libraries/language-processing/build.gradle @@ -16,9 +16,9 @@ java { dependencies { implementation project(':third-party') - implementation project(':common:model') - implementation project(':common:config') - implementation project(':libraries:easy-lsh') + implementation project(':code:common:model') + implementation project(':code:common:config') + implementation project(':code:libraries:easy-lsh') implementation libs.lombok annotationProcessor libs.lombok diff --git a/libraries/language-processing/src/main/java/nu/marginalia/language/LanguageFilter.java b/code/libraries/language-processing/src/main/java/nu/marginalia/language/LanguageFilter.java similarity index 100% rename from libraries/language-processing/src/main/java/nu/marginalia/language/LanguageFilter.java rename to code/libraries/language-processing/src/main/java/nu/marginalia/language/LanguageFilter.java diff --git a/libraries/language-processing/src/main/java/nu/marginalia/language/WordPatterns.java b/code/libraries/language-processing/src/main/java/nu/marginalia/language/WordPatterns.java similarity index 100% rename from libraries/language-processing/src/main/java/nu/marginalia/language/WordPatterns.java rename to code/libraries/language-processing/src/main/java/nu/marginalia/language/WordPatterns.java diff --git a/libraries/language-processing/src/main/java/nu/marginalia/language/encoding/AsciiFlattener.java b/code/libraries/language-processing/src/main/java/nu/marginalia/language/encoding/AsciiFlattener.java similarity index 100% rename from libraries/language-processing/src/main/java/nu/marginalia/language/encoding/AsciiFlattener.java rename to code/libraries/language-processing/src/main/java/nu/marginalia/language/encoding/AsciiFlattener.java diff --git a/libraries/language-processing/src/main/java/nu/marginalia/language/encoding/HtmlTagCleaner.java b/code/libraries/language-processing/src/main/java/nu/marginalia/language/encoding/HtmlTagCleaner.java similarity index 100% rename from libraries/language-processing/src/main/java/nu/marginalia/language/encoding/HtmlTagCleaner.java rename to code/libraries/language-processing/src/main/java/nu/marginalia/language/encoding/HtmlTagCleaner.java diff --git a/libraries/language-processing/src/main/java/nu/marginalia/language/encoding/UnicodeRanges.java b/code/libraries/language-processing/src/main/java/nu/marginalia/language/encoding/UnicodeRanges.java similarity index 100% rename from libraries/language-processing/src/main/java/nu/marginalia/language/encoding/UnicodeRanges.java rename to code/libraries/language-processing/src/main/java/nu/marginalia/language/encoding/UnicodeRanges.java diff --git a/libraries/language-processing/src/main/java/nu/marginalia/language/keywords/KeywordExtractor.java b/code/libraries/language-processing/src/main/java/nu/marginalia/language/keywords/KeywordExtractor.java similarity index 100% rename from libraries/language-processing/src/main/java/nu/marginalia/language/keywords/KeywordExtractor.java rename to code/libraries/language-processing/src/main/java/nu/marginalia/language/keywords/KeywordExtractor.java diff --git a/libraries/language-processing/src/main/java/nu/marginalia/language/model/DocumentLanguageData.java b/code/libraries/language-processing/src/main/java/nu/marginalia/language/model/DocumentLanguageData.java similarity index 100% rename from libraries/language-processing/src/main/java/nu/marginalia/language/model/DocumentLanguageData.java rename to code/libraries/language-processing/src/main/java/nu/marginalia/language/model/DocumentLanguageData.java diff --git a/libraries/language-processing/src/main/java/nu/marginalia/language/model/DocumentSentence.java b/code/libraries/language-processing/src/main/java/nu/marginalia/language/model/DocumentSentence.java similarity index 100% rename from libraries/language-processing/src/main/java/nu/marginalia/language/model/DocumentSentence.java rename to code/libraries/language-processing/src/main/java/nu/marginalia/language/model/DocumentSentence.java diff --git a/libraries/language-processing/src/main/java/nu/marginalia/language/model/KeywordMetadata.java b/code/libraries/language-processing/src/main/java/nu/marginalia/language/model/KeywordMetadata.java similarity index 100% rename from libraries/language-processing/src/main/java/nu/marginalia/language/model/KeywordMetadata.java rename to code/libraries/language-processing/src/main/java/nu/marginalia/language/model/KeywordMetadata.java diff --git a/libraries/language-processing/src/main/java/nu/marginalia/language/model/WordFrequencyData.java b/code/libraries/language-processing/src/main/java/nu/marginalia/language/model/WordFrequencyData.java similarity index 100% rename from libraries/language-processing/src/main/java/nu/marginalia/language/model/WordFrequencyData.java rename to code/libraries/language-processing/src/main/java/nu/marginalia/language/model/WordFrequencyData.java diff --git a/libraries/language-processing/src/main/java/nu/marginalia/language/model/WordRep.java b/code/libraries/language-processing/src/main/java/nu/marginalia/language/model/WordRep.java similarity index 100% rename from libraries/language-processing/src/main/java/nu/marginalia/language/model/WordRep.java rename to code/libraries/language-processing/src/main/java/nu/marginalia/language/model/WordRep.java diff --git a/libraries/language-processing/src/main/java/nu/marginalia/language/model/WordSeparator.java b/code/libraries/language-processing/src/main/java/nu/marginalia/language/model/WordSeparator.java similarity index 100% rename from libraries/language-processing/src/main/java/nu/marginalia/language/model/WordSeparator.java rename to code/libraries/language-processing/src/main/java/nu/marginalia/language/model/WordSeparator.java diff --git a/libraries/language-processing/src/main/java/nu/marginalia/language/model/WordSpan.java b/code/libraries/language-processing/src/main/java/nu/marginalia/language/model/WordSpan.java similarity index 100% rename from libraries/language-processing/src/main/java/nu/marginalia/language/model/WordSpan.java rename to code/libraries/language-processing/src/main/java/nu/marginalia/language/model/WordSpan.java diff --git a/libraries/language-processing/src/main/java/nu/marginalia/language/sentence/SentenceExtractor.java b/code/libraries/language-processing/src/main/java/nu/marginalia/language/sentence/SentenceExtractor.java similarity index 100% rename from libraries/language-processing/src/main/java/nu/marginalia/language/sentence/SentenceExtractor.java rename to code/libraries/language-processing/src/main/java/nu/marginalia/language/sentence/SentenceExtractor.java diff --git a/libraries/language-processing/src/main/java/nu/marginalia/language/sentence/SentenceExtractorStringUtils.java b/code/libraries/language-processing/src/main/java/nu/marginalia/language/sentence/SentenceExtractorStringUtils.java similarity index 100% rename from libraries/language-processing/src/main/java/nu/marginalia/language/sentence/SentenceExtractorStringUtils.java rename to code/libraries/language-processing/src/main/java/nu/marginalia/language/sentence/SentenceExtractorStringUtils.java diff --git a/libraries/language-processing/src/main/java/nu/marginalia/language/sentence/SentenceSegmentSplitter.java b/code/libraries/language-processing/src/main/java/nu/marginalia/language/sentence/SentenceSegmentSplitter.java similarity index 100% rename from libraries/language-processing/src/main/java/nu/marginalia/language/sentence/SentenceSegmentSplitter.java rename to code/libraries/language-processing/src/main/java/nu/marginalia/language/sentence/SentenceSegmentSplitter.java diff --git a/libraries/language-processing/src/main/java/nu/marginalia/language/statistics/EnglishDictionary.java b/code/libraries/language-processing/src/main/java/nu/marginalia/language/statistics/EnglishDictionary.java similarity index 100% rename from libraries/language-processing/src/main/java/nu/marginalia/language/statistics/EnglishDictionary.java rename to code/libraries/language-processing/src/main/java/nu/marginalia/language/statistics/EnglishDictionary.java diff --git a/libraries/language-processing/src/main/java/nu/marginalia/language/statistics/NGramBloomFilter.java b/code/libraries/language-processing/src/main/java/nu/marginalia/language/statistics/NGramBloomFilter.java similarity index 100% rename from libraries/language-processing/src/main/java/nu/marginalia/language/statistics/NGramBloomFilter.java rename to code/libraries/language-processing/src/main/java/nu/marginalia/language/statistics/NGramBloomFilter.java diff --git a/libraries/language-processing/src/main/java/nu/marginalia/language/statistics/TermFrequencyDict.java b/code/libraries/language-processing/src/main/java/nu/marginalia/language/statistics/TermFrequencyDict.java similarity index 100% rename from libraries/language-processing/src/main/java/nu/marginalia/language/statistics/TermFrequencyDict.java rename to code/libraries/language-processing/src/main/java/nu/marginalia/language/statistics/TermFrequencyDict.java diff --git a/libraries/language-processing/src/main/resources/dictionary/en-1000 b/code/libraries/language-processing/src/main/resources/dictionary/en-1000 similarity index 100% rename from libraries/language-processing/src/main/resources/dictionary/en-1000 rename to code/libraries/language-processing/src/main/resources/dictionary/en-1000 diff --git a/libraries/language-processing/src/main/resources/dictionary/en-stopwords b/code/libraries/language-processing/src/main/resources/dictionary/en-stopwords similarity index 100% rename from libraries/language-processing/src/main/resources/dictionary/en-stopwords rename to code/libraries/language-processing/src/main/resources/dictionary/en-stopwords diff --git a/libraries/language-processing/src/main/resources/dictionary/en-words b/code/libraries/language-processing/src/main/resources/dictionary/en-words similarity index 100% rename from libraries/language-processing/src/main/resources/dictionary/en-words rename to code/libraries/language-processing/src/main/resources/dictionary/en-words diff --git a/libraries/language-processing/src/main/resources/dictionary/latin-1000 b/code/libraries/language-processing/src/main/resources/dictionary/latin-1000 similarity index 100% rename from libraries/language-processing/src/main/resources/dictionary/latin-1000 rename to code/libraries/language-processing/src/main/resources/dictionary/latin-1000 diff --git a/libraries/language-processing/src/main/resources/dictionary/swe-1000 b/code/libraries/language-processing/src/main/resources/dictionary/swe-1000 similarity index 100% rename from libraries/language-processing/src/main/resources/dictionary/swe-1000 rename to code/libraries/language-processing/src/main/resources/dictionary/swe-1000 diff --git a/libraries/language-processing/src/main/resources/dictionary/word-frequency b/code/libraries/language-processing/src/main/resources/dictionary/word-frequency similarity index 100% rename from libraries/language-processing/src/main/resources/dictionary/word-frequency rename to code/libraries/language-processing/src/main/resources/dictionary/word-frequency diff --git a/libraries/language-processing/src/test/java/nu/marginalia/language/encoding/AsciiFlattenerTest.java b/code/libraries/language-processing/src/test/java/nu/marginalia/language/encoding/AsciiFlattenerTest.java similarity index 100% rename from libraries/language-processing/src/test/java/nu/marginalia/language/encoding/AsciiFlattenerTest.java rename to code/libraries/language-processing/src/test/java/nu/marginalia/language/encoding/AsciiFlattenerTest.java diff --git a/libraries/misc/build.gradle b/code/libraries/misc/build.gradle similarity index 100% rename from libraries/misc/build.gradle rename to code/libraries/misc/build.gradle diff --git a/libraries/misc/src/main/java/nu/marginalia/util/FileSizeUtil.java b/code/libraries/misc/src/main/java/nu/marginalia/util/FileSizeUtil.java similarity index 100% rename from libraries/misc/src/main/java/nu/marginalia/util/FileSizeUtil.java rename to code/libraries/misc/src/main/java/nu/marginalia/util/FileSizeUtil.java diff --git a/libraries/misc/src/main/java/nu/marginalia/util/PrimeUtil.java b/code/libraries/misc/src/main/java/nu/marginalia/util/PrimeUtil.java similarity index 100% rename from libraries/misc/src/main/java/nu/marginalia/util/PrimeUtil.java rename to code/libraries/misc/src/main/java/nu/marginalia/util/PrimeUtil.java diff --git a/libraries/misc/src/main/java/nu/marginalia/util/TransformList.java b/code/libraries/misc/src/main/java/nu/marginalia/util/TransformList.java similarity index 100% rename from libraries/misc/src/main/java/nu/marginalia/util/TransformList.java rename to code/libraries/misc/src/main/java/nu/marginalia/util/TransformList.java diff --git a/libraries/misc/src/test/java/nu/marginalia/test/TestUtil.java b/code/libraries/misc/src/test/java/nu/marginalia/test/TestUtil.java similarity index 100% rename from libraries/misc/src/test/java/nu/marginalia/test/TestUtil.java rename to code/libraries/misc/src/test/java/nu/marginalia/test/TestUtil.java diff --git a/libraries/misc/src/test/java/nu/marginalia/util/TransformListTest.java b/code/libraries/misc/src/test/java/nu/marginalia/util/TransformListTest.java similarity index 100% rename from libraries/misc/src/test/java/nu/marginalia/util/TransformListTest.java rename to code/libraries/misc/src/test/java/nu/marginalia/util/TransformListTest.java diff --git a/libraries/random-write-funnel/build.gradle b/code/libraries/random-write-funnel/build.gradle similarity index 100% rename from libraries/random-write-funnel/build.gradle rename to code/libraries/random-write-funnel/build.gradle diff --git a/libraries/random-write-funnel/readme.md b/code/libraries/random-write-funnel/readme.md similarity index 100% rename from libraries/random-write-funnel/readme.md rename to code/libraries/random-write-funnel/readme.md diff --git a/libraries/random-write-funnel/src/main/java/nu/marginalia/rwf/RandomWriteFunnel.java b/code/libraries/random-write-funnel/src/main/java/nu/marginalia/rwf/RandomWriteFunnel.java similarity index 100% rename from libraries/random-write-funnel/src/main/java/nu/marginalia/rwf/RandomWriteFunnel.java rename to code/libraries/random-write-funnel/src/main/java/nu/marginalia/rwf/RandomWriteFunnel.java diff --git a/libraries/random-write-funnel/src/test/java/nu/marginalia/rwf/RandomWriteFunnelTest.java b/code/libraries/random-write-funnel/src/test/java/nu/marginalia/rwf/RandomWriteFunnelTest.java similarity index 100% rename from libraries/random-write-funnel/src/test/java/nu/marginalia/rwf/RandomWriteFunnelTest.java rename to code/libraries/random-write-funnel/src/test/java/nu/marginalia/rwf/RandomWriteFunnelTest.java diff --git a/libraries/readme.md b/code/libraries/readme.md similarity index 100% rename from libraries/readme.md rename to code/libraries/readme.md diff --git a/services-core/assistant-service/build.gradle b/code/services-core/assistant-service/build.gradle similarity index 72% rename from services-core/assistant-service/build.gradle rename to code/services-core/assistant-service/build.gradle index 8cce6566..e743be90 100644 --- a/services-core/assistant-service/build.gradle +++ b/code/services-core/assistant-service/build.gradle @@ -21,15 +21,15 @@ java { dependencies { implementation project(':third-party') - implementation project(':api:assistant-api') - implementation project(':common:config') - implementation project(':common:service') - implementation project(':common:model') - implementation project(':common:service-discovery') - implementation project(':common:service-client') + implementation project(':code:api:assistant-api') + implementation project(':code:common:config') + implementation project(':code:common:service') + implementation project(':code:common:model') + implementation project(':code:common:service-discovery') + implementation project(':code:common:service-client') - implementation project(':features:screenshots') - implementation project(':libraries:language-processing') + implementation project(':code:features:screenshots') + implementation project(':code:libraries:language-processing') implementation libs.lombok diff --git a/services-core/assistant-service/readme.md b/code/services-core/assistant-service/readme.md similarity index 100% rename from services-core/assistant-service/readme.md rename to code/services-core/assistant-service/readme.md diff --git a/services-core/assistant-service/src/main/java/nu/marginalia/assistant/AssistantMain.java b/code/services-core/assistant-service/src/main/java/nu/marginalia/assistant/AssistantMain.java similarity index 100% rename from services-core/assistant-service/src/main/java/nu/marginalia/assistant/AssistantMain.java rename to code/services-core/assistant-service/src/main/java/nu/marginalia/assistant/AssistantMain.java diff --git a/services-core/assistant-service/src/main/java/nu/marginalia/assistant/AssistantModule.java b/code/services-core/assistant-service/src/main/java/nu/marginalia/assistant/AssistantModule.java similarity index 100% rename from services-core/assistant-service/src/main/java/nu/marginalia/assistant/AssistantModule.java rename to code/services-core/assistant-service/src/main/java/nu/marginalia/assistant/AssistantModule.java diff --git a/services-core/assistant-service/src/main/java/nu/marginalia/assistant/AssistantService.java b/code/services-core/assistant-service/src/main/java/nu/marginalia/assistant/AssistantService.java similarity index 100% rename from services-core/assistant-service/src/main/java/nu/marginalia/assistant/AssistantService.java rename to code/services-core/assistant-service/src/main/java/nu/marginalia/assistant/AssistantService.java diff --git a/services-core/assistant-service/src/main/java/nu/marginalia/assistant/dict/DictionaryService.java b/code/services-core/assistant-service/src/main/java/nu/marginalia/assistant/dict/DictionaryService.java similarity index 100% rename from services-core/assistant-service/src/main/java/nu/marginalia/assistant/dict/DictionaryService.java rename to code/services-core/assistant-service/src/main/java/nu/marginalia/assistant/dict/DictionaryService.java diff --git a/services-core/assistant-service/src/main/java/nu/marginalia/assistant/dict/SpellChecker.java b/code/services-core/assistant-service/src/main/java/nu/marginalia/assistant/dict/SpellChecker.java similarity index 100% rename from services-core/assistant-service/src/main/java/nu/marginalia/assistant/dict/SpellChecker.java rename to code/services-core/assistant-service/src/main/java/nu/marginalia/assistant/dict/SpellChecker.java diff --git a/services-core/assistant-service/src/main/java/nu/marginalia/assistant/eval/MathParser.java b/code/services-core/assistant-service/src/main/java/nu/marginalia/assistant/eval/MathParser.java similarity index 100% rename from services-core/assistant-service/src/main/java/nu/marginalia/assistant/eval/MathParser.java rename to code/services-core/assistant-service/src/main/java/nu/marginalia/assistant/eval/MathParser.java diff --git a/services-core/assistant-service/src/main/java/nu/marginalia/assistant/eval/Unit.java b/code/services-core/assistant-service/src/main/java/nu/marginalia/assistant/eval/Unit.java similarity index 100% rename from services-core/assistant-service/src/main/java/nu/marginalia/assistant/eval/Unit.java rename to code/services-core/assistant-service/src/main/java/nu/marginalia/assistant/eval/Unit.java diff --git a/services-core/assistant-service/src/main/java/nu/marginalia/assistant/eval/Units.java b/code/services-core/assistant-service/src/main/java/nu/marginalia/assistant/eval/Units.java similarity index 100% rename from services-core/assistant-service/src/main/java/nu/marginalia/assistant/eval/Units.java rename to code/services-core/assistant-service/src/main/java/nu/marginalia/assistant/eval/Units.java diff --git a/services-core/assistant-service/src/main/java/nu/marginalia/assistant/suggest/Suggestions.java b/code/services-core/assistant-service/src/main/java/nu/marginalia/assistant/suggest/Suggestions.java similarity index 100% rename from services-core/assistant-service/src/main/java/nu/marginalia/assistant/suggest/Suggestions.java rename to code/services-core/assistant-service/src/main/java/nu/marginalia/assistant/suggest/Suggestions.java diff --git a/services-core/assistant-service/src/main/resources/units.csv b/code/services-core/assistant-service/src/main/resources/units.csv similarity index 100% rename from services-core/assistant-service/src/main/resources/units.csv rename to code/services-core/assistant-service/src/main/resources/units.csv diff --git a/services-core/assistant-service/src/test/java/nu/marginalia/assistant/dict/WikiCleanerTest.java b/code/services-core/assistant-service/src/test/java/nu/marginalia/assistant/dict/WikiCleanerTest.java similarity index 100% rename from services-core/assistant-service/src/test/java/nu/marginalia/assistant/dict/WikiCleanerTest.java rename to code/services-core/assistant-service/src/test/java/nu/marginalia/assistant/dict/WikiCleanerTest.java diff --git a/services-core/assistant-service/src/test/java/nu/marginalia/assistant/eval/MathParserTest.java b/code/services-core/assistant-service/src/test/java/nu/marginalia/assistant/eval/MathParserTest.java similarity index 100% rename from services-core/assistant-service/src/test/java/nu/marginalia/assistant/eval/MathParserTest.java rename to code/services-core/assistant-service/src/test/java/nu/marginalia/assistant/eval/MathParserTest.java diff --git a/services-core/assistant-service/src/test/java/nu/marginalia/assistant/eval/UnitsTest.java b/code/services-core/assistant-service/src/test/java/nu/marginalia/assistant/eval/UnitsTest.java similarity index 100% rename from services-core/assistant-service/src/test/java/nu/marginalia/assistant/eval/UnitsTest.java rename to code/services-core/assistant-service/src/test/java/nu/marginalia/assistant/eval/UnitsTest.java diff --git a/services-core/index-service/build.gradle b/code/services-core/index-service/build.gradle similarity index 63% rename from services-core/index-service/build.gradle rename to code/services-core/index-service/build.gradle index e0d21e1b..f6a62bdf 100644 --- a/services-core/index-service/build.gradle +++ b/code/services-core/index-service/build.gradle @@ -20,23 +20,23 @@ java { } dependencies { implementation project(':third-party') - implementation project(':common:config') - implementation project(':common:model') - implementation project(':common:service') - implementation project(':api:index-api') - implementation project(':common:service-discovery') + implementation project(':code:common:config') + implementation project(':code:common:model') + implementation project(':code:common:service') + implementation project(':code:api:index-api') + implementation project(':code:common:service-discovery') - implementation project(':libraries:array') - implementation project(':libraries:btree') - implementation project(':libraries:misc') + implementation project(':code:libraries:array') + implementation project(':code:libraries:btree') + implementation project(':code:libraries:misc') - implementation project(':index:index-journal') - implementation project(':index:index-query') - implementation project(':index:index-forward') - implementation project(':index:index-reverse') - implementation project(':index:lexicon') + implementation project(':code:index:index-journal') + implementation project(':code:index:index-query') + implementation project(':code:index:index-forward') + implementation project(':code:index:index-reverse') + implementation project(':code:index:lexicon') - implementation project(':features:domain-ranking') + implementation project(':code:features:domain-ranking') implementation libs.lombok diff --git a/services-core/index-service/readme.md b/code/services-core/index-service/readme.md similarity index 100% rename from services-core/index-service/readme.md rename to code/services-core/index-service/readme.md diff --git a/services-core/index-service/src/main/java/nu/marginalia/index/IndexMain.java b/code/services-core/index-service/src/main/java/nu/marginalia/index/IndexMain.java similarity index 100% rename from services-core/index-service/src/main/java/nu/marginalia/index/IndexMain.java rename to code/services-core/index-service/src/main/java/nu/marginalia/index/IndexMain.java diff --git a/services-core/index-service/src/main/java/nu/marginalia/index/IndexModule.java b/code/services-core/index-service/src/main/java/nu/marginalia/index/IndexModule.java similarity index 100% rename from services-core/index-service/src/main/java/nu/marginalia/index/IndexModule.java rename to code/services-core/index-service/src/main/java/nu/marginalia/index/IndexModule.java diff --git a/services-core/index-service/src/main/java/nu/marginalia/index/IndexService.java b/code/services-core/index-service/src/main/java/nu/marginalia/index/IndexService.java similarity index 100% rename from services-core/index-service/src/main/java/nu/marginalia/index/IndexService.java rename to code/services-core/index-service/src/main/java/nu/marginalia/index/IndexService.java diff --git a/services-core/index-service/src/main/java/nu/marginalia/index/IndexServicesFactory.java b/code/services-core/index-service/src/main/java/nu/marginalia/index/IndexServicesFactory.java similarity index 100% rename from services-core/index-service/src/main/java/nu/marginalia/index/IndexServicesFactory.java rename to code/services-core/index-service/src/main/java/nu/marginalia/index/IndexServicesFactory.java diff --git a/services-core/index-service/src/main/java/nu/marginalia/index/IndexTablesModule.java b/code/services-core/index-service/src/main/java/nu/marginalia/index/IndexTablesModule.java similarity index 100% rename from services-core/index-service/src/main/java/nu/marginalia/index/IndexTablesModule.java rename to code/services-core/index-service/src/main/java/nu/marginalia/index/IndexTablesModule.java diff --git a/services-core/index-service/src/main/java/nu/marginalia/index/config/RankingSettings.java b/code/services-core/index-service/src/main/java/nu/marginalia/index/config/RankingSettings.java similarity index 100% rename from services-core/index-service/src/main/java/nu/marginalia/index/config/RankingSettings.java rename to code/services-core/index-service/src/main/java/nu/marginalia/index/config/RankingSettings.java diff --git a/services-core/index-service/src/main/java/nu/marginalia/index/config/RankingSettingsEntry.java b/code/services-core/index-service/src/main/java/nu/marginalia/index/config/RankingSettingsEntry.java similarity index 100% rename from services-core/index-service/src/main/java/nu/marginalia/index/config/RankingSettingsEntry.java rename to code/services-core/index-service/src/main/java/nu/marginalia/index/config/RankingSettingsEntry.java diff --git a/services-core/index-service/src/main/java/nu/marginalia/index/index/SearchIndex.java b/code/services-core/index-service/src/main/java/nu/marginalia/index/index/SearchIndex.java similarity index 100% rename from services-core/index-service/src/main/java/nu/marginalia/index/index/SearchIndex.java rename to code/services-core/index-service/src/main/java/nu/marginalia/index/index/SearchIndex.java diff --git a/services-core/index-service/src/main/java/nu/marginalia/index/index/SearchIndexQueryBuilder.java b/code/services-core/index-service/src/main/java/nu/marginalia/index/index/SearchIndexQueryBuilder.java similarity index 100% rename from services-core/index-service/src/main/java/nu/marginalia/index/index/SearchIndexQueryBuilder.java rename to code/services-core/index-service/src/main/java/nu/marginalia/index/index/SearchIndexQueryBuilder.java diff --git a/services-core/index-service/src/main/java/nu/marginalia/index/index/SearchIndexReader.java b/code/services-core/index-service/src/main/java/nu/marginalia/index/index/SearchIndexReader.java similarity index 100% rename from services-core/index-service/src/main/java/nu/marginalia/index/index/SearchIndexReader.java rename to code/services-core/index-service/src/main/java/nu/marginalia/index/index/SearchIndexReader.java diff --git a/services-core/index-service/src/main/java/nu/marginalia/index/index/SearchIndexSearchTerms.java b/code/services-core/index-service/src/main/java/nu/marginalia/index/index/SearchIndexSearchTerms.java similarity index 100% rename from services-core/index-service/src/main/java/nu/marginalia/index/index/SearchIndexSearchTerms.java rename to code/services-core/index-service/src/main/java/nu/marginalia/index/index/SearchIndexSearchTerms.java diff --git a/services-core/index-service/src/main/java/nu/marginalia/index/results/IndexMetadataService.java b/code/services-core/index-service/src/main/java/nu/marginalia/index/results/IndexMetadataService.java similarity index 100% rename from services-core/index-service/src/main/java/nu/marginalia/index/results/IndexMetadataService.java rename to code/services-core/index-service/src/main/java/nu/marginalia/index/results/IndexMetadataService.java diff --git a/services-core/index-service/src/main/java/nu/marginalia/index/results/IndexResultDomainDeduplicator.java b/code/services-core/index-service/src/main/java/nu/marginalia/index/results/IndexResultDomainDeduplicator.java similarity index 100% rename from services-core/index-service/src/main/java/nu/marginalia/index/results/IndexResultDomainDeduplicator.java rename to code/services-core/index-service/src/main/java/nu/marginalia/index/results/IndexResultDomainDeduplicator.java diff --git a/services-core/index-service/src/main/java/nu/marginalia/index/results/IndexResultValuator.java b/code/services-core/index-service/src/main/java/nu/marginalia/index/results/IndexResultValuator.java similarity index 100% rename from services-core/index-service/src/main/java/nu/marginalia/index/results/IndexResultValuator.java rename to code/services-core/index-service/src/main/java/nu/marginalia/index/results/IndexResultValuator.java diff --git a/services-core/index-service/src/main/java/nu/marginalia/index/svc/IndexOpsService.java b/code/services-core/index-service/src/main/java/nu/marginalia/index/svc/IndexOpsService.java similarity index 100% rename from services-core/index-service/src/main/java/nu/marginalia/index/svc/IndexOpsService.java rename to code/services-core/index-service/src/main/java/nu/marginalia/index/svc/IndexOpsService.java diff --git a/services-core/index-service/src/main/java/nu/marginalia/index/svc/IndexQueryService.java b/code/services-core/index-service/src/main/java/nu/marginalia/index/svc/IndexQueryService.java similarity index 100% rename from services-core/index-service/src/main/java/nu/marginalia/index/svc/IndexQueryService.java rename to code/services-core/index-service/src/main/java/nu/marginalia/index/svc/IndexQueryService.java diff --git a/services-core/index-service/src/main/java/nu/marginalia/index/svc/IndexSearchSetsService.java b/code/services-core/index-service/src/main/java/nu/marginalia/index/svc/IndexSearchSetsService.java similarity index 100% rename from services-core/index-service/src/main/java/nu/marginalia/index/svc/IndexSearchSetsService.java rename to code/services-core/index-service/src/main/java/nu/marginalia/index/svc/IndexSearchSetsService.java diff --git a/services-core/index-service/src/main/java/nu/marginalia/index/svc/SearchTermsService.java b/code/services-core/index-service/src/main/java/nu/marginalia/index/svc/SearchTermsService.java similarity index 100% rename from services-core/index-service/src/main/java/nu/marginalia/index/svc/SearchTermsService.java rename to code/services-core/index-service/src/main/java/nu/marginalia/index/svc/SearchTermsService.java diff --git a/services-core/index-service/src/main/java/nu/marginalia/index/svc/searchset/RankingSearchSet.java b/code/services-core/index-service/src/main/java/nu/marginalia/index/svc/searchset/RankingSearchSet.java similarity index 100% rename from services-core/index-service/src/main/java/nu/marginalia/index/svc/searchset/RankingSearchSet.java rename to code/services-core/index-service/src/main/java/nu/marginalia/index/svc/searchset/RankingSearchSet.java diff --git a/services-core/index-service/src/main/java/nu/marginalia/index/svc/searchset/SearchSetAny.java b/code/services-core/index-service/src/main/java/nu/marginalia/index/svc/searchset/SearchSetAny.java similarity index 100% rename from services-core/index-service/src/main/java/nu/marginalia/index/svc/searchset/SearchSetAny.java rename to code/services-core/index-service/src/main/java/nu/marginalia/index/svc/searchset/SearchSetAny.java diff --git a/services-core/index-service/src/main/java/nu/marginalia/index/svc/searchset/SmallSearchSet.java b/code/services-core/index-service/src/main/java/nu/marginalia/index/svc/searchset/SmallSearchSet.java similarity index 100% rename from services-core/index-service/src/main/java/nu/marginalia/index/svc/searchset/SmallSearchSet.java rename to code/services-core/index-service/src/main/java/nu/marginalia/index/svc/searchset/SmallSearchSet.java diff --git a/services-core/index-service/src/test/java/nu/marginalia/index/model/DocumentMetadataTest.java b/code/services-core/index-service/src/test/java/nu/marginalia/index/model/DocumentMetadataTest.java similarity index 100% rename from services-core/index-service/src/test/java/nu/marginalia/index/model/DocumentMetadataTest.java rename to code/services-core/index-service/src/test/java/nu/marginalia/index/model/DocumentMetadataTest.java diff --git a/services-core/index-service/src/test/java/nu/marginalia/index/model/RankingSettingsTest.java b/code/services-core/index-service/src/test/java/nu/marginalia/index/model/RankingSettingsTest.java similarity index 100% rename from services-core/index-service/src/test/java/nu/marginalia/index/model/RankingSettingsTest.java rename to code/services-core/index-service/src/test/java/nu/marginalia/index/model/RankingSettingsTest.java diff --git a/services-core/index-service/src/test/java/nu/marginalia/index/service/util/DictionaryDataTest.java b/code/services-core/index-service/src/test/java/nu/marginalia/index/service/util/DictionaryDataTest.java similarity index 100% rename from services-core/index-service/src/test/java/nu/marginalia/index/service/util/DictionaryDataTest.java rename to code/services-core/index-service/src/test/java/nu/marginalia/index/service/util/DictionaryDataTest.java diff --git a/services-core/index-service/src/test/java/nu/marginalia/index/service/util/DictionaryHashMapTest.java b/code/services-core/index-service/src/test/java/nu/marginalia/index/service/util/DictionaryHashMapTest.java similarity index 100% rename from services-core/index-service/src/test/java/nu/marginalia/index/service/util/DictionaryHashMapTest.java rename to code/services-core/index-service/src/test/java/nu/marginalia/index/service/util/DictionaryHashMapTest.java diff --git a/services-core/index-service/src/test/java/nu/marginalia/index/service/util/PrimeUtilTest.java b/code/services-core/index-service/src/test/java/nu/marginalia/index/service/util/PrimeUtilTest.java similarity index 100% rename from services-core/index-service/src/test/java/nu/marginalia/index/service/util/PrimeUtilTest.java rename to code/services-core/index-service/src/test/java/nu/marginalia/index/service/util/PrimeUtilTest.java diff --git a/services-core/index-service/src/test/java/nu/marginalia/index/svc/IndexQueryServiceIntegrationTest.java b/code/services-core/index-service/src/test/java/nu/marginalia/index/svc/IndexQueryServiceIntegrationTest.java similarity index 100% rename from services-core/index-service/src/test/java/nu/marginalia/index/svc/IndexQueryServiceIntegrationTest.java rename to code/services-core/index-service/src/test/java/nu/marginalia/index/svc/IndexQueryServiceIntegrationTest.java diff --git a/services-core/index-service/src/test/java/nu/marginalia/index/svc/IndexQueryServiceIntegrationTestModule.java b/code/services-core/index-service/src/test/java/nu/marginalia/index/svc/IndexQueryServiceIntegrationTestModule.java similarity index 100% rename from services-core/index-service/src/test/java/nu/marginalia/index/svc/IndexQueryServiceIntegrationTestModule.java rename to code/services-core/index-service/src/test/java/nu/marginalia/index/svc/IndexQueryServiceIntegrationTestModule.java diff --git a/services-core/index-service/src/test/java/nu/marginalia/index/svc/searchset/RankingSearchSetTest.java b/code/services-core/index-service/src/test/java/nu/marginalia/index/svc/searchset/RankingSearchSetTest.java similarity index 100% rename from services-core/index-service/src/test/java/nu/marginalia/index/svc/searchset/RankingSearchSetTest.java rename to code/services-core/index-service/src/test/java/nu/marginalia/index/svc/searchset/RankingSearchSetTest.java diff --git a/services-core/index-service/src/test/java/nu/marginalia/index/util/TestUtil.java b/code/services-core/index-service/src/test/java/nu/marginalia/index/util/TestUtil.java similarity index 100% rename from services-core/index-service/src/test/java/nu/marginalia/index/util/TestUtil.java rename to code/services-core/index-service/src/test/java/nu/marginalia/index/util/TestUtil.java diff --git a/services-core/readme.md b/code/services-core/readme.md similarity index 100% rename from services-core/readme.md rename to code/services-core/readme.md diff --git a/services-core/search-service/build.gradle b/code/services-core/search-service/build.gradle similarity index 58% rename from services-core/search-service/build.gradle rename to code/services-core/search-service/build.gradle index 76562a15..17a964c3 100644 --- a/services-core/search-service/build.gradle +++ b/code/services-core/search-service/build.gradle @@ -20,25 +20,25 @@ java { } dependencies { implementation project(':third-party') - implementation project(':common:model') - implementation project(':common:service') - implementation project(':common:config') - implementation project(':index:index-query') + implementation project(':code:common:model') + implementation project(':code:common:service') + implementation project(':code:common:config') + implementation project(':code:index:index-query') - implementation project(':libraries:misc') - implementation project(':libraries:easy-lsh') - implementation project(':libraries:language-processing') + implementation project(':code:libraries:misc') + implementation project(':code:libraries:easy-lsh') + implementation project(':code:libraries:language-processing') - implementation project(':api:assistant-api') - implementation project(':api:index-api') - implementation project(':api:search-api') - implementation project(':common:service-discovery') - implementation project(':common:service-client') - implementation project(':common:renderer') + implementation project(':code:api:assistant-api') + implementation project(':code:api:index-api') + implementation project(':code:api:search-api') + implementation project(':code:common:service-discovery') + implementation project(':code:common:service-client') + implementation project(':code:common:renderer') - implementation project(':features:screenshots') - implementation project(':features:random-websites') - implementation project(':features:query-parser') + implementation project(':code:features:screenshots') + implementation project(':code:features:random-websites') + implementation project(':code:features:query-parser') implementation libs.lombok diff --git a/services-core/search-service/readme.md b/code/services-core/search-service/readme.md similarity index 100% rename from services-core/search-service/readme.md rename to code/services-core/search-service/readme.md diff --git a/services-core/search-service/src/main/java/nu/marginalia/search/SearchMain.java b/code/services-core/search-service/src/main/java/nu/marginalia/search/SearchMain.java similarity index 100% rename from services-core/search-service/src/main/java/nu/marginalia/search/SearchMain.java rename to code/services-core/search-service/src/main/java/nu/marginalia/search/SearchMain.java diff --git a/services-core/search-service/src/main/java/nu/marginalia/search/SearchModule.java b/code/services-core/search-service/src/main/java/nu/marginalia/search/SearchModule.java similarity index 100% rename from services-core/search-service/src/main/java/nu/marginalia/search/SearchModule.java rename to code/services-core/search-service/src/main/java/nu/marginalia/search/SearchModule.java diff --git a/services-core/search-service/src/main/java/nu/marginalia/search/SearchOperator.java b/code/services-core/search-service/src/main/java/nu/marginalia/search/SearchOperator.java similarity index 100% rename from services-core/search-service/src/main/java/nu/marginalia/search/SearchOperator.java rename to code/services-core/search-service/src/main/java/nu/marginalia/search/SearchOperator.java diff --git a/services-core/search-service/src/main/java/nu/marginalia/search/SearchService.java b/code/services-core/search-service/src/main/java/nu/marginalia/search/SearchService.java similarity index 100% rename from services-core/search-service/src/main/java/nu/marginalia/search/SearchService.java rename to code/services-core/search-service/src/main/java/nu/marginalia/search/SearchService.java diff --git a/services-core/search-service/src/main/java/nu/marginalia/search/command/CommandEvaluator.java b/code/services-core/search-service/src/main/java/nu/marginalia/search/command/CommandEvaluator.java similarity index 100% rename from services-core/search-service/src/main/java/nu/marginalia/search/command/CommandEvaluator.java rename to code/services-core/search-service/src/main/java/nu/marginalia/search/command/CommandEvaluator.java diff --git a/services-core/search-service/src/main/java/nu/marginalia/search/command/IndexCommand.java b/code/services-core/search-service/src/main/java/nu/marginalia/search/command/IndexCommand.java similarity index 100% rename from services-core/search-service/src/main/java/nu/marginalia/search/command/IndexCommand.java rename to code/services-core/search-service/src/main/java/nu/marginalia/search/command/IndexCommand.java diff --git a/services-core/search-service/src/main/java/nu/marginalia/search/command/SearchCommandInterface.java b/code/services-core/search-service/src/main/java/nu/marginalia/search/command/SearchCommandInterface.java similarity index 100% rename from services-core/search-service/src/main/java/nu/marginalia/search/command/SearchCommandInterface.java rename to code/services-core/search-service/src/main/java/nu/marginalia/search/command/SearchCommandInterface.java diff --git a/services-core/search-service/src/main/java/nu/marginalia/search/command/SearchJsParameter.java b/code/services-core/search-service/src/main/java/nu/marginalia/search/command/SearchJsParameter.java similarity index 100% rename from services-core/search-service/src/main/java/nu/marginalia/search/command/SearchJsParameter.java rename to code/services-core/search-service/src/main/java/nu/marginalia/search/command/SearchJsParameter.java diff --git a/services-core/search-service/src/main/java/nu/marginalia/search/command/SearchParameters.java b/code/services-core/search-service/src/main/java/nu/marginalia/search/command/SearchParameters.java similarity index 100% rename from services-core/search-service/src/main/java/nu/marginalia/search/command/SearchParameters.java rename to code/services-core/search-service/src/main/java/nu/marginalia/search/command/SearchParameters.java diff --git a/services-core/search-service/src/main/java/nu/marginalia/search/command/commands/BangCommand.java b/code/services-core/search-service/src/main/java/nu/marginalia/search/command/commands/BangCommand.java similarity index 100% rename from services-core/search-service/src/main/java/nu/marginalia/search/command/commands/BangCommand.java rename to code/services-core/search-service/src/main/java/nu/marginalia/search/command/commands/BangCommand.java diff --git a/services-core/search-service/src/main/java/nu/marginalia/search/command/commands/BrowseCommand.java b/code/services-core/search-service/src/main/java/nu/marginalia/search/command/commands/BrowseCommand.java similarity index 100% rename from services-core/search-service/src/main/java/nu/marginalia/search/command/commands/BrowseCommand.java rename to code/services-core/search-service/src/main/java/nu/marginalia/search/command/commands/BrowseCommand.java diff --git a/services-core/search-service/src/main/java/nu/marginalia/search/command/commands/ConvertCommand.java b/code/services-core/search-service/src/main/java/nu/marginalia/search/command/commands/ConvertCommand.java similarity index 100% rename from services-core/search-service/src/main/java/nu/marginalia/search/command/commands/ConvertCommand.java rename to code/services-core/search-service/src/main/java/nu/marginalia/search/command/commands/ConvertCommand.java diff --git a/services-core/search-service/src/main/java/nu/marginalia/search/command/commands/DefinitionCommand.java b/code/services-core/search-service/src/main/java/nu/marginalia/search/command/commands/DefinitionCommand.java similarity index 100% rename from services-core/search-service/src/main/java/nu/marginalia/search/command/commands/DefinitionCommand.java rename to code/services-core/search-service/src/main/java/nu/marginalia/search/command/commands/DefinitionCommand.java diff --git a/services-core/search-service/src/main/java/nu/marginalia/search/command/commands/SearchCommand.java b/code/services-core/search-service/src/main/java/nu/marginalia/search/command/commands/SearchCommand.java similarity index 100% rename from services-core/search-service/src/main/java/nu/marginalia/search/command/commands/SearchCommand.java rename to code/services-core/search-service/src/main/java/nu/marginalia/search/command/commands/SearchCommand.java diff --git a/services-core/search-service/src/main/java/nu/marginalia/search/command/commands/SiteListCommand.java b/code/services-core/search-service/src/main/java/nu/marginalia/search/command/commands/SiteListCommand.java similarity index 100% rename from services-core/search-service/src/main/java/nu/marginalia/search/command/commands/SiteListCommand.java rename to code/services-core/search-service/src/main/java/nu/marginalia/search/command/commands/SiteListCommand.java diff --git a/services-core/search-service/src/main/java/nu/marginalia/search/db/DbUrlDetailsQuery.java b/code/services-core/search-service/src/main/java/nu/marginalia/search/db/DbUrlDetailsQuery.java similarity index 100% rename from services-core/search-service/src/main/java/nu/marginalia/search/db/DbUrlDetailsQuery.java rename to code/services-core/search-service/src/main/java/nu/marginalia/search/db/DbUrlDetailsQuery.java diff --git a/services-core/search-service/src/main/java/nu/marginalia/search/exceptions/RedirectException.java b/code/services-core/search-service/src/main/java/nu/marginalia/search/exceptions/RedirectException.java similarity index 100% rename from services-core/search-service/src/main/java/nu/marginalia/search/exceptions/RedirectException.java rename to code/services-core/search-service/src/main/java/nu/marginalia/search/exceptions/RedirectException.java diff --git a/services-core/search-service/src/main/java/nu/marginalia/search/model/DecoratedSearchResults.java b/code/services-core/search-service/src/main/java/nu/marginalia/search/model/DecoratedSearchResults.java similarity index 100% rename from services-core/search-service/src/main/java/nu/marginalia/search/model/DecoratedSearchResults.java rename to code/services-core/search-service/src/main/java/nu/marginalia/search/model/DecoratedSearchResults.java diff --git a/services-core/search-service/src/main/java/nu/marginalia/search/model/DomainInformation.java b/code/services-core/search-service/src/main/java/nu/marginalia/search/model/DomainInformation.java similarity index 100% rename from services-core/search-service/src/main/java/nu/marginalia/search/model/DomainInformation.java rename to code/services-core/search-service/src/main/java/nu/marginalia/search/model/DomainInformation.java diff --git a/services-core/search-service/src/main/java/nu/marginalia/search/model/PageScoreAdjustment.java b/code/services-core/search-service/src/main/java/nu/marginalia/search/model/PageScoreAdjustment.java similarity index 100% rename from services-core/search-service/src/main/java/nu/marginalia/search/model/PageScoreAdjustment.java rename to code/services-core/search-service/src/main/java/nu/marginalia/search/model/PageScoreAdjustment.java diff --git a/services-core/search-service/src/main/java/nu/marginalia/search/model/SearchProfile.java b/code/services-core/search-service/src/main/java/nu/marginalia/search/model/SearchProfile.java similarity index 100% rename from services-core/search-service/src/main/java/nu/marginalia/search/model/SearchProfile.java rename to code/services-core/search-service/src/main/java/nu/marginalia/search/model/SearchProfile.java diff --git a/services-core/search-service/src/main/java/nu/marginalia/search/model/SearchRankingSymbols.java b/code/services-core/search-service/src/main/java/nu/marginalia/search/model/SearchRankingSymbols.java similarity index 100% rename from services-core/search-service/src/main/java/nu/marginalia/search/model/SearchRankingSymbols.java rename to code/services-core/search-service/src/main/java/nu/marginalia/search/model/SearchRankingSymbols.java diff --git a/services-core/search-service/src/main/java/nu/marginalia/search/model/UrlDetails.java b/code/services-core/search-service/src/main/java/nu/marginalia/search/model/UrlDetails.java similarity index 100% rename from services-core/search-service/src/main/java/nu/marginalia/search/model/UrlDetails.java rename to code/services-core/search-service/src/main/java/nu/marginalia/search/model/UrlDetails.java diff --git a/services-core/search-service/src/main/java/nu/marginalia/search/query/NearQueryProcessor.java b/code/services-core/search-service/src/main/java/nu/marginalia/search/query/NearQueryProcessor.java similarity index 100% rename from services-core/search-service/src/main/java/nu/marginalia/search/query/NearQueryProcessor.java rename to code/services-core/search-service/src/main/java/nu/marginalia/search/query/NearQueryProcessor.java diff --git a/services-core/search-service/src/main/java/nu/marginalia/search/query/QueryFactory.java b/code/services-core/search-service/src/main/java/nu/marginalia/search/query/QueryFactory.java similarity index 100% rename from services-core/search-service/src/main/java/nu/marginalia/search/query/QueryFactory.java rename to code/services-core/search-service/src/main/java/nu/marginalia/search/query/QueryFactory.java diff --git a/services-core/search-service/src/main/java/nu/marginalia/search/query/model/SearchQuery.java b/code/services-core/search-service/src/main/java/nu/marginalia/search/query/model/SearchQuery.java similarity index 100% rename from services-core/search-service/src/main/java/nu/marginalia/search/query/model/SearchQuery.java rename to code/services-core/search-service/src/main/java/nu/marginalia/search/query/model/SearchQuery.java diff --git a/services-core/search-service/src/main/java/nu/marginalia/search/query/model/UserSearchParameters.java b/code/services-core/search-service/src/main/java/nu/marginalia/search/query/model/UserSearchParameters.java similarity index 100% rename from services-core/search-service/src/main/java/nu/marginalia/search/query/model/UserSearchParameters.java rename to code/services-core/search-service/src/main/java/nu/marginalia/search/query/model/UserSearchParameters.java diff --git a/services-core/search-service/src/main/java/nu/marginalia/search/results/BrowseResultCleaner.java b/code/services-core/search-service/src/main/java/nu/marginalia/search/results/BrowseResultCleaner.java similarity index 100% rename from services-core/search-service/src/main/java/nu/marginalia/search/results/BrowseResultCleaner.java rename to code/services-core/search-service/src/main/java/nu/marginalia/search/results/BrowseResultCleaner.java diff --git a/services-core/search-service/src/main/java/nu/marginalia/search/results/SearchResultDecorator.java b/code/services-core/search-service/src/main/java/nu/marginalia/search/results/SearchResultDecorator.java similarity index 100% rename from services-core/search-service/src/main/java/nu/marginalia/search/results/SearchResultDecorator.java rename to code/services-core/search-service/src/main/java/nu/marginalia/search/results/SearchResultDecorator.java diff --git a/services-core/search-service/src/main/java/nu/marginalia/search/results/UrlDeduplicator.java b/code/services-core/search-service/src/main/java/nu/marginalia/search/results/UrlDeduplicator.java similarity index 100% rename from services-core/search-service/src/main/java/nu/marginalia/search/results/UrlDeduplicator.java rename to code/services-core/search-service/src/main/java/nu/marginalia/search/results/UrlDeduplicator.java diff --git a/services-core/search-service/src/main/java/nu/marginalia/search/siteinfo/DomainInformationService.java b/code/services-core/search-service/src/main/java/nu/marginalia/search/siteinfo/DomainInformationService.java similarity index 100% rename from services-core/search-service/src/main/java/nu/marginalia/search/siteinfo/DomainInformationService.java rename to code/services-core/search-service/src/main/java/nu/marginalia/search/siteinfo/DomainInformationService.java diff --git a/services-core/search-service/src/main/java/nu/marginalia/search/svc/SearchAddToCrawlQueueService.java b/code/services-core/search-service/src/main/java/nu/marginalia/search/svc/SearchAddToCrawlQueueService.java similarity index 100% rename from services-core/search-service/src/main/java/nu/marginalia/search/svc/SearchAddToCrawlQueueService.java rename to code/services-core/search-service/src/main/java/nu/marginalia/search/svc/SearchAddToCrawlQueueService.java diff --git a/services-core/search-service/src/main/java/nu/marginalia/search/svc/SearchApiQueryService.java b/code/services-core/search-service/src/main/java/nu/marginalia/search/svc/SearchApiQueryService.java similarity index 100% rename from services-core/search-service/src/main/java/nu/marginalia/search/svc/SearchApiQueryService.java rename to code/services-core/search-service/src/main/java/nu/marginalia/search/svc/SearchApiQueryService.java diff --git a/services-core/search-service/src/main/java/nu/marginalia/search/svc/SearchErrorPageService.java b/code/services-core/search-service/src/main/java/nu/marginalia/search/svc/SearchErrorPageService.java similarity index 100% rename from services-core/search-service/src/main/java/nu/marginalia/search/svc/SearchErrorPageService.java rename to code/services-core/search-service/src/main/java/nu/marginalia/search/svc/SearchErrorPageService.java diff --git a/services-core/search-service/src/main/java/nu/marginalia/search/svc/SearchFlagSiteService.java b/code/services-core/search-service/src/main/java/nu/marginalia/search/svc/SearchFlagSiteService.java similarity index 100% rename from services-core/search-service/src/main/java/nu/marginalia/search/svc/SearchFlagSiteService.java rename to code/services-core/search-service/src/main/java/nu/marginalia/search/svc/SearchFlagSiteService.java diff --git a/services-core/search-service/src/main/java/nu/marginalia/search/svc/SearchQueryIndexService.java b/code/services-core/search-service/src/main/java/nu/marginalia/search/svc/SearchQueryIndexService.java similarity index 100% rename from services-core/search-service/src/main/java/nu/marginalia/search/svc/SearchQueryIndexService.java rename to code/services-core/search-service/src/main/java/nu/marginalia/search/svc/SearchQueryIndexService.java diff --git a/services-core/search-service/src/main/java/nu/marginalia/search/svc/SearchQueryService.java b/code/services-core/search-service/src/main/java/nu/marginalia/search/svc/SearchQueryService.java similarity index 100% rename from services-core/search-service/src/main/java/nu/marginalia/search/svc/SearchQueryService.java rename to code/services-core/search-service/src/main/java/nu/marginalia/search/svc/SearchQueryService.java diff --git a/services-core/search-service/src/main/java/nu/marginalia/search/svc/SearchUnitConversionService.java b/code/services-core/search-service/src/main/java/nu/marginalia/search/svc/SearchUnitConversionService.java similarity index 100% rename from services-core/search-service/src/main/java/nu/marginalia/search/svc/SearchUnitConversionService.java rename to code/services-core/search-service/src/main/java/nu/marginalia/search/svc/SearchUnitConversionService.java diff --git a/services-core/search-service/src/main/java/nu/marginalia/search/valuation/SearchResultValuator.java b/code/services-core/search-service/src/main/java/nu/marginalia/search/valuation/SearchResultValuator.java similarity index 100% rename from services-core/search-service/src/main/java/nu/marginalia/search/valuation/SearchResultValuator.java rename to code/services-core/search-service/src/main/java/nu/marginalia/search/valuation/SearchResultValuator.java diff --git a/services-core/search-service/src/main/resources/static/search/about.html b/code/services-core/search-service/src/main/resources/static/search/about.html similarity index 100% rename from services-core/search-service/src/main/resources/static/search/about.html rename to code/services-core/search-service/src/main/resources/static/search/about.html diff --git a/services-core/search-service/src/main/resources/static/search/changelog.html b/code/services-core/search-service/src/main/resources/static/search/changelog.html similarity index 100% rename from services-core/search-service/src/main/resources/static/search/changelog.html rename to code/services-core/search-service/src/main/resources/static/search/changelog.html diff --git a/services-core/search-service/src/main/resources/static/search/crawler-ips.txt b/code/services-core/search-service/src/main/resources/static/search/crawler-ips.txt similarity index 100% rename from services-core/search-service/src/main/resources/static/search/crawler-ips.txt rename to code/services-core/search-service/src/main/resources/static/search/crawler-ips.txt diff --git a/services-core/search-service/src/main/resources/static/search/error.html b/code/services-core/search-service/src/main/resources/static/search/error.html similarity index 100% rename from services-core/search-service/src/main/resources/static/search/error.html rename to code/services-core/search-service/src/main/resources/static/search/error.html diff --git a/services-core/search-service/src/main/resources/static/search/favicon.ico b/code/services-core/search-service/src/main/resources/static/search/favicon.ico similarity index 100% rename from services-core/search-service/src/main/resources/static/search/favicon.ico rename to code/services-core/search-service/src/main/resources/static/search/favicon.ico diff --git a/services-core/search-service/src/main/resources/static/search/known-issues.html b/code/services-core/search-service/src/main/resources/static/search/known-issues.html similarity index 100% rename from services-core/search-service/src/main/resources/static/search/known-issues.html rename to code/services-core/search-service/src/main/resources/static/search/known-issues.html diff --git a/services-core/search-service/src/main/resources/static/search/maintenance.html b/code/services-core/search-service/src/main/resources/static/search/maintenance.html similarity index 100% rename from services-core/search-service/src/main/resources/static/search/maintenance.html rename to code/services-core/search-service/src/main/resources/static/search/maintenance.html diff --git a/services-core/search-service/src/main/resources/static/search/notes.html b/code/services-core/search-service/src/main/resources/static/search/notes.html similarity index 100% rename from services-core/search-service/src/main/resources/static/search/notes.html rename to code/services-core/search-service/src/main/resources/static/search/notes.html diff --git a/services-core/search-service/src/main/resources/static/search/opensearch.xml b/code/services-core/search-service/src/main/resources/static/search/opensearch.xml similarity index 100% rename from services-core/search-service/src/main/resources/static/search/opensearch.xml rename to code/services-core/search-service/src/main/resources/static/search/opensearch.xml diff --git a/services-core/search-service/src/main/resources/static/search/robots.txt b/code/services-core/search-service/src/main/resources/static/search/robots.txt similarity index 100% rename from services-core/search-service/src/main/resources/static/search/robots.txt rename to code/services-core/search-service/src/main/resources/static/search/robots.txt diff --git a/services-core/search-service/src/main/resources/static/search/style-new.css b/code/services-core/search-service/src/main/resources/static/search/style-new.css similarity index 100% rename from services-core/search-service/src/main/resources/static/search/style-new.css rename to code/services-core/search-service/src/main/resources/static/search/style-new.css diff --git a/services-core/search-service/src/main/resources/static/search/tts.js b/code/services-core/search-service/src/main/resources/static/search/tts.js similarity index 100% rename from services-core/search-service/src/main/resources/static/search/tts.js rename to code/services-core/search-service/src/main/resources/static/search/tts.js diff --git a/services-core/search-service/src/main/resources/static/search/wiki-clean.html b/code/services-core/search-service/src/main/resources/static/search/wiki-clean.html similarity index 100% rename from services-core/search-service/src/main/resources/static/search/wiki-clean.html rename to code/services-core/search-service/src/main/resources/static/search/wiki-clean.html diff --git a/services-core/search-service/src/main/resources/templates/search/browse-result.hdb b/code/services-core/search-service/src/main/resources/templates/search/browse-result.hdb similarity index 100% rename from services-core/search-service/src/main/resources/templates/search/browse-result.hdb rename to code/services-core/search-service/src/main/resources/templates/search/browse-result.hdb diff --git a/services-core/search-service/src/main/resources/templates/search/browse-results.hdb b/code/services-core/search-service/src/main/resources/templates/search/browse-results.hdb similarity index 100% rename from services-core/search-service/src/main/resources/templates/search/browse-results.hdb rename to code/services-core/search-service/src/main/resources/templates/search/browse-results.hdb diff --git a/services-core/search-service/src/main/resources/templates/search/conversion-results.hdb b/code/services-core/search-service/src/main/resources/templates/search/conversion-results.hdb similarity index 100% rename from services-core/search-service/src/main/resources/templates/search/conversion-results.hdb rename to code/services-core/search-service/src/main/resources/templates/search/conversion-results.hdb diff --git a/services-core/search-service/src/main/resources/templates/search/dictionary-results.hdb b/code/services-core/search-service/src/main/resources/templates/search/dictionary-results.hdb similarity index 100% rename from services-core/search-service/src/main/resources/templates/search/dictionary-results.hdb rename to code/services-core/search-service/src/main/resources/templates/search/dictionary-results.hdb diff --git a/services-core/search-service/src/main/resources/templates/search/error-page.hdb b/code/services-core/search-service/src/main/resources/templates/search/error-page.hdb similarity index 100% rename from services-core/search-service/src/main/resources/templates/search/error-page.hdb rename to code/services-core/search-service/src/main/resources/templates/search/error-page.hdb diff --git a/services-core/search-service/src/main/resources/templates/search/index.hdb b/code/services-core/search-service/src/main/resources/templates/search/index.hdb similarity index 100% rename from services-core/search-service/src/main/resources/templates/search/index.hdb rename to code/services-core/search-service/src/main/resources/templates/search/index.hdb diff --git a/services-core/search-service/src/main/resources/templates/search/indict/indict-form.hdb b/code/services-core/search-service/src/main/resources/templates/search/indict/indict-form.hdb similarity index 100% rename from services-core/search-service/src/main/resources/templates/search/indict/indict-form.hdb rename to code/services-core/search-service/src/main/resources/templates/search/indict/indict-form.hdb diff --git a/services-core/search-service/src/main/resources/templates/search/parts/search-footer.hdb b/code/services-core/search-service/src/main/resources/templates/search/parts/search-footer.hdb similarity index 100% rename from services-core/search-service/src/main/resources/templates/search/parts/search-footer.hdb rename to code/services-core/search-service/src/main/resources/templates/search/parts/search-footer.hdb diff --git a/services-core/search-service/src/main/resources/templates/search/parts/search-form.hdb b/code/services-core/search-service/src/main/resources/templates/search/parts/search-form.hdb similarity index 100% rename from services-core/search-service/src/main/resources/templates/search/parts/search-form.hdb rename to code/services-core/search-service/src/main/resources/templates/search/parts/search-form.hdb diff --git a/services-core/search-service/src/main/resources/templates/search/parts/search-header.hdb b/code/services-core/search-service/src/main/resources/templates/search/parts/search-header.hdb similarity index 100% rename from services-core/search-service/src/main/resources/templates/search/parts/search-header.hdb rename to code/services-core/search-service/src/main/resources/templates/search/parts/search-header.hdb diff --git a/services-core/search-service/src/main/resources/templates/search/parts/site-info-index.hdb b/code/services-core/search-service/src/main/resources/templates/search/parts/site-info-index.hdb similarity index 100% rename from services-core/search-service/src/main/resources/templates/search/parts/site-info-index.hdb rename to code/services-core/search-service/src/main/resources/templates/search/parts/site-info-index.hdb diff --git a/services-core/search-service/src/main/resources/templates/search/parts/site-info-links.hdb b/code/services-core/search-service/src/main/resources/templates/search/parts/site-info-links.hdb similarity index 100% rename from services-core/search-service/src/main/resources/templates/search/parts/site-info-links.hdb rename to code/services-core/search-service/src/main/resources/templates/search/parts/site-info-links.hdb diff --git a/services-core/search-service/src/main/resources/templates/search/search-result-metadata.hdb b/code/services-core/search-service/src/main/resources/templates/search/search-result-metadata.hdb similarity index 100% rename from services-core/search-service/src/main/resources/templates/search/search-result-metadata.hdb rename to code/services-core/search-service/src/main/resources/templates/search/search-result-metadata.hdb diff --git a/services-core/search-service/src/main/resources/templates/search/search-result.hdb b/code/services-core/search-service/src/main/resources/templates/search/search-result.hdb similarity index 100% rename from services-core/search-service/src/main/resources/templates/search/search-result.hdb rename to code/services-core/search-service/src/main/resources/templates/search/search-result.hdb diff --git a/services-core/search-service/src/main/resources/templates/search/search-results.hdb b/code/services-core/search-service/src/main/resources/templates/search/search-results.hdb similarity index 100% rename from services-core/search-service/src/main/resources/templates/search/search-results.hdb rename to code/services-core/search-service/src/main/resources/templates/search/search-results.hdb diff --git a/services-core/search-service/src/main/resources/templates/search/site-info.hdb b/code/services-core/search-service/src/main/resources/templates/search/site-info.hdb similarity index 100% rename from services-core/search-service/src/main/resources/templates/search/site-info.hdb rename to code/services-core/search-service/src/main/resources/templates/search/site-info.hdb diff --git a/services-core/search-service/src/test/java/nu/marginalia/search/command/commands/BangCommandTest.java b/code/services-core/search-service/src/test/java/nu/marginalia/search/command/commands/BangCommandTest.java similarity index 100% rename from services-core/search-service/src/test/java/nu/marginalia/search/command/commands/BangCommandTest.java rename to code/services-core/search-service/src/test/java/nu/marginalia/search/command/commands/BangCommandTest.java diff --git a/services-core/search-service/src/test/java/nu/marginalia/search/query/QueryFactoryTest.java b/code/services-core/search-service/src/test/java/nu/marginalia/search/query/QueryFactoryTest.java similarity index 100% rename from services-core/search-service/src/test/java/nu/marginalia/search/query/QueryFactoryTest.java rename to code/services-core/search-service/src/test/java/nu/marginalia/search/query/QueryFactoryTest.java diff --git a/services-core/search-service/src/test/java/nu/marginalia/util/TestLanguageModels.java b/code/services-core/search-service/src/test/java/nu/marginalia/util/TestLanguageModels.java similarity index 100% rename from services-core/search-service/src/test/java/nu/marginalia/util/TestLanguageModels.java rename to code/services-core/search-service/src/test/java/nu/marginalia/util/TestLanguageModels.java diff --git a/services-satellite/api-service/build.gradle b/code/services-satellite/api-service/build.gradle similarity index 78% rename from services-satellite/api-service/build.gradle rename to code/services-satellite/api-service/build.gradle index 72b4357c..ebb78374 100644 --- a/services-satellite/api-service/build.gradle +++ b/code/services-satellite/api-service/build.gradle @@ -22,12 +22,12 @@ apply from: "$rootProject.projectDir/docker-service.gradle" dependencies { implementation project(':third-party') - implementation project(':common:model') - implementation project(':common:service') - implementation project(':common:config') - implementation project(':common:service-discovery') - implementation project(':common:service-client') - implementation project(':api:search-api') + implementation project(':code:common:model') + implementation project(':code:common:service') + implementation project(':code:common:config') + implementation project(':code:common:service-discovery') + implementation project(':code:common:service-client') + implementation project(':code:api:search-api') implementation libs.lombok diff --git a/services-satellite/api-service/readme.md b/code/services-satellite/api-service/readme.md similarity index 100% rename from services-satellite/api-service/readme.md rename to code/services-satellite/api-service/readme.md diff --git a/services-satellite/api-service/src/main/java/nu/marginalia/api/ApiMain.java b/code/services-satellite/api-service/src/main/java/nu/marginalia/api/ApiMain.java similarity index 100% rename from services-satellite/api-service/src/main/java/nu/marginalia/api/ApiMain.java rename to code/services-satellite/api-service/src/main/java/nu/marginalia/api/ApiMain.java diff --git a/services-satellite/api-service/src/main/java/nu/marginalia/api/ApiService.java b/code/services-satellite/api-service/src/main/java/nu/marginalia/api/ApiService.java similarity index 100% rename from services-satellite/api-service/src/main/java/nu/marginalia/api/ApiService.java rename to code/services-satellite/api-service/src/main/java/nu/marginalia/api/ApiService.java diff --git a/services-satellite/api-service/src/main/java/nu/marginalia/api/model/ApiLicense.java b/code/services-satellite/api-service/src/main/java/nu/marginalia/api/model/ApiLicense.java similarity index 100% rename from services-satellite/api-service/src/main/java/nu/marginalia/api/model/ApiLicense.java rename to code/services-satellite/api-service/src/main/java/nu/marginalia/api/model/ApiLicense.java diff --git a/services-satellite/dating-service/build.gradle b/code/services-satellite/dating-service/build.gradle similarity index 71% rename from services-satellite/dating-service/build.gradle rename to code/services-satellite/dating-service/build.gradle index 526e248c..34b207b6 100644 --- a/services-satellite/dating-service/build.gradle +++ b/code/services-satellite/dating-service/build.gradle @@ -20,14 +20,14 @@ java { } dependencies { implementation project(':third-party') - implementation project(':common:model') - implementation project(':common:service') - implementation project(':common:service-discovery') - implementation project(':common:service-client') - implementation project(':common:renderer') - implementation project(':features:screenshots') - implementation project(':libraries:language-processing') - implementation project(':features:random-websites') + implementation project(':code:common:model') + implementation project(':code:common:service') + implementation project(':code:common:service-discovery') + implementation project(':code:common:service-client') + implementation project(':code:common:renderer') + implementation project(':code:features:screenshots') + implementation project(':code:libraries:language-processing') + implementation project(':code:features:random-websites') implementation libs.lombok diff --git a/services-satellite/dating-service/readme.md b/code/services-satellite/dating-service/readme.md similarity index 100% rename from services-satellite/dating-service/readme.md rename to code/services-satellite/dating-service/readme.md diff --git a/services-satellite/dating-service/src/main/java/nu/marginalia/dating/DatingMain.java b/code/services-satellite/dating-service/src/main/java/nu/marginalia/dating/DatingMain.java similarity index 100% rename from services-satellite/dating-service/src/main/java/nu/marginalia/dating/DatingMain.java rename to code/services-satellite/dating-service/src/main/java/nu/marginalia/dating/DatingMain.java diff --git a/services-satellite/dating-service/src/main/java/nu/marginalia/dating/DatingModule.java b/code/services-satellite/dating-service/src/main/java/nu/marginalia/dating/DatingModule.java similarity index 100% rename from services-satellite/dating-service/src/main/java/nu/marginalia/dating/DatingModule.java rename to code/services-satellite/dating-service/src/main/java/nu/marginalia/dating/DatingModule.java diff --git a/services-satellite/dating-service/src/main/java/nu/marginalia/dating/DatingService.java b/code/services-satellite/dating-service/src/main/java/nu/marginalia/dating/DatingService.java similarity index 100% rename from services-satellite/dating-service/src/main/java/nu/marginalia/dating/DatingService.java rename to code/services-satellite/dating-service/src/main/java/nu/marginalia/dating/DatingService.java diff --git a/services-satellite/dating-service/src/main/java/nu/marginalia/dating/DatingSessionObject.java b/code/services-satellite/dating-service/src/main/java/nu/marginalia/dating/DatingSessionObject.java similarity index 100% rename from services-satellite/dating-service/src/main/java/nu/marginalia/dating/DatingSessionObject.java rename to code/services-satellite/dating-service/src/main/java/nu/marginalia/dating/DatingSessionObject.java diff --git a/services-satellite/dating-service/src/main/resources/static/dating/index.html b/code/services-satellite/dating-service/src/main/resources/static/dating/index.html similarity index 100% rename from services-satellite/dating-service/src/main/resources/static/dating/index.html rename to code/services-satellite/dating-service/src/main/resources/static/dating/index.html diff --git a/services-satellite/dating-service/src/main/resources/static/dating/robots.txt b/code/services-satellite/dating-service/src/main/resources/static/dating/robots.txt similarity index 100% rename from services-satellite/dating-service/src/main/resources/static/dating/robots.txt rename to code/services-satellite/dating-service/src/main/resources/static/dating/robots.txt diff --git a/services-satellite/dating-service/src/main/resources/templates/dating/dating-view.hdb b/code/services-satellite/dating-service/src/main/resources/templates/dating/dating-view.hdb similarity index 100% rename from services-satellite/dating-service/src/main/resources/templates/dating/dating-view.hdb rename to code/services-satellite/dating-service/src/main/resources/templates/dating/dating-view.hdb diff --git a/services-satellite/explorer-service/build.gradle b/code/services-satellite/explorer-service/build.gradle similarity index 77% rename from services-satellite/explorer-service/build.gradle rename to code/services-satellite/explorer-service/build.gradle index 95c52712..93edc7b6 100644 --- a/services-satellite/explorer-service/build.gradle +++ b/code/services-satellite/explorer-service/build.gradle @@ -20,13 +20,13 @@ java { } dependencies { implementation project(':third-party') - implementation project(':common:model') - implementation project(':common:service') - implementation project(':common:service-discovery') - implementation project(':common:service-client') - implementation project(':common:renderer') + implementation project(':code:common:model') + implementation project(':code:common:service') + implementation project(':code:common:service-discovery') + implementation project(':code:common:service-client') + implementation project(':code:common:renderer') - implementation project(':features:random-websites') + implementation project(':code:features:random-websites') implementation libs.lombok diff --git a/services-satellite/explorer-service/readme.md b/code/services-satellite/explorer-service/readme.md similarity index 100% rename from services-satellite/explorer-service/readme.md rename to code/services-satellite/explorer-service/readme.md diff --git a/services-satellite/explorer-service/src/main/java/nu/marginalia/explorer/ExplorerMain.java b/code/services-satellite/explorer-service/src/main/java/nu/marginalia/explorer/ExplorerMain.java similarity index 100% rename from services-satellite/explorer-service/src/main/java/nu/marginalia/explorer/ExplorerMain.java rename to code/services-satellite/explorer-service/src/main/java/nu/marginalia/explorer/ExplorerMain.java diff --git a/services-satellite/explorer-service/src/main/java/nu/marginalia/explorer/ExplorerService.java b/code/services-satellite/explorer-service/src/main/java/nu/marginalia/explorer/ExplorerService.java similarity index 100% rename from services-satellite/explorer-service/src/main/java/nu/marginalia/explorer/ExplorerService.java rename to code/services-satellite/explorer-service/src/main/java/nu/marginalia/explorer/ExplorerService.java diff --git a/services-satellite/explorer-service/src/main/resources/static/explore/style.css b/code/services-satellite/explorer-service/src/main/resources/static/explore/style.css similarity index 100% rename from services-satellite/explorer-service/src/main/resources/static/explore/style.css rename to code/services-satellite/explorer-service/src/main/resources/static/explore/style.css diff --git a/services-satellite/explorer-service/src/main/resources/templates/explorer/explorer-about.hdb b/code/services-satellite/explorer-service/src/main/resources/templates/explorer/explorer-about.hdb similarity index 100% rename from services-satellite/explorer-service/src/main/resources/templates/explorer/explorer-about.hdb rename to code/services-satellite/explorer-service/src/main/resources/templates/explorer/explorer-about.hdb diff --git a/services-satellite/explorer-service/src/main/resources/templates/explorer/explorer-messages.hdb b/code/services-satellite/explorer-service/src/main/resources/templates/explorer/explorer-messages.hdb similarity index 100% rename from services-satellite/explorer-service/src/main/resources/templates/explorer/explorer-messages.hdb rename to code/services-satellite/explorer-service/src/main/resources/templates/explorer/explorer-messages.hdb diff --git a/services-satellite/explorer-service/src/main/resources/templates/explorer/explorer-results.hdb b/code/services-satellite/explorer-service/src/main/resources/templates/explorer/explorer-results.hdb similarity index 100% rename from services-satellite/explorer-service/src/main/resources/templates/explorer/explorer-results.hdb rename to code/services-satellite/explorer-service/src/main/resources/templates/explorer/explorer-results.hdb diff --git a/services-satellite/explorer-service/src/main/resources/templates/explorer/explorer-search.hdb b/code/services-satellite/explorer-service/src/main/resources/templates/explorer/explorer-search.hdb similarity index 100% rename from services-satellite/explorer-service/src/main/resources/templates/explorer/explorer-search.hdb rename to code/services-satellite/explorer-service/src/main/resources/templates/explorer/explorer-search.hdb diff --git a/services-satellite/explorer-service/src/main/resources/templates/explorer/explorer.hdb b/code/services-satellite/explorer-service/src/main/resources/templates/explorer/explorer.hdb similarity index 100% rename from services-satellite/explorer-service/src/main/resources/templates/explorer/explorer.hdb rename to code/services-satellite/explorer-service/src/main/resources/templates/explorer/explorer.hdb diff --git a/services-satellite/readme.md b/code/services-satellite/readme.md similarity index 100% rename from services-satellite/readme.md rename to code/services-satellite/readme.md diff --git a/other/memex/build.gradle b/other/memex/build.gradle index a276ced1..1ccf83a0 100644 --- a/other/memex/build.gradle +++ b/other/memex/build.gradle @@ -60,11 +60,11 @@ jmhJar { } dependencies { implementation project(':third-party') - implementation project(':common:service') - implementation project(':common:config') - implementation project(':libraries:misc') - implementation project(':common:service-discovery') - implementation project(':common:service-client') + implementation project(':code:common:service') + implementation project(':code:common:config') + implementation project(':code:libraries:misc') + implementation project(':code:common:service-discovery') + implementation project(':code:common:service-client') implementation 'org.projectlombok:lombok:1.18.24' implementation 'org.jetbrains:annotations:20.1.0' diff --git a/other/wmsa_old/build.gradle b/other/wmsa_old/build.gradle index d4a2b4e1..8b41cbc9 100644 --- a/other/wmsa_old/build.gradle +++ b/other/wmsa_old/build.gradle @@ -31,9 +31,9 @@ java { } dependencies { implementation project(':third-party') - implementation project(':common:service') - implementation project(':common:service-discovery') - implementation project(':common:service-client') + implementation project(':code:common:service') + implementation project(':code:common:service-discovery') + implementation project(':code:common:service-client') implementation 'org.jetbrains:annotations:24.0.0' diff --git a/settings.gradle b/settings.gradle index e3c0a2c1..912f8678 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,52 +1,52 @@ rootProject.name = 'marginalia.nu' -include 'services-core:index-service' -include 'services-core:assistant-service' -include 'services-core:search-service' +include 'code:services-core:index-service' +include 'code:services-core:assistant-service' +include 'code:services-core:search-service' -include 'services-satellite:api-service' -include 'services-satellite:dating-service' -include 'services-satellite:explorer-service' +include 'code:services-satellite:api-service' +include 'code:services-satellite:dating-service' +include 'code:services-satellite:explorer-service' -include 'libraries:array' -include 'libraries:btree' -include 'libraries:easy-lsh' -include 'libraries:guarded-regex' -include 'libraries:big-string' -include 'libraries:random-write-funnel' -include 'libraries:misc' -include 'libraries:language-processing' +include 'code:libraries:array' +include 'code:libraries:btree' +include 'code:libraries:easy-lsh' +include 'code:libraries:guarded-regex' +include 'code:libraries:big-string' +include 'code:libraries:random-write-funnel' +include 'code:libraries:misc' +include 'code:libraries:language-processing' -include 'features:screenshots' -include 'features:random-websites' -include 'features:domain-ranking' -include 'features:query-parser' +include 'code:features:screenshots' +include 'code:features:random-websites' +include 'code:features:domain-ranking' +include 'code:features:query-parser' -include 'api:search-api' -include 'api:index-api' -include 'api:assistant-api' +include 'code:api:search-api' +include 'code:api:index-api' +include 'code:api:assistant-api' -include 'index:lexicon' -include 'index:index-journal' -include 'index:index-query' -include 'index:index-forward' -include 'index:index-reverse' +include 'code:index:lexicon' +include 'code:index:index-journal' +include 'code:index:index-query' +include 'code:index:index-forward' +include 'code:index:index-reverse' -include 'common:service-discovery' -include 'common:service-client' -include 'common:service' -include 'common:config' -include 'common:model' -include 'common:renderer' +include 'code:common:service-discovery' +include 'code:common:service-client' +include 'code:common:service' +include 'code:common:config' +include 'code:common:model' +include 'code:common:renderer' -include 'crawl:crawl-job-extractor-process' -include 'crawl:crawling-process' -include 'crawl:crawling-model' -include 'crawl:converting-process' -include 'crawl:converting-model' -include 'crawl:loading-process' -include 'crawl:common' -include 'crawl:experimental' +include 'code:crawl:crawl-job-extractor-process' +include 'code:crawl:crawling-process' +include 'code:crawl:crawling-model' +include 'code:crawl:converting-process' +include 'code:crawl:converting-model' +include 'code:crawl:loading-process' +include 'code:crawl:common' +include 'code:crawl:experimental' include 'third-party' include 'other:memex' diff --git a/tools/screenshot/build.gradle b/tools/screenshot/build.gradle index 56970737..fe0b8345 100644 --- a/tools/screenshot/build.gradle +++ b/tools/screenshot/build.gradle @@ -18,9 +18,9 @@ application { dependencies { implementation project(':third-party') - implementation project(':common:model') - implementation project(':features:screenshots') - implementation project(':common:service') + implementation project(':code:common:model') + implementation project(':code:features:screenshots') + implementation project(':code:common:service') implementation libs.lombok annotationProcessor libs.lombok