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/15 09:53:26 UTC
[camel] 02/04: CAMEL-14720: Move cluster from core-engine to
camel-cluster
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 46f275e84f7cec7f81d3353a7523c3a5a1003883
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Mar 15 10:15:56 2020 +0100
CAMEL-14720: Move cluster from core-engine to camel-cluster
---
apache-camel/pom.xml | 8 ++++----
apache-camel/src/main/descriptors/common-bin.xml | 2 +-
core/{camel-core-cluster => camel-cluster}/pom.xml | 6 +++---
.../org/apache/camel/cluster/ClusteredRouteConfiguration.java | 0
.../org/apache/camel/cluster/ClusteredRouteController.java | 0
.../java/org/apache/camel/cluster/ClusteredRouteFilter.java | 0
.../java/org/apache/camel/cluster/ClusteredRouteFilters.java | 0
.../java/org/apache/camel/cluster/ClusteredRoutePolicy.java | 0
.../org/apache/camel/cluster/ClusteredRoutePolicyFactory.java | 0
.../src/main/java/org/apache/camel/cluster/package.html | 0
core/camel-core/pom.xml | 8 ++++----
core/pom.xml | 2 +-
parent/pom.xml | 10 +++++-----
platforms/karaf/features/src/main/resources/features.xml | 2 +-
14 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 58253ed..06e38bb 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -78,10 +78,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-core-cluster</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-core-languages</artifactId>
</dependency>
<dependency>
@@ -102,6 +98,10 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-cluster</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-headersmap</artifactId>
</dependency>
<dependency>
diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml
index 5b29952..d4fea9d 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -34,13 +34,13 @@
<include>org.apache.camel:camel-base</include>
<include>org.apache.camel:camel-support</include>
<include>org.apache.camel:camel-core</include>
- <include>org.apache.camel:camel-core-cluster</include>
<include>org.apache.camel:camel-core-engine</include>
<include>org.apache.camel:camel-core-languages</include>
<include>org.apache.camel:camel-core-osgi</include>
<include>org.apache.camel:camel-core-xml</include>
<include>org.apache.camel:camel-core-catalog</include>
<include>org.apache.camel:camel-cloud</include>
+ <include>org.apache.camel:camel-cluster</include>
<include>org.apache.camel:camel-xml-jaxp</include>
<include>org.apache.camel:camel-main</include>
<include>org.apache.camel:camel-tooling-model</include>
diff --git a/core/camel-core-cluster/pom.xml b/core/camel-cluster/pom.xml
similarity index 92%
rename from core/camel-core-cluster/pom.xml
rename to core/camel-cluster/pom.xml
index 531cf82..9a6c1d5 100644
--- a/core/camel-core-cluster/pom.xml
+++ b/core/camel-cluster/pom.xml
@@ -27,11 +27,11 @@
<relativePath>..</relativePath>
</parent>
- <artifactId>camel-core-cluster</artifactId>
+ <artifactId>camel-cluster</artifactId>
<packaging>jar</packaging>
- <name>Camel :: Core Cluster</name>
- <description>Camel Core Cluster Support</description>
+ <name>Camel :: Cluster</name>
+ <description>Camel Cluster Support</description>
<properties>
<firstVersion>3.2.0</firstVersion>
diff --git a/core/camel-core-cluster/src/main/java/org/apache/camel/cluster/ClusteredRouteConfiguration.java b/core/camel-cluster/src/main/java/org/apache/camel/cluster/ClusteredRouteConfiguration.java
similarity index 100%
rename from core/camel-core-cluster/src/main/java/org/apache/camel/cluster/ClusteredRouteConfiguration.java
rename to core/camel-cluster/src/main/java/org/apache/camel/cluster/ClusteredRouteConfiguration.java
diff --git a/core/camel-core-cluster/src/main/java/org/apache/camel/cluster/ClusteredRouteController.java b/core/camel-cluster/src/main/java/org/apache/camel/cluster/ClusteredRouteController.java
similarity index 100%
rename from core/camel-core-cluster/src/main/java/org/apache/camel/cluster/ClusteredRouteController.java
rename to core/camel-cluster/src/main/java/org/apache/camel/cluster/ClusteredRouteController.java
diff --git a/core/camel-core-cluster/src/main/java/org/apache/camel/cluster/ClusteredRouteFilter.java b/core/camel-cluster/src/main/java/org/apache/camel/cluster/ClusteredRouteFilter.java
similarity index 100%
rename from core/camel-core-cluster/src/main/java/org/apache/camel/cluster/ClusteredRouteFilter.java
rename to core/camel-cluster/src/main/java/org/apache/camel/cluster/ClusteredRouteFilter.java
diff --git a/core/camel-core-cluster/src/main/java/org/apache/camel/cluster/ClusteredRouteFilters.java b/core/camel-cluster/src/main/java/org/apache/camel/cluster/ClusteredRouteFilters.java
similarity index 100%
rename from core/camel-core-cluster/src/main/java/org/apache/camel/cluster/ClusteredRouteFilters.java
rename to core/camel-cluster/src/main/java/org/apache/camel/cluster/ClusteredRouteFilters.java
diff --git a/core/camel-core-cluster/src/main/java/org/apache/camel/cluster/ClusteredRoutePolicy.java b/core/camel-cluster/src/main/java/org/apache/camel/cluster/ClusteredRoutePolicy.java
similarity index 100%
rename from core/camel-core-cluster/src/main/java/org/apache/camel/cluster/ClusteredRoutePolicy.java
rename to core/camel-cluster/src/main/java/org/apache/camel/cluster/ClusteredRoutePolicy.java
diff --git a/core/camel-core-cluster/src/main/java/org/apache/camel/cluster/ClusteredRoutePolicyFactory.java b/core/camel-cluster/src/main/java/org/apache/camel/cluster/ClusteredRoutePolicyFactory.java
similarity index 100%
rename from core/camel-core-cluster/src/main/java/org/apache/camel/cluster/ClusteredRoutePolicyFactory.java
rename to core/camel-cluster/src/main/java/org/apache/camel/cluster/ClusteredRoutePolicyFactory.java
diff --git a/core/camel-core-cluster/src/main/java/org/apache/camel/cluster/package.html b/core/camel-cluster/src/main/java/org/apache/camel/cluster/package.html
similarity index 100%
rename from core/camel-core-cluster/src/main/java/org/apache/camel/cluster/package.html
rename to core/camel-cluster/src/main/java/org/apache/camel/cluster/package.html
diff --git a/core/camel-core/pom.xml b/core/camel-core/pom.xml
index 80059b9..db794cf 100644
--- a/core/camel-core/pom.xml
+++ b/core/camel-core/pom.xml
@@ -43,10 +43,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-languages</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core-cluster</artifactId>
- </dependency>
<!-- core components -->
<dependency>
@@ -63,6 +59,10 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-cluster</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-controlbus</artifactId>
</dependency>
<dependency>
diff --git a/core/pom.xml b/core/pom.xml
index d76eb6b..c517dca 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -44,8 +44,8 @@
<module>camel-management</module>
<module>camel-base</module>
<module>camel-xml-jaxp</module>
+ <module>camel-cluster</module>
<module>camel-core-engine</module>
- <module>camel-core-cluster</module>
<module>camel-core-languages</module>
<module>camel-xml-io</module>
<module>camel-xml-jaxb</module>
diff --git a/parent/pom.xml b/parent/pom.xml
index d403d8e..4633a2b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -807,11 +807,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-core-cluster</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-core-languages</artifactId>
<version>${project.version}</version>
</dependency>
@@ -847,6 +842,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-cluster</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-headersmap</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 0dccbc6..ade13c6 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -53,12 +53,12 @@
<bundle>mvn:org.apache.camel/camel-support/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-base/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-management/${project.version}</bundle>
- <bundle>mvn:org.apache.camel/camel-core-cluster/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-core-engine/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-core-languages/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-core-osgi/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-core-catalog/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-cloud/${project.version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-cluster/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-xml-jaxp/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-xml-jaxb/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-main/${project.version}</bundle>