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:24 UTC
[camel] branch master updated (677e434 -> 7febb74)
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 677e434 CAMEL-14719: camel-core - Camel context started events should be emitted after its status is started. Also fix clustered route policy to only start routes after camel has been started up.
new 67ae652 CAMEL-14720: Move cluster from core-engine to camel-cluster
new 46f275e CAMEL-14720: Move cluster from core-engine to camel-cluster
new 1725a02 CAMEL-14720: Move cluster from core-engine to camel-cluster
new 7febb74 CAMEL-14627: We still have references to 3.1.0-SNAPSHOT
The 4 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:
apache-camel/pom.xml | 4 ++
apache-camel/src/main/descriptors/common-bin.xml | 1 +
bom/camel-bom/pom.xml | 5 ++
components/camel-atomix/pom.xml | 4 ++
components/camel-consul/pom.xml | 9 ++++
components/camel-file/pom.xml | 4 ++
components/camel-jgroups-raft/pom.xml | 5 ++
components/camel-jgroups/pom.xml | 5 ++
components/camel-kubernetes/pom.xml | 9 ++++
components/camel-master/pom.xml | 4 ++
components/camel-zookeeper/pom.xml | 9 ++++
.../pom.xml | 8 +--
.../camel/cluster/ClusteredRouteConfiguration.java | 0
.../camel/cluster/ClusteredRouteController.java | 0
.../apache/camel/cluster/ClusteredRouteFilter.java | 0
.../camel/cluster/ClusteredRouteFilters.java | 0
.../apache/camel/cluster/ClusteredRoutePolicy.java | 0
.../camel/cluster/ClusteredRoutePolicyFactory.java | 0
.../java/org/apache/camel/cluster/package.html | 0
core/camel-core-languages/pom.xml | 2 +-
.../services/org/apache/camel/language.properties | 2 +-
core/camel-core/pom.xml | 6 ++-
core/pom.xml | 1 +
.../modules/ROOT/pages/camel-3x-upgrade-guide.adoc | 60 +++++++++++++---------
parent/pom.xml | 5 ++
.../karaf/features/src/main/resources/features.xml | 1 +
.../test/resources/json/component_metadata.json | 4 +-
.../src/test/resources/json/test_component.json | 2 +-
.../src/test/resources/json/test_component2.json | 2 +-
29 files changed, 117 insertions(+), 35 deletions(-)
copy core/{camel-core-languages => camel-cluster}/pom.xml (89%)
rename core/{camel-core-engine => camel-cluster}/src/main/java/org/apache/camel/cluster/ClusteredRouteConfiguration.java (100%)
rename core/{camel-core-engine => camel-cluster}/src/main/java/org/apache/camel/cluster/ClusteredRouteController.java (100%)
rename core/{camel-core-engine => camel-cluster}/src/main/java/org/apache/camel/cluster/ClusteredRouteFilter.java (100%)
rename core/{camel-core-engine => camel-cluster}/src/main/java/org/apache/camel/cluster/ClusteredRouteFilters.java (100%)
rename core/{camel-core-engine => camel-cluster}/src/main/java/org/apache/camel/cluster/ClusteredRoutePolicy.java (100%)
rename core/{camel-core-engine => camel-cluster}/src/main/java/org/apache/camel/cluster/ClusteredRoutePolicyFactory.java (100%)
rename core/{camel-core-engine => camel-cluster}/src/main/java/org/apache/camel/cluster/package.html (100%)
[camel] 02/04: CAMEL-14720: Move cluster from core-engine to
camel-cluster
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 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>
[camel] 03/04: CAMEL-14720: Move cluster from core-engine to
camel-cluster
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 1725a02694b21989d4e33422e4c4fda05e40e80b
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Mar 15 10:39:19 2020 +0100
CAMEL-14720: Move cluster from core-engine to camel-cluster
---
bom/camel-bom/pom.xml | 5 ++
components/camel-atomix/pom.xml | 4 ++
components/camel-consul/pom.xml | 9 ++++
components/camel-file/pom.xml | 4 ++
components/camel-jgroups-raft/pom.xml | 5 ++
components/camel-jgroups/pom.xml | 5 ++
components/camel-kubernetes/pom.xml | 9 ++++
components/camel-master/pom.xml | 4 ++
components/camel-zookeeper/pom.xml | 9 ++++
.../services/org/apache/camel/language.properties | 2 +-
.../modules/ROOT/pages/camel-3x-upgrade-guide.adoc | 60 +++++++++++++---------
11 files changed, 91 insertions(+), 25 deletions(-)
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 3de2e01..19a986f 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -438,6 +438,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-cm-sms</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/components/camel-atomix/pom.xml b/components/camel-atomix/pom.xml
index 1ef0c20..a940d3c 100644
--- a/components/camel-atomix/pom.xml
+++ b/components/camel-atomix/pom.xml
@@ -41,6 +41,10 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-support</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-cluster</artifactId>
+ </dependency>
<!-- atomix -->
<dependency>
diff --git a/components/camel-consul/pom.xml b/components/camel-consul/pom.xml
index 8c1d5f2..5f47eec 100644
--- a/components/camel-consul/pom.xml
+++ b/components/camel-consul/pom.xml
@@ -38,9 +38,18 @@
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-support</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-cloud</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-cluster</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>com.orbitz.consul</groupId>
<artifactId>consul-client</artifactId>
<version>${consul-client-version}</version>
diff --git a/components/camel-file/pom.xml b/components/camel-file/pom.xml
index b7b4dba..9b19d44 100644
--- a/components/camel-file/pom.xml
+++ b/components/camel-file/pom.xml
@@ -38,6 +38,10 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-support</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-cluster</artifactId>
+ </dependency>
<!-- TODO: needed for dynamic to, until we have a better solution -->
<dependency>
diff --git a/components/camel-jgroups-raft/pom.xml b/components/camel-jgroups-raft/pom.xml
index 1a1709a..09a2e98 100644
--- a/components/camel-jgroups-raft/pom.xml
+++ b/components/camel-jgroups-raft/pom.xml
@@ -40,6 +40,11 @@
<artifactId>camel-support</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-cluster</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.jgroups</groupId>
<artifactId>jgroups-raft</artifactId>
<version>${jgroups-raft-version}</version>
diff --git a/components/camel-jgroups/pom.xml b/components/camel-jgroups/pom.xml
index 449799c..876e7a5 100644
--- a/components/camel-jgroups/pom.xml
+++ b/components/camel-jgroups/pom.xml
@@ -40,6 +40,11 @@
<artifactId>camel-support</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-cluster</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.jgroups</groupId>
<artifactId>jgroups</artifactId>
<version>${jgroups-version}</version>
diff --git a/components/camel-kubernetes/pom.xml b/components/camel-kubernetes/pom.xml
index 0a1fd8f..4500cb6 100644
--- a/components/camel-kubernetes/pom.xml
+++ b/components/camel-kubernetes/pom.xml
@@ -37,9 +37,18 @@
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-support</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-cloud</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-cluster</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-client</artifactId>
<version>${kubernetes-client-version}</version>
diff --git a/components/camel-master/pom.xml b/components/camel-master/pom.xml
index aa53d7a..820e9c8 100644
--- a/components/camel-master/pom.xml
+++ b/components/camel-master/pom.xml
@@ -41,6 +41,10 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-support</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-cluster</artifactId>
+ </dependency>
<!-- test dependencies -->
<dependency>
diff --git a/components/camel-zookeeper/pom.xml b/components/camel-zookeeper/pom.xml
index bb3f238..c302d89 100644
--- a/components/camel-zookeeper/pom.xml
+++ b/components/camel-zookeeper/pom.xml
@@ -39,9 +39,18 @@
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-support</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-cloud</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-cluster</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>${zookeeper-version}</version>
diff --git a/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language.properties b/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language.properties
index 73e589c..fcd4da8 100644
--- a/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language.properties
+++ b/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language.properties
@@ -4,4 +4,4 @@ groupId=org.apache.camel
artifactId=camel-core-languages
version=3.2.0-SNAPSHOT
projectName=Camel :: Core Languages
-projectDescription=The Base Camel Framework
+projectDescription=Camel Core Languages
diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc
index f3ab8f1..8e44115 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc
@@ -649,29 +649,30 @@ The XML DSL has changed for the `<configuration>` element, which now
is flattened so the key/values should be configured on it directly:
Before:
-[source,mxl]
+[source,xml]
----
- <dataFormats>
- <any23 id="any23" baseURI ="http://mock.foo/bar" outputFormat="TURTLE" >
- <configuration>
- <property key="any23.extraction.metadata.nesting" value="off" />
- <property key="another-key" value="another-value" />
- </configuration>
- <extractors>html-head-title</extractors>
- </any23>
- </dataFormats>
+<dataFormats>
+ <any23 id="any23" baseURI ="http://mock.foo/bar" outputFormat="TURTLE" >
+ <configuration>
+ <property key="any23.extraction.metadata.nesting" value="off" />
+ <property key="another-key" value="another-value" />
+ </configuration>
+ <extractors>html-head-title</extractors>
+ </any23>
+</dataFormats>
----
After:
-[source,mxl]
+
+[source,xml]
----
- <dataFormats>
- <any23 id="any23" baseURI ="http://mock.foo/bar" outputFormat="TURTLE" >
- <configuration key="any23.extraction.metadata.nesting" value="off"/>
- <configuration key="another-key" value="another-value"/>
- <extractors>html-head-title</extractors>
- </any23>
- </dataFormats>
+<dataFormats>
+ <any23 id="any23" baseURI ="http://mock.foo/bar" outputFormat="TURTLE" >
+ <configuration key="any23.extraction.metadata.nesting" value="off"/>
+ <configuration key="another-key" value="another-value"/>
+ <extractors>html-head-title</extractors>
+ </any23>
+</dataFormats>
----
=== camel-infinispan
@@ -725,7 +726,7 @@ Multiple values for `implicitCollections` and `omitFields` can be separated by c
For example:
[source,xml]
----
- <implicitCollections key="org.apache.camel.dataformat.xstream.PurchaseHistory" value="history,adress"/>
+<implicitCollections key="org.apache.camel.dataformat.xstream.PurchaseHistory" value="history,adress"/>
----
=== Endpoint URIs without context path
@@ -747,17 +748,28 @@ The context scope error handling has been modified a bit. The processors in tho
`onCompletion` are not shared between routes anymore. This should have little effect in most cases.
If there is a need to have a single set of processors involved (such as when using a loadbalancer or
other stateful patterns), then an intermediary route needs to be used. The following exerpt:
-```
+
+[source,java]
+----
onException(Exception.class).handled(true)
.loadBalance().roundRobin().id("round")
.to("mock:error", "mock:error2", "mock:error3");
-```
-needs to be rewritten as:
-```
+----
+
+... needs to be rewritten as:
+
+[source,java]
+----
onException(Exception.class).handled(true).to("direct:error");
+
from("direct:error").loadBalance().roundRobin().id("round")
.to("mock:error", "mock:error2", "mock:error3");
-```
+----
+
+=== camel-cluster
+
+The base support for cluster in `org.apache.camel.cluster` has been moved
+out of `camel-core-engine` into separate JAR named `camel-cluster`.
=== API changes
[camel] 04/04: CAMEL-14627: We still have references to
3.1.0-SNAPSHOT
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 7febb743ed3b21e58f99ffc6dfea45c142464d84
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Mar 15 10:43:14 2020 +0100
CAMEL-14627: We still have references to 3.1.0-SNAPSHOT
---
.../src/test/resources/json/component_metadata.json | 4 ++--
.../src/test/resources/json/test_component.json | 2 +-
.../src/test/resources/json/test_component2.json | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tooling/maven/camel-package-maven-plugin/src/test/resources/json/component_metadata.json b/tooling/maven/camel-package-maven-plugin/src/test/resources/json/component_metadata.json
index d6a38b5..3e5de05 100644
--- a/tooling/maven/camel-package-maven-plugin/src/test/resources/json/component_metadata.json
+++ b/tooling/maven/camel-package-maven-plugin/src/test/resources/json/component_metadata.json
@@ -8,7 +8,7 @@
"lenientProperties": false,
"groupId": "org.apache.camel",
"artifactId": "camel-debezium-mysql",
- "version": "3.1.0-SNAPSHOT",
+ "version": "3.2.0-SNAPSHOT",
"endpointOptions": [],
"title": "Debezium MySQL Connector",
"description": "Represents a Debezium MySQL endpoint which is used to capture changes in MySQL database so that that applications can see those changes and respond to them.",
@@ -28,7 +28,7 @@
"lenientProperties": false,
"groupId": "org.apache.camel",
"artifactId": "camel-timer",
- "version": "3.1.0-SNAPSHOT",
+ "version": "3.2.0-SNAPSHOT",
"endpointOptions": [],
"title": "Timer",
"description": "The timer component is used for generating message exchanges when a timer fires.",
diff --git a/tooling/maven/camel-package-maven-plugin/src/test/resources/json/test_component.json b/tooling/maven/camel-package-maven-plugin/src/test/resources/json/test_component.json
index 5779cf2..d1fa808 100644
--- a/tooling/maven/camel-package-maven-plugin/src/test/resources/json/test_component.json
+++ b/tooling/maven/camel-package-maven-plugin/src/test/resources/json/test_component.json
@@ -16,7 +16,7 @@
"firstVersion": "2.13.0",
"groupId": "org.apache.camel",
"artifactId": "camel-kafka",
- "version": "3.1.0-SNAPSHOT"
+ "version": "3.2.0-SNAPSHOT"
},
"componentProperties": {
"configuration": { "kind": "property", "displayName": "Configuration", "group": "common", "required": false, "type": "object", "javaType": "org.apache.camel.component.kafka.KafkaConfiguration", "deprecated": false, "secret": false, "description": "Allows to pre-configure the Kafka component with common options that the endpoints will reuse." },
diff --git a/tooling/maven/camel-package-maven-plugin/src/test/resources/json/test_component2.json b/tooling/maven/camel-package-maven-plugin/src/test/resources/json/test_component2.json
index f2b7e2a..8746914 100644
--- a/tooling/maven/camel-package-maven-plugin/src/test/resources/json/test_component2.json
+++ b/tooling/maven/camel-package-maven-plugin/src/test/resources/json/test_component2.json
@@ -16,7 +16,7 @@
"firstVersion": "2.13.0",
"groupId": "org.apache.camel",
"artifactId": "camel-kafka",
- "version": "3.1.0-SNAPSHOT"
+ "version": "3.2.0-SNAPSHOT"
},
"componentProperties": {},
"properties": {}
[camel] 01/04: CAMEL-14720: Move cluster from core-engine to
camel-cluster
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 67ae65213598389f3bec7a13048a157d472ae52a
Author: Claus Ibsen <cl...@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>