You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/03/30 08:10:04 UTC
[camel] branch master updated (0c6e1c2 -> 7bfc50c)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 0c6e1c2 Regen
new de3c3c5 Move camel-cluster to impl package to avoid OSGi issues
new 7bfc50c Move camel-cluster to impl package to avoid OSGi issues
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../atomix/cluster/AtomixClientClusteredRoutePolicyFactoryMain.java | 2 +-
.../atomix/cluster/AtomixClientRoutePolicyFactoryTestSupport.java | 2 +-
.../atomix/cluster/AtomixClientRoutePolicyTestSupport.java | 2 +-
.../component/atomix/cluster/AtomixRoutePolicyFactoryTest.java | 2 +-
.../camel/component/atomix/cluster/AtomixRoutePolicyTest.java | 2 +-
.../consul/cluster/ConsulClusteredRoutePolicyFactoryMain.java | 2 +-
.../consul/cluster/ConsulClusteredRoutePolicyFactoryTest.java | 2 +-
.../component/consul/cluster/ConsulClusteredRoutePolicyTest.java | 2 +-
.../jgroups/raft/cluster/JGroupsRaftClusteredRoutePolicyTest.java | 2 +-
.../cluster/SpringZooKeeperClusteredRouteConfigurationTest.java | 2 +-
.../zookeeper/cluster/ZooKeeperClusteredRoutePolicyFactoryMain.java | 2 +-
.../zookeeper/cluster/ZooKeeperClusteredRoutePolicyFactoryTest.java | 2 +-
.../zookeeper/cluster/ZooKeeperClusteredRoutePolicyTest.java | 2 +-
.../cluster/SpringZooKeeperClusteredRouteConfigurationTest.xml | 2 +-
.../camel/{ => impl}/cluster/ClusteredRouteConfiguration.java | 2 +-
.../apache/camel/{ => impl}/cluster/ClusteredRouteController.java | 3 ++-
.../org/apache/camel/{ => impl}/cluster/ClusteredRouteFilter.java | 2 +-
.../org/apache/camel/{ => impl}/cluster/ClusteredRouteFilters.java | 2 +-
.../org/apache/camel/{ => impl}/cluster/ClusteredRoutePolicy.java | 6 +++++-
.../camel/{ => impl}/cluster/ClusteredRoutePolicyFactory.java | 3 ++-
.../src/main/java/org/apache/camel/{ => impl}/cluster/package.html | 0
.../file/cluster/FileLockClusteredRoutePolicyFactoryTest.java | 2 +-
.../component/file/cluster/FileLockClusteredRoutePolicyTest.java | 2 +-
23 files changed, 28 insertions(+), 22 deletions(-)
rename core/camel-cluster/src/main/java/org/apache/camel/{ => impl}/cluster/ClusteredRouteConfiguration.java (97%)
rename core/camel-cluster/src/main/java/org/apache/camel/{ => impl}/cluster/ClusteredRouteController.java (99%)
rename core/camel-cluster/src/main/java/org/apache/camel/{ => impl}/cluster/ClusteredRouteFilter.java (97%)
rename core/camel-cluster/src/main/java/org/apache/camel/{ => impl}/cluster/ClusteredRouteFilters.java (98%)
rename core/camel-cluster/src/main/java/org/apache/camel/{ => impl}/cluster/ClusteredRoutePolicy.java (98%)
rename core/camel-cluster/src/main/java/org/apache/camel/{ => impl}/cluster/ClusteredRoutePolicyFactory.java (97%)
rename core/camel-cluster/src/main/java/org/apache/camel/{ => impl}/cluster/package.html (100%)
[camel] 01/02: Move camel-cluster to impl package to avoid OSGi
issues
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit de3c3c55b7506549c2cef8329b76af68e9e78850
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Mar 30 09:46:30 2020 +0200
Move camel-cluster to impl package to avoid OSGi issues
---
.../camel/{ => impl}/cluster/ClusteredRouteConfiguration.java | 2 +-
.../apache/camel/{ => impl}/cluster/ClusteredRouteController.java | 3 ++-
.../org/apache/camel/{ => impl}/cluster/ClusteredRouteFilter.java | 2 +-
.../org/apache/camel/{ => impl}/cluster/ClusteredRouteFilters.java | 2 +-
.../org/apache/camel/{ => impl}/cluster/ClusteredRoutePolicy.java | 6 +++++-
.../camel/{ => impl}/cluster/ClusteredRoutePolicyFactory.java | 3 ++-
.../src/main/java/org/apache/camel/{ => impl}/cluster/package.html | 0
.../file/cluster/FileLockClusteredRoutePolicyFactoryTest.java | 2 +-
.../component/file/cluster/FileLockClusteredRoutePolicyTest.java | 2 +-
9 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/core/camel-cluster/src/main/java/org/apache/camel/cluster/ClusteredRouteConfiguration.java b/core/camel-cluster/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteConfiguration.java
similarity index 97%
rename from core/camel-cluster/src/main/java/org/apache/camel/cluster/ClusteredRouteConfiguration.java
rename to core/camel-cluster/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteConfiguration.java
index 05687c3..3eff1b5 100644
--- a/core/camel-cluster/src/main/java/org/apache/camel/cluster/ClusteredRouteConfiguration.java
+++ b/core/camel-cluster/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.cluster;
+package org.apache.camel.impl.cluster;
import java.time.Duration;
diff --git a/core/camel-cluster/src/main/java/org/apache/camel/cluster/ClusteredRouteController.java b/core/camel-cluster/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteController.java
similarity index 99%
rename from core/camel-cluster/src/main/java/org/apache/camel/cluster/ClusteredRouteController.java
rename to core/camel-cluster/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteController.java
index 8af3ac3..229b360 100644
--- a/core/camel-cluster/src/main/java/org/apache/camel/cluster/ClusteredRouteController.java
+++ b/core/camel-cluster/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.cluster;
+package org.apache.camel.impl.cluster;
import java.time.Duration;
import java.util.ArrayList;
@@ -35,6 +35,7 @@ import org.apache.camel.Experimental;
import org.apache.camel.NamedNode;
import org.apache.camel.Route;
import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.cluster.CamelClusterService;
import org.apache.camel.impl.engine.DefaultRouteController;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.spi.RoutePolicy;
diff --git a/core/camel-cluster/src/main/java/org/apache/camel/cluster/ClusteredRouteFilter.java b/core/camel-cluster/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteFilter.java
similarity index 97%
rename from core/camel-cluster/src/main/java/org/apache/camel/cluster/ClusteredRouteFilter.java
rename to core/camel-cluster/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteFilter.java
index 4d72f47..85ddf48 100644
--- a/core/camel-cluster/src/main/java/org/apache/camel/cluster/ClusteredRouteFilter.java
+++ b/core/camel-cluster/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.cluster;
+package org.apache.camel.impl.cluster;
import org.apache.camel.CamelContext;
import org.apache.camel.NamedNode;
diff --git a/core/camel-cluster/src/main/java/org/apache/camel/cluster/ClusteredRouteFilters.java b/core/camel-cluster/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteFilters.java
similarity index 98%
rename from core/camel-cluster/src/main/java/org/apache/camel/cluster/ClusteredRouteFilters.java
rename to core/camel-cluster/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteFilters.java
index 9e5ff43..278f506 100644
--- a/core/camel-cluster/src/main/java/org/apache/camel/cluster/ClusteredRouteFilters.java
+++ b/core/camel-cluster/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.cluster;
+package org.apache.camel.impl.cluster;
import java.util.Collection;
import java.util.Collections;
diff --git a/core/camel-cluster/src/main/java/org/apache/camel/cluster/ClusteredRoutePolicy.java b/core/camel-cluster/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicy.java
similarity index 98%
rename from core/camel-cluster/src/main/java/org/apache/camel/cluster/ClusteredRoutePolicy.java
rename to core/camel-cluster/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicy.java
index 10d7cd8..1088d66 100644
--- a/core/camel-cluster/src/main/java/org/apache/camel/cluster/ClusteredRoutePolicy.java
+++ b/core/camel-cluster/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.cluster;
+package org.apache.camel.impl.cluster;
import java.time.Duration;
import java.util.HashSet;
@@ -32,6 +32,10 @@ import org.apache.camel.Route;
import org.apache.camel.ServiceStatus;
import org.apache.camel.api.management.ManagedAttribute;
import org.apache.camel.api.management.ManagedResource;
+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.spi.CamelEvent;
import org.apache.camel.spi.CamelEvent.CamelContextStartedEvent;
import org.apache.camel.support.EventNotifierSupport;
diff --git a/core/camel-cluster/src/main/java/org/apache/camel/cluster/ClusteredRoutePolicyFactory.java b/core/camel-cluster/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicyFactory.java
similarity index 97%
rename from core/camel-cluster/src/main/java/org/apache/camel/cluster/ClusteredRoutePolicyFactory.java
rename to core/camel-cluster/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicyFactory.java
index fa02c8b..f3c87a0 100644
--- a/core/camel-cluster/src/main/java/org/apache/camel/cluster/ClusteredRoutePolicyFactory.java
+++ b/core/camel-cluster/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicyFactory.java
@@ -14,11 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.cluster;
+package org.apache.camel.impl.cluster;
import org.apache.camel.CamelContext;
import org.apache.camel.NamedNode;
import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.cluster.CamelClusterService;
import org.apache.camel.spi.RoutePolicy;
import org.apache.camel.spi.RoutePolicyFactory;
import org.apache.camel.support.cluster.ClusterServiceSelectors;
diff --git a/core/camel-cluster/src/main/java/org/apache/camel/cluster/package.html b/core/camel-cluster/src/main/java/org/apache/camel/impl/cluster/package.html
similarity index 100%
rename from core/camel-cluster/src/main/java/org/apache/camel/cluster/package.html
rename to core/camel-cluster/src/main/java/org/apache/camel/impl/cluster/package.html
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/cluster/FileLockClusteredRoutePolicyFactoryTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/cluster/FileLockClusteredRoutePolicyFactoryTest.java
index 2a96d50..046bf6e 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/cluster/FileLockClusteredRoutePolicyFactoryTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/cluster/FileLockClusteredRoutePolicyFactoryTest.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.cluster.ClusteredRoutePolicyFactory;
+import org.apache.camel.impl.cluster.ClusteredRoutePolicyFactory;
import org.apache.camel.impl.DefaultCamelContext;
import org.junit.Assert;
import org.junit.Test;
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/cluster/FileLockClusteredRoutePolicyTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/cluster/FileLockClusteredRoutePolicyTest.java
index cbf0151..a9e81ae 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/cluster/FileLockClusteredRoutePolicyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/cluster/FileLockClusteredRoutePolicyTest.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.cluster.ClusteredRoutePolicy;
+import org.apache.camel.impl.cluster.ClusteredRoutePolicy;
import org.apache.camel.impl.DefaultCamelContext;
import org.junit.Assert;
import org.junit.Test;
[camel] 02/02: Move camel-cluster to impl package to avoid OSGi
issues
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7bfc50c39742e96c96aa451c1cbd778bb74a6d46
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Mar 30 10:08:17 2020 +0200
Move camel-cluster to impl package to avoid OSGi issues
---
.../atomix/cluster/AtomixClientClusteredRoutePolicyFactoryMain.java | 2 +-
.../atomix/cluster/AtomixClientRoutePolicyFactoryTestSupport.java | 2 +-
.../component/atomix/cluster/AtomixClientRoutePolicyTestSupport.java | 2 +-
.../camel/component/atomix/cluster/AtomixRoutePolicyFactoryTest.java | 2 +-
.../apache/camel/component/atomix/cluster/AtomixRoutePolicyTest.java | 2 +-
.../component/consul/cluster/ConsulClusteredRoutePolicyFactoryMain.java | 2 +-
.../component/consul/cluster/ConsulClusteredRoutePolicyFactoryTest.java | 2 +-
.../camel/component/consul/cluster/ConsulClusteredRoutePolicyTest.java | 2 +-
.../jgroups/raft/cluster/JGroupsRaftClusteredRoutePolicyTest.java | 2 +-
.../cluster/SpringZooKeeperClusteredRouteConfigurationTest.java | 2 +-
.../zookeeper/cluster/ZooKeeperClusteredRoutePolicyFactoryMain.java | 2 +-
.../zookeeper/cluster/ZooKeeperClusteredRoutePolicyFactoryTest.java | 2 +-
.../component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyTest.java | 2 +-
.../cluster/SpringZooKeeperClusteredRouteConfigurationTest.xml | 2 +-
14 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientClusteredRoutePolicyFactoryMain.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientClusteredRoutePolicyFactoryMain.java
index b6fec94..416a529 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientClusteredRoutePolicyFactoryMain.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientClusteredRoutePolicyFactoryMain.java
@@ -22,7 +22,7 @@ import io.atomix.catalyst.transport.Address;
import io.atomix.copycat.server.storage.StorageLevel;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.cluster.ClusteredRoutePolicyFactory;
+import org.apache.camel.impl.cluster.ClusteredRoutePolicyFactory;
import org.apache.camel.impl.engine.ExplicitCamelContextNameStrategy;
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/cluster/AtomixClientRoutePolicyFactoryTestSupport.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientRoutePolicyFactoryTestSupport.java
index b870162..2a78a5e 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientRoutePolicyFactoryTestSupport.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientRoutePolicyFactoryTestSupport.java
@@ -30,8 +30,8 @@ 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.cluster.ClusteredRoutePolicyFactory;
import org.apache.camel.component.atomix.client.AtomixFactory;
+import org.apache.camel.impl.cluster.ClusteredRoutePolicyFactory;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.test.AvailablePortFinder;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientRoutePolicyTestSupport.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientRoutePolicyTestSupport.java
index 74d652d..bd5910f 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientRoutePolicyTestSupport.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientRoutePolicyTestSupport.java
@@ -30,8 +30,8 @@ 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.cluster.ClusteredRoutePolicy;
import org.apache.camel.component.atomix.client.AtomixFactory;
+import org.apache.camel.impl.cluster.ClusteredRoutePolicy;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.test.AvailablePortFinder;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixRoutePolicyFactoryTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixRoutePolicyFactoryTest.java
index eeee513..9fd5065 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixRoutePolicyFactoryTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixRoutePolicyFactoryTest.java
@@ -29,7 +29,7 @@ import java.util.concurrent.TimeUnit;
import io.atomix.catalyst.transport.Address;
import io.atomix.copycat.server.storage.StorageLevel;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.cluster.ClusteredRoutePolicyFactory;
+import org.apache.camel.impl.cluster.ClusteredRoutePolicyFactory;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.test.AvailablePortFinder;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixRoutePolicyTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixRoutePolicyTest.java
index e1c5c04..4798242 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixRoutePolicyTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixRoutePolicyTest.java
@@ -29,7 +29,7 @@ import java.util.concurrent.TimeUnit;
import io.atomix.catalyst.transport.Address;
import io.atomix.copycat.server.storage.StorageLevel;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.cluster.ClusteredRoutePolicy;
+import org.apache.camel.impl.cluster.ClusteredRoutePolicy;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.test.AvailablePortFinder;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryMain.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryMain.java
index b41b14d..a2cf563 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryMain.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryMain.java
@@ -20,7 +20,7 @@ import java.util.UUID;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.cluster.ClusteredRoutePolicyFactory;
+import org.apache.camel.impl.cluster.ClusteredRoutePolicyFactory;
import org.apache.camel.impl.engine.ExplicitCamelContextNameStrategy;
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/cluster/ConsulClusteredRoutePolicyFactoryTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryTest.java
index 188cf21..fe38dd4 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryTest.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryTest.java
@@ -28,8 +28,8 @@ import java.util.stream.IntStream;
import com.orbitz.consul.Consul;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.cluster.ClusteredRoutePolicyFactory;
import org.apache.camel.component.consul.ConsulTestSupport;
+import org.apache.camel.impl.cluster.ClusteredRoutePolicyFactory;
import org.apache.camel.impl.DefaultCamelContext;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyTest.java
index 2fa6a1f..d87cada 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyTest.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyTest.java
@@ -28,8 +28,8 @@ import java.util.stream.IntStream;
import com.orbitz.consul.Consul;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.cluster.ClusteredRoutePolicy;
import org.apache.camel.component.consul.ConsulTestSupport;
+import org.apache.camel.impl.cluster.ClusteredRoutePolicy;
import org.apache.camel.impl.DefaultCamelContext;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftClusteredRoutePolicyTest.java b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftClusteredRoutePolicyTest.java
index ea85caa..2687926 100644
--- a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftClusteredRoutePolicyTest.java
+++ b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftClusteredRoutePolicyTest.java
@@ -21,8 +21,8 @@ import java.util.ArrayList;
import org.apache.camel.CamelContext;
import org.apache.camel.ServiceStatus;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.cluster.ClusteredRoutePolicy;
import org.apache.camel.component.jgroups.raft.utils.NopStateMachine;
+import org.apache.camel.impl.cluster.ClusteredRoutePolicy;
import org.apache.camel.impl.DefaultCamelContext;
import org.jgroups.JChannel;
import org.jgroups.raft.RaftHandle;
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/SpringZooKeeperClusteredRouteConfigurationTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/SpringZooKeeperClusteredRouteConfigurationTest.java
index 1789100..53f2721 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/SpringZooKeeperClusteredRouteConfigurationTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/SpringZooKeeperClusteredRouteConfigurationTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.zookeeper.cluster;
import org.apache.camel.cluster.CamelClusterService;
-import org.apache.camel.cluster.ClusteredRoutePolicyFactory;
+import org.apache.camel.impl.cluster.ClusteredRoutePolicyFactory;
import org.apache.camel.test.spring.CamelSpringTestSupport;
import org.junit.Test;
import org.springframework.context.support.AbstractApplicationContext;
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyFactoryMain.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyFactoryMain.java
index 7a8a81f..567d7cb 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyFactoryMain.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyFactoryMain.java
@@ -20,7 +20,7 @@ import java.util.UUID;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.cluster.ClusteredRoutePolicyFactory;
+import org.apache.camel.impl.cluster.ClusteredRoutePolicyFactory;
import org.apache.camel.impl.engine.ExplicitCamelContextNameStrategy;
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/cluster/ZooKeeperClusteredRoutePolicyFactoryTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyFactoryTest.java
index 482ed02..0c38429 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyFactoryTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyFactoryTest.java
@@ -27,8 +27,8 @@ import java.util.stream.Collectors;
import java.util.stream.IntStream;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.cluster.ClusteredRoutePolicyFactory;
import org.apache.camel.component.zookeeper.ZooKeeperContainer;
+import org.apache.camel.impl.cluster.ClusteredRoutePolicyFactory;
import org.apache.camel.impl.DefaultCamelContext;
import org.junit.Assert;
import org.junit.Test;
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyTest.java
index ff072a4..fd00323 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyTest.java
@@ -27,8 +27,8 @@ import java.util.stream.Collectors;
import java.util.stream.IntStream;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.cluster.ClusteredRoutePolicy;
import org.apache.camel.component.zookeeper.ZooKeeperContainer;
+import org.apache.camel.impl.cluster.ClusteredRoutePolicy;
import org.apache.camel.impl.DefaultCamelContext;
import org.junit.Assert;
import org.junit.Test;
diff --git a/components/camel-zookeeper/src/test/resources/org/apache/camel/component/zookeeper/cluster/SpringZooKeeperClusteredRouteConfigurationTest.xml b/components/camel-zookeeper/src/test/resources/org/apache/camel/component/zookeeper/cluster/SpringZooKeeperClusteredRouteConfigurationTest.xml
index 0b4c0b0..2b91015 100644
--- a/components/camel-zookeeper/src/test/resources/org/apache/camel/component/zookeeper/cluster/SpringZooKeeperClusteredRouteConfigurationTest.xml
+++ b/components/camel-zookeeper/src/test/resources/org/apache/camel/component/zookeeper/cluster/SpringZooKeeperClusteredRouteConfigurationTest.xml
@@ -43,7 +43,7 @@
<property name="nodes" ref="zkConnectString"/>
</bean>
- <bean id="cluster-policy" class="org.apache.camel.cluster.ClusteredRoutePolicyFactory" factory-method="forNamespace">
+ <bean id="cluster-policy" class="org.apache.camel.impl.cluster.ClusteredRoutePolicyFactory" factory-method="forNamespace">
<constructor-arg value="my-ns"/>
</bean>