You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2020/03/04 08:58:13 UTC
[camel] 28/32: Rename package org.apache.camel.impl.cluster to
org.apache.camel.cluster
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 909bbcec7ab7361d22006819c5474e375dc7486d
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Wed Mar 4 08:02:37 2020 +0100
Rename package org.apache.camel.impl.cluster to org.apache.camel.cluster
---
.../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
.../apache/camel/{impl => }/cluster/ClusterServiceSelectorTest.java | 5 +----
.../org/apache/camel/{impl => }/cluster/ClusterServiceViewTest.java | 5 +----
.../file/cluster/FileLockClusteredRoutePolicyFactoryTest.java | 2 +-
.../component/file/cluster/FileLockClusteredRoutePolicyTest.java | 2 +-
25 files changed, 24 insertions(+), 36 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 7b24170..6d4e962 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.impl.cluster.ClusteredRoutePolicyFactory;
+import org.apache.camel.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 a251548..ccb46fd 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
@@ -32,7 +32,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.cluster.CamelClusterService;
import org.apache.camel.component.atomix.client.AtomixFactory;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.impl.cluster.ClusteredRoutePolicyFactory;
+import org.apache.camel.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/cluster/AtomixClientRoutePolicyTestSupport.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientRoutePolicyTestSupport.java
index a6a9cd6..6fc34cf 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
@@ -32,7 +32,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.cluster.CamelClusterService;
import org.apache.camel.component.atomix.client.AtomixFactory;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.impl.cluster.ClusteredRoutePolicy;
+import org.apache.camel.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/cluster/AtomixRoutePolicyFactoryTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixRoutePolicyFactoryTest.java
index 6961d57..61de3e4 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
@@ -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.cluster.ClusteredRoutePolicyFactory;
+import org.apache.camel.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/cluster/AtomixRoutePolicyTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixRoutePolicyTest.java
index f654385..6d00d99 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
@@ -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.cluster.ClusteredRoutePolicy;
+import org.apache.camel.cluster.ClusteredRoutePolicy;
import org.apache.camel.test.AvailablePortFinder;
import org.junit.Assert;
import org.junit.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 7c49e50..c633038 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.impl.cluster.ClusteredRoutePolicyFactory;
+import org.apache.camel.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 31f080e..ffbeb38 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
@@ -30,7 +30,7 @@ import com.orbitz.consul.Consul;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.consul.ConsulTestSupport;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.impl.cluster.ClusteredRoutePolicyFactory;
+import org.apache.camel.cluster.ClusteredRoutePolicyFactory;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
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 949c543..4d15d53 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
@@ -30,7 +30,7 @@ import com.orbitz.consul.Consul;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.consul.ConsulTestSupport;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.impl.cluster.ClusteredRoutePolicy;
+import org.apache.camel.cluster.ClusteredRoutePolicy;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
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 f676644..991eaea 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
@@ -23,7 +23,7 @@ import org.apache.camel.ServiceStatus;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jgroups.raft.utils.NopStateMachine;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.impl.cluster.ClusteredRoutePolicy;
+import org.apache.camel.cluster.ClusteredRoutePolicy;
import org.jgroups.JChannel;
import org.jgroups.raft.RaftHandle;
import org.junit.Test;
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 53f2721..1789100 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.impl.cluster.ClusteredRoutePolicyFactory;
+import org.apache.camel.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 afa68ec..83f9853 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.impl.cluster.ClusteredRoutePolicyFactory;
+import org.apache.camel.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 b3289c3..147e4f9 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
@@ -29,7 +29,7 @@ import java.util.stream.IntStream;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.zookeeper.ZooKeeperContainer;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.impl.cluster.ClusteredRoutePolicyFactory;
+import org.apache.camel.cluster.ClusteredRoutePolicyFactory;
import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
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 b686f74..0f21fe9 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
@@ -29,7 +29,7 @@ import java.util.stream.IntStream;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.zookeeper.ZooKeeperContainer;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.impl.cluster.ClusteredRoutePolicy;
+import org.apache.camel.cluster.ClusteredRoutePolicy;
import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
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 2b91015..0b4c0b0 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.impl.cluster.ClusteredRoutePolicyFactory" factory-method="forNamespace">
+ <bean id="cluster-policy" class="org.apache.camel.cluster.ClusteredRoutePolicyFactory" factory-method="forNamespace">
<constructor-arg value="my-ns"/>
</bean>
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteConfiguration.java b/core/camel-core-engine/src/main/java/org/apache/camel/cluster/ClusteredRouteConfiguration.java
similarity index 97%
rename from core/camel-core-engine/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteConfiguration.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/cluster/ClusteredRouteConfiguration.java
index 3eff1b5..05687c3 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteConfiguration.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/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.cluster;
+package org.apache.camel.cluster;
import java.time.Duration;
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteController.java b/core/camel-core-engine/src/main/java/org/apache/camel/cluster/ClusteredRouteController.java
similarity index 99%
rename from core/camel-core-engine/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteController.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/cluster/ClusteredRouteController.java
index 229b360..8af3ac3 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteController.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/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.cluster;
+package org.apache.camel.cluster;
import java.time.Duration;
import java.util.ArrayList;
@@ -35,7 +35,6 @@ 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-core-engine/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteFilter.java b/core/camel-core-engine/src/main/java/org/apache/camel/cluster/ClusteredRouteFilter.java
similarity index 97%
rename from core/camel-core-engine/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteFilter.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/cluster/ClusteredRouteFilter.java
index 85ddf48..4d72f47 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteFilter.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/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.cluster;
+package org.apache.camel.cluster;
import org.apache.camel.CamelContext;
import org.apache.camel.NamedNode;
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteFilters.java b/core/camel-core-engine/src/main/java/org/apache/camel/cluster/ClusteredRouteFilters.java
similarity index 98%
rename from core/camel-core-engine/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteFilters.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/cluster/ClusteredRouteFilters.java
index 278f506..9e5ff43 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteFilters.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/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.cluster;
+package org.apache.camel.cluster;
import java.util.Collection;
import java.util.Collections;
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicy.java b/core/camel-core-engine/src/main/java/org/apache/camel/cluster/ClusteredRoutePolicy.java
similarity index 98%
rename from core/camel-core-engine/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicy.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/cluster/ClusteredRoutePolicy.java
index 2d09695..c4e976a 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicy.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/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.cluster;
+package org.apache.camel.cluster;
import java.time.Duration;
import java.util.HashSet;
@@ -32,10 +32,6 @@ 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.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-core-engine/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicyFactory.java b/core/camel-core-engine/src/main/java/org/apache/camel/cluster/ClusteredRoutePolicyFactory.java
similarity index 97%
rename from core/camel-core-engine/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicyFactory.java
rename to core/camel-core-engine/src/main/java/org/apache/camel/cluster/ClusteredRoutePolicyFactory.java
index f3c87a0..fa02c8b 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicyFactory.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/cluster/ClusteredRoutePolicyFactory.java
@@ -14,12 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.impl.cluster;
+package org.apache.camel.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-core-engine/src/main/java/org/apache/camel/impl/cluster/package.html b/core/camel-core-engine/src/main/java/org/apache/camel/cluster/package.html
similarity index 100%
rename from core/camel-core-engine/src/main/java/org/apache/camel/impl/cluster/package.html
rename to core/camel-core-engine/src/main/java/org/apache/camel/cluster/package.html
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/cluster/ClusterServiceSelectorTest.java b/core/camel-core/src/test/java/org/apache/camel/cluster/ClusterServiceSelectorTest.java
similarity index 98%
rename from core/camel-core/src/test/java/org/apache/camel/impl/cluster/ClusterServiceSelectorTest.java
rename to core/camel-core/src/test/java/org/apache/camel/cluster/ClusterServiceSelectorTest.java
index a67ac63..25c2f22 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/cluster/ClusterServiceSelectorTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/cluster/ClusterServiceSelectorTest.java
@@ -14,16 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.impl.cluster;
+package org.apache.camel.cluster;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import org.apache.camel.CamelContext;
-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.apache.camel.support.cluster.AbstractCamelClusterService;
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/cluster/ClusterServiceViewTest.java b/core/camel-core/src/test/java/org/apache/camel/cluster/ClusterServiceViewTest.java
similarity index 97%
rename from core/camel-core/src/test/java/org/apache/camel/impl/cluster/ClusterServiceViewTest.java
rename to core/camel-core/src/test/java/org/apache/camel/cluster/ClusterServiceViewTest.java
index 1c5930f..feda62a 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/cluster/ClusterServiceViewTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/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.cluster;
+package org.apache.camel.cluster;
import java.util.Collections;
import java.util.HashSet;
@@ -28,9 +28,6 @@ import java.util.concurrent.TimeUnit;
import java.util.stream.IntStream;
import org.apache.camel.ServiceStatus;
-import org.apache.camel.cluster.CamelClusterEventListener;
-import org.apache.camel.cluster.CamelClusterMember;
-import org.apache.camel.cluster.CamelClusterService;
import org.apache.camel.support.cluster.AbstractCamelClusterService;
import org.apache.camel.support.cluster.AbstractCamelClusterView;
import org.junit.Assert;
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 6b6c4e6..71caa29 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
@@ -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.cluster.ClusteredRoutePolicyFactory;
+import org.apache.camel.cluster.ClusteredRoutePolicyFactory;
import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
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 d9d8f59..4c40720 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
@@ -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.cluster.ClusteredRoutePolicy;
+import org.apache.camel.cluster.ClusteredRoutePolicy;
import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;