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:05 UTC
[camel] 01/02: Move camel-cluster to impl package to avoid OSGi
issues
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;