diff --git a/code/features-control/actors/build.gradle b/code/features-control/actors/build.gradle deleted file mode 100644 index da12c712..00000000 --- a/code/features-control/actors/build.gradle +++ /dev/null @@ -1,41 +0,0 @@ - -plugins { - id 'java' - id 'jvm-test-suite' -} - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) - } -} - -dependencies { - - implementation project(':code:libraries:message-queue') - implementation project(':code:common:service') - implementation project(':code:common:process') - implementation project(':code:common:model') - implementation project(':code:common:service-client') - implementation project(':code:common:db') - implementation project(':code:common:config') - implementation project(':code:api:process-mqapi') - implementation project(':code:api:index-api') - implementation project(':code:features-control:process-execution') - implementation project(':code:features-index:index-journal') - implementation project(':code:process-models:crawl-spec') - - implementation libs.bundles.slf4j - implementation libs.guice - implementation libs.notnull - implementation libs.spark - implementation libs.jsoup - implementation libs.zstd - implementation libs.bundles.mariadb - implementation libs.commons.io - implementation libs.bundles.gson - - testImplementation libs.bundles.slf4j.test - testImplementation libs.bundles.junit - testImplementation libs.mockito -} diff --git a/code/features-control/process-execution/build.gradle b/code/features-control/process-execution/build.gradle deleted file mode 100644 index b2ab9536..00000000 --- a/code/features-control/process-execution/build.gradle +++ /dev/null @@ -1,28 +0,0 @@ - -plugins { - id 'java' - id 'jvm-test-suite' -} - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) - } -} - -dependencies { - - implementation project(':code:libraries:message-queue') - implementation project(':code:common:service') - implementation project(':code:common:process') - implementation project(':code:api:process-mqapi') - - implementation libs.bundles.slf4j - implementation libs.guice - implementation libs.notnull - implementation libs.jsoup - - testImplementation libs.bundles.slf4j.test - testImplementation libs.bundles.junit - testImplementation libs.mockito -} diff --git a/code/services-core/executor-service/build.gradle b/code/services-core/executor-service/build.gradle index d09b52a7..d8cb39ad 100644 --- a/code/services-core/executor-service/build.gradle +++ b/code/services-core/executor-service/build.gradle @@ -25,16 +25,20 @@ dependencies { implementation project(':code:common:config') implementation project(':code:common:model') implementation project(':code:common:db') + implementation project(':code:common:service') implementation project(':code:common:service-client') - implementation project(':code:api:index-api') - implementation project(':code:api:query-api') - implementation project(':code:api:executor-api') implementation project(':code:common:service-discovery') + implementation project(':code:libraries:message-queue') - implementation project(':code:features-control:process-execution') - implementation project(':code:features-control:actors') + implementation project(':code:process-models:crawl-spec') + implementation project(':code:features-index:index-journal') + + implementation project(':code:api:index-api') + implementation project(':code:api:query-api') + implementation project(':code:api:process-mqapi') + implementation project(':code:api:executor-api') implementation libs.bundles.slf4j @@ -45,6 +49,8 @@ dependencies { implementation libs.guice implementation libs.protobuf implementation libs.rxjava + implementation libs.zstd + implementation libs.commons.io implementation libs.bundles.mariadb testImplementation libs.bundles.slf4j.test diff --git a/code/features-control/actors/src/main/java/nu/marginalia/actor/Actor.java b/code/services-core/executor-service/src/main/java/nu/marginalia/actor/Actor.java similarity index 100% rename from code/features-control/actors/src/main/java/nu/marginalia/actor/Actor.java rename to code/services-core/executor-service/src/main/java/nu/marginalia/actor/Actor.java diff --git a/code/features-control/actors/src/main/java/nu/marginalia/actor/ActorApi.java b/code/services-core/executor-service/src/main/java/nu/marginalia/actor/ActorApi.java similarity index 100% rename from code/features-control/actors/src/main/java/nu/marginalia/actor/ActorApi.java rename to code/services-core/executor-service/src/main/java/nu/marginalia/actor/ActorApi.java diff --git a/code/features-control/actors/src/main/java/nu/marginalia/actor/ActorControlService.java b/code/services-core/executor-service/src/main/java/nu/marginalia/actor/ActorControlService.java similarity index 100% rename from code/features-control/actors/src/main/java/nu/marginalia/actor/ActorControlService.java rename to code/services-core/executor-service/src/main/java/nu/marginalia/actor/ActorControlService.java diff --git a/code/features-control/actors/src/main/java/nu/marginalia/actor/monitor/AbstractProcessSpawnerActor.java b/code/services-core/executor-service/src/main/java/nu/marginalia/actor/monitor/AbstractProcessSpawnerActor.java similarity index 99% rename from code/features-control/actors/src/main/java/nu/marginalia/actor/monitor/AbstractProcessSpawnerActor.java rename to code/services-core/executor-service/src/main/java/nu/marginalia/actor/monitor/AbstractProcessSpawnerActor.java index 4b8cfffa..6010497a 100644 --- a/code/features-control/actors/src/main/java/nu/marginalia/actor/monitor/AbstractProcessSpawnerActor.java +++ b/code/services-core/executor-service/src/main/java/nu/marginalia/actor/monitor/AbstractProcessSpawnerActor.java @@ -7,7 +7,7 @@ import nu.marginalia.actor.prototype.AbstractActorPrototype; import nu.marginalia.actor.state.ActorResumeBehavior; import nu.marginalia.actor.state.ActorState; import nu.marginalia.actor.state.ActorTerminalState; -import nu.marginalia.control.process.ProcessService; +import nu.marginalia.process.ProcessService; import nu.marginalia.mq.MqMessageState; import nu.marginalia.mq.persistence.MqPersistence; import nu.marginalia.service.module.ServiceConfiguration; diff --git a/code/features-control/actors/src/main/java/nu/marginalia/actor/monitor/FileStorageMonitorActor.java b/code/services-core/executor-service/src/main/java/nu/marginalia/actor/monitor/FileStorageMonitorActor.java similarity index 100% rename from code/features-control/actors/src/main/java/nu/marginalia/actor/monitor/FileStorageMonitorActor.java rename to code/services-core/executor-service/src/main/java/nu/marginalia/actor/monitor/FileStorageMonitorActor.java diff --git a/code/features-control/actors/src/main/java/nu/marginalia/actor/monitor/MessageQueueMonitorActor.java b/code/services-core/executor-service/src/main/java/nu/marginalia/actor/monitor/MessageQueueMonitorActor.java similarity index 100% rename from code/features-control/actors/src/main/java/nu/marginalia/actor/monitor/MessageQueueMonitorActor.java rename to code/services-core/executor-service/src/main/java/nu/marginalia/actor/monitor/MessageQueueMonitorActor.java diff --git a/code/features-control/actors/src/main/java/nu/marginalia/actor/proc/ConverterMonitorActor.java b/code/services-core/executor-service/src/main/java/nu/marginalia/actor/proc/ConverterMonitorActor.java similarity index 94% rename from code/features-control/actors/src/main/java/nu/marginalia/actor/proc/ConverterMonitorActor.java rename to code/services-core/executor-service/src/main/java/nu/marginalia/actor/proc/ConverterMonitorActor.java index 53b73460..83c7fbd2 100644 --- a/code/features-control/actors/src/main/java/nu/marginalia/actor/proc/ConverterMonitorActor.java +++ b/code/services-core/executor-service/src/main/java/nu/marginalia/actor/proc/ConverterMonitorActor.java @@ -4,7 +4,7 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import nu.marginalia.actor.ActorStateFactory; import nu.marginalia.actor.monitor.AbstractProcessSpawnerActor; -import nu.marginalia.control.process.ProcessService; +import nu.marginalia.process.ProcessService; import nu.marginalia.mq.persistence.MqPersistence; import nu.marginalia.mqapi.ProcessInboxNames; import nu.marginalia.service.module.ServiceConfiguration; diff --git a/code/features-control/actors/src/main/java/nu/marginalia/actor/proc/CrawlerMonitorActor.java b/code/services-core/executor-service/src/main/java/nu/marginalia/actor/proc/CrawlerMonitorActor.java similarity index 94% rename from code/features-control/actors/src/main/java/nu/marginalia/actor/proc/CrawlerMonitorActor.java rename to code/services-core/executor-service/src/main/java/nu/marginalia/actor/proc/CrawlerMonitorActor.java index 0251d74c..8e969126 100644 --- a/code/features-control/actors/src/main/java/nu/marginalia/actor/proc/CrawlerMonitorActor.java +++ b/code/services-core/executor-service/src/main/java/nu/marginalia/actor/proc/CrawlerMonitorActor.java @@ -4,7 +4,7 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import nu.marginalia.actor.ActorStateFactory; import nu.marginalia.actor.monitor.AbstractProcessSpawnerActor; -import nu.marginalia.control.process.ProcessService; +import nu.marginalia.process.ProcessService; import nu.marginalia.mq.persistence.MqPersistence; import nu.marginalia.mqapi.ProcessInboxNames; import nu.marginalia.service.module.ServiceConfiguration; diff --git a/code/features-control/actors/src/main/java/nu/marginalia/actor/proc/IndexConstructorMonitorActor.java b/code/services-core/executor-service/src/main/java/nu/marginalia/actor/proc/IndexConstructorMonitorActor.java similarity index 95% rename from code/features-control/actors/src/main/java/nu/marginalia/actor/proc/IndexConstructorMonitorActor.java rename to code/services-core/executor-service/src/main/java/nu/marginalia/actor/proc/IndexConstructorMonitorActor.java index 1013fef7..087ec31b 100644 --- a/code/features-control/actors/src/main/java/nu/marginalia/actor/proc/IndexConstructorMonitorActor.java +++ b/code/services-core/executor-service/src/main/java/nu/marginalia/actor/proc/IndexConstructorMonitorActor.java @@ -4,7 +4,7 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import nu.marginalia.actor.ActorStateFactory; import nu.marginalia.actor.monitor.AbstractProcessSpawnerActor; -import nu.marginalia.control.process.ProcessService; +import nu.marginalia.process.ProcessService; import nu.marginalia.mq.persistence.MqPersistence; import nu.marginalia.mqapi.ProcessInboxNames; import nu.marginalia.service.module.ServiceConfiguration; diff --git a/code/features-control/actors/src/main/java/nu/marginalia/actor/proc/LoaderMonitorActor.java b/code/services-core/executor-service/src/main/java/nu/marginalia/actor/proc/LoaderMonitorActor.java similarity index 94% rename from code/features-control/actors/src/main/java/nu/marginalia/actor/proc/LoaderMonitorActor.java rename to code/services-core/executor-service/src/main/java/nu/marginalia/actor/proc/LoaderMonitorActor.java index 69f88542..768cef4b 100644 --- a/code/features-control/actors/src/main/java/nu/marginalia/actor/proc/LoaderMonitorActor.java +++ b/code/services-core/executor-service/src/main/java/nu/marginalia/actor/proc/LoaderMonitorActor.java @@ -4,7 +4,7 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import nu.marginalia.actor.ActorStateFactory; import nu.marginalia.actor.monitor.AbstractProcessSpawnerActor; -import nu.marginalia.control.process.ProcessService; +import nu.marginalia.process.ProcessService; import nu.marginalia.mq.persistence.MqPersistence; import nu.marginalia.mqapi.ProcessInboxNames; import nu.marginalia.service.module.ServiceConfiguration; diff --git a/code/features-control/actors/src/main/java/nu/marginalia/actor/proc/ProcessLivenessMonitorActor.java b/code/services-core/executor-service/src/main/java/nu/marginalia/actor/proc/ProcessLivenessMonitorActor.java similarity index 99% rename from code/features-control/actors/src/main/java/nu/marginalia/actor/proc/ProcessLivenessMonitorActor.java rename to code/services-core/executor-service/src/main/java/nu/marginalia/actor/proc/ProcessLivenessMonitorActor.java index bd29a335..5efe7f56 100644 --- a/code/features-control/actors/src/main/java/nu/marginalia/actor/proc/ProcessLivenessMonitorActor.java +++ b/code/services-core/executor-service/src/main/java/nu/marginalia/actor/proc/ProcessLivenessMonitorActor.java @@ -7,7 +7,7 @@ import nu.marginalia.actor.ActorStateFactory; import nu.marginalia.actor.prototype.AbstractActorPrototype; import nu.marginalia.actor.state.ActorResumeBehavior; import nu.marginalia.actor.state.ActorState; -import nu.marginalia.control.process.ProcessService; +import nu.marginalia.process.ProcessService; import nu.marginalia.service.control.ServiceEventLog; import java.sql.SQLException; diff --git a/code/features-control/actors/src/main/java/nu/marginalia/actor/task/ActorProcessWatcher.java b/code/services-core/executor-service/src/main/java/nu/marginalia/actor/task/ActorProcessWatcher.java similarity index 98% rename from code/features-control/actors/src/main/java/nu/marginalia/actor/task/ActorProcessWatcher.java rename to code/services-core/executor-service/src/main/java/nu/marginalia/actor/task/ActorProcessWatcher.java index 83835e00..8d268b2b 100644 --- a/code/features-control/actors/src/main/java/nu/marginalia/actor/task/ActorProcessWatcher.java +++ b/code/services-core/executor-service/src/main/java/nu/marginalia/actor/task/ActorProcessWatcher.java @@ -3,7 +3,7 @@ package nu.marginalia.actor.task; import com.google.inject.Inject; import com.google.inject.Singleton; import nu.marginalia.actor.prototype.AbstractActorPrototype; -import nu.marginalia.control.process.ProcessService; +import nu.marginalia.process.ProcessService; import nu.marginalia.mq.MqMessage; import nu.marginalia.mq.outbox.MqOutbox; diff --git a/code/features-control/actors/src/main/java/nu/marginalia/actor/task/ConvertActor.java b/code/services-core/executor-service/src/main/java/nu/marginalia/actor/task/ConvertActor.java similarity index 98% rename from code/features-control/actors/src/main/java/nu/marginalia/actor/task/ConvertActor.java rename to code/services-core/executor-service/src/main/java/nu/marginalia/actor/task/ConvertActor.java index 1d13ed45..baf82d23 100644 --- a/code/features-control/actors/src/main/java/nu/marginalia/actor/task/ConvertActor.java +++ b/code/services-core/executor-service/src/main/java/nu/marginalia/actor/task/ConvertActor.java @@ -10,8 +10,8 @@ import nu.marginalia.actor.ActorStateFactory; import nu.marginalia.actor.prototype.AbstractActorPrototype; import nu.marginalia.actor.state.ActorResumeBehavior; import nu.marginalia.actor.state.ActorState; -import nu.marginalia.control.process.ProcessOutboxes; -import nu.marginalia.control.process.ProcessService; +import nu.marginalia.process.ProcessOutboxes; +import nu.marginalia.process.ProcessService; import nu.marginalia.storage.FileStorageService; import nu.marginalia.storage.model.FileStorageBaseType; import nu.marginalia.storage.model.FileStorageId; diff --git a/code/features-control/actors/src/main/java/nu/marginalia/actor/task/ConvertAndLoadActor.java b/code/services-core/executor-service/src/main/java/nu/marginalia/actor/task/ConvertAndLoadActor.java similarity index 99% rename from code/features-control/actors/src/main/java/nu/marginalia/actor/task/ConvertAndLoadActor.java rename to code/services-core/executor-service/src/main/java/nu/marginalia/actor/task/ConvertAndLoadActor.java index e7f44742..97f3e877 100644 --- a/code/features-control/actors/src/main/java/nu/marginalia/actor/task/ConvertAndLoadActor.java +++ b/code/services-core/executor-service/src/main/java/nu/marginalia/actor/task/ConvertAndLoadActor.java @@ -10,8 +10,8 @@ import nu.marginalia.actor.ActorStateFactory; import nu.marginalia.actor.prototype.AbstractActorPrototype; import nu.marginalia.actor.state.ActorResumeBehavior; import nu.marginalia.actor.state.ActorState; -import nu.marginalia.control.process.ProcessOutboxes; -import nu.marginalia.control.process.ProcessService; +import nu.marginalia.process.ProcessOutboxes; +import nu.marginalia.process.ProcessService; import nu.marginalia.svc.BackupService; import nu.marginalia.storage.FileStorageService; import nu.marginalia.storage.model.FileStorageBaseType; diff --git a/code/features-control/actors/src/main/java/nu/marginalia/actor/task/CrawlActor.java b/code/services-core/executor-service/src/main/java/nu/marginalia/actor/task/CrawlActor.java similarity index 97% rename from code/features-control/actors/src/main/java/nu/marginalia/actor/task/CrawlActor.java rename to code/services-core/executor-service/src/main/java/nu/marginalia/actor/task/CrawlActor.java index 94c7823a..92615ca2 100644 --- a/code/features-control/actors/src/main/java/nu/marginalia/actor/task/CrawlActor.java +++ b/code/services-core/executor-service/src/main/java/nu/marginalia/actor/task/CrawlActor.java @@ -10,8 +10,8 @@ import nu.marginalia.actor.ActorStateFactory; import nu.marginalia.actor.prototype.AbstractActorPrototype; import nu.marginalia.actor.state.ActorResumeBehavior; import nu.marginalia.actor.state.ActorState; -import nu.marginalia.control.process.ProcessOutboxes; -import nu.marginalia.control.process.ProcessService; +import nu.marginalia.process.ProcessOutboxes; +import nu.marginalia.process.ProcessService; import nu.marginalia.storage.FileStorageService; import nu.marginalia.storage.model.FileStorageBaseType; import nu.marginalia.storage.model.FileStorageId; diff --git a/code/features-control/actors/src/main/java/nu/marginalia/actor/task/CrawlJobExtractorActor.java b/code/services-core/executor-service/src/main/java/nu/marginalia/actor/task/CrawlJobExtractorActor.java similarity index 100% rename from code/features-control/actors/src/main/java/nu/marginalia/actor/task/CrawlJobExtractorActor.java rename to code/services-core/executor-service/src/main/java/nu/marginalia/actor/task/CrawlJobExtractorActor.java diff --git a/code/features-control/actors/src/main/java/nu/marginalia/actor/task/ExportDataActor.java b/code/services-core/executor-service/src/main/java/nu/marginalia/actor/task/ExportDataActor.java similarity index 100% rename from code/features-control/actors/src/main/java/nu/marginalia/actor/task/ExportDataActor.java rename to code/services-core/executor-service/src/main/java/nu/marginalia/actor/task/ExportDataActor.java diff --git a/code/features-control/actors/src/main/java/nu/marginalia/actor/task/RecrawlActor.java b/code/services-core/executor-service/src/main/java/nu/marginalia/actor/task/RecrawlActor.java similarity index 97% rename from code/features-control/actors/src/main/java/nu/marginalia/actor/task/RecrawlActor.java rename to code/services-core/executor-service/src/main/java/nu/marginalia/actor/task/RecrawlActor.java index b065f01f..204253fe 100644 --- a/code/features-control/actors/src/main/java/nu/marginalia/actor/task/RecrawlActor.java +++ b/code/services-core/executor-service/src/main/java/nu/marginalia/actor/task/RecrawlActor.java @@ -10,8 +10,8 @@ import nu.marginalia.actor.ActorStateFactory; import nu.marginalia.actor.prototype.AbstractActorPrototype; import nu.marginalia.actor.state.ActorResumeBehavior; import nu.marginalia.actor.state.ActorState; -import nu.marginalia.control.process.ProcessOutboxes; -import nu.marginalia.control.process.ProcessService; +import nu.marginalia.process.ProcessOutboxes; +import nu.marginalia.process.ProcessService; import nu.marginalia.storage.FileStorageService; import nu.marginalia.storage.model.FileStorage; import nu.marginalia.storage.model.FileStorageId; diff --git a/code/features-control/actors/src/main/java/nu/marginalia/actor/task/RestoreBackupActor.java b/code/services-core/executor-service/src/main/java/nu/marginalia/actor/task/RestoreBackupActor.java similarity index 100% rename from code/features-control/actors/src/main/java/nu/marginalia/actor/task/RestoreBackupActor.java rename to code/services-core/executor-service/src/main/java/nu/marginalia/actor/task/RestoreBackupActor.java diff --git a/code/features-control/actors/src/main/java/nu/marginalia/actor/task/TriggerAdjacencyCalculationActor.java b/code/services-core/executor-service/src/main/java/nu/marginalia/actor/task/TriggerAdjacencyCalculationActor.java similarity index 97% rename from code/features-control/actors/src/main/java/nu/marginalia/actor/task/TriggerAdjacencyCalculationActor.java rename to code/services-core/executor-service/src/main/java/nu/marginalia/actor/task/TriggerAdjacencyCalculationActor.java index 14a3d500..91dd31bf 100644 --- a/code/features-control/actors/src/main/java/nu/marginalia/actor/task/TriggerAdjacencyCalculationActor.java +++ b/code/services-core/executor-service/src/main/java/nu/marginalia/actor/task/TriggerAdjacencyCalculationActor.java @@ -6,7 +6,7 @@ import nu.marginalia.actor.ActorStateFactory; import nu.marginalia.actor.prototype.AbstractActorPrototype; import nu.marginalia.actor.state.ActorResumeBehavior; import nu.marginalia.actor.state.ActorState; -import nu.marginalia.control.process.ProcessService; +import nu.marginalia.process.ProcessService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/code/features-control/actors/src/main/java/nu/marginalia/actor/task/TruncateLinkDatabase.java b/code/services-core/executor-service/src/main/java/nu/marginalia/actor/task/TruncateLinkDatabase.java similarity index 100% rename from code/features-control/actors/src/main/java/nu/marginalia/actor/task/TruncateLinkDatabase.java rename to code/services-core/executor-service/src/main/java/nu/marginalia/actor/task/TruncateLinkDatabase.java diff --git a/code/features-control/process-execution/src/main/java/nu/marginalia/control/process/ProcessOutboxes.java b/code/services-core/executor-service/src/main/java/nu/marginalia/process/ProcessOutboxes.java similarity index 98% rename from code/features-control/process-execution/src/main/java/nu/marginalia/control/process/ProcessOutboxes.java rename to code/services-core/executor-service/src/main/java/nu/marginalia/process/ProcessOutboxes.java index 9f8d835d..2c7e3fad 100644 --- a/code/features-control/process-execution/src/main/java/nu/marginalia/control/process/ProcessOutboxes.java +++ b/code/services-core/executor-service/src/main/java/nu/marginalia/process/ProcessOutboxes.java @@ -1,4 +1,4 @@ -package nu.marginalia.control.process; +package nu.marginalia.process; import com.google.inject.Inject; import com.google.inject.Singleton; diff --git a/code/features-control/process-execution/src/main/java/nu/marginalia/control/process/ProcessService.java b/code/services-core/executor-service/src/main/java/nu/marginalia/process/ProcessService.java similarity index 99% rename from code/features-control/process-execution/src/main/java/nu/marginalia/control/process/ProcessService.java rename to code/services-core/executor-service/src/main/java/nu/marginalia/process/ProcessService.java index 0dbe147e..7b524792 100644 --- a/code/features-control/process-execution/src/main/java/nu/marginalia/control/process/ProcessService.java +++ b/code/services-core/executor-service/src/main/java/nu/marginalia/process/ProcessService.java @@ -1,4 +1,4 @@ -package nu.marginalia.control.process; +package nu.marginalia.process; import com.google.inject.Inject; import com.google.inject.Singleton; diff --git a/code/features-control/actors/src/main/java/nu/marginalia/svc/BackupService.java b/code/services-core/executor-service/src/main/java/nu/marginalia/svc/BackupService.java similarity index 100% rename from code/features-control/actors/src/main/java/nu/marginalia/svc/BackupService.java rename to code/services-core/executor-service/src/main/java/nu/marginalia/svc/BackupService.java diff --git a/code/services-core/executor-service/src/test/java/nu/marginalia/executor/ExecutorSvcApiIntegrationTest.java b/code/services-core/executor-service/src/test/java/nu/marginalia/executor/ExecutorSvcApiIntegrationTest.java index 08922793..63d1f87c 100644 --- a/code/services-core/executor-service/src/test/java/nu/marginalia/executor/ExecutorSvcApiIntegrationTest.java +++ b/code/services-core/executor-service/src/test/java/nu/marginalia/executor/ExecutorSvcApiIntegrationTest.java @@ -9,8 +9,8 @@ import nu.marginalia.actor.ActorControlService; import nu.marginalia.actor.task.CrawlJobExtractorActor; import nu.marginalia.client.Context; import nu.marginalia.client.route.RouteProvider; -import nu.marginalia.control.process.ProcessOutboxes; -import nu.marginalia.control.process.ProcessService; +import nu.marginalia.process.ProcessOutboxes; +import nu.marginalia.process.ProcessService; import nu.marginalia.storage.FileStorageService; import nu.marginalia.storage.model.FileStorageId; import nu.marginalia.executor.client.ExecutorClient; diff --git a/settings.gradle b/settings.gradle index a9d4d4cf..45e6bcea 100644 --- a/settings.gradle +++ b/settings.gradle @@ -30,9 +30,6 @@ include 'code:features-search:random-websites' include 'code:features-qs:query-parser' include 'code:features-index:result-ranking' -include 'code:features-control:process-execution' -include 'code:features-control:actors' - include 'code:features-convert:adblock' include 'code:features-convert:stackexchange-xml' include 'code:features-convert:pubdate'