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:27 UTC
[camel] 03/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 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