You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2017/11/13 07:28:54 UTC
[camel] branch master updated: CAMEL-11954: Renamed ha packages to
cluster
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new c3d99b7 CAMEL-11954: Renamed ha packages to cluster
c3d99b7 is described below
commit c3d99b72896de7b0a1658c3d2b387709df7f779a
Author: Viral Gohel <vr...@gmail.com>
AuthorDate: Thu Nov 9 21:47:18 2017 +0530
CAMEL-11954: Renamed ha packages to cluster
---
camel-core/src/main/docs/clustering.adoc | 14 +++++++-------
.../camel/{ha => cluster}/CamelClusterEventListener.java | 2 +-
.../apache/camel/{ha => cluster}/CamelClusterMember.java | 2 +-
.../apache/camel/{ha => cluster}/CamelClusterService.java | 2 +-
.../apache/camel/{ha => cluster}/CamelClusterView.java | 2 +-
.../java/org/apache/camel/{ha => cluster}/package.html | 2 +-
.../file/{ha => cluster}/FileLockClusterService.java | 4 ++--
.../file/{ha => cluster}/FileLockClusterView.java | 6 +++---
.../impl/{ha => cluster}/AbstractCamelClusterService.java | 8 ++++----
.../impl/{ha => cluster}/AbstractCamelClusterView.java | 10 +++++-----
.../camel/impl/{ha => cluster}/ClusterServiceHelper.java | 4 ++--
.../impl/{ha => cluster}/ClusterServiceSelectors.java | 4 ++--
.../impl/{ha => cluster}/ClusteredRouteConfiguration.java | 2 +-
.../impl/{ha => cluster}/ClusteredRouteController.java | 4 ++--
.../camel/impl/{ha => cluster}/ClusteredRouteFilter.java | 2 +-
.../camel/impl/{ha => cluster}/ClusteredRouteFilters.java | 2 +-
.../camel/impl/{ha => cluster}/ClusteredRoutePolicy.java | 10 +++++-----
.../impl/{ha => cluster}/ClusteredRoutePolicyFactory.java | 4 ++--
.../org/apache/camel/impl/{ha => cluster}/package.html | 2 +-
.../management/DefaultManagementLifecycleStrategy.java | 2 +-
.../camel/management/DefaultManagementNamingStrategy.java | 6 +++---
.../camel/management/DefaultManagementObjectStrategy.java | 2 +-
.../camel/management/mbean/ManagedClusterService.java | 4 ++--
.../org/apache/camel/spi/ManagementNamingStrategy.java | 2 +-
.../org/apache/camel/spi/ManagementObjectStrategy.java | 2 +-
.../FileLockClusteredRoutePolicyFactoryTest.java | 6 +++---
.../{ha => cluster}/FileLockClusteredRoutePolicyTest.java | 6 +++---
.../impl/{ha => cluster}/ClusterServiceSelectorTest.java | 15 ++++++++-------
.../impl/{ha => cluster}/ClusterServiceViewTest.java | 8 ++++----
.../src/test/java/org/apache/camel/issues/Issue3Test.java | 2 +-
.../camel/language/XPathRouteConcurrentBigTest.java | 4 ++--
camel-core/src/test/resources/log4j2.properties | 4 ++--
components/camel-atomix/pom.xml | 2 +-
.../{ha => cluster}/AtomixClusterClientService.java | 4 ++--
.../{ha => cluster}/AtomixClusterConfiguration.java | 2 +-
.../atomix/{ha => cluster}/AtomixClusterHelper.java | 2 +-
.../atomix/{ha => cluster}/AtomixClusterService.java | 4 ++--
.../atomix/{ha => cluster}/AtomixClusterView.java | 8 ++++----
.../META-INF/services/org/apache/camel/ha/atomix | 2 +-
.../AtomixClientClusteredRoutePolicyFactoryMain.java | 4 ++--
.../AtomixClientRoutePolicyFactoryTest.java | 4 ++--
.../AtomixClientRoutePolicyFactoryTestSupport.java | 6 +++---
.../{ha => cluster}/AtomixClientRoutePolicyTest.java | 4 ++--
.../AtomixClientRoutePolicyTestSupport.java | 6 +++---
.../AtomixEphemeralClientRoutePolicyFactoryTest.java | 4 ++--
.../AtomixEphemeralClientRoutePolicyTest.java | 4 ++--
.../{ha => cluster}/AtomixRoutePolicyFactoryTest.java | 4 ++--
.../atomix/{ha => cluster}/AtomixRoutePolicyTest.java | 4 ++--
.../camel-atomix/src/test/resources/log4j2.properties | 8 ++++----
.../{ha => cluster}/ConsulClusterConfiguration.java | 2 +-
.../consul/{ha => cluster}/ConsulClusterService.java | 4 ++--
.../consul/{ha => cluster}/ConsulClusterView.java | 6 +++---
.../camel/component/consul/policy/ConsulRoutePolicy.java | 2 +-
.../ConsulClusteredRoutePolicyFactoryIT.java | 4 ++--
.../ConsulClusteredRoutePolicyFactoryMain.java | 4 ++--
.../{ha => cluster}/ConsulClusteredRoutePolicyIT.java | 4 ++--
.../component/consul/{ha => cluster}/ConsulMasterIT.java | 2 +-
.../camel-consul/src/test/resources/log4j2.properties | 8 ++++----
.../camel/core/xml/AbstractCamelContextFactoryBean.java | 2 +-
.../{ha => cluster}/JGroupsLockClusterService.java | 4 ++--
.../jgroups/{ha => cluster}/JGroupsLockClusterView.java | 8 ++++----
.../jgroups/{ha => cluster}/JGroupsLockMasterTest.java | 2 +-
.../{ha => cluster}/KubernetesClusterService.java | 6 +++---
.../kubernetes/{ha => cluster}/KubernetesClusterView.java | 12 ++++++------
.../{ha => cluster}/lock/ConfigMapLockUtils.java | 2 +-
.../{ha => cluster}/lock/KubernetesClusterEvent.java | 2 +-
.../lock/KubernetesClusterEventHandler.java | 2 +-
.../lock/KubernetesLeadershipController.java | 2 +-
.../{ha => cluster}/lock/KubernetesLockConfiguration.java | 2 +-
.../kubernetes/{ha => cluster}/lock/LeaderInfo.java | 2 +-
.../{ha => cluster}/lock/TimedLeaderNotifier.java | 2 +-
.../{ha => cluster}/KubernetesClusterServiceTest.java | 8 ++++----
.../{ha => cluster}/TimedLeaderNotifierTest.java | 6 +++---
.../{ha => cluster}/utils/ConfigMapLockSimulator.java | 2 +-
.../kubernetes/{ha => cluster}/utils/LeaderRecorder.java | 8 ++++----
.../kubernetes/{ha => cluster}/utils/LockTestServer.java | 2 +-
.../{ha => cluster}/utils/LockTestServerTest.java | 2 +-
.../camel-master/src/main/docs/master-component.adoc | 8 ++++----
.../apache/camel/component/master/MasterComponent.java | 6 +++---
.../org/apache/camel/component/master/MasterConsumer.java | 8 ++++----
.../org/apache/camel/component/master/MasterEndpoint.java | 4 ++--
.../camel/component/master/MasterComponentTest.java | 4 ++--
.../camel-master/src/test/resources/log4j2.properties | 4 ++--
.../apache/camel/spring/boot/CamelAutoConfiguration.java | 2 +-
.../ClusteredRouteControllerAutoConfiguration.java | 12 ++++++------
.../ClusteredRouteControllerConfiguration.java | 4 ++--
.../src/main/resources/META-INF/spring.factories | 2 +-
.../{ha => cluster}/ZooKeeperClusterService.java | 4 ++--
.../zookeeper/{ha => cluster}/ZooKeeperClusterView.java | 8 ++++----
.../SpringZooKeeperClusteredRouteConfigurationTest.java | 8 ++++----
.../ZooKeeperClusteredRoutePolicyFactoryMain.java | 4 ++--
.../ZooKeeperClusteredRoutePolicyFactoryTest.java | 4 ++--
.../ZooKeeperClusteredRoutePolicyTest.java | 4 ++--
.../zookeeper/{ha => cluster}/ZooKeeperMasterMain.java | 2 +-
.../zookeeper/{ha => cluster}/ZooKeeperMasterTest.java | 2 +-
.../camel-zookeeper/src/test/resources/log4j2.properties | 12 ++++++------
.../SpringZooKeeperClusteredRouteConfigurationTest.xml | 6 +++---
.../src/main/resources/application.properties | 4 ++--
.../src/main/resources/application.properties | 4 ++--
.../springboot/AtomixClusterServiceAutoConfiguration.java | 10 +++++-----
.../springboot/AtomixClusterServiceConfiguration.java | 2 +-
.../src/main/resources/META-INF/spring.factories | 2 +-
.../ConsulClusterServiceAutoConfiguration.java | 8 ++++----
.../ConsulClusterServiceConfiguration.java | 4 ++--
.../src/main/resources/META-INF/spring.factories | 2 +-
.../FileLockClusterServiceAutoConfiguration.java | 8 ++++----
.../FileLockClusterServiceConfiguration.java | 2 +-
.../src/main/resources/META-INF/spring.factories | 2 +-
.../JGroupsLockClusterServiceAutoConfiguration.java | 8 ++++----
.../JGroupsLockClusterServiceConfiguration.java | 2 +-
.../src/main/resources/META-INF/spring.factories | 2 +-
.../KubernetesClusterServiceAutoConfiguration.java | 8 ++++----
.../KubernetesClusterServiceConfiguration.java | 2 +-
.../src/main/resources/META-INF/spring.factories | 2 +-
...rnetesClusterServiceAutoConfigurationDisabledTest.java | 6 +++---
.../KubernetesClusterServiceAutoConfigurationTest.java | 6 +++---
.../master/springboot/MasterComponentConfiguration.java | 4 ++--
.../ZooKeeperClusterServiceAutoConfiguration.java | 8 ++++----
.../springboot/ZooKeeperClusterServiceConfiguration.java | 2 +-
.../src/main/resources/META-INF/spring.factories | 2 +-
120 files changed, 271 insertions(+), 270 deletions(-)
diff --git a/camel-core/src/main/docs/clustering.adoc b/camel-core/src/main/docs/clustering.adoc
index 327ca38..31a7c74 100644
--- a/camel-core/src/main/docs/clustering.adoc
+++ b/camel-core/src/main/docs/clustering.adoc
@@ -45,11 +45,11 @@ Out of the box camel provides the following implementations:
[cols="1,1,2", options="header"]
|====
|Type |Module | Class
-|atomix |camel-atomix | org.apache.camel.component.atomix.ha.AtomixClusterService
-|consul |camel-consul | org.apache.camel.component.consul.ha.ConsulClusterService
-|file |camel-core | org.apache.camel.component.file.ha.FileLockClusterService
-|kubernetes |camel-kubernetes | org.apache.camel.component.kubernetes.ha.KubernetesClusterService
-|zookeeper |camel-zookeeper | org.apache.camel.component.zookeeper.ha.ZooKeeperClusterService
+|atomix |camel-atomix | org.apache.camel.component.atomix.cluster.AtomixClusterService
+|consul |camel-consul | org.apache.camel.component.consul.cluster.ConsulClusterService
+|file |camel-core | org.apache.camel.component.file.cluster.FileLockClusterService
+|kubernetes |camel-kubernetes | org.apache.camel.component.kubernetes.cluster.KubernetesClusterService
+|zookeeper |camel-zookeeper | org.apache.camel.component.zookeeper.cluster.ZooKeeperClusterService
|====
On Spring/Bluepring all the _Cluster Service_ instances are automatically added to the camel context.
@@ -80,9 +80,9 @@ camel.component.file.cluster.service.root = ${java.io.tmpdir}
http://camel.apache.org/schema/spring/camel-spring.xsd">
- <bean id="zx" class="org.apache.camel.component.zookeeper.ha.ZooKeeperClusterService">
+ <bean id="zx" class="org.apache.camel.component.zookeeper.cluster.ZooKeeperClusterService">
<property name="id" value="node-1"/>
- <property name="basePath" value="/camel/ha"/>
+ <property name="basePath" value="/camel/cluster"/>
<property name="nodes" value="localhost:2181"/>
</bean>
diff --git a/camel-core/src/main/java/org/apache/camel/ha/CamelClusterEventListener.java b/camel-core/src/main/java/org/apache/camel/cluster/CamelClusterEventListener.java
similarity index 98%
rename from camel-core/src/main/java/org/apache/camel/ha/CamelClusterEventListener.java
rename to camel-core/src/main/java/org/apache/camel/cluster/CamelClusterEventListener.java
index 8fcd4d6..70e00c4 100644
--- a/camel-core/src/main/java/org/apache/camel/ha/CamelClusterEventListener.java
+++ b/camel-core/src/main/java/org/apache/camel/cluster/CamelClusterEventListener.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.ha;
+package org.apache.camel.cluster;
import java.util.Optional;
diff --git a/camel-core/src/main/java/org/apache/camel/ha/CamelClusterMember.java b/camel-core/src/main/java/org/apache/camel/cluster/CamelClusterMember.java
similarity index 96%
rename from camel-core/src/main/java/org/apache/camel/ha/CamelClusterMember.java
rename to camel-core/src/main/java/org/apache/camel/cluster/CamelClusterMember.java
index 951ea9e..8d50a9c 100644
--- a/camel-core/src/main/java/org/apache/camel/ha/CamelClusterMember.java
+++ b/camel-core/src/main/java/org/apache/camel/cluster/CamelClusterMember.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.ha;
+package org.apache.camel.cluster;
import org.apache.camel.spi.HasId;
diff --git a/camel-core/src/main/java/org/apache/camel/ha/CamelClusterService.java b/camel-core/src/main/java/org/apache/camel/cluster/CamelClusterService.java
similarity index 99%
rename from camel-core/src/main/java/org/apache/camel/ha/CamelClusterService.java
rename to camel-core/src/main/java/org/apache/camel/cluster/CamelClusterService.java
index aa56cce..99e6001 100644
--- a/camel-core/src/main/java/org/apache/camel/ha/CamelClusterService.java
+++ b/camel-core/src/main/java/org/apache/camel/cluster/CamelClusterService.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.ha;
+package org.apache.camel.cluster;
import java.util.Collection;
import java.util.Collections;
diff --git a/camel-core/src/main/java/org/apache/camel/ha/CamelClusterView.java b/camel-core/src/main/java/org/apache/camel/cluster/CamelClusterView.java
similarity index 98%
rename from camel-core/src/main/java/org/apache/camel/ha/CamelClusterView.java
rename to camel-core/src/main/java/org/apache/camel/cluster/CamelClusterView.java
index 9ba2a31..b6fe229 100644
--- a/camel-core/src/main/java/org/apache/camel/ha/CamelClusterView.java
+++ b/camel-core/src/main/java/org/apache/camel/cluster/CamelClusterView.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.ha;
+package org.apache.camel.cluster;
import java.util.List;
import java.util.Optional;
diff --git a/camel-core/src/main/java/org/apache/camel/ha/package.html b/camel-core/src/main/java/org/apache/camel/cluster/package.html
similarity index 97%
rename from camel-core/src/main/java/org/apache/camel/ha/package.html
rename to camel-core/src/main/java/org/apache/camel/cluster/package.html
index 4113b3c..21e0001 100644
--- a/camel-core/src/main/java/org/apache/camel/ha/package.html
+++ b/camel-core/src/main/java/org/apache/camel/cluster/package.html
@@ -19,7 +19,7 @@
</head>
<body>
-Camel HA support
+Camel Cluster support
</body>
</html>
diff --git a/camel-core/src/main/java/org/apache/camel/component/file/ha/FileLockClusterService.java b/camel-core/src/main/java/org/apache/camel/component/file/cluster/FileLockClusterService.java
similarity index 97%
rename from camel-core/src/main/java/org/apache/camel/component/file/ha/FileLockClusterService.java
rename to camel-core/src/main/java/org/apache/camel/component/file/cluster/FileLockClusterService.java
index 2d207de..bf27e70 100644
--- a/camel-core/src/main/java/org/apache/camel/component/file/ha/FileLockClusterService.java
+++ b/camel-core/src/main/java/org/apache/camel/component/file/cluster/FileLockClusterService.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.file.ha;
+package org.apache.camel.component.file.cluster;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import org.apache.camel.CamelContext;
-import org.apache.camel.impl.ha.AbstractCamelClusterService;
+import org.apache.camel.impl.cluster.AbstractCamelClusterService;
import org.apache.camel.util.ObjectHelper;
public class FileLockClusterService extends AbstractCamelClusterService<FileLockClusterView> {
diff --git a/camel-core/src/main/java/org/apache/camel/component/file/ha/FileLockClusterView.java b/camel-core/src/main/java/org/apache/camel/component/file/cluster/FileLockClusterView.java
similarity index 97%
rename from camel-core/src/main/java/org/apache/camel/component/file/ha/FileLockClusterView.java
rename to camel-core/src/main/java/org/apache/camel/component/file/cluster/FileLockClusterView.java
index 6eae98c..5a3128d 100644
--- a/camel-core/src/main/java/org/apache/camel/component/file/ha/FileLockClusterView.java
+++ b/camel-core/src/main/java/org/apache/camel/component/file/cluster/FileLockClusterView.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.file.ha;
+package org.apache.camel.component.file.cluster;
import java.io.RandomAccessFile;
import java.nio.channels.FileChannel;
@@ -30,8 +30,8 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
-import org.apache.camel.ha.CamelClusterMember;
-import org.apache.camel.impl.ha.AbstractCamelClusterView;
+import org.apache.camel.cluster.CamelClusterMember;
+import org.apache.camel.impl.cluster.AbstractCamelClusterView;
import org.apache.camel.util.IOHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ha/AbstractCamelClusterService.java b/camel-core/src/main/java/org/apache/camel/impl/cluster/AbstractCamelClusterService.java
similarity index 97%
rename from camel-core/src/main/java/org/apache/camel/impl/ha/AbstractCamelClusterService.java
rename to camel-core/src/main/java/org/apache/camel/impl/cluster/AbstractCamelClusterService.java
index a9b2e6a..9652d08 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ha/AbstractCamelClusterService.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/cluster/AbstractCamelClusterService.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.impl.ha;
+package org.apache.camel.impl.cluster;
import java.util.Collection;
import java.util.Collections;
@@ -25,9 +25,9 @@ import java.util.concurrent.locks.StampedLock;
import org.apache.camel.CamelContext;
import org.apache.camel.Ordered;
-import org.apache.camel.ha.CamelClusterMember;
-import org.apache.camel.ha.CamelClusterService;
-import org.apache.camel.ha.CamelClusterView;
+import org.apache.camel.cluster.CamelClusterMember;
+import org.apache.camel.cluster.CamelClusterService;
+import org.apache.camel.cluster.CamelClusterView;
import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.ReferenceCount;
import org.apache.camel.util.concurrent.LockHelper;
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ha/AbstractCamelClusterView.java b/camel-core/src/main/java/org/apache/camel/impl/cluster/AbstractCamelClusterView.java
similarity index 94%
rename from camel-core/src/main/java/org/apache/camel/impl/ha/AbstractCamelClusterView.java
rename to camel-core/src/main/java/org/apache/camel/impl/cluster/AbstractCamelClusterView.java
index fd3257a..92faa38 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ha/AbstractCamelClusterView.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/cluster/AbstractCamelClusterView.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.impl.ha;
+package org.apache.camel.impl.cluster;
import java.util.ArrayList;
import java.util.List;
@@ -23,10 +23,10 @@ import java.util.concurrent.locks.StampedLock;
import java.util.function.Consumer;
import org.apache.camel.CamelContext;
-import org.apache.camel.ha.CamelClusterEventListener;
-import org.apache.camel.ha.CamelClusterMember;
-import org.apache.camel.ha.CamelClusterService;
-import org.apache.camel.ha.CamelClusterView;
+import org.apache.camel.cluster.CamelClusterEventListener;
+import org.apache.camel.cluster.CamelClusterMember;
+import org.apache.camel.cluster.CamelClusterService;
+import org.apache.camel.cluster.CamelClusterView;
import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.concurrent.LockHelper;
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ha/ClusterServiceHelper.java b/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusterServiceHelper.java
similarity index 95%
rename from camel-core/src/main/java/org/apache/camel/impl/ha/ClusterServiceHelper.java
rename to camel-core/src/main/java/org/apache/camel/impl/cluster/ClusterServiceHelper.java
index b008af4..22b7706 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ha/ClusterServiceHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusterServiceHelper.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.impl.ha;
+package org.apache.camel.impl.cluster;
import java.util.Optional;
import java.util.Set;
import org.apache.camel.CamelContext;
-import org.apache.camel.ha.CamelClusterService;
+import org.apache.camel.cluster.CamelClusterService;
import org.apache.camel.util.ObjectHelper;
public final class ClusterServiceHelper {
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ha/ClusterServiceSelectors.java b/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusterServiceSelectors.java
similarity index 98%
rename from camel-core/src/main/java/org/apache/camel/impl/ha/ClusterServiceSelectors.java
rename to camel-core/src/main/java/org/apache/camel/impl/cluster/ClusterServiceSelectors.java
index 2939afc..aa86a5e 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ha/ClusterServiceSelectors.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusterServiceSelectors.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.impl.ha;
+package org.apache.camel.impl.cluster;
import java.util.Collection;
import java.util.Comparator;
@@ -23,7 +23,7 @@ import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors;
-import org.apache.camel.ha.CamelClusterService;
+import org.apache.camel.cluster.CamelClusterService;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ha/ClusteredRouteConfiguration.java b/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteConfiguration.java
similarity index 97%
rename from camel-core/src/main/java/org/apache/camel/impl/ha/ClusteredRouteConfiguration.java
rename to camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteConfiguration.java
index 9cdfaeb..27b69bd 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ha/ClusteredRouteConfiguration.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteConfiguration.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.impl.ha;
+package org.apache.camel.impl.cluster;
import java.time.Duration;
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ha/ClusteredRouteController.java b/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteController.java
similarity index 99%
rename from camel-core/src/main/java/org/apache/camel/impl/ha/ClusteredRouteController.java
rename to camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteController.java
index 137fff5..2e4e51e 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ha/ClusteredRouteController.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteController.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.impl.ha;
+package org.apache.camel.impl.cluster;
import java.time.Duration;
import java.util.ArrayList;
@@ -32,7 +32,7 @@ import java.util.stream.Collectors;
import org.apache.camel.CamelContext;
import org.apache.camel.Route;
-import org.apache.camel.ha.CamelClusterService;
+import org.apache.camel.cluster.CamelClusterService;
import org.apache.camel.impl.DefaultRouteController;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.spi.RoutePolicy;
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ha/ClusteredRouteFilter.java b/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteFilter.java
similarity index 97%
rename from camel-core/src/main/java/org/apache/camel/impl/ha/ClusteredRouteFilter.java
rename to camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteFilter.java
index a6d3c01..273e2df 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ha/ClusteredRouteFilter.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteFilter.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.impl.ha;
+package org.apache.camel.impl.cluster;
import org.apache.camel.CamelContext;
import org.apache.camel.model.RouteDefinition;
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ha/ClusteredRouteFilters.java b/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteFilters.java
similarity index 98%
rename from camel-core/src/main/java/org/apache/camel/impl/ha/ClusteredRouteFilters.java
rename to camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteFilters.java
index ccda0e1..7bee140 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ha/ClusteredRouteFilters.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteFilters.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.impl.ha;
+package org.apache.camel.impl.cluster;
import java.util.Collection;
import java.util.Collections;
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ha/ClusteredRoutePolicy.java b/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicy.java
similarity index 98%
rename from camel-core/src/main/java/org/apache/camel/impl/ha/ClusteredRoutePolicy.java
rename to camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicy.java
index a733394..11aba04 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ha/ClusteredRoutePolicy.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicy.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.impl.ha;
+package org.apache.camel.impl.cluster;
import java.time.Duration;
import java.util.EventObject;
@@ -33,10 +33,10 @@ import org.apache.camel.ServiceStatus;
import org.apache.camel.StartupListener;
import org.apache.camel.api.management.ManagedAttribute;
import org.apache.camel.api.management.ManagedResource;
-import org.apache.camel.ha.CamelClusterEventListener;
-import org.apache.camel.ha.CamelClusterMember;
-import org.apache.camel.ha.CamelClusterService;
-import org.apache.camel.ha.CamelClusterView;
+import org.apache.camel.cluster.CamelClusterEventListener;
+import org.apache.camel.cluster.CamelClusterMember;
+import org.apache.camel.cluster.CamelClusterService;
+import org.apache.camel.cluster.CamelClusterView;
import org.apache.camel.management.event.CamelContextStartedEvent;
import org.apache.camel.support.EventNotifierSupport;
import org.apache.camel.support.RoutePolicySupport;
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ha/ClusteredRoutePolicyFactory.java b/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicyFactory.java
similarity index 97%
rename from camel-core/src/main/java/org/apache/camel/impl/ha/ClusteredRoutePolicyFactory.java
rename to camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicyFactory.java
index 41efd67..c1b97e1 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ha/ClusteredRoutePolicyFactory.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicyFactory.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.impl.ha;
+package org.apache.camel.impl.cluster;
import org.apache.camel.CamelContext;
import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.ha.CamelClusterService;
+import org.apache.camel.cluster.CamelClusterService;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.spi.RoutePolicy;
import org.apache.camel.spi.RoutePolicyFactory;
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ha/package.html b/camel-core/src/main/java/org/apache/camel/impl/cluster/package.html
similarity index 94%
rename from camel-core/src/main/java/org/apache/camel/impl/ha/package.html
rename to camel-core/src/main/java/org/apache/camel/impl/cluster/package.html
index 7e73df5..a5e4586 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ha/package.html
+++ b/camel-core/src/main/java/org/apache/camel/impl/cluster/package.html
@@ -19,7 +19,7 @@
</head>
<body>
-Base classes and Implementation for Camel HA
+Base classes and Implementation for Camel Cluster
</body>
</html>
diff --git a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
index 63ea20b..d9a2596 100644
--- a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
@@ -46,7 +46,7 @@ import org.apache.camel.StartupListener;
import org.apache.camel.TimerListener;
import org.apache.camel.VetoCamelContextStartException;
import org.apache.camel.api.management.PerformanceCounter;
-import org.apache.camel.ha.CamelClusterService;
+import org.apache.camel.cluster.CamelClusterService;
import org.apache.camel.impl.ConsumerCache;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.DefaultEndpointRegistry;
diff --git a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementNamingStrategy.java b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementNamingStrategy.java
index 169fd6f..6628ffd 100644
--- a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementNamingStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementNamingStrategy.java
@@ -34,7 +34,7 @@ import org.apache.camel.Route;
import org.apache.camel.Service;
import org.apache.camel.StaticService;
import org.apache.camel.builder.ErrorHandlerBuilderRef;
-import org.apache.camel.ha.CamelClusterService;
+import org.apache.camel.cluster.CamelClusterService;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.EventNotifier;
import org.apache.camel.spi.InterceptStrategy;
@@ -53,7 +53,7 @@ public class DefaultManagementNamingStrategy implements ManagementNamingStrategy
public static final String KEY_TYPE = "type";
public static final String KEY_CONTEXT = "context";
public static final String TYPE_CONTEXT = "context";
- public static final String TYPE_ROUTE_CONTROLLER = "routecontroller";
+ public static final String TYPE_ROUTE_CONTROLLER = "routecontrollers";
public static final String TYPE_HEALTH = "health";
public static final String TYPE_ENDPOINT = "endpoints";
public static final String TYPE_DATAFORMAT = "dataformats";
@@ -67,7 +67,7 @@ public class DefaultManagementNamingStrategy implements ManagementNamingStrategy
public static final String TYPE_ERRORHANDLER = "errorhandlers";
public static final String TYPE_THREAD_POOL = "threadpools";
public static final String TYPE_SERVICE = "services";
- public static final String TYPE_HA = "ha";
+ public static final String TYPE_HA = "clusterservices";
protected String domainName;
protected String hostName = "localhost";
diff --git a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java
index 6175134..e31a78b 100644
--- a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java
@@ -29,9 +29,9 @@ import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.Route;
import org.apache.camel.Service;
+import org.apache.camel.cluster.CamelClusterService;
import org.apache.camel.component.bean.BeanProcessor;
import org.apache.camel.component.log.LogEndpoint;
-import org.apache.camel.ha.CamelClusterService;
import org.apache.camel.impl.ScheduledPollConsumer;
import org.apache.camel.management.mbean.ManagedAggregateProcessor;
import org.apache.camel.management.mbean.ManagedBeanProcessor;
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedClusterService.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedClusterService.java
index 3ccc7a7..cb4c427 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedClusterService.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedClusterService.java
@@ -24,8 +24,8 @@ import org.apache.camel.CamelContext;
import org.apache.camel.ServiceStatus;
import org.apache.camel.StatefulService;
import org.apache.camel.api.management.mbean.ManagedClusterServiceMBean;
-import org.apache.camel.ha.CamelClusterService;
-import org.apache.camel.impl.ha.ClusterServiceHelper;
+import org.apache.camel.cluster.CamelClusterService;
+import org.apache.camel.impl.cluster.ClusterServiceHelper;
import org.apache.camel.spi.ManagementStrategy;
public class ManagedClusterService implements ManagedClusterServiceMBean {
diff --git a/camel-core/src/main/java/org/apache/camel/spi/ManagementNamingStrategy.java b/camel-core/src/main/java/org/apache/camel/spi/ManagementNamingStrategy.java
index d331613..7250b4a 100644
--- a/camel-core/src/main/java/org/apache/camel/spi/ManagementNamingStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/spi/ManagementNamingStrategy.java
@@ -30,7 +30,7 @@ import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.Route;
import org.apache.camel.Service;
-import org.apache.camel.ha.CamelClusterService;
+import org.apache.camel.cluster.CamelClusterService;
/**
* Strategy for computing {@link ObjectName} names for the various beans that Camel register for management.
diff --git a/camel-core/src/main/java/org/apache/camel/spi/ManagementObjectStrategy.java b/camel-core/src/main/java/org/apache/camel/spi/ManagementObjectStrategy.java
index a260665..1c6eb6b 100644
--- a/camel-core/src/main/java/org/apache/camel/spi/ManagementObjectStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/spi/ManagementObjectStrategy.java
@@ -27,7 +27,7 @@ import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.Route;
import org.apache.camel.Service;
-import org.apache.camel.ha.CamelClusterService;
+import org.apache.camel.cluster.CamelClusterService;
import org.apache.camel.model.ProcessorDefinition;
/**
diff --git a/camel-core/src/test/java/org/apache/camel/component/file/ha/FileLockClusteredRoutePolicyFactoryTest.java b/camel-core/src/test/java/org/apache/camel/component/file/cluster/FileLockClusteredRoutePolicyFactoryTest.java
similarity index 96%
rename from camel-core/src/test/java/org/apache/camel/component/file/ha/FileLockClusteredRoutePolicyFactoryTest.java
rename to camel-core/src/test/java/org/apache/camel/component/file/cluster/FileLockClusteredRoutePolicyFactoryTest.java
index a93b574..736b3af 100644
--- a/camel-core/src/test/java/org/apache/camel/component/file/ha/FileLockClusteredRoutePolicyFactoryTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/file/cluster/FileLockClusteredRoutePolicyFactoryTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.file.ha;
+package org.apache.camel.component.file.cluster;
import java.util.ArrayList;
import java.util.List;
@@ -28,7 +28,7 @@ import java.util.stream.IntStream;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.impl.ha.ClusteredRoutePolicyFactory;
+import org.apache.camel.impl.cluster.ClusteredRoutePolicyFactory;
import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
@@ -69,7 +69,7 @@ public final class FileLockClusteredRoutePolicyFactoryTest {
FileLockClusterService service = new FileLockClusterService();
service.setId("node-" + id);
- service.setRoot("target/ha");
+ service.setRoot("target/cluster");
service.setAcquireLockDelay(1, TimeUnit.SECONDS);
service.setAcquireLockInterval(1, TimeUnit.SECONDS);
diff --git a/camel-core/src/test/java/org/apache/camel/component/file/ha/FileLockClusteredRoutePolicyTest.java b/camel-core/src/test/java/org/apache/camel/component/file/cluster/FileLockClusteredRoutePolicyTest.java
similarity index 96%
rename from camel-core/src/test/java/org/apache/camel/component/file/ha/FileLockClusteredRoutePolicyTest.java
rename to camel-core/src/test/java/org/apache/camel/component/file/cluster/FileLockClusteredRoutePolicyTest.java
index 77fd3e2..c526f19 100644
--- a/camel-core/src/test/java/org/apache/camel/component/file/ha/FileLockClusteredRoutePolicyTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/file/cluster/FileLockClusteredRoutePolicyTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.file.ha;
+package org.apache.camel.component.file.cluster;
import java.util.ArrayList;
import java.util.List;
@@ -28,7 +28,7 @@ import java.util.stream.IntStream;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.impl.ha.ClusteredRoutePolicy;
+import org.apache.camel.impl.cluster.ClusteredRoutePolicy;
import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
@@ -69,7 +69,7 @@ public final class FileLockClusteredRoutePolicyTest {
FileLockClusterService service = new FileLockClusterService();
service.setId("node-" + id);
- service.setRoot("target/ha");
+ service.setRoot("target/cluster");
service.setAcquireLockDelay(1, TimeUnit.SECONDS);
service.setAcquireLockInterval(1, TimeUnit.SECONDS);
diff --git a/camel-core/src/test/java/org/apache/camel/impl/ha/ClusterServiceSelectorTest.java b/camel-core/src/test/java/org/apache/camel/impl/cluster/ClusterServiceSelectorTest.java
similarity index 96%
rename from camel-core/src/test/java/org/apache/camel/impl/ha/ClusterServiceSelectorTest.java
rename to camel-core/src/test/java/org/apache/camel/impl/cluster/ClusterServiceSelectorTest.java
index 10d246a..318e1fc 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/ha/ClusterServiceSelectorTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/cluster/ClusterServiceSelectorTest.java
@@ -14,23 +14,24 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.impl.ha;
+package org.apache.camel.impl.cluster;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import org.apache.camel.CamelContext;
-import org.apache.camel.component.file.ha.FileLockClusterService;
-import org.apache.camel.ha.CamelClusterMember;
-import org.apache.camel.ha.CamelClusterService;
-import org.apache.camel.ha.CamelClusterView;
+import org.apache.camel.cluster.CamelClusterMember;
+import org.apache.camel.cluster.CamelClusterService;
+import org.apache.camel.cluster.CamelClusterView;
+import org.apache.camel.component.file.cluster.FileLockClusterService;
import org.apache.camel.impl.DefaultCamelContext;
import org.junit.Assert;
import org.junit.Test;
-import static org.apache.camel.impl.ha.ClusterServiceHelper.lookupService;
-import static org.apache.camel.impl.ha.ClusterServiceHelper.mandatoryLookupService;
+import static org.apache.camel.impl.cluster.ClusterServiceHelper.lookupService;
+import static org.apache.camel.impl.cluster.ClusterServiceHelper.mandatoryLookupService;
+
public class ClusterServiceSelectorTest {
diff --git a/camel-core/src/test/java/org/apache/camel/impl/ha/ClusterServiceViewTest.java b/camel-core/src/test/java/org/apache/camel/impl/cluster/ClusterServiceViewTest.java
similarity index 97%
rename from camel-core/src/test/java/org/apache/camel/impl/ha/ClusterServiceViewTest.java
rename to camel-core/src/test/java/org/apache/camel/impl/cluster/ClusterServiceViewTest.java
index 243cc46..bf9d278 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/ha/ClusterServiceViewTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/cluster/ClusterServiceViewTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.impl.ha;
+package org.apache.camel.impl.cluster;
import java.util.Collections;
import java.util.HashSet;
@@ -28,9 +28,9 @@ import java.util.concurrent.TimeUnit;
import java.util.stream.IntStream;
import org.apache.camel.ServiceStatus;
-import org.apache.camel.ha.CamelClusterEventListener;
-import org.apache.camel.ha.CamelClusterMember;
-import org.apache.camel.ha.CamelClusterService;
+import org.apache.camel.cluster.CamelClusterEventListener;
+import org.apache.camel.cluster.CamelClusterMember;
+import org.apache.camel.cluster.CamelClusterService;
import org.junit.Assert;
import org.junit.Test;
diff --git a/camel-core/src/test/java/org/apache/camel/issues/Issue3Test.java b/camel-core/src/test/java/org/apache/camel/issues/Issue3Test.java
index 666a03f..d449056 100644
--- a/camel-core/src/test/java/org/apache/camel/issues/Issue3Test.java
+++ b/camel-core/src/test/java/org/apache/camel/issues/Issue3Test.java
@@ -29,7 +29,7 @@ public class Issue3Test extends ContextTestSupport {
protected String fromQueue = "direct:A";
public void testIssue() throws Exception {
- sendBody(fromQueue, "ha!");
+ sendBody(fromQueue, "cluster!");
}
@Override
diff --git a/camel-core/src/test/java/org/apache/camel/language/XPathRouteConcurrentBigTest.java b/camel-core/src/test/java/org/apache/camel/language/XPathRouteConcurrentBigTest.java
index 72293c0..616a16b 100644
--- a/camel-core/src/test/java/org/apache/camel/language/XPathRouteConcurrentBigTest.java
+++ b/camel-core/src/test/java/org/apache/camel/language/XPathRouteConcurrentBigTest.java
@@ -79,11 +79,11 @@ public class XPathRouteConcurrentBigTest extends ContextTestSupport {
}
}
- LOG.info("Sent {} messages in {} ms", messageCount, (System.currentTimeMillis() - now));
+ LOG.info("Sent {} messages in {} ms", messageCount, System.currentTimeMillis() - now);
assertMockEndpointsSatisfied();
- LOG.info("Processed {} messages in {} ms", messageCount, (System.currentTimeMillis() - now));
+ LOG.info("Processed {} messages in {} ms", messageCount, System.currentTimeMillis() - now);
}
@Override
diff --git a/camel-core/src/test/resources/log4j2.properties b/camel-core/src/test/resources/log4j2.properties
index 6972ef1..a5b53e0 100644
--- a/camel-core/src/test/resources/log4j2.properties
+++ b/camel-core/src/test/resources/log4j2.properties
@@ -37,8 +37,8 @@ logger.customlogger.name = org.apache.camel.customlogger
logger.customlogger.level = TRACE
logger.customlogger.appenderRef.file2.ref = file2
-logger.file-ha.name = org.apache.camel.component.file.ha
-logger.file-ha.level = DEBUG
+logger.file-cluster.name = org.apache.camel.component.file.cluster
+logger.file-cluster.level = DEBUG
rootLogger.level = INFO
diff --git a/components/camel-atomix/pom.xml b/components/camel-atomix/pom.xml
index d9d5066..e69b9d4 100644
--- a/components/camel-atomix/pom.xml
+++ b/components/camel-atomix/pom.xml
@@ -43,7 +43,7 @@
org.apache.camel.component.atomix.client.queue.*,
org.apache.camel.component.atomix.client.value.*,
org.apache.camel.component.atomix.client.messaging.*,
- org.apache.camel.component.atomix.ha.*
+ org.apache.camel.component.atomix.cluster.*
</camel.osgi.export.pkg>
<camel.osgi.export.service>
org.apache.camel.spi.ComponentResolver;component=atomix-map,
diff --git a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/ha/AtomixClusterClientService.java b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/cluster/AtomixClusterClientService.java
similarity index 97%
rename from components/camel-atomix/src/main/java/org/apache/camel/component/atomix/ha/AtomixClusterClientService.java
rename to components/camel-atomix/src/main/java/org/apache/camel/component/atomix/cluster/AtomixClusterClientService.java
index ab844e7..79ad830 100644
--- a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/ha/AtomixClusterClientService.java
+++ b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/cluster/AtomixClusterClientService.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.atomix.ha;
+package org.apache.camel.component.atomix.cluster;
import java.util.List;
@@ -24,7 +24,7 @@ import io.atomix.catalyst.transport.Transport;
import org.apache.camel.CamelContext;
import org.apache.camel.component.atomix.client.AtomixClientConfiguration;
import org.apache.camel.component.atomix.client.AtomixClientHelper;
-import org.apache.camel.impl.ha.AbstractCamelClusterService;
+import org.apache.camel.impl.cluster.AbstractCamelClusterService;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/ha/AtomixClusterConfiguration.java b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/cluster/AtomixClusterConfiguration.java
similarity index 98%
rename from components/camel-atomix/src/main/java/org/apache/camel/component/atomix/ha/AtomixClusterConfiguration.java
rename to components/camel-atomix/src/main/java/org/apache/camel/component/atomix/cluster/AtomixClusterConfiguration.java
index 5cbf30a..b05230f 100644
--- a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/ha/AtomixClusterConfiguration.java
+++ b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/cluster/AtomixClusterConfiguration.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.atomix.ha;
+package org.apache.camel.component.atomix.cluster;
import io.atomix.AtomixReplica;
import io.atomix.catalyst.transport.Transport;
diff --git a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/ha/AtomixClusterHelper.java b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/cluster/AtomixClusterHelper.java
similarity index 98%
rename from components/camel-atomix/src/main/java/org/apache/camel/component/atomix/ha/AtomixClusterHelper.java
rename to components/camel-atomix/src/main/java/org/apache/camel/component/atomix/cluster/AtomixClusterHelper.java
index 4d41263..0530495 100644
--- a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/ha/AtomixClusterHelper.java
+++ b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/cluster/AtomixClusterHelper.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.atomix.ha;
+package org.apache.camel.component.atomix.cluster;
import java.io.InputStream;
import java.util.Properties;
diff --git a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/ha/AtomixClusterService.java b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/cluster/AtomixClusterService.java
similarity index 97%
rename from components/camel-atomix/src/main/java/org/apache/camel/component/atomix/ha/AtomixClusterService.java
rename to components/camel-atomix/src/main/java/org/apache/camel/component/atomix/cluster/AtomixClusterService.java
index 17c90e3..3f14f9c 100644
--- a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/ha/AtomixClusterService.java
+++ b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/cluster/AtomixClusterService.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.atomix.ha;
+package org.apache.camel.component.atomix.cluster;
import java.util.List;
@@ -23,7 +23,7 @@ import io.atomix.catalyst.transport.Address;
import io.atomix.catalyst.transport.Transport;
import io.atomix.copycat.server.storage.StorageLevel;
import org.apache.camel.CamelContext;
-import org.apache.camel.impl.ha.AbstractCamelClusterService;
+import org.apache.camel.impl.cluster.AbstractCamelClusterService;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/ha/AtomixClusterView.java b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/cluster/AtomixClusterView.java
similarity index 97%
rename from components/camel-atomix/src/main/java/org/apache/camel/component/atomix/ha/AtomixClusterView.java
rename to components/camel-atomix/src/main/java/org/apache/camel/component/atomix/cluster/AtomixClusterView.java
index f0128ec..6f64a42 100644
--- a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/ha/AtomixClusterView.java
+++ b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/cluster/AtomixClusterView.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.atomix.ha;
+package org.apache.camel.component.atomix.cluster;
import java.util.Collections;
import java.util.List;
@@ -26,10 +26,10 @@ import io.atomix.Atomix;
import io.atomix.group.DistributedGroup;
import io.atomix.group.GroupMember;
import io.atomix.group.LocalMember;
+import org.apache.camel.cluster.CamelClusterMember;
+import org.apache.camel.cluster.CamelClusterService;
import org.apache.camel.component.atomix.AtomixConfiguration;
-import org.apache.camel.ha.CamelClusterMember;
-import org.apache.camel.ha.CamelClusterService;
-import org.apache.camel.impl.ha.AbstractCamelClusterView;
+import org.apache.camel.impl.cluster.AbstractCamelClusterView;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/components/camel-atomix/src/main/resources/META-INF/services/org/apache/camel/ha/atomix b/components/camel-atomix/src/main/resources/META-INF/services/org/apache/camel/ha/atomix
index a80d8bf..49848cd 100644
--- a/components/camel-atomix/src/main/resources/META-INF/services/org/apache/camel/ha/atomix
+++ b/components/camel-atomix/src/main/resources/META-INF/services/org/apache/camel/ha/atomix
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.component.atomix.ha.AtomixClusterService
+class=org.apache.camel.component.atomix.cluster.AtomixClusterService
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/ha/AtomixClientClusteredRoutePolicyFactoryMain.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientClusteredRoutePolicyFactoryMain.java
similarity index 95%
rename from components/camel-atomix/src/test/java/org/apache/camel/component/atomix/ha/AtomixClientClusteredRoutePolicyFactoryMain.java
rename to components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientClusteredRoutePolicyFactoryMain.java
index d009595..023df12 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/ha/AtomixClientClusteredRoutePolicyFactoryMain.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientClusteredRoutePolicyFactoryMain.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.atomix.ha;
+package org.apache.camel.component.atomix.cluster;
import java.util.UUID;
@@ -23,7 +23,7 @@ import io.atomix.copycat.server.storage.StorageLevel;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.ExplicitCamelContextNameStrategy;
-import org.apache.camel.impl.ha.ClusteredRoutePolicyFactory;
+import org.apache.camel.impl.cluster.ClusteredRoutePolicyFactory;
import org.apache.camel.main.Main;
import org.apache.camel.main.MainListenerSupport;
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/ha/AtomixClientRoutePolicyFactoryTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientRoutePolicyFactoryTest.java
similarity index 92%
rename from components/camel-atomix/src/test/java/org/apache/camel/component/atomix/ha/AtomixClientRoutePolicyFactoryTest.java
rename to components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientRoutePolicyFactoryTest.java
index f29ba20..b8d822f 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/ha/AtomixClientRoutePolicyFactoryTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientRoutePolicyFactoryTest.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.atomix.ha;
+package org.apache.camel.component.atomix.cluster;
import java.util.Collections;
import io.atomix.catalyst.transport.Address;
-import org.apache.camel.ha.CamelClusterService;
+import org.apache.camel.cluster.CamelClusterService;
public final class AtomixClientRoutePolicyFactoryTest extends AtomixClientRoutePolicyFactoryTestSupport {
@Override
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/ha/AtomixClientRoutePolicyFactoryTestSupport.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientRoutePolicyFactoryTestSupport.java
similarity index 96%
rename from components/camel-atomix/src/test/java/org/apache/camel/component/atomix/ha/AtomixClientRoutePolicyFactoryTestSupport.java
rename to components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientRoutePolicyFactoryTestSupport.java
index 95a7cf1..71c24d8 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/ha/AtomixClientRoutePolicyFactoryTestSupport.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientRoutePolicyFactoryTestSupport.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.atomix.ha;
+package org.apache.camel.component.atomix.cluster;
import java.util.ArrayList;
import java.util.List;
@@ -29,10 +29,10 @@ import java.util.stream.IntStream;
import io.atomix.AtomixReplica;
import io.atomix.catalyst.transport.Address;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.cluster.CamelClusterService;
import org.apache.camel.component.atomix.client.AtomixFactory;
-import org.apache.camel.ha.CamelClusterService;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.impl.ha.ClusteredRoutePolicyFactory;
+import org.apache.camel.impl.cluster.ClusteredRoutePolicyFactory;
import org.apache.camel.test.AvailablePortFinder;
import org.junit.Assert;
import org.junit.Test;
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/ha/AtomixClientRoutePolicyTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientRoutePolicyTest.java
similarity index 92%
rename from components/camel-atomix/src/test/java/org/apache/camel/component/atomix/ha/AtomixClientRoutePolicyTest.java
rename to components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientRoutePolicyTest.java
index 4c038ca..2eeb808 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/ha/AtomixClientRoutePolicyTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientRoutePolicyTest.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.atomix.ha;
+package org.apache.camel.component.atomix.cluster;
import java.util.Collections;
import io.atomix.catalyst.transport.Address;
-import org.apache.camel.ha.CamelClusterService;
+import org.apache.camel.cluster.CamelClusterService;
public final class AtomixClientRoutePolicyTest extends AtomixClientRoutePolicyTestSupport {
@Override
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/ha/AtomixClientRoutePolicyTestSupport.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientRoutePolicyTestSupport.java
similarity index 96%
rename from components/camel-atomix/src/test/java/org/apache/camel/component/atomix/ha/AtomixClientRoutePolicyTestSupport.java
rename to components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientRoutePolicyTestSupport.java
index 5e1ff18..2780d9d 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/ha/AtomixClientRoutePolicyTestSupport.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientRoutePolicyTestSupport.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.atomix.ha;
+package org.apache.camel.component.atomix.cluster;
import java.util.ArrayList;
import java.util.List;
@@ -29,10 +29,10 @@ import java.util.stream.IntStream;
import io.atomix.AtomixReplica;
import io.atomix.catalyst.transport.Address;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.cluster.CamelClusterService;
import org.apache.camel.component.atomix.client.AtomixFactory;
-import org.apache.camel.ha.CamelClusterService;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.impl.ha.ClusteredRoutePolicy;
+import org.apache.camel.impl.cluster.ClusteredRoutePolicy;
import org.apache.camel.test.AvailablePortFinder;
import org.junit.Assert;
import org.junit.Test;
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/ha/AtomixEphemeralClientRoutePolicyFactoryTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixEphemeralClientRoutePolicyFactoryTest.java
similarity index 92%
rename from components/camel-atomix/src/test/java/org/apache/camel/component/atomix/ha/AtomixEphemeralClientRoutePolicyFactoryTest.java
rename to components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixEphemeralClientRoutePolicyFactoryTest.java
index 9bf6c75..1dbd58d 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/ha/AtomixEphemeralClientRoutePolicyFactoryTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixEphemeralClientRoutePolicyFactoryTest.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.atomix.ha;
+package org.apache.camel.component.atomix.cluster;
import java.util.Collections;
import io.atomix.catalyst.transport.Address;
-import org.apache.camel.ha.CamelClusterService;
+import org.apache.camel.cluster.CamelClusterService;
public final class AtomixEphemeralClientRoutePolicyFactoryTest extends AtomixClientRoutePolicyFactoryTestSupport {
@Override
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/ha/AtomixEphemeralClientRoutePolicyTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixEphemeralClientRoutePolicyTest.java
similarity index 92%
rename from components/camel-atomix/src/test/java/org/apache/camel/component/atomix/ha/AtomixEphemeralClientRoutePolicyTest.java
rename to components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixEphemeralClientRoutePolicyTest.java
index 2abf562..e09443f 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/ha/AtomixEphemeralClientRoutePolicyTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixEphemeralClientRoutePolicyTest.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.atomix.ha;
+package org.apache.camel.component.atomix.cluster;
import java.util.Collections;
import io.atomix.catalyst.transport.Address;
-import org.apache.camel.ha.CamelClusterService;
+import org.apache.camel.cluster.CamelClusterService;
public final class AtomixEphemeralClientRoutePolicyTest extends AtomixClientRoutePolicyTestSupport {
@Override
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/ha/AtomixRoutePolicyFactoryTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixRoutePolicyFactoryTest.java
similarity index 97%
rename from components/camel-atomix/src/test/java/org/apache/camel/component/atomix/ha/AtomixRoutePolicyFactoryTest.java
rename to components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixRoutePolicyFactoryTest.java
index 4643791..745bc8a 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/ha/AtomixRoutePolicyFactoryTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixRoutePolicyFactoryTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.atomix.ha;
+package org.apache.camel.component.atomix.cluster;
import java.util.Arrays;
import java.util.HashSet;
@@ -30,7 +30,7 @@ import io.atomix.catalyst.transport.Address;
import io.atomix.copycat.server.storage.StorageLevel;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.impl.ha.ClusteredRoutePolicyFactory;
+import org.apache.camel.impl.cluster.ClusteredRoutePolicyFactory;
import org.apache.camel.test.AvailablePortFinder;
import org.junit.Assert;
import org.junit.Test;
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/ha/AtomixRoutePolicyTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixRoutePolicyTest.java
similarity index 97%
rename from components/camel-atomix/src/test/java/org/apache/camel/component/atomix/ha/AtomixRoutePolicyTest.java
rename to components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixRoutePolicyTest.java
index cbb4d21..5db1cd2 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/ha/AtomixRoutePolicyTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixRoutePolicyTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.atomix.ha;
+package org.apache.camel.component.atomix.cluster;
import java.util.Arrays;
import java.util.HashSet;
@@ -30,7 +30,7 @@ import io.atomix.catalyst.transport.Address;
import io.atomix.copycat.server.storage.StorageLevel;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.impl.ha.ClusteredRoutePolicy;
+import org.apache.camel.impl.cluster.ClusteredRoutePolicy;
import org.apache.camel.test.AvailablePortFinder;
import org.junit.Assert;
import org.junit.Test;
diff --git a/components/camel-atomix/src/test/resources/log4j2.properties b/components/camel-atomix/src/test/resources/log4j2.properties
index e11e374..7832e4a 100644
--- a/components/camel-atomix/src/test/resources/log4j2.properties
+++ b/components/camel-atomix/src/test/resources/log4j2.properties
@@ -36,10 +36,10 @@ logger.camel.name = org.apache.camel
logger.camel.level = INFO
logger.camel-atomix.name = org.apache.camel.component.atomix
logger.camel-atomix.level = DEBUG
-logger.camel-ha.name = org.apache.camel.ha
-logger.camel-ha.level = DEBUG
-logger.camel-impl-ha.name = org.apache.camel.impl.ha
-logger.camel-impl-ha.level = DEBUG
+logger.camel-cluster.name = org.apache.camel.cluster
+logger.camel-cluster.level = DEBUG
+logger.camel-impl-cluster.name = org.apache.camel.impl.cluster
+logger.camel-impl-cluster.level = DEBUG
rootLogger.level = INFO
#rootLogger.appenderRef.stdout.ref = out
diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/ha/ConsulClusterConfiguration.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/cluster/ConsulClusterConfiguration.java
similarity index 97%
rename from components/camel-consul/src/main/java/org/apache/camel/component/consul/ha/ConsulClusterConfiguration.java
rename to components/camel-consul/src/main/java/org/apache/camel/component/consul/cluster/ConsulClusterConfiguration.java
index 535eec6..aa94c80 100644
--- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/ha/ConsulClusterConfiguration.java
+++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/cluster/ConsulClusterConfiguration.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.consul.ha;
+package org.apache.camel.component.consul.cluster;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.component.consul.ConsulClientConfiguration;
diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/ha/ConsulClusterService.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/cluster/ConsulClusterService.java
similarity index 97%
rename from components/camel-consul/src/main/java/org/apache/camel/component/consul/ha/ConsulClusterService.java
rename to components/camel-consul/src/main/java/org/apache/camel/component/consul/cluster/ConsulClusterService.java
index c77b453..70ce0de 100644
--- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/ha/ConsulClusterService.java
+++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/cluster/ConsulClusterService.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.consul.ha;
+package org.apache.camel.component.consul.cluster;
-import org.apache.camel.impl.ha.AbstractCamelClusterService;
+import org.apache.camel.impl.cluster.AbstractCamelClusterService;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.jsse.SSLContextParameters;
import org.slf4j.Logger;
diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/ha/ConsulClusterView.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/cluster/ConsulClusterView.java
similarity index 98%
rename from components/camel-consul/src/main/java/org/apache/camel/component/consul/ha/ConsulClusterView.java
rename to components/camel-consul/src/main/java/org/apache/camel/component/consul/cluster/ConsulClusterView.java
index 8c16302..74d0b35 100644
--- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/ha/ConsulClusterView.java
+++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/cluster/ConsulClusterView.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.consul.ha;
+package org.apache.camel.component.consul.cluster;
import java.math.BigInteger;
import java.util.Collections;
@@ -33,8 +33,8 @@ import com.orbitz.consul.model.kv.Value;
import com.orbitz.consul.model.session.ImmutableSession;
import com.orbitz.consul.model.session.SessionInfo;
import com.orbitz.consul.option.QueryOptions;
-import org.apache.camel.ha.CamelClusterMember;
-import org.apache.camel.impl.ha.AbstractCamelClusterView;
+import org.apache.camel.cluster.CamelClusterMember;
+import org.apache.camel.impl.cluster.AbstractCamelClusterView;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/policy/ConsulRoutePolicy.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/policy/ConsulRoutePolicy.java
index c5ce6c1..a18f42f 100644
--- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/policy/ConsulRoutePolicy.java
+++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/policy/ConsulRoutePolicy.java
@@ -45,7 +45,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * @deprecated use {@link org.apache.camel.component.consul.ha.ConsulClusterService} and {@link org.apache.camel.impl.ha.ClusteredRoutePolicy} instead.
+ * @deprecated use {@link org.apache.camel.component.consul.cluster.ConsulClusterService} and {@link org.apache.camel.impl.cluster.ClusteredRoutePolicy} instead.
*/
@Deprecated
@ManagedResource(description = "Route policy using Consul as clustered lock")
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ha/ConsulClusteredRoutePolicyFactoryIT.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryIT.java
similarity index 97%
rename from components/camel-consul/src/test/java/org/apache/camel/component/consul/ha/ConsulClusteredRoutePolicyFactoryIT.java
rename to components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryIT.java
index ad912f6..668cb97 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ha/ConsulClusteredRoutePolicyFactoryIT.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryIT.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.consul.ha;
+package org.apache.camel.component.consul.cluster;
import java.util.ArrayList;
import java.util.List;
@@ -29,7 +29,7 @@ import java.util.stream.IntStream;
import com.orbitz.consul.Consul;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.impl.ha.ClusteredRoutePolicyFactory;
+import org.apache.camel.impl.cluster.ClusteredRoutePolicyFactory;
import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ha/ConsulClusteredRoutePolicyFactoryMain.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryMain.java
similarity index 95%
rename from components/camel-consul/src/test/java/org/apache/camel/component/consul/ha/ConsulClusteredRoutePolicyFactoryMain.java
rename to components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryMain.java
index 8179ea7..d418e30 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ha/ConsulClusteredRoutePolicyFactoryMain.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryMain.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.consul.ha;
+package org.apache.camel.component.consul.cluster;
import java.util.UUID;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.ExplicitCamelContextNameStrategy;
-import org.apache.camel.impl.ha.ClusteredRoutePolicyFactory;
+import org.apache.camel.impl.cluster.ClusteredRoutePolicyFactory;
import org.apache.camel.main.Main;
import org.apache.camel.main.MainListenerSupport;
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ha/ConsulClusteredRoutePolicyIT.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyIT.java
similarity index 97%
rename from components/camel-consul/src/test/java/org/apache/camel/component/consul/ha/ConsulClusteredRoutePolicyIT.java
rename to components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyIT.java
index 2c003a6..f625a06 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ha/ConsulClusteredRoutePolicyIT.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyIT.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.consul.ha;
+package org.apache.camel.component.consul.cluster;
import java.util.ArrayList;
import java.util.List;
@@ -29,7 +29,7 @@ import java.util.stream.IntStream;
import com.orbitz.consul.Consul;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.impl.ha.ClusteredRoutePolicy;
+import org.apache.camel.impl.cluster.ClusteredRoutePolicy;
import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ha/ConsulMasterIT.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulMasterIT.java
similarity index 98%
rename from components/camel-consul/src/test/java/org/apache/camel/component/consul/ha/ConsulMasterIT.java
rename to components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulMasterIT.java
index 5dbbb5c..3b93577 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ha/ConsulMasterIT.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulMasterIT.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.consul.ha;
+package org.apache.camel.component.consul.cluster;
import java.util.ArrayList;
import java.util.List;
diff --git a/components/camel-consul/src/test/resources/log4j2.properties b/components/camel-consul/src/test/resources/log4j2.properties
index 059cf25..f08fa75 100644
--- a/components/camel-consul/src/test/resources/log4j2.properties
+++ b/components/camel-consul/src/test/resources/log4j2.properties
@@ -36,10 +36,10 @@ logger.camel.name = org.apache.camel
logger.camel.level = INFO
logger.camel-consul.name = org.apache.camel.component.consul
logger.camel-consul.level = DEBUG
-logger.camel-ha.name = org.apache.camel.ha
-logger.camel-ha.level = DEBUG
-logger.camel-impl-ha.name = org.apache.camel.impl.ha
-logger.camel-impl-ha.level = DEBUG
+logger.camel-cluster.name = org.apache.camel.cluster
+logger.camel-cluster.level = DEBUG
+logger.camel-impl-cluster.name = org.apache.camel.impl.cluster
+logger.camel-impl-cluster.level = DEBUG
logger.camel-master.name = org.apache.camel.component.master
logger.camel-master.level = DEBUG
diff --git a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
index ae0715e..3284c4b 100644
--- a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
+++ b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
@@ -40,12 +40,12 @@ import org.apache.camel.TypeConverterExists;
import org.apache.camel.TypeConverters;
import org.apache.camel.builder.ErrorHandlerBuilderRef;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.cluster.CamelClusterService;
import org.apache.camel.component.properties.PropertiesComponent;
import org.apache.camel.component.properties.PropertiesFunction;
import org.apache.camel.component.properties.PropertiesLocation;
import org.apache.camel.component.properties.PropertiesParser;
import org.apache.camel.component.properties.PropertiesResolver;
-import org.apache.camel.ha.CamelClusterService;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.health.HealthCheckService;
diff --git a/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/ha/JGroupsLockClusterService.java b/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/cluster/JGroupsLockClusterService.java
similarity index 94%
rename from components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/ha/JGroupsLockClusterService.java
rename to components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/cluster/JGroupsLockClusterService.java
index d560105..085e79b 100644
--- a/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/ha/JGroupsLockClusterService.java
+++ b/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/cluster/JGroupsLockClusterService.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.jgroups.ha;
+package org.apache.camel.component.jgroups.cluster;
-import org.apache.camel.impl.ha.AbstractCamelClusterService;
+import org.apache.camel.impl.cluster.AbstractCamelClusterService;
public class JGroupsLockClusterService extends AbstractCamelClusterService<JGroupsLockClusterView> {
diff --git a/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/ha/JGroupsLockClusterView.java b/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/cluster/JGroupsLockClusterView.java
similarity index 95%
rename from components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/ha/JGroupsLockClusterView.java
rename to components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/cluster/JGroupsLockClusterView.java
index 60616fa..9d3edc2 100644
--- a/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/ha/JGroupsLockClusterView.java
+++ b/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/cluster/JGroupsLockClusterView.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.jgroups.ha;
+package org.apache.camel.component.jgroups.cluster;
import java.util.ArrayList;
import java.util.List;
@@ -23,9 +23,9 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.locks.Lock;
import org.apache.camel.CamelContext;
-import org.apache.camel.ha.CamelClusterMember;
-import org.apache.camel.ha.CamelClusterService;
-import org.apache.camel.impl.ha.AbstractCamelClusterView;
+import org.apache.camel.cluster.CamelClusterMember;
+import org.apache.camel.cluster.CamelClusterService;
+import org.apache.camel.impl.cluster.AbstractCamelClusterView;
import org.apache.camel.util.ObjectHelper;
import org.jgroups.JChannel;
import org.jgroups.blocks.locking.LockService;
diff --git a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/ha/JGroupsLockMasterTest.java b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/cluster/JGroupsLockMasterTest.java
similarity index 98%
rename from components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/ha/JGroupsLockMasterTest.java
rename to components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/cluster/JGroupsLockMasterTest.java
index 4d972cf..c16e290 100644
--- a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/ha/JGroupsLockMasterTest.java
+++ b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/cluster/JGroupsLockMasterTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.jgroups.ha;
+package org.apache.camel.component.jgroups.cluster;
import java.util.ArrayList;
import java.util.List;
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/ha/KubernetesClusterService.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/KubernetesClusterService.java
similarity index 97%
rename from components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/ha/KubernetesClusterService.java
rename to components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/KubernetesClusterService.java
index 60b6f5c..621874b 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/ha/KubernetesClusterService.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/KubernetesClusterService.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.kubernetes.ha;
+package org.apache.camel.component.kubernetes.cluster;
import java.net.InetAddress;
import java.util.Map;
@@ -22,8 +22,8 @@ import java.util.Map;
import org.apache.camel.CamelContext;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.component.kubernetes.KubernetesConfiguration;
-import org.apache.camel.component.kubernetes.ha.lock.KubernetesLockConfiguration;
-import org.apache.camel.impl.ha.AbstractCamelClusterService;
+import org.apache.camel.component.kubernetes.cluster.lock.KubernetesLockConfiguration;
+import org.apache.camel.impl.cluster.AbstractCamelClusterService;
import org.apache.camel.util.ObjectHelper;
/**
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/ha/KubernetesClusterView.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/KubernetesClusterView.java
similarity index 93%
rename from components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/ha/KubernetesClusterView.java
rename to components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/KubernetesClusterView.java
index 3069036..7ace336 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/ha/KubernetesClusterView.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/KubernetesClusterView.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.kubernetes.ha;
+package org.apache.camel.component.kubernetes.cluster;
import java.util.Collections;
import java.util.HashMap;
@@ -28,13 +28,13 @@ import java.util.stream.Collectors;
import io.fabric8.kubernetes.client.KubernetesClient;
import org.apache.camel.CamelContext;
+import org.apache.camel.cluster.CamelClusterMember;
import org.apache.camel.component.kubernetes.KubernetesConfiguration;
import org.apache.camel.component.kubernetes.KubernetesHelper;
-import org.apache.camel.component.kubernetes.ha.lock.KubernetesClusterEvent;
-import org.apache.camel.component.kubernetes.ha.lock.KubernetesLeadershipController;
-import org.apache.camel.component.kubernetes.ha.lock.KubernetesLockConfiguration;
-import org.apache.camel.ha.CamelClusterMember;
-import org.apache.camel.impl.ha.AbstractCamelClusterView;
+import org.apache.camel.component.kubernetes.cluster.lock.KubernetesClusterEvent;
+import org.apache.camel.component.kubernetes.cluster.lock.KubernetesLeadershipController;
+import org.apache.camel.component.kubernetes.cluster.lock.KubernetesLockConfiguration;
+import org.apache.camel.impl.cluster.AbstractCamelClusterView;
import org.apache.camel.util.ObjectHelper;
/**
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/ha/lock/ConfigMapLockUtils.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/ConfigMapLockUtils.java
similarity index 98%
rename from components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/ha/lock/ConfigMapLockUtils.java
rename to components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/ConfigMapLockUtils.java
index feea1c6..a9157ee 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/ha/lock/ConfigMapLockUtils.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/ConfigMapLockUtils.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.kubernetes.ha.lock;
+package org.apache.camel.component.kubernetes.cluster.lock;
import java.text.SimpleDateFormat;
import java.util.Date;
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/ha/lock/KubernetesClusterEvent.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/KubernetesClusterEvent.java
similarity index 96%
rename from components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/ha/lock/KubernetesClusterEvent.java
rename to components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/KubernetesClusterEvent.java
index 59f8768..518d81b 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/ha/lock/KubernetesClusterEvent.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/KubernetesClusterEvent.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.kubernetes.ha.lock;
+package org.apache.camel.component.kubernetes.cluster.lock;
import java.util.Optional;
import java.util.Set;
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/ha/lock/KubernetesClusterEventHandler.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/KubernetesClusterEventHandler.java
similarity index 94%
rename from components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/ha/lock/KubernetesClusterEventHandler.java
rename to components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/KubernetesClusterEventHandler.java
index 0962847..b9f172f 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/ha/lock/KubernetesClusterEventHandler.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/KubernetesClusterEventHandler.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.kubernetes.ha.lock;
+package org.apache.camel.component.kubernetes.cluster.lock;
/**
* Interface for handling Kubernetes cluster events.
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/ha/lock/KubernetesLeadershipController.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/KubernetesLeadershipController.java
similarity index 99%
rename from components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/ha/lock/KubernetesLeadershipController.java
rename to components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/KubernetesLeadershipController.java
index 25a09f8..f5f8990 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/ha/lock/KubernetesLeadershipController.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/KubernetesLeadershipController.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.kubernetes.ha.lock;
+package org.apache.camel.component.kubernetes.cluster.lock;
import java.math.BigDecimal;
import java.util.Date;
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/ha/lock/KubernetesLockConfiguration.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/KubernetesLockConfiguration.java
similarity index 99%
rename from components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/ha/lock/KubernetesLockConfiguration.java
rename to components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/KubernetesLockConfiguration.java
index 94dcca8..2aba3a1 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/ha/lock/KubernetesLockConfiguration.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/KubernetesLockConfiguration.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.kubernetes.ha.lock;
+package org.apache.camel.component.kubernetes.cluster.lock;
import java.util.HashMap;
import java.util.Map;
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/ha/lock/LeaderInfo.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/LeaderInfo.java
similarity index 97%
rename from components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/ha/lock/LeaderInfo.java
rename to components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/LeaderInfo.java
index d061945..6404f7e 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/ha/lock/LeaderInfo.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/LeaderInfo.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.kubernetes.ha.lock;
+package org.apache.camel.component.kubernetes.cluster.lock;
import java.util.Date;
import java.util.Set;
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/ha/lock/TimedLeaderNotifier.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/TimedLeaderNotifier.java
similarity index 99%
rename from components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/ha/lock/TimedLeaderNotifier.java
rename to components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/TimedLeaderNotifier.java
index f805536..f267f92 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/ha/lock/TimedLeaderNotifier.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/TimedLeaderNotifier.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.kubernetes.ha.lock;
+package org.apache.camel.component.kubernetes.cluster.lock;
import java.util.Collections;
import java.util.Objects;
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/ha/KubernetesClusterServiceTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/KubernetesClusterServiceTest.java
similarity index 97%
rename from components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/ha/KubernetesClusterServiceTest.java
rename to components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/KubernetesClusterServiceTest.java
index 62174c2..9f40a7c 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/ha/KubernetesClusterServiceTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/KubernetesClusterServiceTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.kubernetes.ha;
+package org.apache.camel.component.kubernetes.cluster;
import java.util.Arrays;
import java.util.HashMap;
@@ -29,9 +29,9 @@ import java.util.stream.IntStream;
import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
import org.apache.camel.component.kubernetes.KubernetesConfiguration;
-import org.apache.camel.component.kubernetes.ha.utils.ConfigMapLockSimulator;
-import org.apache.camel.component.kubernetes.ha.utils.LeaderRecorder;
-import org.apache.camel.component.kubernetes.ha.utils.LockTestServer;
+import org.apache.camel.component.kubernetes.cluster.utils.ConfigMapLockSimulator;
+import org.apache.camel.component.kubernetes.cluster.utils.LeaderRecorder;
+import org.apache.camel.component.kubernetes.cluster.utils.LockTestServer;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.After;
import org.junit.Before;
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/ha/TimedLeaderNotifierTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/TimedLeaderNotifierTest.java
similarity index 95%
rename from components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/ha/TimedLeaderNotifierTest.java
rename to components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/TimedLeaderNotifierTest.java
index 164912d..c7a34a1 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/ha/TimedLeaderNotifierTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/TimedLeaderNotifierTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.kubernetes.ha;
+package org.apache.camel.component.kubernetes.cluster;
import java.util.Arrays;
import java.util.Collections;
@@ -23,8 +23,8 @@ import java.util.Set;
import java.util.TreeSet;
import org.apache.camel.CamelContext;
-import org.apache.camel.component.kubernetes.ha.lock.KubernetesClusterEvent;
-import org.apache.camel.component.kubernetes.ha.lock.TimedLeaderNotifier;
+import org.apache.camel.component.kubernetes.cluster.lock.KubernetesClusterEvent;
+import org.apache.camel.component.kubernetes.cluster.lock.TimedLeaderNotifier;
import org.apache.camel.impl.DefaultCamelContext;
import org.junit.After;
import org.junit.Before;
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/ha/utils/ConfigMapLockSimulator.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/utils/ConfigMapLockSimulator.java
similarity index 97%
rename from components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/ha/utils/ConfigMapLockSimulator.java
rename to components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/utils/ConfigMapLockSimulator.java
index 1c3d7d0..9badb3d 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/ha/utils/ConfigMapLockSimulator.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/utils/ConfigMapLockSimulator.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.kubernetes.ha.utils;
+package org.apache.camel.component.kubernetes.cluster.utils;
import io.fabric8.kubernetes.api.model.ConfigMap;
import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/ha/utils/LeaderRecorder.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/utils/LeaderRecorder.java
similarity index 94%
rename from components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/ha/utils/LeaderRecorder.java
rename to components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/utils/LeaderRecorder.java
index 0f8199d..e47d770 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/ha/utils/LeaderRecorder.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/utils/LeaderRecorder.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.kubernetes.ha.utils;
+package org.apache.camel.component.kubernetes.cluster.utils;
import java.util.ArrayList;
import java.util.Collections;
@@ -25,9 +25,9 @@ import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.TimeUnit;
import java.util.function.Predicate;
-import org.apache.camel.ha.CamelClusterEventListener;
-import org.apache.camel.ha.CamelClusterMember;
-import org.apache.camel.ha.CamelClusterView;
+import org.apache.camel.cluster.CamelClusterEventListener;
+import org.apache.camel.cluster.CamelClusterMember;
+import org.apache.camel.cluster.CamelClusterView;
import org.junit.Assert;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/ha/utils/LockTestServer.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/utils/LockTestServer.java
similarity index 99%
rename from components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/ha/utils/LockTestServer.java
rename to components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/utils/LockTestServer.java
index d30caa2..d32b556 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/ha/utils/LockTestServer.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/utils/LockTestServer.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.kubernetes.ha.utils;
+package org.apache.camel.component.kubernetes.cluster.utils;
import java.io.IOException;
import java.util.Collection;
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/ha/utils/LockTestServerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/utils/LockTestServerTest.java
similarity index 98%
rename from components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/ha/utils/LockTestServerTest.java
rename to components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/utils/LockTestServerTest.java
index 282b83f..5f97541 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/ha/utils/LockTestServerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/utils/LockTestServerTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.kubernetes.ha.utils;
+package org.apache.camel.component.kubernetes.cluster.utils;
import io.fabric8.kubernetes.api.model.ConfigMap;
import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
diff --git a/components/camel-master/src/main/docs/master-component.adoc b/components/camel-master/src/main/docs/master-component.adoc
index a5969bd..55e66bf 100644
--- a/components/camel-master/src/main/docs/master-component.adoc
+++ b/components/camel-master/src/main/docs/master-component.adoc
@@ -104,7 +104,7 @@ The master component leverages CamelClusterService you can configure using
ZooKeeperClusterService service = new ZooKeeperClusterService();
service.setId("camel-node-1");
service.setNodes("myzk:2181");
-service.setBasePath("/camel/ha");
+service.setBasePath("/camel/cluster");
context.addService(service)
----
@@ -122,9 +122,9 @@ context.addService(service)
http://camel.apache.org/schema/spring/camel-spring.xsd">
- <bean id="ha" class="org.apache.camel.component.zookeeper.ha.ZooKeeperClusterService">
+ <bean id="cluster" class="org.apache.camel.component.zookeeper.cluster.ZooKeeperClusterService">
<property name="id" value="camel-node-1"/>
- <property name="basePath" value="/camel/ha"/>
+ <property name="basePath" value="/camel/cluster"/>
<property name="nodes" value="myzk:2181"/>
</bean>
@@ -141,7 +141,7 @@ context.addService(service)
----
camel.component.zookeeper.cluster.service.enabled = true
camel.component.zookeeper.cluster.service.id = camel-node-1
-camel.component.zookeeper.cluster.service.base-path = /camel/ha
+camel.component.zookeeper.cluster.service.base-path = /camel/cluster
camel.component.zookeeper.cluster.service.nodes = myzk:2181
----
diff --git a/components/camel-master/src/main/java/org/apache/camel/component/master/MasterComponent.java b/components/camel-master/src/main/java/org/apache/camel/component/master/MasterComponent.java
index 5b8a6f6..6f6d766 100644
--- a/components/camel-master/src/main/java/org/apache/camel/component/master/MasterComponent.java
+++ b/components/camel-master/src/main/java/org/apache/camel/component/master/MasterComponent.java
@@ -20,10 +20,10 @@ import java.util.Map;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
-import org.apache.camel.ha.CamelClusterService;
+import org.apache.camel.cluster.CamelClusterService;
import org.apache.camel.impl.DefaultComponent;
-import org.apache.camel.impl.ha.ClusterServiceHelper;
-import org.apache.camel.impl.ha.ClusterServiceSelectors;
+import org.apache.camel.impl.cluster.ClusterServiceHelper;
+import org.apache.camel.impl.cluster.ClusterServiceSelectors;
import org.apache.camel.spi.Metadata;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.StringHelper;
diff --git a/components/camel-master/src/main/java/org/apache/camel/component/master/MasterConsumer.java b/components/camel-master/src/main/java/org/apache/camel/component/master/MasterConsumer.java
index 8d3815f..8611224 100644
--- a/components/camel-master/src/main/java/org/apache/camel/component/master/MasterConsumer.java
+++ b/components/camel-master/src/main/java/org/apache/camel/component/master/MasterConsumer.java
@@ -25,10 +25,10 @@ import org.apache.camel.StartupListener;
import org.apache.camel.SuspendableService;
import org.apache.camel.api.management.ManagedAttribute;
import org.apache.camel.api.management.ManagedResource;
-import org.apache.camel.ha.CamelClusterEventListener;
-import org.apache.camel.ha.CamelClusterMember;
-import org.apache.camel.ha.CamelClusterService;
-import org.apache.camel.ha.CamelClusterView;
+import org.apache.camel.cluster.CamelClusterEventListener;
+import org.apache.camel.cluster.CamelClusterMember;
+import org.apache.camel.cluster.CamelClusterService;
+import org.apache.camel.cluster.CamelClusterView;
import org.apache.camel.impl.DefaultConsumer;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ServiceHelper;
diff --git a/components/camel-master/src/main/java/org/apache/camel/component/master/MasterEndpoint.java b/components/camel-master/src/main/java/org/apache/camel/component/master/MasterEndpoint.java
index abeb601..79e9a9b 100644
--- a/components/camel-master/src/main/java/org/apache/camel/component/master/MasterEndpoint.java
+++ b/components/camel-master/src/main/java/org/apache/camel/component/master/MasterEndpoint.java
@@ -23,8 +23,8 @@ import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.api.management.ManagedAttribute;
import org.apache.camel.api.management.ManagedResource;
-import org.apache.camel.ha.CamelClusterService;
-import org.apache.camel.ha.CamelClusterView;
+import org.apache.camel.cluster.CamelClusterService;
+import org.apache.camel.cluster.CamelClusterView;
import org.apache.camel.impl.DefaultEndpoint;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriEndpoint;
diff --git a/components/camel-master/src/test/java/org/apache/camel/component/master/MasterComponentTest.java b/components/camel-master/src/test/java/org/apache/camel/component/master/MasterComponentTest.java
index c252ccc..d5d592b 100644
--- a/components/camel-master/src/test/java/org/apache/camel/component/master/MasterComponentTest.java
+++ b/components/camel-master/src/test/java/org/apache/camel/component/master/MasterComponentTest.java
@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
import java.util.stream.IntStream;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.ha.FileLockClusterService;
+import org.apache.camel.component.file.cluster.FileLockClusterService;
import org.apache.camel.impl.DefaultCamelContext;
import org.junit.Assert;
import org.junit.Test;
@@ -66,7 +66,7 @@ public class MasterComponentTest {
FileLockClusterService service = new FileLockClusterService();
service.setId(id);
- service.setRoot("target/ha");
+ service.setRoot("target/cluster");
service.setAcquireLockDelay(1, TimeUnit.SECONDS);
service.setAcquireLockInterval(1, TimeUnit.SECONDS);
diff --git a/components/camel-master/src/test/resources/log4j2.properties b/components/camel-master/src/test/resources/log4j2.properties
index 40a55e4..c8fc58b 100644
--- a/components/camel-master/src/test/resources/log4j2.properties
+++ b/components/camel-master/src/test/resources/log4j2.properties
@@ -26,8 +26,8 @@ appender.out.layout.type = PatternLayout
appender.out.layout.pattern = [%t] %c{1} %-5p %m%n
-logger.camel-file-ha.name = org.apache.camel.component.file.ha
-logger.camel-file-ha.level = DEBUG
+logger.camel-file-cluster.name = org.apache.camel.component.file.cluster
+logger.camel-file-cluster.level = DEBUG
logger.camel-master.name = org.apache.camel.component.master
logger.camel-master.level = DEBUG
logger.camel.name = org.apache.camel
diff --git a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
index b6331a2..badc9d6 100644
--- a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
+++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
@@ -28,9 +28,9 @@ import org.apache.camel.Exchange;
import org.apache.camel.FluentProducerTemplate;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.TypeConverters;
+import org.apache.camel.cluster.CamelClusterService;
import org.apache.camel.component.properties.PropertiesComponent;
import org.apache.camel.component.properties.PropertiesParser;
-import org.apache.camel.ha.CamelClusterService;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.health.HealthCheckService;
diff --git a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/ha/ClusteredRouteControllerAutoConfiguration.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cluster/ClusteredRouteControllerAutoConfiguration.java
similarity index 92%
rename from components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/ha/ClusteredRouteControllerAutoConfiguration.java
rename to components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cluster/ClusteredRouteControllerAutoConfiguration.java
index 19a3959..ef000cc 100644
--- a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/ha/ClusteredRouteControllerAutoConfiguration.java
+++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cluster/ClusteredRouteControllerAutoConfiguration.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.spring.boot.ha;
+package org.apache.camel.spring.boot.cluster;
import java.time.Duration;
import java.util.Collections;
@@ -22,12 +22,12 @@ import java.util.List;
import java.util.Map;
import java.util.Optional;
+import org.apache.camel.cluster.CamelClusterService;
import org.apache.camel.converter.TimePatternConverter;
-import org.apache.camel.ha.CamelClusterService;
-import org.apache.camel.impl.ha.ClusteredRouteConfiguration;
-import org.apache.camel.impl.ha.ClusteredRouteController;
-import org.apache.camel.impl.ha.ClusteredRouteFilter;
-import org.apache.camel.impl.ha.ClusteredRouteFilters;
+import org.apache.camel.impl.cluster.ClusteredRouteConfiguration;
+import org.apache.camel.impl.cluster.ClusteredRouteController;
+import org.apache.camel.impl.cluster.ClusteredRouteFilter;
+import org.apache.camel.impl.cluster.ClusteredRouteFilters;
import org.apache.camel.spi.RouteController;
import org.apache.camel.spring.boot.CamelAutoConfiguration;
import org.apache.camel.util.ObjectHelper;
diff --git a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/ha/ClusteredRouteControllerConfiguration.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cluster/ClusteredRouteControllerConfiguration.java
similarity index 97%
rename from components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/ha/ClusteredRouteControllerConfiguration.java
rename to components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cluster/ClusteredRouteControllerConfiguration.java
index 946c20d..d27751f 100644
--- a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/ha/ClusteredRouteControllerConfiguration.java
+++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cluster/ClusteredRouteControllerConfiguration.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.camel.spring.boot.ha;
+package org.apache.camel.spring.boot.cluster;
import java.util.HashMap;
import java.util.Map;
-import org.apache.camel.ha.CamelClusterService;
+import org.apache.camel.cluster.CamelClusterService;
import org.springframework.boot.context.properties.ConfigurationProperties;
@ConfigurationProperties(prefix = "camel.clustered.controller")
diff --git a/components/camel-spring-boot/src/main/resources/META-INF/spring.factories b/components/camel-spring-boot/src/main/resources/META-INF/spring.factories
index 1642563..d27512a 100644
--- a/components/camel-spring-boot/src/main/resources/META-INF/spring.factories
+++ b/components/camel-spring-boot/src/main/resources/META-INF/spring.factories
@@ -28,7 +28,7 @@ org.apache.camel.spring.boot.cloud.CamelCloudServiceCallConfigurationAutoConfigu
org.apache.camel.spring.boot.cloud.CamelCloudServiceDiscoveryAutoConfiguration,\
org.apache.camel.spring.boot.cloud.CamelCloudServiceFilterAutoConfiguration,\
org.apache.camel.spring.boot.cloud.CamelCloudServiceChooserAutoConfiguration,\
-org.apache.camel.spring.boot.ha.ClusteredRouteControllerAutoConfiguration,\
+org.apache.camel.spring.boot.cluster.ClusteredRouteControllerAutoConfiguration,\
org.apache.camel.spring.boot.health.HealthCheckRoutesAutoConfiguration,\
org.apache.camel.spring.boot.health.HealthCheckServiceAutoConfiguration,\
org.apache.camel.spring.boot.security.CamelSSLAutoConfiguration
diff --git a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ha/ZooKeeperClusterService.java b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusterService.java
similarity index 98%
rename from components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ha/ZooKeeperClusterService.java
rename to components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusterService.java
index 6af1269..b542d4b 100644
--- a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ha/ZooKeeperClusterService.java
+++ b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusterService.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.zookeeper.ha;
+package org.apache.camel.component.zookeeper.cluster;
import java.util.List;
import java.util.concurrent.TimeUnit;
import org.apache.camel.component.zookeeper.ZooKeeperCuratorConfiguration;
import org.apache.camel.component.zookeeper.ZooKeeperCuratorHelper;
-import org.apache.camel.impl.ha.AbstractCamelClusterService;
+import org.apache.camel.impl.cluster.AbstractCamelClusterService;
import org.apache.camel.util.ObjectHelper;
import org.apache.curator.RetryPolicy;
import org.apache.curator.framework.AuthInfo;
diff --git a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ha/ZooKeeperClusterView.java b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusterView.java
similarity index 96%
rename from components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ha/ZooKeeperClusterView.java
rename to components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusterView.java
index c9fdd42..b8a3813 100644
--- a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ha/ZooKeeperClusterView.java
+++ b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusterView.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.zookeeper.ha;
+package org.apache.camel.component.zookeeper.cluster;
import java.util.Collections;
import java.util.List;
@@ -22,10 +22,10 @@ import java.util.Optional;
import java.util.stream.Collectors;
import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.cluster.CamelClusterMember;
+import org.apache.camel.cluster.CamelClusterService;
import org.apache.camel.component.zookeeper.ZooKeeperCuratorConfiguration;
-import org.apache.camel.ha.CamelClusterMember;
-import org.apache.camel.ha.CamelClusterService;
-import org.apache.camel.impl.ha.AbstractCamelClusterView;
+import org.apache.camel.impl.cluster.AbstractCamelClusterView;
import org.apache.camel.util.ObjectHelper;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.recipes.leader.LeaderSelector;
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ha/SpringZooKeeperClusteredRouteConfigurationTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/SpringZooKeeperClusteredRouteConfigurationTest.java
similarity index 86%
rename from components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ha/SpringZooKeeperClusteredRouteConfigurationTest.java
rename to components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/SpringZooKeeperClusteredRouteConfigurationTest.java
index c472e84..39fd1d3 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ha/SpringZooKeeperClusteredRouteConfigurationTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/SpringZooKeeperClusteredRouteConfigurationTest.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.zookeeper.ha;
+package org.apache.camel.component.zookeeper.cluster;
-import org.apache.camel.ha.CamelClusterService;
-import org.apache.camel.impl.ha.ClusteredRoutePolicyFactory;
+import org.apache.camel.cluster.CamelClusterService;
+import org.apache.camel.impl.cluster.ClusteredRoutePolicyFactory;
import org.apache.camel.test.spring.CamelSpringTestSupport;
import org.junit.Test;
import org.springframework.context.support.AbstractApplicationContext;
@@ -37,6 +37,6 @@ public class SpringZooKeeperClusteredRouteConfigurationTest extends CamelSpringT
@Override
protected AbstractApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/apache/camel/component/zookeeper/ha/SpringZooKeeperClusteredRouteConfigurationTest.xml");
+ return new ClassPathXmlApplicationContext("org/apache/camel/component/zookeeper/cluster/SpringZooKeeperClusteredRouteConfigurationTest.xml");
}
}
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ha/ZooKeeperClusteredRoutePolicyFactoryMain.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyFactoryMain.java
similarity index 95%
rename from components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ha/ZooKeeperClusteredRoutePolicyFactoryMain.java
rename to components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyFactoryMain.java
index 0d455dd..612d6f2 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ha/ZooKeeperClusteredRoutePolicyFactoryMain.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyFactoryMain.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.zookeeper.ha;
+package org.apache.camel.component.zookeeper.cluster;
import java.util.UUID;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.ExplicitCamelContextNameStrategy;
-import org.apache.camel.impl.ha.ClusteredRoutePolicyFactory;
+import org.apache.camel.impl.cluster.ClusteredRoutePolicyFactory;
import org.apache.camel.main.Main;
import org.apache.camel.main.MainListenerSupport;
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ha/ZooKeeperClusteredRoutePolicyFactoryTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyFactoryTest.java
similarity index 97%
rename from components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ha/ZooKeeperClusteredRoutePolicyFactoryTest.java
rename to components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyFactoryTest.java
index a58cc02..3e889b3 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ha/ZooKeeperClusteredRoutePolicyFactoryTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyFactoryTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.zookeeper.ha;
+package org.apache.camel.component.zookeeper.cluster;
import java.util.ArrayList;
import java.util.List;
@@ -30,7 +30,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.zookeeper.ZooKeeperTestSupport;
import org.apache.camel.component.zookeeper.ZooKeeperTestSupport.TestZookeeperServer;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.impl.ha.ClusteredRoutePolicyFactory;
+import org.apache.camel.impl.cluster.ClusteredRoutePolicyFactory;
import org.apache.camel.test.AvailablePortFinder;
import org.junit.Assert;
import org.junit.Test;
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ha/ZooKeeperClusteredRoutePolicyTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyTest.java
similarity index 97%
rename from components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ha/ZooKeeperClusteredRoutePolicyTest.java
rename to components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyTest.java
index 6f60f06..499a96a 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ha/ZooKeeperClusteredRoutePolicyTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.zookeeper.ha;
+package org.apache.camel.component.zookeeper.cluster;
import java.util.ArrayList;
import java.util.List;
@@ -30,7 +30,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.zookeeper.ZooKeeperTestSupport;
import org.apache.camel.component.zookeeper.ZooKeeperTestSupport.TestZookeeperServer;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.impl.ha.ClusteredRoutePolicy;
+import org.apache.camel.impl.cluster.ClusteredRoutePolicy;
import org.apache.camel.test.AvailablePortFinder;
import org.junit.Assert;
import org.junit.Test;
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ha/ZooKeeperMasterMain.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperMasterMain.java
similarity index 97%
rename from components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ha/ZooKeeperMasterMain.java
rename to components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperMasterMain.java
index 479c6f1..7f3ccf4 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ha/ZooKeeperMasterMain.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperMasterMain.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.zookeeper.ha;
+package org.apache.camel.component.zookeeper.cluster;
import java.util.UUID;
import java.util.concurrent.ThreadLocalRandom;
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ha/ZooKeeperMasterTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperMasterTest.java
similarity index 98%
rename from components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ha/ZooKeeperMasterTest.java
rename to components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperMasterTest.java
index 3e50bd2..f9e3632 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ha/ZooKeeperMasterTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperMasterTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.zookeeper.ha;
+package org.apache.camel.component.zookeeper.cluster;
import java.util.ArrayList;
import java.util.List;
diff --git a/components/camel-zookeeper/src/test/resources/log4j2.properties b/components/camel-zookeeper/src/test/resources/log4j2.properties
index 5318521..98db0e3 100644
--- a/components/camel-zookeeper/src/test/resources/log4j2.properties
+++ b/components/camel-zookeeper/src/test/resources/log4j2.properties
@@ -35,12 +35,12 @@ logger.camel-zookeeper.name = org.apache.camel.component.zookeeper
logger.camel-zookeeper.level = INFO
logger.camel-zookeeper-policy.name = org.apache.camel.component.zookeeper.policy
logger.camel-zookeeper-policy.level = INFO
-logger.camel-zookeeper-ha.name = org.apache.camel.component.zookeeper.ha
-logger.camel-zookeeper-ha.level = DEBUG
-logger.camel-ha.name = org.apache.camel.ha
-logger.camel-ha.level = DEBUG
-logger.camel-impl-ha.name = org.apache.camel.impl.ha
-logger.camel-impl-ha.level = DEBUG
+logger.camel-zookeeper-cluster.name = org.apache.camel.component.zookeeper.cluster
+logger.camel-zookeeper-cluster.level = DEBUG
+logger.camel-cluster.name = org.apache.camel.cluster
+logger.camel-cluster.level = DEBUG
+logger.camel-impl-cluster.name = org.apache.camel.impl.cluster
+logger.camel-impl-cluster.level = DEBUG
logger.camel-support.name = org.apache.camel.support
logger.camel-support.level = INFO
diff --git a/components/camel-zookeeper/src/test/resources/org/apache/camel/component/zookeeper/ha/SpringZooKeeperClusteredRouteConfigurationTest.xml b/components/camel-zookeeper/src/test/resources/org/apache/camel/component/zookeeper/cluster/SpringZooKeeperClusteredRouteConfigurationTest.xml
similarity index 87%
rename from components/camel-zookeeper/src/test/resources/org/apache/camel/component/zookeeper/ha/SpringZooKeeperClusteredRouteConfigurationTest.xml
rename to components/camel-zookeeper/src/test/resources/org/apache/camel/component/zookeeper/cluster/SpringZooKeeperClusteredRouteConfigurationTest.xml
index 2ab9589..c0ba63e 100644
--- a/components/camel-zookeeper/src/test/resources/org/apache/camel/component/zookeeper/ha/SpringZooKeeperClusteredRouteConfigurationTest.xml
+++ b/components/camel-zookeeper/src/test/resources/org/apache/camel/component/zookeeper/cluster/SpringZooKeeperClusteredRouteConfigurationTest.xml
@@ -26,13 +26,13 @@
http://camel.apache.org/schema/spring/camel-spring.xsd">
- <bean id="cluster-service" class="org.apache.camel.component.zookeeper.ha.ZooKeeperClusterService">
+ <bean id="cluster-service" class="org.apache.camel.component.zookeeper.cluster.ZooKeeperClusterService">
<property name="id" value="node-1"/>
- <property name="basePath" value="/camel/ha"/>
+ <property name="basePath" value="/camel/cluster"/>
<property name="nodes" value="localhost:2181"/>
</bean>
- <bean id="cluster-policy" class="org.apache.camel.impl.ha.ClusteredRoutePolicyFactory" factory-method="forNamespace">
+ <bean id="cluster-policy" class="org.apache.camel.impl.cluster.ClusteredRoutePolicyFactory" factory-method="forNamespace">
<constructor-arg value="my-ns"/>
</bean>
diff --git a/examples/camel-example-spring-boot-clustered-route-controller/cluster-node/src/main/resources/application.properties b/examples/camel-example-spring-boot-clustered-route-controller/cluster-node/src/main/resources/application.properties
index 4636507..e5f6c92 100644
--- a/examples/camel-example-spring-boot-clustered-route-controller/cluster-node/src/main/resources/application.properties
+++ b/examples/camel-example-spring-boot-clustered-route-controller/cluster-node/src/main/resources/application.properties
@@ -19,8 +19,8 @@ debug = false
logging.level.org.springframework = INFO
logging.level.io.atomix = DEBUG
-logging.level.org.apache.camel.ha = DEBUG
-logging.level.org.apache.camel.impl.ha = DEBUG
+logging.level.org.apache.camel.cluster = DEBUG
+logging.level.org.apache.camel.impl.cluster = DEBUG
logging.level.org.apache.camel.component.atomix = DEBUG
logging.level.org.apache.camel.examples.cluster = DEBUG
diff --git a/examples/camel-example-spring-boot-master/src/main/resources/application.properties b/examples/camel-example-spring-boot-master/src/main/resources/application.properties
index d0bc3bf..6d09642 100644
--- a/examples/camel-example-spring-boot-master/src/main/resources/application.properties
+++ b/examples/camel-example-spring-boot-master/src/main/resources/application.properties
@@ -19,8 +19,8 @@ debug = false
logging.level.org.springframework = INFO
logging.level.io.atomix = DEBUG
-logging.level.org.apache.camel.ha = DEBUG
-logging.level.org.apache.camel.impl.ha = DEBUG
+logging.level.org.apache.camel.cluster = DEBUG
+logging.level.org.apache.camel.impl.cluster = DEBUG
logging.level.org.apache.camel.component.atomix = DEBUG
logging.level.org.apache.camel.component.master = DEBUG
logging.level.org.apache.camel.examples.cluster = DEBUG
diff --git a/platforms/spring-boot/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/ha/springboot/AtomixClusterServiceAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/cluster/springboot/AtomixClusterServiceAutoConfiguration.java
similarity index 93%
rename from platforms/spring-boot/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/ha/springboot/AtomixClusterServiceAutoConfiguration.java
rename to platforms/spring-boot/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/cluster/springboot/AtomixClusterServiceAutoConfiguration.java
index c065bd6..84c424c 100644
--- a/platforms/spring-boot/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/ha/springboot/AtomixClusterServiceAutoConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/cluster/springboot/AtomixClusterServiceAutoConfiguration.java
@@ -14,17 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.atomix.ha.springboot;
+package org.apache.camel.component.atomix.cluster.springboot;
import java.util.stream.Collectors;
import io.atomix.catalyst.transport.Address;
-import org.apache.camel.component.atomix.ha.AtomixClusterClientService;
-import org.apache.camel.component.atomix.ha.AtomixClusterService;
-import org.apache.camel.ha.CamelClusterService;
+import org.apache.camel.cluster.CamelClusterService;
+import org.apache.camel.component.atomix.cluster.AtomixClusterClientService;
+import org.apache.camel.component.atomix.cluster.AtomixClusterService;
import org.apache.camel.spring.boot.CamelAutoConfiguration;
-import org.apache.camel.spring.boot.ha.ClusteredRouteControllerAutoConfiguration;
+import org.apache.camel.spring.boot.cluster.ClusteredRouteControllerAutoConfiguration;
import org.apache.camel.util.ObjectHelper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
diff --git a/platforms/spring-boot/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/ha/springboot/AtomixClusterServiceConfiguration.java b/platforms/spring-boot/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/cluster/springboot/AtomixClusterServiceConfiguration.java
similarity index 98%
rename from platforms/spring-boot/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/ha/springboot/AtomixClusterServiceConfiguration.java
rename to platforms/spring-boot/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/cluster/springboot/AtomixClusterServiceConfiguration.java
index fb9bcba..65c41ef 100644
--- a/platforms/spring-boot/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/ha/springboot/AtomixClusterServiceConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/cluster/springboot/AtomixClusterServiceConfiguration.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.atomix.ha.springboot;
+package org.apache.camel.component.atomix.cluster.springboot;
import java.util.HashSet;
import java.util.Map;
diff --git a/platforms/spring-boot/components-starter/camel-atomix-starter/src/main/resources/META-INF/spring.factories b/platforms/spring-boot/components-starter/camel-atomix-starter/src/main/resources/META-INF/spring.factories
index ae14d13..7a4a78c 100644
--- a/platforms/spring-boot/components-starter/camel-atomix-starter/src/main/resources/META-INF/spring.factories
+++ b/platforms/spring-boot/components-starter/camel-atomix-starter/src/main/resources/META-INF/spring.factories
@@ -28,7 +28,7 @@ org.apache.camel.component.atomix.client.map.springboot.AtomixMapComponentAutoCo
org.apache.camel.component.atomix.client.multimap.springboot.AtomixMultiMapComponentAutoConfiguration,\
org.apache.camel.component.atomix.client.value.springboot.AtomixValueComponentAutoConfiguration,\
org.apache.camel.component.atomix.client.messaging.springboot.AtomixMessagingComponentAutoConfiguration,\
-org.apache.camel.component.atomix.ha.springboot.AtomixClusterServiceAutoConfiguration
+org.apache.camel.component.atomix.cluster.springboot.AtomixClusterServiceAutoConfiguration
diff --git a/platforms/spring-boot/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/ha/ConsulClusterServiceAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/cluster/ConsulClusterServiceAutoConfiguration.java
similarity index 89%
rename from platforms/spring-boot/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/ha/ConsulClusterServiceAutoConfiguration.java
rename to platforms/spring-boot/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/cluster/ConsulClusterServiceAutoConfiguration.java
index 526e6c3..28d0c00 100644
--- a/platforms/spring-boot/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/ha/ConsulClusterServiceAutoConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/cluster/ConsulClusterServiceAutoConfiguration.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.consul.springboot.ha;
+package org.apache.camel.component.consul.springboot.cluster;
-import org.apache.camel.component.consul.ha.ConsulClusterService;
-import org.apache.camel.ha.CamelClusterService;
+import org.apache.camel.cluster.CamelClusterService;
+import org.apache.camel.component.consul.cluster.ConsulClusterService;
import org.apache.camel.spring.boot.CamelAutoConfiguration;
-import org.apache.camel.spring.boot.ha.ClusteredRouteControllerAutoConfiguration;
+import org.apache.camel.spring.boot.cluster.ClusteredRouteControllerAutoConfiguration;
import org.apache.camel.util.IntrospectionSupport;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
diff --git a/platforms/spring-boot/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/ha/ConsulClusterServiceConfiguration.java b/platforms/spring-boot/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/cluster/ConsulClusterServiceConfiguration.java
similarity index 93%
rename from platforms/spring-boot/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/ha/ConsulClusterServiceConfiguration.java
rename to platforms/spring-boot/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/cluster/ConsulClusterServiceConfiguration.java
index 205483b..6cb1bf9 100644
--- a/platforms/spring-boot/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/ha/ConsulClusterServiceConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/cluster/ConsulClusterServiceConfiguration.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.consul.springboot.ha;
+package org.apache.camel.component.consul.springboot.cluster;
import java.util.Map;
-import org.apache.camel.component.consul.ha.ConsulClusterConfiguration;
+import org.apache.camel.component.consul.cluster.ConsulClusterConfiguration;
import org.springframework.boot.context.properties.ConfigurationProperties;
@ConfigurationProperties(prefix = "camel.component.consul.cluster.service")
diff --git a/platforms/spring-boot/components-starter/camel-consul-starter/src/main/resources/META-INF/spring.factories b/platforms/spring-boot/components-starter/camel-consul-starter/src/main/resources/META-INF/spring.factories
index 9e50542..1e63a81 100644
--- a/platforms/spring-boot/components-starter/camel-consul-starter/src/main/resources/META-INF/spring.factories
+++ b/platforms/spring-boot/components-starter/camel-consul-starter/src/main/resources/META-INF/spring.factories
@@ -17,5 +17,5 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.apache.camel.component.consul.springboot.ConsulComponentAutoConfiguration,\
org.apache.camel.component.consul.springboot.cloud.ConsulServiceDiscoveryAutoConfiguration,\
-org.apache.camel.component.consul.springboot.ha.ConsulClusterServiceAutoConfiguration,\
+org.apache.camel.component.consul.springboot.cluster.ConsulClusterServiceAutoConfiguration,\
org.apache.camel.component.consul.springboot.health.HealthCheckRepositoryAutoConfiguration
\ No newline at end of file
diff --git a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/file/springboot/ha/FileLockClusterServiceAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/file/springboot/cluster/FileLockClusterServiceAutoConfiguration.java
similarity index 91%
rename from platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/file/springboot/ha/FileLockClusterServiceAutoConfiguration.java
rename to platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/file/springboot/cluster/FileLockClusterServiceAutoConfiguration.java
index 988db9d..7882dd5 100644
--- a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/file/springboot/ha/FileLockClusterServiceAutoConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/file/springboot/cluster/FileLockClusterServiceAutoConfiguration.java
@@ -14,17 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.file.springboot.ha;
+package org.apache.camel.component.file.springboot.cluster;
import java.util.Optional;
import java.util.concurrent.TimeUnit;
-import org.apache.camel.component.file.ha.FileLockClusterService;
+import org.apache.camel.cluster.CamelClusterService;
+import org.apache.camel.component.file.cluster.FileLockClusterService;
import org.apache.camel.converter.TimePatternConverter;
-import org.apache.camel.ha.CamelClusterService;
import org.apache.camel.spring.boot.CamelAutoConfiguration;
-import org.apache.camel.spring.boot.ha.ClusteredRouteControllerAutoConfiguration;
+import org.apache.camel.spring.boot.cluster.ClusteredRouteControllerAutoConfiguration;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
diff --git a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/file/springboot/ha/FileLockClusterServiceConfiguration.java b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/file/springboot/cluster/FileLockClusterServiceConfiguration.java
similarity index 97%
rename from platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/file/springboot/ha/FileLockClusterServiceConfiguration.java
rename to platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/file/springboot/cluster/FileLockClusterServiceConfiguration.java
index 5a13324..70c4272 100644
--- a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/file/springboot/ha/FileLockClusterServiceConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/file/springboot/cluster/FileLockClusterServiceConfiguration.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.file.springboot.ha;
+package org.apache.camel.component.file.springboot.cluster;
import java.util.Map;
diff --git a/platforms/spring-boot/components-starter/camel-core-starter/src/main/resources/META-INF/spring.factories b/platforms/spring-boot/components-starter/camel-core-starter/src/main/resources/META-INF/spring.factories
index 800582d..904d89c 100644
--- a/platforms/spring-boot/components-starter/camel-core-starter/src/main/resources/META-INF/spring.factories
+++ b/platforms/spring-boot/components-starter/camel-core-starter/src/main/resources/META-INF/spring.factories
@@ -46,7 +46,7 @@ org.apache.camel.component.mock.springboot.MockComponentAutoConfiguration,\
org.apache.camel.component.browse.springboot.BrowseComponentAutoConfiguration,\
org.apache.camel.component.language.springboot.LanguageComponentAutoConfiguration,\
org.apache.camel.component.file.springboot.FileComponentAutoConfiguration,\
-org.apache.camel.component.file.springboot.ha.FileLockClusterServiceAutoConfiguration,\
+org.apache.camel.component.file.springboot.cluster.FileLockClusterServiceAutoConfiguration,\
org.apache.camel.component.timer.springboot.TimerComponentAutoConfiguration,\
org.apache.camel.component.test.springboot.TestComponentAutoConfiguration,\
org.apache.camel.component.beanclass.springboot.ClassComponentAutoConfiguration,\
diff --git a/platforms/spring-boot/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/ha/springboot/JGroupsLockClusterServiceAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/cluster/springboot/JGroupsLockClusterServiceAutoConfiguration.java
similarity index 88%
rename from platforms/spring-boot/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/ha/springboot/JGroupsLockClusterServiceAutoConfiguration.java
rename to platforms/spring-boot/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/cluster/springboot/JGroupsLockClusterServiceAutoConfiguration.java
index 00c5a53..03e8503 100644
--- a/platforms/spring-boot/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/ha/springboot/JGroupsLockClusterServiceAutoConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/cluster/springboot/JGroupsLockClusterServiceAutoConfiguration.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.jgroups.springboot.ha.springboot;
+package org.apache.camel.component.jgroups.springboot.cluster.springboot;
-import org.apache.camel.component.jgroups.ha.JGroupsLockClusterService;
-import org.apache.camel.ha.CamelClusterService;
+import org.apache.camel.cluster.CamelClusterService;
+import org.apache.camel.component.jgroups.cluster.JGroupsLockClusterService;
import org.apache.camel.spring.boot.CamelAutoConfiguration;
-import org.apache.camel.spring.boot.ha.ClusteredRouteControllerAutoConfiguration;
+import org.apache.camel.spring.boot.cluster.ClusteredRouteControllerAutoConfiguration;
import org.apache.camel.util.IntrospectionSupport;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
diff --git a/platforms/spring-boot/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/ha/springboot/JGroupsLockClusterServiceConfiguration.java b/platforms/spring-boot/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/cluster/springboot/JGroupsLockClusterServiceConfiguration.java
similarity index 96%
rename from platforms/spring-boot/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/ha/springboot/JGroupsLockClusterServiceConfiguration.java
rename to platforms/spring-boot/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/cluster/springboot/JGroupsLockClusterServiceConfiguration.java
index 9a2821e..c1a4e2d 100644
--- a/platforms/spring-boot/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/ha/springboot/JGroupsLockClusterServiceConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/cluster/springboot/JGroupsLockClusterServiceConfiguration.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.jgroups.springboot.ha.springboot;
+package org.apache.camel.component.jgroups.springboot.cluster.springboot;
import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/platforms/spring-boot/components-starter/camel-jgroups-starter/src/main/resources/META-INF/spring.factories b/platforms/spring-boot/components-starter/camel-jgroups-starter/src/main/resources/META-INF/spring.factories
index b52840f..b7b5b31 100644
--- a/platforms/spring-boot/components-starter/camel-jgroups-starter/src/main/resources/META-INF/spring.factories
+++ b/platforms/spring-boot/components-starter/camel-jgroups-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,4 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.apache.camel.component.jgroups.springboot.JGroupsComponentAutoConfiguration,\
-org.apache.camel.component.jgroups.ha.springboot.JGroupsLockClusterServiceAutoConfiguration
+org.apache.camel.component.jgroups.cluster.springboot.JGroupsLockClusterServiceAutoConfiguration
diff --git a/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/ha/KubernetesClusterServiceAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/cluster/KubernetesClusterServiceAutoConfiguration.java
similarity index 89%
rename from platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/ha/KubernetesClusterServiceAutoConfiguration.java
rename to platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/cluster/KubernetesClusterServiceAutoConfiguration.java
index 6e7f444..f789391 100644
--- a/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/ha/KubernetesClusterServiceAutoConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/cluster/KubernetesClusterServiceAutoConfiguration.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.kubernetes.springboot.ha;
+package org.apache.camel.component.kubernetes.springboot.cluster;
-import org.apache.camel.component.kubernetes.ha.KubernetesClusterService;
-import org.apache.camel.ha.CamelClusterService;
+import org.apache.camel.cluster.CamelClusterService;
+import org.apache.camel.component.kubernetes.cluster.KubernetesClusterService;
import org.apache.camel.spring.boot.CamelAutoConfiguration;
-import org.apache.camel.spring.boot.ha.ClusteredRouteControllerAutoConfiguration;
+import org.apache.camel.spring.boot.cluster.ClusteredRouteControllerAutoConfiguration;
import org.apache.camel.util.IntrospectionSupport;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
diff --git a/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/ha/KubernetesClusterServiceConfiguration.java b/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/cluster/KubernetesClusterServiceConfiguration.java
similarity index 98%
rename from platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/ha/KubernetesClusterServiceConfiguration.java
rename to platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/cluster/KubernetesClusterServiceConfiguration.java
index 42745a3..04d38d6 100644
--- a/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/ha/KubernetesClusterServiceConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/cluster/KubernetesClusterServiceConfiguration.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.kubernetes.springboot.ha;
+package org.apache.camel.component.kubernetes.springboot.cluster;
import java.util.Map;
diff --git a/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/resources/META-INF/spring.factories b/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/resources/META-INF/spring.factories
index 9a5a25a..0454ac3 100644
--- a/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/resources/META-INF/spring.factories
+++ b/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/main/resources/META-INF/spring.factories
@@ -24,7 +24,7 @@ org.apache.camel.component.kubernetes.builds.springboot.KubernetesBuildsComponen
org.apache.camel.component.kubernetes.pods.springboot.KubernetesPodsComponentAutoConfiguration,\
org.apache.camel.component.kubernetes.secrets.springboot.KubernetesSecretsComponentAutoConfiguration,\
org.apache.camel.component.kubernetes.springboot.KubernetesComponentAutoConfiguration,\
-org.apache.camel.component.kubernetes.springboot.ha.KubernetesClusterServiceAutoConfiguration,\
+org.apache.camel.component.kubernetes.springboot.cluster.KubernetesClusterServiceAutoConfiguration,\
org.apache.camel.component.kubernetes.replication_controllers.springboot.KubernetesReplicationControllersComponentAutoConfiguration,\
org.apache.camel.component.kubernetes.persistent_volumes.springboot.KubernetesPersistentVolumesComponentAutoConfiguration,\
org.apache.camel.component.kubernetes.build_configs.springboot.KubernetesBuildConfigsComponentAutoConfiguration,\
diff --git a/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/test/java/org/apache/camel/component/kubernetes/springboot/test/ha/KubernetesClusterServiceAutoConfigurationDisabledTest.java b/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/test/java/org/apache/camel/component/kubernetes/springboot/test/cluster/KubernetesClusterServiceAutoConfigurationDisabledTest.java
similarity index 86%
rename from platforms/spring-boot/components-starter/camel-kubernetes-starter/src/test/java/org/apache/camel/component/kubernetes/springboot/test/ha/KubernetesClusterServiceAutoConfigurationDisabledTest.java
rename to platforms/spring-boot/components-starter/camel-kubernetes-starter/src/test/java/org/apache/camel/component/kubernetes/springboot/test/cluster/KubernetesClusterServiceAutoConfigurationDisabledTest.java
index 8e304d6..a917b88 100644
--- a/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/test/java/org/apache/camel/component/kubernetes/springboot/test/ha/KubernetesClusterServiceAutoConfigurationDisabledTest.java
+++ b/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/test/java/org/apache/camel/component/kubernetes/springboot/test/cluster/KubernetesClusterServiceAutoConfigurationDisabledTest.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.kubernetes.springboot.test.ha;
+package org.apache.camel.component.kubernetes.springboot.test.cluster;
-import org.apache.camel.component.kubernetes.ha.KubernetesClusterService;
-import org.apache.camel.component.kubernetes.springboot.ha.KubernetesClusterServiceAutoConfiguration;
+import org.apache.camel.component.kubernetes.cluster.KubernetesClusterService;
+import org.apache.camel.component.kubernetes.springboot.cluster.KubernetesClusterServiceAutoConfiguration;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/test/java/org/apache/camel/component/kubernetes/springboot/test/ha/KubernetesClusterServiceAutoConfigurationTest.java b/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/test/java/org/apache/camel/component/kubernetes/springboot/test/cluster/KubernetesClusterServiceAutoConfigurationTest.java
similarity index 93%
rename from platforms/spring-boot/components-starter/camel-kubernetes-starter/src/test/java/org/apache/camel/component/kubernetes/springboot/test/ha/KubernetesClusterServiceAutoConfigurationTest.java
rename to platforms/spring-boot/components-starter/camel-kubernetes-starter/src/test/java/org/apache/camel/component/kubernetes/springboot/test/cluster/KubernetesClusterServiceAutoConfigurationTest.java
index 982540b..1f0f6c4 100644
--- a/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/test/java/org/apache/camel/component/kubernetes/springboot/test/ha/KubernetesClusterServiceAutoConfigurationTest.java
+++ b/platforms/spring-boot/components-starter/camel-kubernetes-starter/src/test/java/org/apache/camel/component/kubernetes/springboot/test/cluster/KubernetesClusterServiceAutoConfigurationTest.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.kubernetes.springboot.test.ha;
+package org.apache.camel.component.kubernetes.springboot.test.cluster;
-import org.apache.camel.component.kubernetes.ha.KubernetesClusterService;
-import org.apache.camel.component.kubernetes.springboot.ha.KubernetesClusterServiceAutoConfiguration;
+import org.apache.camel.component.kubernetes.cluster.KubernetesClusterService;
+import org.apache.camel.component.kubernetes.springboot.cluster.KubernetesClusterServiceAutoConfiguration;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/platforms/spring-boot/components-starter/camel-master-starter/src/main/java/org/apache/camel/component/master/springboot/MasterComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-master-starter/src/main/java/org/apache/camel/component/master/springboot/MasterComponentConfiguration.java
index cce155e..7df2f82 100644
--- a/platforms/spring-boot/components-starter/camel-master-starter/src/main/java/org/apache/camel/component/master/springboot/MasterComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-master-starter/src/main/java/org/apache/camel/component/master/springboot/MasterComponentConfiguration.java
@@ -17,8 +17,8 @@
package org.apache.camel.component.master.springboot;
import javax.annotation.Generated;
-import org.apache.camel.ha.CamelClusterService;
-import org.apache.camel.ha.CamelClusterService.Selector;
+import org.apache.camel.cluster.CamelClusterService;
+import org.apache.camel.cluster.CamelClusterService.Selector;
import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.NestedConfigurationProperty;
diff --git a/platforms/spring-boot/components-starter/camel-zookeeper-starter/src/main/java/org/apache/camel/component/zookeeper/ha/springboot/ZooKeeperClusterServiceAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-zookeeper-starter/src/main/java/org/apache/camel/component/zookeeper/cluster/springboot/ZooKeeperClusterServiceAutoConfiguration.java
similarity index 89%
rename from platforms/spring-boot/components-starter/camel-zookeeper-starter/src/main/java/org/apache/camel/component/zookeeper/ha/springboot/ZooKeeperClusterServiceAutoConfiguration.java
rename to platforms/spring-boot/components-starter/camel-zookeeper-starter/src/main/java/org/apache/camel/component/zookeeper/cluster/springboot/ZooKeeperClusterServiceAutoConfiguration.java
index f41656a..c34d82e 100644
--- a/platforms/spring-boot/components-starter/camel-zookeeper-starter/src/main/java/org/apache/camel/component/zookeeper/ha/springboot/ZooKeeperClusterServiceAutoConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-zookeeper-starter/src/main/java/org/apache/camel/component/zookeeper/cluster/springboot/ZooKeeperClusterServiceAutoConfiguration.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.zookeeper.ha.springboot;
+package org.apache.camel.component.zookeeper.cluster.springboot;
-import org.apache.camel.component.zookeeper.ha.ZooKeeperClusterService;
-import org.apache.camel.ha.CamelClusterService;
+import org.apache.camel.cluster.CamelClusterService;
+import org.apache.camel.component.zookeeper.cluster.ZooKeeperClusterService;
import org.apache.camel.spring.boot.CamelAutoConfiguration;
-import org.apache.camel.spring.boot.ha.ClusteredRouteControllerAutoConfiguration;
+import org.apache.camel.spring.boot.cluster.ClusteredRouteControllerAutoConfiguration;
import org.apache.camel.util.IntrospectionSupport;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
diff --git a/platforms/spring-boot/components-starter/camel-zookeeper-starter/src/main/java/org/apache/camel/component/zookeeper/ha/springboot/ZooKeeperClusterServiceConfiguration.java b/platforms/spring-boot/components-starter/camel-zookeeper-starter/src/main/java/org/apache/camel/component/zookeeper/cluster/springboot/ZooKeeperClusterServiceConfiguration.java
similarity index 97%
rename from platforms/spring-boot/components-starter/camel-zookeeper-starter/src/main/java/org/apache/camel/component/zookeeper/ha/springboot/ZooKeeperClusterServiceConfiguration.java
rename to platforms/spring-boot/components-starter/camel-zookeeper-starter/src/main/java/org/apache/camel/component/zookeeper/cluster/springboot/ZooKeeperClusterServiceConfiguration.java
index e9d4265..1feb5af 100644
--- a/platforms/spring-boot/components-starter/camel-zookeeper-starter/src/main/java/org/apache/camel/component/zookeeper/ha/springboot/ZooKeeperClusterServiceConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-zookeeper-starter/src/main/java/org/apache/camel/component/zookeeper/cluster/springboot/ZooKeeperClusterServiceConfiguration.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.zookeeper.ha.springboot;
+package org.apache.camel.component.zookeeper.cluster.springboot;
import java.util.Map;
diff --git a/platforms/spring-boot/components-starter/camel-zookeeper-starter/src/main/resources/META-INF/spring.factories b/platforms/spring-boot/components-starter/camel-zookeeper-starter/src/main/resources/META-INF/spring.factories
index e494925..f3a7b4b 100644
--- a/platforms/spring-boot/components-starter/camel-zookeeper-starter/src/main/resources/META-INF/spring.factories
+++ b/platforms/spring-boot/components-starter/camel-zookeeper-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,4 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.apache.camel.component.zookeeper.springboot.ZooKeeperComponentAutoConfiguration,\
-org.apache.camel.component.zookeeper.ha.springboot.ZooKeeperClusterServiceAutoConfiguration
+org.apache.camel.component.zookeeper.cluster.springboot.ZooKeeperClusterServiceAutoConfiguration
--
To stop receiving notification emails like this one, please contact
['"commits@camel.apache.org" <co...@camel.apache.org>'].