From a8a7092ee130bb54e16f60d1f6a6a72a9148f3cf Mon Sep 17 00:00:00 2001 From: Andreas Haufler Date: Fri, 13 Oct 2023 20:36:04 +0200 Subject: [PATCH] Renames component-kernel.conf to support a controlled load order Fixes: SIRI-891 --- README.md | 2 +- src/main/java/sirius/kernel/cache/README.md | 2 +- src/main/java/sirius/kernel/info/README.md | 2 +- src/main/java/sirius/kernel/xml/Outcall.java | 2 +- .../{component-kernel.conf => component-050-kernel.conf} | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename src/main/resources/{component-kernel.conf => component-050-kernel.conf} (100%) diff --git a/README.md b/README.md index 7cac77df..f4c7db7a 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ the core frameworks and a fair amount of commonly used classes. ## Important files of this module: -* [Default configuration](src/main/resources/component-kernel.conf) +* [Default configuration](src/main/resources/component-050-kernel.conf) * [Maven setup](pom.xml). ## The Kernel diff --git a/src/main/java/sirius/kernel/cache/README.md b/src/main/java/sirius/kernel/cache/README.md index a919bda1..c5cc5fba 100644 --- a/src/main/java/sirius/kernel/cache/README.md +++ b/src/main/java/sirius/kernel/cache/README.md @@ -2,7 +2,7 @@ [Caches](Cache.java) can be created using the [CacheManager](CacheManager.java). Each cache should be a constant (**static final**). The configuration of a cache is loaded from the -system configuration using **cache** section (see [component-kernel.conf](../../../../resources/component-kernel.conf)). +system configuration using **cache** section (see [component-kernel.conf](../../../../resources/component-050-kernel.conf)). A coherent cache will be synchronized across a cluster with the help of [CacheCoherence](CacheCoherence.java) - [sirius-biz](https://github.com/scireum/sirius-biz) provides an implementation for this using **Redis**. diff --git a/src/main/java/sirius/kernel/info/README.md b/src/main/java/sirius/kernel/info/README.md index c8db8dcc..0201eeee 100644 --- a/src/main/java/sirius/kernel/info/README.md +++ b/src/main/java/sirius/kernel/info/README.md @@ -1,6 +1,6 @@ # Software Distribution Information With the help of variables in the system configuration -(e.g. [component-kernel.conf](../../../../resources/component-kernel.conf)) the +(e.g. [component-kernel.conf](../../../../resources/component-050-kernel.conf)) the product name and revision as well as a list of all installed modules and their version can be queried using [Product](Product.java). diff --git a/src/main/java/sirius/kernel/xml/Outcall.java b/src/main/java/sirius/kernel/xml/Outcall.java index 42d26742..91a6e6cb 100644 --- a/src/main/java/sirius/kernel/xml/Outcall.java +++ b/src/main/java/sirius/kernel/xml/Outcall.java @@ -331,7 +331,7 @@ public void setReadTimeout(int timeoutMillis) { * Sets the connect-timeout and read-timeout to the values specified in the config block http.outcall.timeouts.* * where * equals the configKey parameter. *

- * See the http.outcall.timeouts.soap block in component-kernel.conf for reference. + * See the http.outcall.timeouts.soap block in component-050-kernel.conf for reference. * * @param configKey the config key of the timeout configuration block * @return this for fluent method calls diff --git a/src/main/resources/component-kernel.conf b/src/main/resources/component-050-kernel.conf similarity index 100% rename from src/main/resources/component-kernel.conf rename to src/main/resources/component-050-kernel.conf