This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit a44bf49cbe1738b25118a0e8a2e5171b9d0c93b7
Author: Luca Burgazzoli <lburgazz...@gmail.com>
AuthorDate: Mon Mar 25 11:20:57 2024 +0100
Move FileLock cluster service to its own module
---
.../{file.adoc => file-cluster-service.adoc} | 43 ++++--------
.../ROOT/pages/reference/extensions/file.adoc | 82 ----------------------
.../deployment/pom.xml | 12 ++--
.../FileLockClusterServiceProcessor.java | 0
...LockClusterServiceConfigDefaultEnabledTest.java | 1 -
.../FileLockClusterServiceConfigDefaultTest.java | 3 +-
...kClusterServiceConfigNonDefaultEnabledTest.java | 1 -
...ileLockClusterServiceConfigNotEnabledTest.java} | 4 +-
extensions/file-cluster-service/pom.xml | 37 ++++++++++
.../runtime}/pom.xml | 50 ++++++++++---
.../runtime/src/main/doc/configuration.adoc | 3 +-
.../file/cluster/FileLockClusterServiceConfig.java | 12 ++--
.../cluster/FileLockClusterServiceRecorder.java | 0
.../main/resources/META-INF/quarkus-extension.yaml | 32 +++++++++
extensions/file/deployment/pom.xml | 5 --
extensions/pom.xml | 1 +
integration-tests/master-file/pom.xml | 4 ++
.../src/main/resources/application.properties | 1 -
poms/bom/pom.xml | 10 +++
poms/bom/src/main/generated/flattened-full-pom.xml | 20 ++++++
.../src/main/generated/flattened-reduced-pom.xml | 20 ++++++
.../generated/flattened-reduced-verbose-pom.xml | 20 ++++++
22 files changed, 221 insertions(+), 140 deletions(-)
diff --git a/docs/modules/ROOT/pages/reference/extensions/file.adoc
b/docs/modules/ROOT/pages/reference/extensions/file-cluster-service.adoc
similarity index 72%
copy from docs/modules/ROOT/pages/reference/extensions/file.adoc
copy to docs/modules/ROOT/pages/reference/extensions/file-cluster-service.adoc
index 39f1d45907..c700ca0686 100644
--- a/docs/modules/ROOT/pages/reference/extensions/file.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/file-cluster-service.adoc
@@ -1,36 +1,28 @@
// Do not edit directly!
// This file was generated by
camel-quarkus-maven-plugin:update-extension-doc-page
-[id="extensions-file"]
-= File
-:page-aliases: extensions/file.adoc
+[id="extensions-file-cluster-service"]
+= File Cluster Service
:linkattrs:
-:cq-artifact-id: camel-quarkus-file
+:cq-artifact-id: camel-quarkus-file-cluster-service
:cq-native-supported: true
:cq-status: Stable
:cq-status-deprecation: Stable
-:cq-description: Read and write files.
+:cq-description: Provides a FileLock implementation of the Camel Cluster
Service SPI
:cq-deprecated: false
-:cq-jvm-since: 0.4.0
-:cq-native-since: 0.4.0
+:cq-jvm-since: 3.10.0
+:cq-native-since: 3.10.0
ifeval::[{doc-show-badges} == true]
[.badges]
-[.badge-key]##JVM since##[.badge-supported]##0.4.0## [.badge-key]##Native
since##[.badge-supported]##0.4.0##
+[.badge-key]##JVM since##[.badge-supported]##3.10.0## [.badge-key]##Native
since##[.badge-supported]##3.10.0##
endif::[]
-Read and write files.
+Provides a FileLock implementation of the Camel Cluster Service SPI
-[id="extensions-file-whats-inside"]
-== What's inside
-
-* xref:{cq-camel-components}::file-component.adoc[File component], URI syntax:
`file:directoryName`
-
-Please refer to the above link for usage and configuration details.
-
-[id="extensions-file-maven-coordinates"]
+[id="extensions-file-cluster-service-maven-coordinates"]
== Maven coordinates
-https://{link-quarkus-code-generator}/?extension-search=camel-quarkus-file[Create
a new project with this extension on {link-quarkus-code-generator},
window="_blank"]
+https://{link-quarkus-code-generator}/?extension-search=camel-quarkus-file-cluster-service[Create
a new project with this extension on {link-quarkus-code-generator},
window="_blank"]
Or add the coordinates to your existing project:
@@ -38,18 +30,18 @@ Or add the coordinates to your existing project:
----
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-file</artifactId>
+ <artifactId>camel-quarkus-file-cluster-service</artifactId>
</dependency>
----
ifeval::[{doc-show-user-guide-link} == true]
Check the xref:user-guide/index.adoc[User guide] for more information about
writing Camel Quarkus applications.
endif::[]
-[id="extensions-file-additional-camel-quarkus-configuration"]
+[id="extensions-file-cluster-service-additional-camel-quarkus-configuration"]
== Additional Camel Quarkus configuration
-[id="extensions-file-configuration-having-only-a-single-consumer-in-a-cluster-consuming-from-a-given-endpoint"]
+[id="extensions-file-cluster-service-configuration-having-only-a-single-consumer-in-a-cluster-consuming-from-a-given-endpoint"]
=== Having only a single consumer in a cluster consuming from a given endpoint
When the same route is deployed on multiple JVMs, it could be interesting to
use this extension in conjunction with the
xref:reference/extensions/master.adoc[Master one].
@@ -61,10 +53,9 @@ For instance, having the route below deployed on multiple
JVMs:
from("master:ns:timer:test?period=100").log("Timer invoked on a single JVM at
a time");
```
-It's possible to enable the file cluster service with a property like below:
+It's possible to configure the file cluster service with a property like below:
```
-quarkus.camel.cluster.file.enabled = true
quarkus.camel.cluster.file.root =
target/cluster-folder-where-lock-file-will-be-held
```
@@ -80,12 +71,6 @@ The file cluster service could further be tuned by tweaking
`quarkus.camel.clust
| Configuration property | Type | Default
-|icon:lock[title=Fixed at build time]
[[quarkus.camel.cluster.file.enabled]]`link:#quarkus.camel.cluster.file.enabled[quarkus.camel.cluster.file.enabled]`
-
-Whether a File Lock Cluster Service should be automatically configured
according to 'quarkus.camel.cluster.file.++*++' configurations.
-| `boolean`
-| `false`
-
|icon:lock[title=Fixed at build time]
[[quarkus.camel.cluster.file.id]]`link:#quarkus.camel.cluster.file.id[quarkus.camel.cluster.file.id]`
The cluster service ID (defaults to null).
diff --git a/docs/modules/ROOT/pages/reference/extensions/file.adoc
b/docs/modules/ROOT/pages/reference/extensions/file.adoc
index 39f1d45907..5c4676e61d 100644
--- a/docs/modules/ROOT/pages/reference/extensions/file.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/file.adoc
@@ -44,85 +44,3 @@ Or add the coordinates to your existing project:
ifeval::[{doc-show-user-guide-link} == true]
Check the xref:user-guide/index.adoc[User guide] for more information about
writing Camel Quarkus applications.
endif::[]
-
-[id="extensions-file-additional-camel-quarkus-configuration"]
-== Additional Camel Quarkus configuration
-
-
-[id="extensions-file-configuration-having-only-a-single-consumer-in-a-cluster-consuming-from-a-given-endpoint"]
-=== Having only a single consumer in a cluster consuming from a given endpoint
-
-When the same route is deployed on multiple JVMs, it could be interesting to
use this extension in conjunction with the
xref:reference/extensions/master.adoc[Master one].
-In such a setup, a single consumer will be active at a time across the whole
camel master namespace.
-
-For instance, having the route below deployed on multiple JVMs:
-
-```
-from("master:ns:timer:test?period=100").log("Timer invoked on a single JVM at
a time");
-```
-
-It's possible to enable the file cluster service with a property like below:
-
-```
-quarkus.camel.cluster.file.enabled = true
-quarkus.camel.cluster.file.root =
target/cluster-folder-where-lock-file-will-be-held
-```
-
-As a result, a single consumer will be active across the `ns` camel master
namespace.
-It means that, at a given time, only a single timer will generate exchanges
across all JVMs.
-In other words, messages will be logged every 100ms on a single JVM at a time.
-
-The file cluster service could further be tuned by tweaking
`quarkus.camel.cluster.file.*` properties.
-
-
-[width="100%",cols="80,5,15",options="header"]
-|===
-| Configuration property | Type | Default
-
-
-|icon:lock[title=Fixed at build time]
[[quarkus.camel.cluster.file.enabled]]`link:#quarkus.camel.cluster.file.enabled[quarkus.camel.cluster.file.enabled]`
-
-Whether a File Lock Cluster Service should be automatically configured
according to 'quarkus.camel.cluster.file.++*++' configurations.
-| `boolean`
-| `false`
-
-|icon:lock[title=Fixed at build time]
[[quarkus.camel.cluster.file.id]]`link:#quarkus.camel.cluster.file.id[quarkus.camel.cluster.file.id]`
-
-The cluster service ID (defaults to null).
-| `string`
-|
-
-|icon:lock[title=Fixed at build time]
[[quarkus.camel.cluster.file.root]]`link:#quarkus.camel.cluster.file.root[quarkus.camel.cluster.file.root]`
-
-The root path (defaults to null).
-| `string`
-|
-
-|icon:lock[title=Fixed at build time]
[[quarkus.camel.cluster.file.order]]`link:#quarkus.camel.cluster.file.order[quarkus.camel.cluster.file.order]`
-
-The service lookup order/priority (defaults to 2147482647).
-| `java.lang.Integer`
-|
-
-|icon:lock[title=Fixed at build time]
[[quarkus.camel.cluster.file.acquire-lock-delay]]`link:#quarkus.camel.cluster.file.acquire-lock-delay[quarkus.camel.cluster.file.acquire-lock-delay]`
-
-The time to wait before starting to try to acquire lock (defaults to 1000ms).
-| `string`
-|
-
-|icon:lock[title=Fixed at build time]
[[quarkus.camel.cluster.file.acquire-lock-interval]]`link:#quarkus.camel.cluster.file.acquire-lock-interval[quarkus.camel.cluster.file.acquire-lock-interval]`
-
-The time to wait between attempts to try to acquire lock (defaults to 10000ms).
-| `string`
-|
-
-|icon:lock[title=Fixed at build time]
[[quarkus.camel.cluster.file.attributes]]`link:#quarkus.camel.cluster.file.attributes[quarkus.camel.cluster.file.attributes]`
-
-The custom attributes associated to the service (defaults to empty map).
-| ``Map<String,String>``
-|
-|===
-
-[.configuration-legend]
-{doc-link-icon-lock}[title=Fixed at build time] Configuration property fixed
at build time. All other configuration properties are overridable at runtime.
-
diff --git a/extensions/file/deployment/pom.xml
b/extensions/file-cluster-service/deployment/pom.xml
similarity index 84%
copy from extensions/file/deployment/pom.xml
copy to extensions/file-cluster-service/deployment/pom.xml
index e0513d1fb7..02aded3215 100644
--- a/extensions/file/deployment/pom.xml
+++ b/extensions/file-cluster-service/deployment/pom.xml
@@ -21,13 +21,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-file-parent</artifactId>
+ <artifactId>camel-quarkus-file-cluster-service-parent</artifactId>
<version>3.10.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>camel-quarkus-file-deployment</artifactId>
- <name>Camel Quarkus :: File :: Deployment</name>
+ <artifactId>camel-quarkus-file-cluster-service-deployment</artifactId>
+ <name>Camel Quarkus :: File Cluster Service :: Deployment</name>
<dependencies>
<dependency>
@@ -36,7 +36,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-file</artifactId>
+ <artifactId>camel-quarkus-file-deployment</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-file-cluster-service</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
diff --git
a/extensions/file/deployment/src/main/java/org/apache/camel/quarkus/component/file/cluster/deployment/FileLockClusterServiceProcessor.java
b/extensions/file-cluster-service/deployment/src/main/java/org/apache/camel/quarkus/component/file/cluster/deployment/FileLockClusterServiceProcessor.java
similarity index 100%
rename from
extensions/file/deployment/src/main/java/org/apache/camel/quarkus/component/file/cluster/deployment/FileLockClusterServiceProcessor.java
rename to
extensions/file-cluster-service/deployment/src/main/java/org/apache/camel/quarkus/component/file/cluster/deployment/FileLockClusterServiceProcessor.java
diff --git
a/extensions/file/deployment/src/test/java/org/apache/camel/quarkus/component/file/cluster/deployment/FileLockClusterServiceConfigDefaultEnabledTest.java
b/extensions/file-cluster-service/deployment/src/test/java/org/apache/camel/quarkus/component/file/cluster/deployment/FileLockClusterServiceConfigDefaultEnabledTest.java
similarity index 97%
rename from
extensions/file/deployment/src/test/java/org/apache/camel/quarkus/component/file/cluster/deployment/FileLockClusterServiceConfigDefaultEnabledTest.java
rename to
extensions/file-cluster-service/deployment/src/test/java/org/apache/camel/quarkus/component/file/cluster/deployment/FileLockClusterServiceConfigDefaultEnabledTest.java
index 4503c9a47e..211b7993e8 100644
---
a/extensions/file/deployment/src/test/java/org/apache/camel/quarkus/component/file/cluster/deployment/FileLockClusterServiceConfigDefaultEnabledTest.java
+++
b/extensions/file-cluster-service/deployment/src/test/java/org/apache/camel/quarkus/component/file/cluster/deployment/FileLockClusterServiceConfigDefaultEnabledTest.java
@@ -50,7 +50,6 @@ public class FileLockClusterServiceConfigDefaultEnabledTest {
Writer writer = new StringWriter();
Properties props = new Properties();
- props.setProperty("quarkus.camel.cluster.file.enabled", "true");
try {
props.store(writer, "");
diff --git
a/extensions/file/deployment/src/test/java/org/apache/camel/quarkus/component/file/cluster/deployment/FileLockClusterServiceConfigDefaultTest.java
b/extensions/file-cluster-service/deployment/src/test/java/org/apache/camel/quarkus/component/file/cluster/deployment/FileLockClusterServiceConfigDefaultTest.java
similarity index 98%
copy from
extensions/file/deployment/src/test/java/org/apache/camel/quarkus/component/file/cluster/deployment/FileLockClusterServiceConfigDefaultTest.java
copy to
extensions/file-cluster-service/deployment/src/test/java/org/apache/camel/quarkus/component/file/cluster/deployment/FileLockClusterServiceConfigDefaultTest.java
index f1e0edea34..da1112b303 100644
---
a/extensions/file/deployment/src/test/java/org/apache/camel/quarkus/component/file/cluster/deployment/FileLockClusterServiceConfigDefaultTest.java
+++
b/extensions/file-cluster-service/deployment/src/test/java/org/apache/camel/quarkus/component/file/cluster/deployment/FileLockClusterServiceConfigDefaultTest.java
@@ -65,6 +65,7 @@ public class FileLockClusterServiceConfigDefaultTest {
.stream()
.filter(s -> s instanceof FileLockClusterService)
.toArray(FileLockClusterService[]::new);
- assertEquals(0, flcs.length);
+
+ assertEquals(1, flcs.length);
}
}
diff --git
a/extensions/file/deployment/src/test/java/org/apache/camel/quarkus/component/file/cluster/deployment/FileLockClusterServiceConfigNonDefaultEnabledTest.java
b/extensions/file-cluster-service/deployment/src/test/java/org/apache/camel/quarkus/component/file/cluster/deployment/FileLockClusterServiceConfigNonDefaultEnabledTest.java
similarity index 98%
rename from
extensions/file/deployment/src/test/java/org/apache/camel/quarkus/component/file/cluster/deployment/FileLockClusterServiceConfigNonDefaultEnabledTest.java
rename to
extensions/file-cluster-service/deployment/src/test/java/org/apache/camel/quarkus/component/file/cluster/deployment/FileLockClusterServiceConfigNonDefaultEnabledTest.java
index 3af26b25bc..9104fda388 100644
---
a/extensions/file/deployment/src/test/java/org/apache/camel/quarkus/component/file/cluster/deployment/FileLockClusterServiceConfigNonDefaultEnabledTest.java
+++
b/extensions/file-cluster-service/deployment/src/test/java/org/apache/camel/quarkus/component/file/cluster/deployment/FileLockClusterServiceConfigNonDefaultEnabledTest.java
@@ -48,7 +48,6 @@ public class
FileLockClusterServiceConfigNonDefaultEnabledTest {
Writer writer = new StringWriter();
Properties props = new Properties();
- props.setProperty("quarkus.camel.cluster.file.enabled", "true");
props.setProperty("quarkus.camel.cluster.file.id", "service-id");
props.setProperty("quarkus.camel.cluster.file.root", "root-path");
props.setProperty("quarkus.camel.cluster.file.order", "10");
diff --git
a/extensions/file/deployment/src/test/java/org/apache/camel/quarkus/component/file/cluster/deployment/FileLockClusterServiceConfigDefaultTest.java
b/extensions/file-cluster-service/deployment/src/test/java/org/apache/camel/quarkus/component/file/cluster/deployment/FileLockClusterServiceConfigNotEnabledTest.java
similarity index 94%
rename from
extensions/file/deployment/src/test/java/org/apache/camel/quarkus/component/file/cluster/deployment/FileLockClusterServiceConfigDefaultTest.java
rename to
extensions/file-cluster-service/deployment/src/test/java/org/apache/camel/quarkus/component/file/cluster/deployment/FileLockClusterServiceConfigNotEnabledTest.java
index f1e0edea34..92d0ea3102 100644
---
a/extensions/file/deployment/src/test/java/org/apache/camel/quarkus/component/file/cluster/deployment/FileLockClusterServiceConfigDefaultTest.java
+++
b/extensions/file-cluster-service/deployment/src/test/java/org/apache/camel/quarkus/component/file/cluster/deployment/FileLockClusterServiceConfigNotEnabledTest.java
@@ -34,7 +34,7 @@ import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
-public class FileLockClusterServiceConfigDefaultTest {
+public class FileLockClusterServiceConfigNotEnabledTest {
@RegisterExtension
static final QuarkusUnitTest CONFIG = new QuarkusUnitTest()
@@ -45,6 +45,7 @@ public class FileLockClusterServiceConfigDefaultTest {
Writer writer = new StringWriter();
Properties props = new Properties();
+ props.setProperty("quarkus.camel.cluster.file.enabled", "false");
try {
props.store(writer, "");
@@ -65,6 +66,7 @@ public class FileLockClusterServiceConfigDefaultTest {
.stream()
.filter(s -> s instanceof FileLockClusterService)
.toArray(FileLockClusterService[]::new);
+
assertEquals(0, flcs.length);
}
}
diff --git a/extensions/file-cluster-service/pom.xml
b/extensions/file-cluster-service/pom.xml
new file mode 100644
index 0000000000..d4d0239673
--- /dev/null
+++ b/extensions/file-cluster-service/pom.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-extensions</artifactId>
+ <version>3.10.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>camel-quarkus-file-cluster-service-parent</artifactId>
+ <name>Camel Quarkus :: File Cluster Service</name>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>deployment</module>
+ <module>runtime</module>
+ </modules>
+</project>
diff --git a/extensions/file/deployment/pom.xml
b/extensions/file-cluster-service/runtime/pom.xml
similarity index 57%
copy from extensions/file/deployment/pom.xml
copy to extensions/file-cluster-service/runtime/pom.xml
index e0513d1fb7..0dd2d67625 100644
--- a/extensions/file/deployment/pom.xml
+++ b/extensions/file-cluster-service/runtime/pom.xml
@@ -21,32 +21,37 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-file-parent</artifactId>
+ <artifactId>camel-quarkus-file-cluster-service-parent</artifactId>
<version>3.10.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>camel-quarkus-file-deployment</artifactId>
- <name>Camel Quarkus :: File :: Deployment</name>
+ <artifactId>camel-quarkus-file-cluster-service</artifactId>
+ <name>Camel Quarkus :: File Cluster Service :: Runtime</name>
+ <description>Provides a FileLock implementation of the Camel Cluster
Service SPI</description>
+
+ <properties>
+ <camel.quarkus.jvmSince>3.10.0</camel.quarkus.jvmSince>
+ <camel.quarkus.nativeSince>3.10.0</camel.quarkus.nativeSince>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-core-deployment</artifactId>
+ <artifactId>camel-quarkus-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-file</artifactId>
</dependency>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-junit5-internal</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<plugins>
+ <plugin>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-extension-maven-plugin</artifactId>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@@ -63,4 +68,31 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <property>
+ <name>!quickly</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>update-extension-doc-page</id>
+ <goals>
+ <goal>update-extension-doc-page</goal>
+ </goals>
+ <phase>process-classes</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/extensions/file/runtime/src/main/doc/configuration.adoc
b/extensions/file-cluster-service/runtime/src/main/doc/configuration.adoc
similarity index 89%
rename from extensions/file/runtime/src/main/doc/configuration.adoc
rename to
extensions/file-cluster-service/runtime/src/main/doc/configuration.adoc
index fc379d6044..2c9e4d2f79 100644
--- a/extensions/file/runtime/src/main/doc/configuration.adoc
+++ b/extensions/file-cluster-service/runtime/src/main/doc/configuration.adoc
@@ -10,10 +10,9 @@ For instance, having the route below deployed on multiple
JVMs:
from("master:ns:timer:test?period=100").log("Timer invoked on a single JVM at
a time");
```
-It's possible to enable the file cluster service with a property like below:
+It's possible to configure the file cluster service with a property like below:
```
-quarkus.camel.cluster.file.enabled = true
quarkus.camel.cluster.file.root =
target/cluster-folder-where-lock-file-will-be-held
```
diff --git
a/extensions/file/runtime/src/main/java/org/apache/camel/quarkus/component/file/cluster/FileLockClusterServiceConfig.java
b/extensions/file-cluster-service/runtime/src/main/java/org/apache/camel/quarkus/component/file/cluster/FileLockClusterServiceConfig.java
similarity index 86%
rename from
extensions/file/runtime/src/main/java/org/apache/camel/quarkus/component/file/cluster/FileLockClusterServiceConfig.java
rename to
extensions/file-cluster-service/runtime/src/main/java/org/apache/camel/quarkus/component/file/cluster/FileLockClusterServiceConfig.java
index e67c5e72bf..5735703f9a 100644
---
a/extensions/file/runtime/src/main/java/org/apache/camel/quarkus/component/file/cluster/FileLockClusterServiceConfig.java
+++
b/extensions/file-cluster-service/runtime/src/main/java/org/apache/camel/quarkus/component/file/cluster/FileLockClusterServiceConfig.java
@@ -22,7 +22,6 @@ import java.util.function.BooleanSupplier;
import io.quarkus.runtime.annotations.ConfigItem;
import io.quarkus.runtime.annotations.ConfigRoot;
-import org.eclipse.microprofile.config.ConfigProvider;
@ConfigRoot(name = "camel.cluster.file")
public class FileLockClusterServiceConfig {
@@ -30,8 +29,12 @@ public class FileLockClusterServiceConfig {
/**
* Whether a File Lock Cluster Service should be automatically configured
* according to 'quarkus.camel.cluster.file.*' configurations.
+ *
+ * @deprecated this property is no longer needed as the FileLock
implementation of the Camel CLuster Service API has
+ * been moved to a dedicated extension.
*/
- @ConfigItem(defaultValue = "false")
+ @Deprecated(since = "3.10.0", forRemoval = true)
+ @ConfigItem(defaultValue = "true")
public boolean enabled;
/**
@@ -71,10 +74,11 @@ public class FileLockClusterServiceConfig {
public Optional<String> acquireLockInterval;
public static final class Enabled implements BooleanSupplier {
+ FileLockClusterServiceConfig config;
+
@Override
public boolean getAsBoolean() {
- return
ConfigProvider.getConfig().getOptionalValue("quarkus.camel.cluster.file.enabled",
Boolean.class)
- .orElse(Boolean.FALSE);
+ return config.enabled;
}
}
}
diff --git
a/extensions/file/runtime/src/main/java/org/apache/camel/quarkus/component/file/cluster/FileLockClusterServiceRecorder.java
b/extensions/file-cluster-service/runtime/src/main/java/org/apache/camel/quarkus/component/file/cluster/FileLockClusterServiceRecorder.java
similarity index 100%
rename from
extensions/file/runtime/src/main/java/org/apache/camel/quarkus/component/file/cluster/FileLockClusterServiceRecorder.java
rename to
extensions/file-cluster-service/runtime/src/main/java/org/apache/camel/quarkus/component/file/cluster/FileLockClusterServiceRecorder.java
diff --git
a/extensions/file-cluster-service/runtime/src/main/resources/META-INF/quarkus-extension.yaml
b/extensions/file-cluster-service/runtime/src/main/resources/META-INF/quarkus-extension.yaml
new file mode 100644
index 0000000000..27d5697759
--- /dev/null
+++
b/extensions/file-cluster-service/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -0,0 +1,32 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# This is a generated file. Do not edit directly!
+# To re-generate, run the following command from the top level directory:
+#
+# mvn -N cq:update-quarkus-metadata
+#
+---
+name: "Camel File Cluster Service"
+description: "Provides a FileLock implementation of the Camel Cluster Service
SPI"
+metadata:
+ icon-url:
"https://raw.githubusercontent.com/apache/camel-website/main/antora-ui-camel/src/img/logo-d.svg";
+ guide:
"https://camel.apache.org/camel-quarkus/latest/reference/extensions/file-cluster-service.html";
+ categories:
+ - "integration"
+ status:
+ - "stable"
diff --git a/extensions/file/deployment/pom.xml
b/extensions/file/deployment/pom.xml
index e0513d1fb7..7c5bdc23df 100644
--- a/extensions/file/deployment/pom.xml
+++ b/extensions/file/deployment/pom.xml
@@ -38,11 +38,6 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-file</artifactId>
</dependency>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-junit5-internal</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
diff --git a/extensions/pom.xml b/extensions/pom.xml
index dd0e224fc3..2d9db9e730 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -99,6 +99,7 @@
<module>exec</module>
<module>fhir</module>
<module>file</module>
+ <module>file-cluster-service</module>
<module>file-watch</module>
<module>flatpack</module>
<module>fop</module>
diff --git a/integration-tests/master-file/pom.xml
b/integration-tests/master-file/pom.xml
index 4e55800cc8..266dd30ee2 100644
--- a/integration-tests/master-file/pom.xml
+++ b/integration-tests/master-file/pom.xml
@@ -39,6 +39,10 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-file</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-file-cluster-service</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-log</artifactId>
diff --git
a/integration-tests/master-file/src/main/resources/application.properties
b/integration-tests/master-file/src/main/resources/application.properties
index 04061f086d..128e1149ea 100644
--- a/integration-tests/master-file/src/main/resources/application.properties
+++ b/integration-tests/master-file/src/main/resources/application.properties
@@ -17,7 +17,6 @@
application.id = leader
-quarkus.camel.cluster.file.enabled = true
quarkus.camel.cluster.file.root = target/cluster
quarkus.camel.cluster.file.acquire-lock-delay = 1s
quarkus.camel.cluster.file.acquire-lock-interval = 1000
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 4380dc1534..3c3e98fad0 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -3710,6 +3710,16 @@
<artifactId>camel-quarkus-file-deployment</artifactId>
<version>${camel-quarkus.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-file-cluster-service</artifactId>
+ <version>${camel-quarkus.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+
<artifactId>camel-quarkus-file-cluster-service-deployment</artifactId>
+ <version>${camel-quarkus.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-file-watch</artifactId>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index 3cffff0283..9fa8061815 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -3635,6 +3635,16 @@
<artifactId>camel-quarkus-file-deployment</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>3.10.0-SNAPSHOT</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>camel-quarkus-file-cluster-service</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>3.9.1-SNAPSHOT</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+
<artifactId>camel-quarkus-file-cluster-service-deployment</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>3.9.1-SNAPSHOT</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>camel-quarkus-file-watch</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -4425,6 +4435,16 @@
<artifactId>camel-quarkus-kubernetes-deployment</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>3.10.0-SNAPSHOT</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>camel-quarkus-kubernetes-cluster-service</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>3.9.1-SNAPSHOT</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+
<artifactId>camel-quarkus-kubernetes-cluster-service-deployment</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>3.9.1-SNAPSHOT</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>camel-quarkus-kudu</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index b14fa1cc00..088ccd5dc7 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -3635,6 +3635,16 @@
<artifactId>camel-quarkus-file-deployment</artifactId>
<version>3.10.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-file-cluster-service</artifactId>
+ <version>3.9.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-file-cluster-service-deployment</artifactId>
+ <version>3.9.1-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-file-watch</artifactId>
@@ -4425,6 +4435,16 @@
<artifactId>camel-quarkus-kubernetes-deployment</artifactId>
<version>3.10.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-kubernetes-cluster-service</artifactId>
+ <version>3.9.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+
<artifactId>camel-quarkus-kubernetes-cluster-service-deployment</artifactId>
+ <version>3.9.1-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-kudu</artifactId>
diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
index cd4befa380..1e5aea97ab 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -3635,6 +3635,16 @@
<artifactId>camel-quarkus-file-deployment</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>3.10.0-SNAPSHOT</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>camel-quarkus-file-cluster-service</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>3.9.1-SNAPSHOT</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+
<artifactId>camel-quarkus-file-cluster-service-deployment</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>3.9.1-SNAPSHOT</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>camel-quarkus-file-watch</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -4425,6 +4435,16 @@
<artifactId>camel-quarkus-kubernetes-deployment</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>3.10.0-SNAPSHOT</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>camel-quarkus-kubernetes-cluster-service</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>3.9.1-SNAPSHOT</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+
<artifactId>camel-quarkus-kubernetes-cluster-service-deployment</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>3.9.1-SNAPSHOT</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>camel-quarkus-kudu</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
![https://raw.githubusercontent.com/apache/camel-website/main/antora-ui-camel/src/img/logo-d.svg"](https://raw.githubusercontent.com/apache/camel-website/main/antora-ui-camel/src/img/logo-d.svg"){kind=link}