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 67ae65213598389f3bec7a13048a157d472ae52a
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sun Mar 15 10:11:44 2020 +0100
CAMEL-14720: Move cluster from core-engine to camel-cluster
---
apache-camel/pom.xml | 4 ++++
apache-camel/src/main/descriptors/common-bin.xml | 1 +
core/{camel-core-languages => camel-core-cluster}/pom.xml | 8 ++++----
.../org/apache/camel/cluster/ClusteredRouteConfiguration.java | 0
.../java/org/apache/camel/cluster/ClusteredRouteController.java | 0
.../main/java/org/apache/camel/cluster/ClusteredRouteFilter.java | 0
.../main/java/org/apache/camel/cluster/ClusteredRouteFilters.java | 0
.../main/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-languages/pom.xml | 2 +-
core/camel-core/pom.xml | 6 +++++-
core/pom.xml | 1 +
parent/pom.xml | 5 +++++
platforms/karaf/features/src/main/resources/features.xml | 1 +
15 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index b50523f..58253ed 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -78,6 +78,10 @@
</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>
diff --git a/apache-camel/src/main/descriptors/common-bin.xml
b/apache-camel/src/main/descriptors/common-bin.xml
index 2d16104..5b29952 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -34,6 +34,7 @@
<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>
diff --git a/core/camel-core-languages/pom.xml b/core/camel-core-cluster/pom.xml
similarity index 89%
copy from core/camel-core-languages/pom.xml
copy to core/camel-core-cluster/pom.xml
index e6cabb2..531cf82 100644
--- a/core/camel-core-languages/pom.xml
+++ b/core/camel-core-cluster/pom.xml
@@ -27,16 +27,16 @@
<relativePath>..</relativePath>
</parent>
- <artifactId>camel-core-languages</artifactId>
+ <artifactId>camel-core-cluster</artifactId>
<packaging>jar</packaging>
- <name>Camel :: Core Languages</name>
- <description>The Base Camel Framework</description>
+ <name>Camel :: Core Cluster</name>
+ <description>Camel Core Cluster Support</description>
<properties>
<firstVersion>3.2.0</firstVersion>
<label>core</label>
- <camel-prepare-component>true</camel-prepare-component>
+ <camel-prepare-component>false</camel-prepare-component>
</properties>
<dependencies>
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/cluster/ClusteredRouteConfiguration.java
b/core/camel-core-cluster/src/main/java/org/apache/camel/cluster/ClusteredRouteConfiguration.java
similarity index 100%
rename from
core/camel-core-engine/src/main/java/org/apache/camel/cluster/ClusteredRouteConfiguration.java
rename to
core/camel-core-cluster/src/main/java/org/apache/camel/cluster/ClusteredRouteConfiguration.java
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/cluster/ClusteredRouteController.java
b/core/camel-core-cluster/src/main/java/org/apache/camel/cluster/ClusteredRouteController.java
similarity index 100%
rename from
core/camel-core-engine/src/main/java/org/apache/camel/cluster/ClusteredRouteController.java
rename to
core/camel-core-cluster/src/main/java/org/apache/camel/cluster/ClusteredRouteController.java
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/cluster/ClusteredRouteFilter.java
b/core/camel-core-cluster/src/main/java/org/apache/camel/cluster/ClusteredRouteFilter.java
similarity index 100%
rename from
core/camel-core-engine/src/main/java/org/apache/camel/cluster/ClusteredRouteFilter.java
rename to
core/camel-core-cluster/src/main/java/org/apache/camel/cluster/ClusteredRouteFilter.java
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/cluster/ClusteredRouteFilters.java
b/core/camel-core-cluster/src/main/java/org/apache/camel/cluster/ClusteredRouteFilters.java
similarity index 100%
rename from
core/camel-core-engine/src/main/java/org/apache/camel/cluster/ClusteredRouteFilters.java
rename to
core/camel-core-cluster/src/main/java/org/apache/camel/cluster/ClusteredRouteFilters.java
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/cluster/ClusteredRoutePolicy.java
b/core/camel-core-cluster/src/main/java/org/apache/camel/cluster/ClusteredRoutePolicy.java
similarity index 100%
rename from
core/camel-core-engine/src/main/java/org/apache/camel/cluster/ClusteredRoutePolicy.java
rename to
core/camel-core-cluster/src/main/java/org/apache/camel/cluster/ClusteredRoutePolicy.java
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/cluster/ClusteredRoutePolicyFactory.java
b/core/camel-core-cluster/src/main/java/org/apache/camel/cluster/ClusteredRoutePolicyFactory.java
similarity index 100%
rename from
core/camel-core-engine/src/main/java/org/apache/camel/cluster/ClusteredRoutePolicyFactory.java
rename to
core/camel-core-cluster/src/main/java/org/apache/camel/cluster/ClusteredRoutePolicyFactory.java
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/cluster/package.html
b/core/camel-core-cluster/src/main/java/org/apache/camel/cluster/package.html
similarity index 100%
rename from
core/camel-core-engine/src/main/java/org/apache/camel/cluster/package.html
rename to
core/camel-core-cluster/src/main/java/org/apache/camel/cluster/package.html
diff --git a/core/camel-core-languages/pom.xml
b/core/camel-core-languages/pom.xml
index e6cabb2..78eb996 100644
--- a/core/camel-core-languages/pom.xml
+++ b/core/camel-core-languages/pom.xml
@@ -31,7 +31,7 @@
<packaging>jar</packaging>
<name>Camel :: Core Languages</name>
- <description>The Base Camel Framework</description>
+ <description>Camel Core Languages</description>
<properties>
<firstVersion>3.2.0</firstVersion>
diff --git a/core/camel-core/pom.xml b/core/camel-core/pom.xml
index d27de25..80059b9 100644
--- a/core/camel-core/pom.xml
+++ b/core/camel-core/pom.xml
@@ -31,7 +31,7 @@
<packaging>jar</packaging>
<name>Camel :: Core</name>
- <description>The Core Camel Java DSL based router</description>
+ <description>The Core Camel Framework</description>
<dependencies>
@@ -43,6 +43,10 @@
<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>
diff --git a/core/pom.xml b/core/pom.xml
index 01a5f37..d76eb6b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -45,6 +45,7 @@
<module>camel-base</module>
<module>camel-xml-jaxp</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 08db078..d403d8e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -807,6 +807,11 @@
</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>
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 88546b3..0dccbc6 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -53,6 +53,7 @@
<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>
